diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-03-21 10:20:42 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-03-21 10:20:42 +0000 |
| commit | aba7932a5c7c5f4a65f1c8558c94ed313ff3ca96 (patch) | |
| tree | ef58b9575ec89bdd48bc176f0a4d26a20013dbd3 /LUFA/Drivers/USB | |
| parent | c7f4752d6bacf15aaea13a111c1d9bb8576f186d (diff) | |
| download | lufa-aba7932a5c7c5f4a65f1c8558c94ed313ff3ca96.tar.gz lufa-aba7932a5c7c5f4a65f1c8558c94ed313ff3ca96.tar.bz2 lufa-aba7932a5c7c5f4a65f1c8558c94ed313ff3ca96.zip | |
F_CLOCK changed to F_USB to be more descriptive, and applicable on future architecture ports.
Diffstat (limited to 'LUFA/Drivers/USB')
| -rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h | 10 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/HostStandardReq.c | 1 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/UC3/USBController_UC3.c | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h index 77e92cb27..a6e0067e3 100644 --- a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h @@ -80,11 +80,11 @@ #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead. #endif - #if !defined(F_CLOCK) - #error F_CLOCK is not defined. You must define F_CLOCK to the frequency of the unprescaled USB controller clock in your project makefile. + #if !defined(F_USB) + #error F_USB is not defined. You must define F_USB to the frequency of the unprescaled USB controller clock in your project makefile. #endif - #if (F_CLOCK == 8000000) + #if (F_USB == 8000000) #if (defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__) || \ defined(__AVR_ATmega8U2__) || defined(__AVR_ATmega16U2__) || \ defined(__AVR_ATmega32U2__)) @@ -96,7 +96,7 @@ #elif (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__)) #define USB_PLL_PSC ((1 << PLLP1) | (1 << PLLP0)) #endif - #elif (F_CLOCK == 16000000) + #elif (F_USB == 16000000) #if (defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__) || \ defined(__AVR_ATmega8U2__) || defined(__AVR_ATmega16U2__) || \ defined(__AVR_ATmega32U2__)) @@ -111,7 +111,7 @@ #endif #if !defined(USB_PLL_PSC) - #error No PLL prescale value available for chosen F_CLOCK value and AVR model. + #error No PLL prescale value available for chosen F_USB value and AVR model. #endif /* Public Interface - May be used in end-application: */ diff --git a/LUFA/Drivers/USB/Core/HostStandardReq.c b/LUFA/Drivers/USB/Core/HostStandardReq.c index d2523fdef..5b443e772 100644 --- a/LUFA/Drivers/USB/Core/HostStandardReq.c +++ b/LUFA/Drivers/USB/Core/HostStandardReq.c @@ -38,7 +38,6 @@ uint8_t USB_Host_SendControlRequest(void* const BufferPtr) { - uint8_t* HeaderStream = (uint8_t*)&USB_ControlRequest; uint8_t* DataStream = (uint8_t*)BufferPtr; bool BusSuspended = USB_Host_IsBusSuspended(); uint8_t ReturnStatus = HOST_SENDCONTROL_Successful; diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c index a9ac2481c..e3d97d684 100644 --- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c @@ -106,8 +106,8 @@ void USB_ResetInterface(void) AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].pllsel = !(USB_Options & USB_OPT_GCLK_SRC_OSC);
AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].oscsel = !(USB_Options & USB_OPT_GCLK_CHANNEL_0);
- AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].diven = (F_CLOCK != USB_CLOCK_REQUIRED_FREQ);
- AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].div = (F_CLOCK == USB_CLOCK_REQUIRED_FREQ) ? 0 : (uint32_t)(((F_CLOCK / USB_CLOCK_REQUIRED_FREQ) - 1) / 2);
+ AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].diven = (F_USB != USB_CLOCK_REQUIRED_FREQ);
+ AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].div = (F_USB == USB_CLOCK_REQUIRED_FREQ) ? 0 : (uint32_t)(((F_USB / USB_CLOCK_REQUIRED_FREQ) - 1) / 2);
AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].cen = true;
USB_INT_DisableAllInterrupts();
|