diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 54c7b7e49d..60fe4a4bc9 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -71,8 +71,8 @@ int main(void) MCUSR &= ~(1 << WDRF); wdt_disable(); - /* Disable Clock Division */ - SetSystemClockPrescaler(0); + /* Disable clock division */ + clock_prescale_set(clock_div_1); /* Relocate the interrupt vector table to the bootloader section */ MCUCR = (1 << IVCE); diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h index a6e77550c9..dce84a5f84 100644 --- a/Bootloaders/CDC/BootloaderCDC.h +++ b/Bootloaders/CDC/BootloaderCDC.h @@ -41,6 +41,7 @@ #include #include #include + #include #include #include "Descriptors.h" diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 704133f5df..8cc5fd4099 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -109,8 +109,8 @@ int main (void) MCUSR &= ~(1 << WDRF); wdt_disable(); - /* Disable Clock Division */ - SetSystemClockPrescaler(0); + /* Disable clock division */ + clock_prescale_set(clock_div_1); /* Relocate the interrupt vector table to the bootloader section */ MCUCR = (1 << IVCE); diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h index b90fee13fe..21e8fce71f 100644 --- a/Bootloaders/DFU/BootloaderDFU.h +++ b/Bootloaders/DFU/BootloaderDFU.h @@ -42,6 +42,7 @@ #include #include #include + #include #include #include "Descriptors.h" diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c index 4f09ac50b7..fe20702cdd 100644 --- a/Bootloaders/TeensyHID/TeensyHID.c +++ b/Bootloaders/TeensyHID/TeensyHID.c @@ -53,8 +53,8 @@ int main(void) MCUSR &= ~(1 << WDRF); wdt_disable(); - /* Disable Clock Division */ - SetSystemClockPrescaler(0); + /* Disable clock division */ + clock_prescale_set(clock_div_1); /* Relocate the interrupt vector table to the bootloader section */ MCUCR = (1 << IVCE); diff --git a/Bootloaders/TeensyHID/TeensyHID.h b/Bootloaders/TeensyHID/TeensyHID.h index a53fca30f6..a4773f8f54 100644 --- a/Bootloaders/TeensyHID/TeensyHID.h +++ b/Bootloaders/TeensyHID/TeensyHID.h @@ -41,6 +41,7 @@ #include #include #include + #include #include #include diff --git a/Demos/AudioInput/AudioInput.c b/Demos/AudioInput/AudioInput.c index f5474b497f..0db41c3c11 100644 --- a/Demos/AudioInput/AudioInput.c +++ b/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(); diff --git a/Demos/AudioInput/AudioInput.h b/Demos/AudioInput/AudioInput.h index 97978fdea5..02c838039c 100644 --- a/Demos/AudioInput/AudioInput.h +++ b/Demos/AudioInput/AudioInput.h @@ -39,6 +39,7 @@ /* Includes: */ #include #include + #include #include "Descriptors.h" diff --git a/Demos/AudioOutput/AudioOutput.c b/Demos/AudioOutput/AudioOutput.c index 184910e81a..3d2e3249ed 100644 --- a/Demos/AudioOutput/AudioOutput.c +++ b/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(); diff --git a/Demos/AudioOutput/AudioOutput.h b/Demos/AudioOutput/AudioOutput.h index 3b9923179b..0ad9e5bf9d 100644 --- a/Demos/AudioOutput/AudioOutput.h +++ b/Demos/AudioOutput/AudioOutput.h @@ -39,6 +39,7 @@ /* Includes: */ #include #include + #include #include "Descriptors.h" diff --git a/Demos/BluetoothHost/BluetoothHost.c b/Demos/BluetoothHost/BluetoothHost.c index 50bd1a8fe1..2e5ae44d2d 100644 --- a/Demos/BluetoothHost/BluetoothHost.c +++ b/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); diff --git a/Demos/BluetoothHost/BluetoothHost.h b/Demos/BluetoothHost/BluetoothHost.h index 5fe9dbd1e9..51d4173566 100644 --- a/Demos/BluetoothHost/BluetoothHost.h +++ b/Demos/BluetoothHost/BluetoothHost.h @@ -35,6 +35,7 @@ #include #include #include + #include #include #include "BluetoothStack.h" diff --git a/Demos/CDC/CDC.c b/Demos/CDC/CDC.c index 6e232a48b7..eeae625cfe 100644 --- a/Demos/CDC/CDC.c +++ b/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(); diff --git a/Demos/CDC/CDC.h b/Demos/CDC/CDC.h index 98f30b52fc..d953303f75 100644 --- a/Demos/CDC/CDC.h +++ b/Demos/CDC/CDC.h @@ -39,6 +39,7 @@ /* Includes: */ #include #include + #include #include #include "Descriptors.h" diff --git a/Demos/CDCHost/CDCHost.c b/Demos/CDCHost/CDCHost.c index ac6d89ad11..1f05ecb1f4 100644 --- a/Demos/CDCHost/CDCHost.c +++ b/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); diff --git a/Demos/CDCHost/CDCHost.h b/Demos/CDCHost/CDCHost.h index 2adbefd307..21b9d67eda 100644 --- a/Demos/CDCHost/CDCHost.h +++ b/Demos/CDCHost/CDCHost.h @@ -40,6 +40,7 @@ #include #include #include + #include #include #include // Library Version Information diff --git a/Demos/DualCDC/DualCDC.c b/Demos/DualCDC/DualCDC.c index 90f00997ee..8e6e389071 100644 --- a/Demos/DualCDC/DualCDC.c +++ b/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(); diff --git a/Demos/DualCDC/DualCDC.h b/Demos/DualCDC/DualCDC.h index 5a01e07f78..4c62abf9da 100644 --- a/Demos/DualCDC/DualCDC.h +++ b/Demos/DualCDC/DualCDC.h @@ -39,6 +39,7 @@ /* Includes: */ #include #include + #include #include #include "Descriptors.h" diff --git a/Demos/Joystick/Joystick.c b/Demos/Joystick/Joystick.c index 88d4158430..cd8822705b 100644 --- a/Demos/Joystick/Joystick.c +++ b/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(); diff --git a/Demos/Joystick/Joystick.h b/Demos/Joystick/Joystick.h index 966fa7e104..79c7e498fb 100644 --- a/Demos/Joystick/Joystick.h +++ b/Demos/Joystick/Joystick.h @@ -39,6 +39,7 @@ /* Includes: */ #include #include + #include #include #include "Descriptors.h" diff --git a/Demos/Keyboard/Keyboard.c b/Demos/Keyboard/Keyboard.c index 92f4ae9486..22d406dbe9 100644 --- a/Demos/Keyboard/Keyboard.c +++ b/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(); diff --git a/Demos/Keyboard/Keyboard.h b/Demos/Keyboard/Keyboard.h index e1aed1ec99..6988e579ab 100644 --- a/Demos/Keyboard/Keyboard.h +++ b/Demos/Keyboard/Keyboard.h @@ -41,6 +41,7 @@ #include #include #include + #include #include #include diff --git a/Demos/KeyboardFullInt/KeyboardFullInt.c b/Demos/KeyboardFullInt/KeyboardFullInt.c index 44f9830591..ed081376d3 100644 --- a/Demos/KeyboardFullInt/KeyboardFullInt.c +++ b/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(); diff --git a/Demos/KeyboardFullInt/KeyboardFullInt.h b/Demos/KeyboardFullInt/KeyboardFullInt.h index 7711faaa3e..cc6655a6aa 100644 --- a/Demos/KeyboardFullInt/KeyboardFullInt.h +++ b/Demos/KeyboardFullInt/KeyboardFullInt.h @@ -41,6 +41,7 @@ #include #include #include + #include #include #include diff --git a/Demos/KeyboardHost/KeyboardHost.c b/Demos/KeyboardHost/KeyboardHost.c index dd05bdea26..74d65550ed 100644 --- a/Demos/KeyboardHost/KeyboardHost.c +++ b/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); diff --git a/Demos/KeyboardHost/KeyboardHost.h b/Demos/KeyboardHost/KeyboardHost.h index 97695f748b..388e50f525 100644 --- a/Demos/KeyboardHost/KeyboardHost.h +++ b/Demos/KeyboardHost/KeyboardHost.h @@ -40,6 +40,7 @@ #include #include #include + #include #include #include // Library Version Information diff --git a/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c b/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c index ecff951147..424eb85027 100644 --- a/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c +++ b/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); diff --git a/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h b/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h index 22848eeaf1..7ae54e6ada 100644 --- a/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h +++ b/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h @@ -41,6 +41,7 @@ #include #include #include + #include #include #include // Library Version Information diff --git a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c index f0eec2b99c..f7a0087e7d 100644 --- a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c +++ b/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); diff --git a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h index 6846e179e2..fece679718 100644 --- a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h +++ b/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h @@ -35,6 +35,7 @@ #include #include #include + #include #include #include // Library Version Information diff --git a/Demos/KeyboardMouse/KeyboardMouse.c b/Demos/KeyboardMouse/KeyboardMouse.c index 383c66a58b..8108a30327 100644 --- a/Demos/KeyboardMouse/KeyboardMouse.c +++ b/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(); diff --git a/Demos/KeyboardMouse/KeyboardMouse.h b/Demos/KeyboardMouse/KeyboardMouse.h index f5c1d4e775..9794159fc3 100644 --- a/Demos/KeyboardMouse/KeyboardMouse.h +++ b/Demos/KeyboardMouse/KeyboardMouse.h @@ -35,6 +35,7 @@ /* Includes: */ #include #include + #include #include #include diff --git a/Demos/KeyboardViaInt/KeyboardViaInt.c b/Demos/KeyboardViaInt/KeyboardViaInt.c index 7916506755..b66506df5a 100644 --- a/Demos/KeyboardViaInt/KeyboardViaInt.c +++ b/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(); diff --git a/Demos/KeyboardViaInt/KeyboardViaInt.h b/Demos/KeyboardViaInt/KeyboardViaInt.h index 833bc919bc..7dfe60d19c 100644 --- a/Demos/KeyboardViaInt/KeyboardViaInt.h +++ b/Demos/KeyboardViaInt/KeyboardViaInt.h @@ -41,6 +41,7 @@ #include #include #include + #include #include #include diff --git a/Demos/MIDI/MIDI.c b/Demos/MIDI/MIDI.c index a9c827a0d3..c0e4f9df9f 100644 --- a/Demos/MIDI/MIDI.c +++ b/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(); diff --git a/Demos/MIDI/MIDI.h b/Demos/MIDI/MIDI.h index 1775c63747..733a7baedf 100644 --- a/Demos/MIDI/MIDI.h +++ b/Demos/MIDI/MIDI.h @@ -39,6 +39,7 @@ /* Includes: */ #include #include + #include #include #include "Descriptors.h" diff --git a/Demos/MassStorage/MassStorage.c b/Demos/MassStorage/MassStorage.c index fb61530ff3..34fcee4884 100644 --- a/Demos/MassStorage/MassStorage.c +++ b/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(); diff --git a/Demos/MassStorage/MassStorage.h b/Demos/MassStorage/MassStorage.h index 4f0e5b58fd..3525340ffd 100644 --- a/Demos/MassStorage/MassStorage.h +++ b/Demos/MassStorage/MassStorage.h @@ -39,6 +39,7 @@ /* Includes: */ #include #include + #include #include "Descriptors.h" #include "SCSI.h" diff --git a/Demos/MassStorageHost/MassStorageHost.c b/Demos/MassStorageHost/MassStorageHost.c index ee4befd049..d042b78bbb 100644 --- a/Demos/MassStorageHost/MassStorageHost.c +++ b/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); diff --git a/Demos/MassStorageHost/MassStorageHost.h b/Demos/MassStorageHost/MassStorageHost.h index 3ace6d46ab..b130cfed31 100644 --- a/Demos/MassStorageHost/MassStorageHost.h +++ b/Demos/MassStorageHost/MassStorageHost.h @@ -40,6 +40,7 @@ #include #include #include + #include #include #include diff --git a/Demos/Mouse/Mouse.c b/Demos/Mouse/Mouse.c index 9080efba34..3e59706c98 100644 --- a/Demos/Mouse/Mouse.c +++ b/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(); diff --git a/Demos/Mouse/Mouse.h b/Demos/Mouse/Mouse.h index 1c7b5888da..50908129aa 100644 --- a/Demos/Mouse/Mouse.h +++ b/Demos/Mouse/Mouse.h @@ -40,6 +40,7 @@ #include #include #include + #include #include #include diff --git a/Demos/MouseFullInt/MouseFullInt.c b/Demos/MouseFullInt/MouseFullInt.c index 28267a14f6..98782b6cf9 100644 --- a/Demos/MouseFullInt/MouseFullInt.c +++ b/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(); diff --git a/Demos/MouseFullInt/MouseFullInt.h b/Demos/MouseFullInt/MouseFullInt.h index 9fdc51d3bc..f46f7ef980 100644 --- a/Demos/MouseFullInt/MouseFullInt.h +++ b/Demos/MouseFullInt/MouseFullInt.h @@ -40,6 +40,7 @@ #include #include #include + #include #include #include diff --git a/Demos/MouseHost/MouseHost.c b/Demos/MouseHost/MouseHost.c index 2bc13a9077..ee7aec9d5c 100644 --- a/Demos/MouseHost/MouseHost.c +++ b/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); diff --git a/Demos/MouseHost/MouseHost.h b/Demos/MouseHost/MouseHost.h index 9e474956b4..1bd52ebea5 100644 --- a/Demos/MouseHost/MouseHost.h +++ b/Demos/MouseHost/MouseHost.h @@ -40,6 +40,7 @@ #include #include #include + #include #include #include // Library Version Information diff --git a/Demos/MouseHostViaInt/MouseHostViaInt.c b/Demos/MouseHostViaInt/MouseHostViaInt.c index c4c3778586..a44f707d98 100644 --- a/Demos/MouseHostViaInt/MouseHostViaInt.c +++ b/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); diff --git a/Demos/MouseHostViaInt/MouseHostViaInt.h b/Demos/MouseHostViaInt/MouseHostViaInt.h index c4238c80b0..459bc22617 100644 --- a/Demos/MouseHostViaInt/MouseHostViaInt.h +++ b/Demos/MouseHostViaInt/MouseHostViaInt.h @@ -41,6 +41,7 @@ #include #include #include + #include #include #include // Library Version Information diff --git a/Demos/MouseHostWithParser/MouseHostWithParser.c b/Demos/MouseHostWithParser/MouseHostWithParser.c index 97bad3b5b4..5ccda49126 100644 --- a/Demos/MouseHostWithParser/MouseHostWithParser.c +++ b/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); diff --git a/Demos/MouseHostWithParser/MouseHostWithParser.h b/Demos/MouseHostWithParser/MouseHostWithParser.h index 6d1ce32d00..b59ab9a789 100644 --- a/Demos/MouseHostWithParser/MouseHostWithParser.h +++ b/Demos/MouseHostWithParser/MouseHostWithParser.h @@ -35,6 +35,7 @@ #include #include #include + #include #include #include // Library Version Information diff --git a/Demos/MouseViaInt/MouseViaInt.c b/Demos/MouseViaInt/MouseViaInt.c index a4b863c133..445fb49940 100644 --- a/Demos/MouseViaInt/MouseViaInt.c +++ b/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(); diff --git a/Demos/MouseViaInt/MouseViaInt.h b/Demos/MouseViaInt/MouseViaInt.h index 6f4b9abe56..ccc37ef3cd 100644 --- a/Demos/MouseViaInt/MouseViaInt.h +++ b/Demos/MouseViaInt/MouseViaInt.h @@ -40,6 +40,7 @@ #include #include #include + #include #include #include diff --git a/Demos/RNDISEthernet/RNDISEthernet.c b/Demos/RNDISEthernet/RNDISEthernet.c index 255a53b3dd..3f9bb187ad 100644 --- a/Demos/RNDISEthernet/RNDISEthernet.c +++ b/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(); diff --git a/Demos/RNDISEthernet/RNDISEthernet.h b/Demos/RNDISEthernet/RNDISEthernet.h index 4a0f3c1839..83e49ce84c 100644 --- a/Demos/RNDISEthernet/RNDISEthernet.h +++ b/Demos/RNDISEthernet/RNDISEthernet.h @@ -39,9 +39,10 @@ /* Includes: */ #include #include + #include + #include #include #include - #include #include "Descriptors.h" #include "RNDIS.h" diff --git a/Demos/StillImageHost/StillImageHost.h b/Demos/StillImageHost/StillImageHost.h index 5669c827c9..7757b08077 100644 --- a/Demos/StillImageHost/StillImageHost.h +++ b/Demos/StillImageHost/StillImageHost.h @@ -39,6 +39,7 @@ /* Includes: */ #include #include + #include #include #include "ConfigDescriptor.h" diff --git a/Demos/TestApp/TestApp.c b/Demos/TestApp/TestApp.c index e7ee526d7f..a66a728c93 100644 --- a/Demos/TestApp/TestApp.c +++ b/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); diff --git a/Demos/TestApp/TestApp.h b/Demos/TestApp/TestApp.h index 4175fad120..cb262397dd 100644 --- a/Demos/TestApp/TestApp.h +++ b/Demos/TestApp/TestApp.h @@ -40,6 +40,7 @@ #include #include #include + #include #include // Library Version Information #include // USB Functionality diff --git a/Demos/USBtoSerial/USBtoSerial.c b/Demos/USBtoSerial/USBtoSerial.c index 0cef8d193e..0495826b9d 100644 --- a/Demos/USBtoSerial/USBtoSerial.c +++ b/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(); diff --git a/Demos/USBtoSerial/USBtoSerial.h b/Demos/USBtoSerial/USBtoSerial.h index f363fa93f4..3fb6d7d9f7 100644 --- a/Demos/USBtoSerial/USBtoSerial.h +++ b/Demos/USBtoSerial/USBtoSerial.h @@ -40,6 +40,7 @@ #include #include #include + #include #include "Descriptors.h" #include "RingBuff.h" diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt index f699507dde..1a2b9f8a18 100644 --- 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 * - 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 * diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h index 97e9ce9318..ed2d1bc904 100644 --- a/LUFA/Common/Common.h +++ b/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. * diff --git a/LUFA/MigrationInformation.txt b/LUFA/MigrationInformation.txt index ebfc364d05..364f09c3e0 100644 --- 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. * - 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 and call clock_prescale_set(clock_div_1); instead on recent avr-libc distributions. * * Library Demos * - The USBtoSerial demo now discards all data when not connected to a host, rather than buffering it for later transmission. diff --git a/Projects/AVRISP_Programmer/AVRISP_Programmer.c b/Projects/AVRISP_Programmer/AVRISP_Programmer.c index 9ba3c0e7ec..4bc4f9cc31 100644 --- a/Projects/AVRISP_Programmer/AVRISP_Programmer.c +++ b/Projects/AVRISP_Programmer/AVRISP_Programmer.c @@ -167,8 +167,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(); diff --git a/Projects/AVRISP_Programmer/AVRISP_Programmer.h b/Projects/AVRISP_Programmer/AVRISP_Programmer.h index 4c98d6bf3a..c6ac13fe7b 100644 --- a/Projects/AVRISP_Programmer/AVRISP_Programmer.h +++ b/Projects/AVRISP_Programmer/AVRISP_Programmer.h @@ -37,10 +37,11 @@ #define _AVRISP_PROGRAMMER_H_ /* Includes: */ - #include #include #include #include + #include + #include #include "Descriptors.h" #include "RingBuff.h" diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index 3696c12496..2826c140e0 100644 --- a/Projects/Magstripe/Magstripe.c +++ b/Projects/Magstripe/Magstripe.c @@ -93,8 +93,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 */ Magstripe_Init(); diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h index cde2fcdc63..61f3098eab 100644 --- a/Projects/Magstripe/Magstripe.h +++ b/Projects/Magstripe/Magstripe.h @@ -41,6 +41,7 @@ #include #include #include + #include #include #include