eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix nasty bug in USBInterrupt.c which would cause a lockup if the control endpoint was not selected at the point the USB endpoint interrupt fires when INTERRUPT_CONTROL_ENDPOINT is defined.

This commit is contained in:
Dean Camera 2010-05-11 13:45:23 +00:00
parent 53ebb2f21a
commit ee5ea4ce2b
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
View File

@ -183,8 +183,6 @@ static uint32_t ServiceDiscovery_GetDataElementSize(const void** DataElementHead
uint8_t SizeIndex = (*((uint8_t*)*DataElementHeader) & 0x07); uint8_t SizeIndex = (*((uint8_t*)*DataElementHeader) & 0x07);
*DataElementHeader += sizeof(uint8_t); *DataElementHeader += sizeof(uint8_t);
*ElementHeaderSize = 1;
uint32_t ElementValue; uint32_t ElementValue;
switch (SizeIndex) switch (SizeIndex)
@ -205,7 +203,8 @@ static uint32_t ServiceDiscovery_GetDataElementSize(const void** DataElementHead
*ElementHeaderSize = (1 + sizeof(uint32_t)); *ElementHeaderSize = (1 + sizeof(uint32_t));
break; break;
default: default:
ElementValue = (1UL << SizeIndex); ElementValue = (1 << SizeIndex);
*ElementHeaderSize = 1;
break; break;
} }

6
LUFA/Drivers/USB/LowLevel/USBInterrupt.c
View File

@ -235,13 +235,13 @@ ISR(USB_COM_vect, ISR_BLOCK)
{ {
uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint(); uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
USB_INT_Disable(USB_INT_RXSTPI); USB_INT_Disable(USB_INT_RXSTPI);
sei(); sei();
USB_USBTask(); USB_USBTask();
USB_INT_Enable(USB_INT_RXSTPI); USB_INT_Enable(USB_INT_RXSTPI);
USB_INT_Clear(USB_INT_RXSTPI);
Endpoint_SelectEndpoint(PrevSelectedEndpoint); Endpoint_SelectEndpoint(PrevSelectedEndpoint);
} }
#endif #endif