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

Changed over manual loops waiting for endpoints to be ready to use the library Endpoint_WaitUntilReady() function for robustness. Fixes issues with terminated transfers on the host locking up USB devices.

Browse source
This commit is contained in:
Dean Camera 2009-08-05 09:37:45 +00:00
parent 4b35dd1670
commit a9d5e129b7
9 changed files with 31 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

14
LUFA/Drivers/USB/Class/Device/CDC.c
View file

@ -126,12 +126,7 @@ void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)
if (!(Endpoint_IsReadWriteAllowed()))
{
Endpoint_ClearIN();
while (!(Endpoint_IsReadWriteAllowed()))
{
if (USB_DeviceState == DEVICE_STATE_Unattached)
return;
}
Endpoint_WaitUntilReady();
}
Endpoint_ClearIN();
@ -156,12 +151,7 @@ void CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, con
if (!(Endpoint_IsReadWriteAllowed()))
{
Endpoint_ClearIN();
while (!(Endpoint_IsReadWriteAllowed()))
{
if (USB_DeviceState == DEVICE_STATE_Unattached)
return;
}
Endpoint_WaitUntilReady();
}
Endpoint_Write_Byte(Data);

4
LUFA/Drivers/USB/HighLevel/USBInterrupt.c
View file

@ -223,7 +223,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
}
#if defined(INTERRUPT_CONTROL_ENDPOINT)
ISR(USB_COM_vect, ISR_NOBLOCK)
ISR(USB_COM_vect, ISR_BLOCK)
{
uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
@ -231,6 +231,6 @@ ISR(USB_COM_vect, ISR_NOBLOCK)
USB_INT_Clear(USB_INT_ENDPOINT_SETUP);
Endpoint_SelectEndpoint(PrevSelectedEndpoint);
Endpoint_SelectEndpoint(PrevSelectedEndpoint);
}
#endif