ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed hardware race condition that could cause failed device enumerations for AVR8 and UC3 architectures (thanks to Mike Beyhs).

Browse source 
Fixed incorrect Minimus board LED definitions (thanks to Joonas Lahtinen).

Fixed incorrect LED masks for received data display in the Device GenericHID demos (thanks to Denys Berkovskyy).
This commit is contained in:
Dean Camera 2013-01-03 10:53:47 +00:00
parent 7d037c7db8
commit 2608fd1dd4
9 changed files with 40 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h
View file

@ -44,9 +44,8 @@
*
* <table>
* <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
* <tr><td>LEDS_LED1</td><td>Red</td><td>General Indicator</td><td>Low</td><td>PORTD.5</td></tr>
* <tr><td>LEDS_LED2</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTD.6</td></tr>
* <tr><td>LEDS_LED3</td><td>Blue</td><td>General Indicator</td><td>Low</td><td>PORTD.7</td></tr>
* <tr><td>LEDS_LED1</td><td>Blue</td><td>General Indicator</td><td>Low</td><td>PORTD.5</td></tr>
* <tr><td>LEDS_LED2</td><td>Red</td><td>General Indicator</td><td>Low</td><td>PORTD.6</td></tr>
* </table>
*
* @{
@ -76,11 +75,8 @@
/** LED mask for the second LED on the board. */
#define LEDS_LED2 (1 << 6)
/** LED mask for the third LED on the board. */
#define LEDS_LED3 (1 << 7)
/** LED mask for all the LEDs on the board. */
#define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
#define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2)
/** LED mask for the none of the board LEDs. */
#define LEDS_NO_LEDS 0

9
LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
View file

@ -210,10 +210,13 @@
static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
{
uint8_t Temp = (UDADDR & (1 << ADDEN)) | (Address & 0x7F);
UDADDR = (UDADDR & (1 << ADDEN)) | (Address & 0x7F);
}
UDADDR = Temp;
UDADDR = Temp | (1 << ADDEN);
static inline void USB_Device_EnableDeviceAddress(void) ATTR_ALWAYS_INLINE;
static inline void USB_Device_EnableDeviceAddress(void)
{
UDADDR |= (1 << ADDEN);
}
static inline bool USB_Device_IsAddressSet(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;

11
LUFA/Drivers/USB/Core/DeviceStandardReq.c
View file

@ -124,9 +124,9 @@ void USB_Device_ProcessControlRequest(void)
static void USB_Device_SetAddress(void)
{
uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable();
uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
USB_Device_SetDeviceAddress(DeviceAddress);
Endpoint_ClearSETUP();
@ -134,10 +134,9 @@ static void USB_Device_SetAddress(void)
while (!(Endpoint_IsINReady()));
USB_Device_SetDeviceAddress(DeviceAddress);
USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
USB_Device_EnableDeviceAddress();
SetGlobalInterruptMask(CurrentGlobalInt);
USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
}
static void USB_Device_SetConfiguration(void)

7
LUFA/Drivers/USB/Core/UC3/Device_UC3.h
View file

@ -209,7 +209,12 @@
static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
{
AVR32_USBB.UDCON.uadd = Address;
AVR32_USBB.UDCON.adden = (Address ? true : false);
}
static inline void USB_Device_EnableDeviceAddress(void) ATTR_ALWAYS_INLINE;
static inline void USB_Device_EnableDeviceAddress(void)
{
AVR32_USBB.UDCON.adden = true;
}
static inline bool USB_Device_IsAddressSet(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;

6
LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
View file

@ -208,6 +208,12 @@
USB.ADDR = Address;
}
static inline void USB_Device_EnableDeviceAddress(void) ATTR_ALWAYS_INLINE;
static inline void USB_Device_EnableDeviceAddress(void)
{
/* No implementation for XMEGA architecture */
}
static inline bool USB_Device_IsAddressSet(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_Device_IsAddressSet(void)
{