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 /Projects | |
| 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 'Projects')
| -rw-r--r-- | Projects/AVRISP_Programmer/AVRISP_Programmer.c | 4 | ||||
| -rw-r--r-- | Projects/AVRISP_Programmer/AVRISP_Programmer.h | 3 | ||||
| -rw-r--r-- | Projects/Magstripe/Magstripe.c | 4 | ||||
| -rw-r--r-- | Projects/Magstripe/Magstripe.h | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/Projects/AVRISP_Programmer/AVRISP_Programmer.c b/Projects/AVRISP_Programmer/AVRISP_Programmer.c index 9ba3c0e7e..4bc4f9cc3 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 4c98d6bf3..c6ac13fe7 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 <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"
diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index 3696c1249..2826c140e 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 cde2fcdc6..61f3098ea 100644 --- a/Projects/Magstripe/Magstripe.h +++ b/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>
|