diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-03-09 12:28:50 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-03-09 12:28:50 +0000 |
| commit | 2fdeeb2acba95c5214db03abe40f33effbd1d3e2 (patch) | |
| tree | 9bff8cf677ebfda3ac8d2c691dcb55543f765b6f /Bootloaders | |
| parent | ce7b8963aefdb0fdd539f4ea44c10c9b0ea62ae9 (diff) | |
| parent | 7255d5566d54ae8ed57c5434d4e9e71cca08ce4b (diff) | |
Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro has been corrected in recent avr-libc versions
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@455 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Bootloaders')
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 4 | ||||
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.h | 1 | ||||
| -rw-r--r-- | Bootloaders/DFU/BootloaderDFU.c | 4 | ||||
| -rw-r--r-- | Bootloaders/DFU/BootloaderDFU.h | 1 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/TeensyHID.c | 4 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/TeensyHID.h | 1 |
6 files changed, 9 insertions, 6 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 54c7b7e4..60fe4a4b 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 a6e77550..dce84a5f 100644 --- a/Bootloaders/CDC/BootloaderCDC.h +++ b/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"
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 704133f5..8cc5fd40 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 b90fee13..21e8fce7 100644 --- a/Bootloaders/DFU/BootloaderDFU.h +++ b/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"
diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c index 4f09ac50..fe20702c 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 a53fca30..a4773f8f 100644 --- a/Bootloaders/TeensyHID/TeensyHID.h +++ b/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>
|