Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro...

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index 54c7b7e..60fe4a4 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -71,8 +71,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
        \r
        /* Relocate the interrupt vector table to the bootloader section */\r
        MCUCR = (1 << IVCE);\r

diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index a6e7755..dce84a5 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@ -41,6 +41,7 @@
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r
                #include <avr/eeprom.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
 \r
                #include "Descriptors.h"\r

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 704133f..8cc5fd4 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -109,8 +109,8 @@ int main (void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
        \r
        /* Relocate the interrupt vector table to the bootloader section */\r
        MCUCR = (1 << IVCE);\r

diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h
index b90fee1..21e8fce 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@ -42,6 +42,7 @@
                #include <avr/boot.h>\r
                #include <avr/pgmspace.h>\r
                #include <avr/eeprom.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
        \r
                #include "Descriptors.h"\r

diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c
index 4f09ac5..fe20702 100644 (file)
--- a/Bootloaders/TeensyHID/TeensyHID.c
+++ b/Bootloaders/TeensyHID/TeensyHID.c
@@ -53,8 +53,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Relocate the interrupt vector table to the bootloader section */\r
        MCUCR = (1 << IVCE);\r

diff --git a/Bootloaders/TeensyHID/TeensyHID.h b/Bootloaders/TeensyHID/TeensyHID.h
index a53fca3..a4773f8 100644 (file)
--- a/Bootloaders/TeensyHID/TeensyHID.h
+++ b/Bootloaders/TeensyHID/TeensyHID.h
@@ -41,6 +41,7 @@
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
                #include <util/delay.h>\r
                #include <stdbool.h>\r
 \r

diff --git a/Demos/AudioInput/AudioInput.c b/Demos/AudioInput/AudioInput.c
index f5474b4..0db41c3 100644 (file)
--- a/Demos/AudioInput/AudioInput.c
+++ b/Demos/AudioInput/AudioInput.c
@@ -63,8 +63,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --git a/Demos/AudioInput/AudioInput.h b/Demos/AudioInput/AudioInput.h
index 97978fd..02c8380 100644 (file)
--- a/Demos/AudioInput/AudioInput.h
+++ b/Demos/AudioInput/AudioInput.h
@@ -39,6 +39,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
 \r
                #include "Descriptors.h"\r
                                \r

diff --git a/Demos/AudioOutput/AudioOutput.c b/Demos/AudioOutput/AudioOutput.c
index 184910e..3d2e324 100644 (file)
--- a/Demos/AudioOutput/AudioOutput.c
+++ b/Demos/AudioOutput/AudioOutput.c
@@ -66,8 +66,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --git a/Demos/AudioOutput/AudioOutput.h b/Demos/AudioOutput/AudioOutput.h
index 3b99231..0ad9e5b 100644 (file)
--- a/Demos/AudioOutput/AudioOutput.h
+++ b/Demos/AudioOutput/AudioOutput.h
@@ -39,6 +39,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
 \r
                #include "Descriptors.h"\r
                \r

diff --git a/Demos/BluetoothHost/BluetoothHost.c b/Demos/BluetoothHost/BluetoothHost.c
index 50bd1a8..2e5ae44 100644 (file)
--- a/Demos/BluetoothHost/BluetoothHost.c
+++ b/Demos/BluetoothHost/BluetoothHost.c
@@ -74,8 +74,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/BluetoothHost/BluetoothHost.h b/Demos/BluetoothHost/BluetoothHost.h
index 5fe9dbd..51d4173 100644 (file)
--- a/Demos/BluetoothHost/BluetoothHost.h
+++ b/Demos/BluetoothHost/BluetoothHost.h
@@ -35,6 +35,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include "BluetoothStack.h"\r

diff --git a/Demos/CDC/CDC.c b/Demos/CDC/CDC.c
index 6e232a4..eeae625 100644 (file)
--- a/Demos/CDC/CDC.c
+++ b/Demos/CDC/CDC.c
@@ -87,8 +87,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/CDC/CDC.h b/Demos/CDC/CDC.h
index 98f30b5..d953303 100644 (file)
--- a/Demos/CDC/CDC.h
+++ b/Demos/CDC/CDC.h
@@ -39,6 +39,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
                #include <string.h>\r
 \r
                #include "Descriptors.h"\r

diff --git a/Demos/CDCHost/CDCHost.c b/Demos/CDCHost/CDCHost.c
index ac6d89a..1f05ecb 100644 (file)
--- a/Demos/CDCHost/CDCHost.c
+++ b/Demos/CDCHost/CDCHost.c
@@ -59,8 +59,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/CDCHost/CDCHost.h b/Demos/CDCHost/CDCHost.h
index 2adbefd..21b9d67 100644 (file)
--- a/Demos/CDCHost/CDCHost.h
+++ b/Demos/CDCHost/CDCHost.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --git a/Demos/DualCDC/DualCDC.c b/Demos/DualCDC/DualCDC.c
index 90f0099..8e6e389 100644 (file)
--- a/Demos/DualCDC/DualCDC.c
+++ b/Demos/DualCDC/DualCDC.c
@@ -101,8 +101,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/DualCDC/DualCDC.h b/Demos/DualCDC/DualCDC.h
index 5a01e07..4c62abf 100644 (file)
--- a/Demos/DualCDC/DualCDC.h
+++ b/Demos/DualCDC/DualCDC.h
@@ -39,6 +39,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
                #include <string.h>\r
 \r
                #include "Descriptors.h"\r

diff --git a/Demos/Joystick/Joystick.c b/Demos/Joystick/Joystick.c
index 88d4158..cd88227 100644 (file)
--- a/Demos/Joystick/Joystick.c
+++ b/Demos/Joystick/Joystick.c
@@ -58,8 +58,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/Joystick/Joystick.h b/Demos/Joystick/Joystick.h
index 966fa7e..79c7e49 100644 (file)
--- a/Demos/Joystick/Joystick.h
+++ b/Demos/Joystick/Joystick.h
@@ -39,6 +39,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
                #include <string.h>\r
 \r
                #include "Descriptors.h"\r

diff --git a/Demos/Keyboard/Keyboard.c b/Demos/Keyboard/Keyboard.c
index 92f4ae9..22d406d 100644 (file)
--- a/Demos/Keyboard/Keyboard.c
+++ b/Demos/Keyboard/Keyboard.c
@@ -77,8 +77,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/Keyboard/Keyboard.h b/Demos/Keyboard/Keyboard.h
index e1aed1e..6988e57 100644 (file)
--- a/Demos/Keyboard/Keyboard.h
+++ b/Demos/Keyboard/Keyboard.h
@@ -41,6 +41,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
 \r

diff --git a/Demos/KeyboardFullInt/KeyboardFullInt.c b/Demos/KeyboardFullInt/KeyboardFullInt.c
index 44f9830..ed08137 100644 (file)
--- a/Demos/KeyboardFullInt/KeyboardFullInt.c
+++ b/Demos/KeyboardFullInt/KeyboardFullInt.c
@@ -70,8 +70,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/KeyboardFullInt/KeyboardFullInt.h b/Demos/KeyboardFullInt/KeyboardFullInt.h
index 7711faa..cc6655a 100644 (file)
--- a/Demos/KeyboardFullInt/KeyboardFullInt.h
+++ b/Demos/KeyboardFullInt/KeyboardFullInt.h
@@ -41,6 +41,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
 \r

diff --git a/Demos/KeyboardHost/KeyboardHost.c b/Demos/KeyboardHost/KeyboardHost.c
index dd05bde..74d6555 100644 (file)
--- a/Demos/KeyboardHost/KeyboardHost.c
+++ b/Demos/KeyboardHost/KeyboardHost.c
@@ -59,8 +59,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/KeyboardHost/KeyboardHost.h b/Demos/KeyboardHost/KeyboardHost.h
index 97695f7..388e50f 100644 (file)
--- a/Demos/KeyboardHost/KeyboardHost.h
+++ b/Demos/KeyboardHost/KeyboardHost.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --git a/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c b/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c
index ecff951..424eb85 100644 (file)
--- a/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c
+++ b/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c
@@ -59,8 +59,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h b/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h
index 22848ee..7ae54e6 100644 (file)
--- a/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h
+++ b/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h
@@ -41,6 +41,7 @@
                #include <avr/pgmspace.h>\r
                #include <avr/interrupt.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --git a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c
index f0eec2b..f7a0087 100644 (file)
--- a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -59,8 +59,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h
index 6846e17..fece679 100644 (file)
--- a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h
+++ b/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h
@@ -35,6 +35,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --git a/Demos/KeyboardMouse/KeyboardMouse.c b/Demos/KeyboardMouse/KeyboardMouse.c
index 383c66a..8108a30 100644 (file)
--- a/Demos/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/KeyboardMouse/KeyboardMouse.c
@@ -67,8 +67,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/KeyboardMouse/KeyboardMouse.h b/Demos/KeyboardMouse/KeyboardMouse.h
index f5c1d4e..9794159 100644 (file)
--- a/Demos/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/KeyboardMouse/KeyboardMouse.h
@@ -35,6 +35,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
 \r

diff --git a/Demos/KeyboardViaInt/KeyboardViaInt.c b/Demos/KeyboardViaInt/KeyboardViaInt.c
index 7916506..b66506d 100644 (file)
--- a/Demos/KeyboardViaInt/KeyboardViaInt.c
+++ b/Demos/KeyboardViaInt/KeyboardViaInt.c
@@ -76,8 +76,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/KeyboardViaInt/KeyboardViaInt.h b/Demos/KeyboardViaInt/KeyboardViaInt.h
index 833bc91..7dfe60d 100644 (file)
--- a/Demos/KeyboardViaInt/KeyboardViaInt.h
+++ b/Demos/KeyboardViaInt/KeyboardViaInt.h
@@ -41,6 +41,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
 \r

diff --git a/Demos/MIDI/MIDI.c b/Demos/MIDI/MIDI.c
index a9c827a..c0e4f9d 100644 (file)
--- a/Demos/MIDI/MIDI.c
+++ b/Demos/MIDI/MIDI.c
@@ -58,8 +58,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/MIDI/MIDI.h b/Demos/MIDI/MIDI.h
index 1775c63..733a7ba 100644 (file)
--- a/Demos/MIDI/MIDI.h
+++ b/Demos/MIDI/MIDI.h
@@ -39,6 +39,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
 \r
                #include "Descriptors.h"\r

diff --git a/Demos/MassStorage/MassStorage.c b/Demos/MassStorage/MassStorage.c
index fb61530..34fcee4 100644 (file)
--- a/Demos/MassStorage/MassStorage.c
+++ b/Demos/MassStorage/MassStorage.c
@@ -68,8 +68,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --git a/Demos/MassStorage/MassStorage.h b/Demos/MassStorage/MassStorage.h
index 4f0e5b5..3525340 100644 (file)
--- a/Demos/MassStorage/MassStorage.h
+++ b/Demos/MassStorage/MassStorage.h
@@ -39,6 +39,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
 \r
                #include "Descriptors.h"\r
                #include "SCSI.h"\r

diff --git a/Demos/MassStorageHost/MassStorageHost.c b/Demos/MassStorageHost/MassStorageHost.c
index ee4befd..d042b78 100644 (file)
--- a/Demos/MassStorageHost/MassStorageHost.c
+++ b/Demos/MassStorageHost/MassStorageHost.c
@@ -63,8 +63,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/MassStorageHost/MassStorageHost.h b/Demos/MassStorageHost/MassStorageHost.h
index 3ace6d4..b130cfe 100644 (file)
--- a/Demos/MassStorageHost/MassStorageHost.h
+++ b/Demos/MassStorageHost/MassStorageHost.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
                #include <ctype.h>\r
 \r

diff --git a/Demos/Mouse/Mouse.c b/Demos/Mouse/Mouse.c
index 9080efb..3e59706 100644 (file)
--- a/Demos/Mouse/Mouse.c
+++ b/Demos/Mouse/Mouse.c
@@ -76,8 +76,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/Mouse/Mouse.h b/Demos/Mouse/Mouse.h
index 1c7b588..5090812 100644 (file)
--- a/Demos/Mouse/Mouse.h
+++ b/Demos/Mouse/Mouse.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
                \r

diff --git a/Demos/MouseFullInt/MouseFullInt.c b/Demos/MouseFullInt/MouseFullInt.c
index 28267a1..98782b6 100644 (file)
--- a/Demos/MouseFullInt/MouseFullInt.c
+++ b/Demos/MouseFullInt/MouseFullInt.c
@@ -69,8 +69,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/MouseFullInt/MouseFullInt.h b/Demos/MouseFullInt/MouseFullInt.h
index 9fdc51d..f46f7ef 100644 (file)
--- a/Demos/MouseFullInt/MouseFullInt.h
+++ b/Demos/MouseFullInt/MouseFullInt.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
                \r

diff --git a/Demos/MouseHost/MouseHost.c b/Demos/MouseHost/MouseHost.c
index 2bc13a9..ee7aec9 100644 (file)
--- a/Demos/MouseHost/MouseHost.c
+++ b/Demos/MouseHost/MouseHost.c
@@ -59,8 +59,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/MouseHost/MouseHost.h b/Demos/MouseHost/MouseHost.h
index 9e47495..1bd52eb 100644 (file)
--- a/Demos/MouseHost/MouseHost.h
+++ b/Demos/MouseHost/MouseHost.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --git a/Demos/MouseHostViaInt/MouseHostViaInt.c b/Demos/MouseHostViaInt/MouseHostViaInt.c
index c4c3778..a44f707 100644 (file)
--- a/Demos/MouseHostViaInt/MouseHostViaInt.c
+++ b/Demos/MouseHostViaInt/MouseHostViaInt.c
@@ -59,8 +59,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/MouseHostViaInt/MouseHostViaInt.h b/Demos/MouseHostViaInt/MouseHostViaInt.h
index c4238c8..459bc22 100644 (file)
--- a/Demos/MouseHostViaInt/MouseHostViaInt.h
+++ b/Demos/MouseHostViaInt/MouseHostViaInt.h
@@ -41,6 +41,7 @@
                #include <avr/pgmspace.h>\r
                #include <avr/interrupt.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --git a/Demos/MouseHostWithParser/MouseHostWithParser.c b/Demos/MouseHostWithParser/MouseHostWithParser.c
index 97bad3b..5ccda49 100644 (file)
--- a/Demos/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/MouseHostWithParser/MouseHostWithParser.c
@@ -59,8 +59,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/MouseHostWithParser/MouseHostWithParser.h b/Demos/MouseHostWithParser/MouseHostWithParser.h
index 6d1ce32..b59ab9a 100644 (file)
--- a/Demos/MouseHostWithParser/MouseHostWithParser.h
+++ b/Demos/MouseHostWithParser/MouseHostWithParser.h
@@ -35,6 +35,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --git a/Demos/MouseViaInt/MouseViaInt.c b/Demos/MouseViaInt/MouseViaInt.c
index a4b863c..445fb49 100644 (file)
--- a/Demos/MouseViaInt/MouseViaInt.c
+++ b/Demos/MouseViaInt/MouseViaInt.c
@@ -74,8 +74,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --git a/Demos/MouseViaInt/MouseViaInt.h b/Demos/MouseViaInt/MouseViaInt.h
index 6f4b9ab..ccc37ef 100644 (file)
--- a/Demos/MouseViaInt/MouseViaInt.h
+++ b/Demos/MouseViaInt/MouseViaInt.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
                \r

diff --git a/Demos/RNDISEthernet/RNDISEthernet.c b/Demos/RNDISEthernet/RNDISEthernet.c
index 255a53b..3f9bb18 100644 (file)
--- a/Demos/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/RNDISEthernet/RNDISEthernet.c
@@ -60,8 +60,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --git a/Demos/RNDISEthernet/RNDISEthernet.h b/Demos/RNDISEthernet/RNDISEthernet.h
index 4a0f3c1..83e49ce 100644 (file)
--- a/Demos/RNDISEthernet/RNDISEthernet.h
+++ b/Demos/RNDISEthernet/RNDISEthernet.h
@@ -39,9 +39,10 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/pgmspace.h>\r
+               #include <avr/power.h>\r
                #include <string.h>\r
                #include <stdio.h>\r
-               #include <avr/pgmspace.h>\r
 \r
                #include "Descriptors.h"\r
                #include "RNDIS.h"\r

diff --git a/Demos/StillImageHost/StillImageHost.h b/Demos/StillImageHost/StillImageHost.h
index 5669c82..7757b08 100644 (file)
--- a/Demos/StillImageHost/StillImageHost.h
+++ b/Demos/StillImageHost/StillImageHost.h
@@ -39,6 +39,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
                #include <stdio.h>\r
                \r
                #include "ConfigDescriptor.h"\r

diff --git a/Demos/TestApp/TestApp.c b/Demos/TestApp/TestApp.c
index e7ee526..a66a728 100644 (file)
--- a/Demos/TestApp/TestApp.c
+++ b/Demos/TestApp/TestApp.c
@@ -61,7 +61,7 @@ int main(void)
        wdt_disable();\r
 \r
        /* Disable clock division */\r
-       SetSystemClockPrescaler(0);\r
+       clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware initialization */\r
        SerialStream_Init(9600, false);\r

diff --git a/Demos/TestApp/TestApp.h b/Demos/TestApp/TestApp.h
index 4175fad..cb26239 100644 (file)
--- a/Demos/TestApp/TestApp.h
+++ b/Demos/TestApp/TestApp.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/interrupt.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
 \r
                #include <LUFA/Version.h>                               // Library Version Information\r
                #include <LUFA/Drivers/USB/USB.h>                       // USB Functionality\r

diff --git a/Demos/USBtoSerial/USBtoSerial.c b/Demos/USBtoSerial/USBtoSerial.c
index 0cef8d1..0495826 100644 (file)
--- a/Demos/USBtoSerial/USBtoSerial.c
+++ b/Demos/USBtoSerial/USBtoSerial.c
@@ -72,8 +72,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --git a/Demos/USBtoSerial/USBtoSerial.h b/Demos/USBtoSerial/USBtoSerial.h
index f363fa9..3fb6d7d 100644 (file)
--- a/Demos/USBtoSerial/USBtoSerial.h
+++ b/Demos/USBtoSerial/USBtoSerial.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>
+               #include <avr/power.h>\r
 \r
                #include "Descriptors.h"\r
                #include "RingBuff.h"\r

diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index f699507..1a2b9f8 100644 (file)
--- a/LUFA/ChangeLog.txt
+++ b/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\r
   *  - Function attribute ATTR_ALWAYSINLINE renamed to ATTR_ALWAYS_INLINE to match other function attribute macro naming conventions\r
   *  - Added ATTR_ALWAYS_INLINE attribute to several key inlined library components, to ensure they are inlined in all circumstances\r
+  *  - Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro has been corrected in recent avr-libc versions\r
   *\r
   *  \section Sec_ChangeLog090209 Version 090209\r
   *\r

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

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

diff --git a/Projects/AVRISP_Programmer/AVRISP_Programmer.c b/Projects/AVRISP_Programmer/AVRISP_Programmer.c
index 9ba3c0e..4bc4f9c 100644 (file)
--- a/Projects/AVRISP_Programmer/AVRISP_Programmer.c
+++ b/Projects/AVRISP_Programmer/AVRISP_Programmer.c
@@ -167,8 +167,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --git a/Projects/AVRISP_Programmer/AVRISP_Programmer.h b/Projects/AVRISP_Programmer/AVRISP_Programmer.h
index 4c98d6b..c6ac13f 100644 (file)
--- a/Projects/AVRISP_Programmer/AVRISP_Programmer.h
+++ b/Projects/AVRISP_Programmer/AVRISP_Programmer.h
@@ -37,10 +37,11 @@
 #define _AVRISP_PROGRAMMER_H_\r
 \r
        /* Includes: */\r
-               #include <util/delay.h>\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
+               #include <avr/power.h>\r
+               #include <util/delay.h>\r
 \r
                #include "Descriptors.h"\r
                #include "RingBuff.h"\r

diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 3696c12..2826c14 100644 (file)
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -93,8 +93,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        Magstripe_Init();\r

diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h
index cde2fcd..61f3098 100644 (file)
--- a/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@ -41,6 +41,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
+               #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
 \r