diff options
Diffstat (limited to 'LUFA/Drivers')
| -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
|