diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-02-26 05:48:47 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-02-26 05:48:47 +0000 |
| commit | 99145a8d7c88d9af065cfb7f5e8507d5b65ff811 (patch) | |
| tree | 80b407b9114c1fe6727b40e7b7e0caf6fefc0ea1 /LUFA/Drivers/USB/LowLevel/LowLevel.h | |
| parent | fa456ce531b75e2dd3c7c0ecb971e3ede36f5d35 (diff) | |
| download | lufa-99145a8d7c88d9af065cfb7f5e8507d5b65ff811.tar.gz lufa-99145a8d7c88d9af065cfb7f5e8507d5b65ff811.tar.bz2 lufa-99145a8d7c88d9af065cfb7f5e8507d5b65ff811.zip | |
Makefiles and library modified to add a new F_CLOCK constant to give the unprescaled master input clock frequency, so that the correct PLL mask can be determined even when the CPU (F_CPU) clock rate is prescaled outside the normal input range of the PLL.
Started to clean up the AVRISP Programmer project code, donated by Opendous Inc.
Diffstat (limited to 'LUFA/Drivers/USB/LowLevel/LowLevel.h')
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/LowLevel.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h index faafbd7bf..9721baca0 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.h +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h @@ -66,7 +66,12 @@ #endif
/* Preprocessor Checks and Defines: */
- #if (F_CPU == 8000000)
+ #if !defined(F_CLOCK)
+ #error F_CLOCK is not defined. You must device F_CLOCK to the frequency of the unprescaled input clock in your project makefile.
+ #define F_CLOCK 0
+ #endif
+
+ #if (F_CLOCK == 8000000)
#if (defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__))
#define USB_PLL_PSC 0
#elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || \
@@ -76,7 +81,7 @@ #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
#define USB_PLL_PSC 0
#endif
- #elif (F_CPU == 16000000)
+ #elif (F_CLOCK == 16000000)
#if (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_ATmega32U6__))
#define USB_PLL_PSC ((1 << PLLP2) | (1 << PLLP1))
#elif (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__))
|