Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro has been corrected in recent avr-libc versions

Demos/AudioInput/AudioInput.c

@@ -63,8 +63,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 	
 	/* Hardware Initialization */
 	LEDs_Init();

Demos/AudioInput/AudioInput.h

@@ -39,6 +39,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 
 		#include "Descriptors.h"
 				

Demos/AudioOutput/AudioOutput.c

@@ -66,8 +66,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	LEDs_Init();

Demos/AudioOutput/AudioOutput.h

@@ -39,6 +39,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 
 		#include "Descriptors.h"
 		

Demos/BluetoothHost/BluetoothHost.c

@@ -74,8 +74,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);

Demos/BluetoothHost/BluetoothHost.h

@@ -35,6 +35,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/pgmspace.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 
 		#include "BluetoothStack.h"

Demos/CDC/CDC.c

@@ -87,8 +87,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/CDC/CDC.h

@@ -39,6 +39,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 		#include <string.h>
 
 		#include "Descriptors.h"

Demos/CDCHost/CDCHost.c

@@ -59,8 +59,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);

Demos/CDCHost/CDCHost.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/pgmspace.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 
 		#include <LUFA/Version.h>                                // Library Version Information

Demos/DualCDC/DualCDC.c

@@ -101,8 +101,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/DualCDC/DualCDC.h

@@ -39,6 +39,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 		#include <string.h>
 
 		#include "Descriptors.h"

Demos/Joystick/Joystick.c

@@ -58,8 +58,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/Joystick/Joystick.h

@@ -39,6 +39,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 		#include <string.h>
 
 		#include "Descriptors.h"

Demos/Keyboard/Keyboard.c

@@ -77,8 +77,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/Keyboard/Keyboard.h

@@ -41,6 +41,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/interrupt.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 		#include <string.h>
 

Demos/KeyboardFullInt/KeyboardFullInt.c

@@ -70,8 +70,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/KeyboardFullInt/KeyboardFullInt.h

@@ -41,6 +41,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/interrupt.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 		#include <string.h>
 

Demos/KeyboardHost/KeyboardHost.c

@@ -59,8 +59,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);

Demos/KeyboardHost/KeyboardHost.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/pgmspace.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 
 		#include <LUFA/Version.h>                                // Library Version Information

Demos/KeyboardHostViaInt/KeyboardHostViaInt.c

@@ -59,8 +59,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);

Demos/KeyboardHostViaInt/KeyboardHostViaInt.h

@@ -41,6 +41,7 @@
 		#include <avr/pgmspace.h>
 		#include <avr/interrupt.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 
 		#include <LUFA/Version.h>                                // Library Version Information

Demos/KeyboardHostWithParser/KeyboardHostWithParser.c

@@ -59,8 +59,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);

Demos/KeyboardHostWithParser/KeyboardHostWithParser.h

@@ -35,6 +35,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/pgmspace.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 
 		#include <LUFA/Version.h>                                // Library Version Information

Demos/KeyboardMouse/KeyboardMouse.c

@@ -67,8 +67,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/KeyboardMouse/KeyboardMouse.h

@@ -35,6 +35,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 		#include <string.h>
 

Demos/KeyboardViaInt/KeyboardViaInt.c

@@ -76,8 +76,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/KeyboardViaInt/KeyboardViaInt.h

@@ -41,6 +41,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/interrupt.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 		#include <string.h>
 

Demos/MIDI/MIDI.c

@@ -58,8 +58,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 	
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/MIDI/MIDI.h

@@ -39,6 +39,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 
 		#include "Descriptors.h"

Demos/MassStorage/MassStorage.c

@@ -68,8 +68,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	LEDs_Init();

Demos/MassStorage/MassStorage.h

@@ -39,6 +39,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 
 		#include "Descriptors.h"
 		#include "SCSI.h"

Demos/MassStorageHost/MassStorageHost.c

@@ -63,8 +63,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);

Demos/MassStorageHost/MassStorageHost.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/pgmspace.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 		#include <ctype.h>
 

Demos/Mouse/Mouse.c

@@ -76,8 +76,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/Mouse/Mouse.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/interrupt.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 		#include <string.h>
 		

Demos/MouseFullInt/MouseFullInt.c

@@ -69,8 +69,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/MouseFullInt/MouseFullInt.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/interrupt.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 		#include <string.h>
 		

Demos/MouseHost/MouseHost.c

@@ -59,8 +59,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 	
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);

Demos/MouseHost/MouseHost.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/pgmspace.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 
 		#include <LUFA/Version.h>                                // Library Version Information

Demos/MouseHostViaInt/MouseHostViaInt.c

@@ -59,8 +59,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);

Demos/MouseHostViaInt/MouseHostViaInt.h

@@ -41,6 +41,7 @@
 		#include <avr/pgmspace.h>
 		#include <avr/interrupt.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 
 		#include <LUFA/Version.h>                                // Library Version Information

Demos/MouseHostWithParser/MouseHostWithParser.c

@@ -59,8 +59,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 	
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);

Demos/MouseHostWithParser/MouseHostWithParser.h

@@ -35,6 +35,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/pgmspace.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 
 		#include <LUFA/Version.h>                                // Library Version Information

Demos/MouseViaInt/MouseViaInt.c

@@ -74,8 +74,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	Joystick_Init();

Demos/MouseViaInt/MouseViaInt.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/interrupt.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 		#include <string.h>
 		

Demos/RNDISEthernet/RNDISEthernet.c

@@ -60,8 +60,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	LEDs_Init();

Demos/RNDISEthernet/RNDISEthernet.h

@@ -39,9 +39,10 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/pgmspace.h>
+		#include <avr/power.h>
 		#include <string.h>
 		#include <stdio.h>
-		#include <avr/pgmspace.h>
 
 		#include "Descriptors.h"
 		#include "RNDIS.h"

Demos/StillImageHost/StillImageHost.h

@@ -39,6 +39,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 		#include <stdio.h>
 		
 		#include "ConfigDescriptor.h"

Demos/TestApp/TestApp.c

@@ -61,7 +61,7 @@ int main(void)
 	wdt_disable();
 
 	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	clock_prescale_set(clock_div_1);
 	
 	/* Hardware initialization */
 	SerialStream_Init(9600, false);

Demos/TestApp/TestApp.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 		#include <avr/interrupt.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 
 		#include <LUFA/Version.h>                               // Library Version Information
 		#include <LUFA/Drivers/USB/USB.h>                       // USB Functionality

Demos/USBtoSerial/USBtoSerial.c

@@ -72,8 +72,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
-	SetSystemClockPrescaler(0);
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
 	LEDs_Init();

Demos/USBtoSerial/USBtoSerial.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/interrupt.h>
+		#include <avr/power.h>
 
 		#include "Descriptors.h"
 		#include "RingBuff.h"