forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tighten up the implementations of the USB_Device_SetDeviceAddress(), USB_Controller_Reset() and USB_PLL_On() functions for the AVR8 devices.

Browse Source 
Minor corrections to the documentation of the USB_Control_Request_t enum.
pull/1469/head
Dean Camera 14 years ago
parent 87b57522b2
commit 4e601207a7
5 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File

2
LUFA.pnproj
View File

File diff suppressed because one or more lines are too long

48
LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
Unescape View File

@ -155,28 +155,28 @@
} }
#if !defined(NO_SOF_EVENTS) #if !defined(NO_SOF_EVENTS)
/** Enables the device mode Start Of Frame events. When enabled, this causes the /** Enables the device mode Start Of Frame events. When enabled, this causes the
* \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus, * \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
* at the start of each USB frame when enumerated in device mode. * at the start of each USB frame when enumerated in device mode.
* *
* \note Not available when the \c NO_SOF_EVENTS compile time token is defined. * \note Not available when the \c NO_SOF_EVENTS compile time token is defined.
*/ */
static inline void USB_Device_EnableSOFEvents(void) ATTR_ALWAYS_INLINE; static inline void USB_Device_EnableSOFEvents(void) ATTR_ALWAYS_INLINE;
static inline void USB_Device_EnableSOFEvents(void) static inline void USB_Device_EnableSOFEvents(void)
{ {
USB_INT_Enable(USB_INT_SOFI); USB_INT_Enable(USB_INT_SOFI);
} }
/** Disables the device mode Start Of Frame events. When disabled, this stops the firing of the /** Disables the device mode Start Of Frame events. When disabled, this stops the firing of the
* \ref EVENT_USB_Device_StartOfFrame() event when enumerated in device mode. * \ref EVENT_USB_Device_StartOfFrame() event when enumerated in device mode.
* *
* \note Not available when the \c NO_SOF_EVENTS compile time token is defined. * \note Not available when the \c NO_SOF_EVENTS compile time token is defined.
*/ */
static inline void USB_Device_DisableSOFEvents(void) ATTR_ALWAYS_INLINE; static inline void USB_Device_DisableSOFEvents(void) ATTR_ALWAYS_INLINE;
static inline void USB_Device_DisableSOFEvents(void) static inline void USB_Device_DisableSOFEvents(void)
{ {
USB_INT_Disable(USB_INT_SOFI); USB_INT_Disable(USB_INT_SOFI);
} }
#endif #endif
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
@ -199,8 +199,10 @@
static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE; static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
static inline void USB_Device_SetDeviceAddress(const uint8_t Address) static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
{ {
UDADDR = ((UDADDR & (1 << ADDEN)) | (Address & 0x7F)); uint8_t Temp = (UDADDR & (1 << ADDEN)) | (Address & 0x7F);
UDADDR |= (1 << ADDEN);
UDADDR = Temp;
UDADDR = Temp | (1 << ADDEN);
} }
static inline bool USB_Device_IsAddressSet(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_Device_IsAddressSet(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;

14
LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h
Unescape View File

@ -359,20 +359,20 @@
static inline void USB_PLL_On(void) ATTR_ALWAYS_INLINE; static inline void USB_PLL_On(void) ATTR_ALWAYS_INLINE;
static inline void USB_PLL_On(void) static inline void USB_PLL_On(void)
{ {
PLLCSR = USB_PLL_PSC; PLLCSR = USB_PLL_PSC;
PLLCSR |= (1 << PLLE); PLLCSR = (USB_PLL_PSC | (1 << PLLE));
} }
static inline void USB_PLL_Off(void) ATTR_ALWAYS_INLINE; static inline void USB_PLL_Off(void) ATTR_ALWAYS_INLINE;
static inline void USB_PLL_Off(void) static inline void USB_PLL_Off(void)
{ {
PLLCSR = 0; PLLCSR = 0;
} }
static inline bool USB_PLL_IsReady(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; static inline bool USB_PLL_IsReady(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
static inline bool USB_PLL_IsReady(void) static inline bool USB_PLL_IsReady(void)
{ {
return ((PLLCSR & (1 << PLOCK)) ? true : false); return ((PLLCSR & (1 << PLOCK)) ? true : false);
} }
static inline void USB_REG_On(void) ATTR_ALWAYS_INLINE; static inline void USB_REG_On(void) ATTR_ALWAYS_INLINE;
@ -436,10 +436,8 @@
static inline void USB_Controller_Reset(void) ATTR_ALWAYS_INLINE; static inline void USB_Controller_Reset(void) ATTR_ALWAYS_INLINE;
static inline void USB_Controller_Reset(void) static inline void USB_Controller_Reset(void)
{ {
const uint8_t Temp = USBCON; USBCON &= ~(1 << USBE);
USBCON |= (1 << USBE);
USBCON = (Temp & ~(1 << USBE));
USBCON = (Temp | (1 << USBE));
} }
#if defined(USB_CAN_BE_BOTH) #if defined(USB_CAN_BE_BOTH)

18
LUFA/Drivers/USB/Core/StdRequestType.h
Unescape View File

@ -178,17 +178,17 @@
*/ */
enum USB_Control_Request_t enum USB_Control_Request_t
{ {
REQ_GetStatus = 0, /**< Implemented in the library for device, endpoint and interface REQ_GetStatus = 0, /**< Implemented in the library for device and endpoint recipients. Passed
* recipients. Passed to the user application for other recipients * to the user application for other recipients via the
* via the \ref EVENT_USB_Device_ControlRequest() event when received in * \ref EVENT_USB_Device_ControlRequest() event when received in
* device mode. */ * device mode. */
REQ_ClearFeature = 1, /**< Implemented in the library for device, endpoint and interface REQ_ClearFeature = 1, /**< Implemented in the library for device and endpoint recipients. Passed
* recipients. Passed to the user application for other recipients * to the user application for other recipients via the
* via the \ref EVENT_USB_Device_ControlRequest() event when received in * \ref EVENT_USB_Device_ControlRequest() event when received in
* device mode. */ * device mode. */
REQ_SetFeature = 3, /**< Implemented in the library for device, endpoint and interface REQ_SetFeature = 3, /**< Implemented in the library for device and endpoint recipients. Passed
* recipients. Passed to the user application for other recipients * to the user application for other recipients via the
* via the \ref EVENT_USB_Device_ControlRequest() event when received in * \ref EVENT_USB_Device_ControlRequest() event when received in
* device mode. */ * device mode. */
REQ_SetAddress = 5, /**< Implemented in the library for the device recipient. Passed REQ_SetAddress = 5, /**< Implemented in the library for the device recipient. Passed
* to the user application for other recipients via the * to the user application for other recipients via the

42
LUFA/Drivers/USB/Core/UC3/Device_UC3.h
Unescape View File

@ -145,28 +145,28 @@
} }
#if !defined(NO_SOF_EVENTS) #if !defined(NO_SOF_EVENTS)
/** Enables the device mode Start Of Frame events. When enabled, this causes the /** Enables the device mode Start Of Frame events. When enabled, this causes the
* \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus, * \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
* at the start of each USB frame when enumerated in device mode. * at the start of each USB frame when enumerated in device mode.
* *
* \note Not available when the \c NO_SOF_EVENTS compile time token is defined. * \note Not available when the \c NO_SOF_EVENTS compile time token is defined.
*/ */
static inline void USB_Device_EnableSOFEvents(void) ATTR_ALWAYS_INLINE; static inline void USB_Device_EnableSOFEvents(void) ATTR_ALWAYS_INLINE;
static inline void USB_Device_EnableSOFEvents(void) static inline void USB_Device_EnableSOFEvents(void)
{ {
USB_INT_Enable(USB_INT_SOFI); USB_INT_Enable(USB_INT_SOFI);
} }
/** Disables the device mode Start Of Frame events. When disabled, this stops the firing of the /** Disables the device mode Start Of Frame events. When disabled, this stops the firing of the
* \ref EVENT_USB_Device_StartOfFrame() event when enumerated in device mode. * \ref EVENT_USB_Device_StartOfFrame() event when enumerated in device mode.
* *
* \note Not available when the \c NO_SOF_EVENTS compile time token is defined. * \note Not available when the \c NO_SOF_EVENTS compile time token is defined.
*/ */
static inline void USB_Device_DisableSOFEvents(void) ATTR_ALWAYS_INLINE; static inline void USB_Device_DisableSOFEvents(void) ATTR_ALWAYS_INLINE;
static inline void USB_Device_DisableSOFEvents(void) static inline void USB_Device_DisableSOFEvents(void)
{ {
USB_INT_Disable(USB_INT_SOFI); USB_INT_Disable(USB_INT_SOFI);
} }
#endif #endif
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */

Write Preview
Loading…
Cancel
Save