diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-05 09:37:45 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-05 09:37:45 +0000 |
| commit | a9d5e129b76449c73a853af450d7d353512cd3a0 (patch) | |
| tree | 8779e0f6d9bd2ab4ea83a88e4a532b8daa8d5154 /LUFA | |
| parent | 4b35dd167001233d2f44f918d3656a3f2ad80f2e (diff) | |
| download | lufa-a9d5e129b76449c73a853af450d7d353512cd3a0.tar.gz lufa-a9d5e129b76449c73a853af450d7d353512cd3a0.tar.bz2 lufa-a9d5e129b76449c73a853af450d7d353512cd3a0.zip | |
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.
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Device/CDC.c | 14 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/HighLevel/USBInterrupt.c | 4 |
2 files changed, 4 insertions, 14 deletions
diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c index 9da0ed1eb..0d6b37850 100644 --- a/LUFA/Drivers/USB/Class/Device/CDC.c +++ b/LUFA/Drivers/USB/Class/Device/CDC.c @@ -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);
diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c index a039dffb6..00fe7d1dc 100644 --- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c +++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c @@ -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
|