diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-03-09 12:28:50 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-03-09 12:28:50 +0000 |
| commit | 4a09da20989dfe0c41dc1272fa6dce1e11539c15 (patch) | |
| tree | 9bff8cf677ebfda3ac8d2c691dcb55543f765b6f /Bootloaders | |
| parent | ddd223fa35720e360daa08e6964f20c2fb625c27 (diff) | |
| parent | b0d9f961acfff498b7c4f2dc4a54ad9513d09a3b (diff) | |
| download | lufa-4a09da20989dfe0c41dc1272fa6dce1e11539c15.tar.gz lufa-4a09da20989dfe0c41dc1272fa6dce1e11539c15.tar.bz2 lufa-4a09da20989dfe0c41dc1272fa6dce1e11539c15.zip | |
Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro has been corrected in recent avr-libc versions
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 54c7b7e49..60fe4a4bc 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 a6e77550c..dce84a5f8 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 704133f5d..8cc5fd409 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 b90fee13f..21e8fce71 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 4f09ac50b..fe20702cd 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 a53fca30f..a4773f8f5 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>
|