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

Bootloaders/CDC/BootloaderCDC.c

@@ -71,8 +71,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	clock_prescale_set(clock_div_1);
 	
 	/* Relocate the interrupt vector table to the bootloader section */
 	MCUCR = (1 << IVCE);

Bootloaders/CDC/BootloaderCDC.h

@@ -41,6 +41,7 @@
 		#include <avr/wdt.h>
 		#include <avr/boot.h>
 		#include <avr/eeprom.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 
 		#include "Descriptors.h"

Bootloaders/DFU/BootloaderDFU.c

@@ -109,8 +109,8 @@ int main (void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	clock_prescale_set(clock_div_1);
 	
 	/* Relocate the interrupt vector table to the bootloader section */
 	MCUCR = (1 << IVCE);

Bootloaders/DFU/BootloaderDFU.h

@@ -42,6 +42,7 @@
 		#include <avr/boot.h>
 		#include <avr/pgmspace.h>
 		#include <avr/eeprom.h>
+		#include <avr/power.h>
 		#include <stdbool.h>
 	
 		#include "Descriptors.h"

Bootloaders/TeensyHID/TeensyHID.c

@@ -53,8 +53,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	clock_prescale_set(clock_div_1);
 
 	/* Relocate the interrupt vector table to the bootloader section */
 	MCUCR = (1 << IVCE);

Bootloaders/TeensyHID/TeensyHID.h

@@ -41,6 +41,7 @@
 		#include <avr/wdt.h>
 		#include <avr/boot.h>
 		#include <avr/wdt.h>
+		#include <avr/power.h>
 		#include <util/delay.h>
 		#include <stdbool.h>
 

Demos/AudioInput/AudioInput.c

@@ -63,8 +63,8 @@ int main(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
-	/* Disable Clock Division */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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 */
+	/* Disable clock division */
-	SetSystemClockPrescaler(0);
+	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"

LUFA/ChangeLog.txt

@@ -28,6 +28,7 @@
   *  - Mass Storage Host demo now uses a USB_STREAM_TIMEOUT_MS of two seconds to maintain compatibility with poorly designed devices
   *  - Function attribute ATTR_ALWAYSINLINE renamed to ATTR_ALWAYS_INLINE to match other function attribute macro naming conventions
   *  - Added ATTR_ALWAYS_INLINE attribute to several key inlined library components, to ensure they are inlined in all circumstances
+  *  - Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro has been corrected in recent avr-libc versions
   *
   *  \section Sec_ChangeLog090209 Version 090209
   *

LUFA/Common/Common.h

@@ -88,27 +88,6 @@
 			                                } }MACROE
 
 		/* Inline Functions: */
-			/** Function for reliably setting the AVR's system clock prescaler, using inline assembly. This function
-			 *  is guaranteed to operate reliably regardless of optimization setting or other compile time options. 
-			 *
-			 *  \param PrescalerMask   The mask of the new prescaler setting for CLKPR
-			 */
-			static inline void SetSystemClockPrescaler(uint8_t PrescalerMask)
-			{
-					uint8_t tmp = (1 << CLKPCE);
-					__asm__ __volatile__ (
-							"in __tmp_reg__,__SREG__" "\n\t"
-							"cli" "\n\t"
-							"sts %1, %0" "\n\t"
-							"sts %1, %2" "\n\t"
-							"out __SREG__, __tmp_reg__"
-							: /* no outputs */
-							: "d" (tmp),
-							  "M" (_SFR_MEM_ADDR(CLKPR)),
-							  "d" (PrescalerMask)
-							: "r0");
-			}
-
 			/** Function to reverse the individual bits in a byte - i.e. bit 7 is moved to bit 0, bit 6 to bit 1,
 			 *  etc.
 			 *

LUFA/MigrationInformation.txt

@@ -17,6 +17,8 @@
  *      defined in the project makefile and passed to the compiler via the -D switch.
  *    - The makefile EEPROM programming targets for FLIP and dfu-programmer no longer program in the FLASH data in addition to the
  *      EEPROM data into the device. If both are to be programmed, both the EEPROM and FLASH programming targets must be called.
+ *    - As the avr-libc macro has been corrected in recent avr-libc distributions, the SetSystemClockPrescaler() macro has been removed.
+ *      Include <avr/power.h> and call clock_prescale_set(clock_div_1); instead on recent avr-libc distributions.
  *
  *  <b>Library Demos</b>
  *    - The USBtoSerial demo now discards all data when not connected to a host, rather than buffering it for later transmission.

Projects/AVRISP_Programmer/AVRISP_Programmer.c

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

Projects/AVRISP_Programmer/AVRISP_Programmer.h

@@ -37,10 +37,11 @@
 #define _AVRISP_PROGRAMMER_H_
 
 	/* Includes: */
-		#include <util/delay.h>
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/interrupt.h>
+		#include <avr/power.h>
+		#include <util/delay.h>
 
 		#include "Descriptors.h"
 		#include "RingBuff.h"

Projects/Magstripe/Magstripe.c

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

Projects/Magstripe/Magstripe.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>