diff options
Diffstat (limited to 'LUFA/Drivers')
3 files changed, 26 insertions, 19 deletions
diff --git a/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_R.c b/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_R.c index 43abe6e1e..c8bfaeb70 100644 --- a/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_R.c +++ b/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_R.c @@ -8,13 +8,14 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, while (Length) { - if (Endpoint_IsSETUPReceived()) - return ENDPOINT_RWCSTREAM_HostAborted; + uint8_t USB_DeviceState_LCL = USB_DeviceState; - if (USB_DeviceState == DEVICE_STATE_Unattached) + if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) return ENDPOINT_RWCSTREAM_DeviceDisconnected; - else if (USB_DeviceState == DEVICE_STATE_Suspended) + else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended) return ENDPOINT_RWCSTREAM_BusSuspended; + else if (Endpoint_IsSETUPReceived()) + return ENDPOINT_RWCSTREAM_HostAborted; if (Endpoint_IsOUTReceived()) { @@ -30,9 +31,11 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, while (!(Endpoint_IsINReady())) { - if (USB_DeviceState == DEVICE_STATE_Unattached) + uint8_t USB_DeviceState_LCL = USB_DeviceState; + + if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) return ENDPOINT_RWCSTREAM_DeviceDisconnected; - else if (USB_DeviceState == DEVICE_STATE_Suspended) + else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended) return ENDPOINT_RWCSTREAM_BusSuspended; } diff --git a/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_W.c b/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_W.c index c9d81f3db..0ae7febc4 100644 --- a/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_W.c +++ b/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_W.c @@ -11,17 +11,17 @@ uint8_t TEMPLATE_FUNC_NAME (const void* Buffer, while (Length || LastPacketFull) { - if (Endpoint_IsSETUPReceived()) - return ENDPOINT_RWCSTREAM_HostAborted; - - if (Endpoint_IsOUTReceived()) - break; + uint8_t USB_DeviceState_LCL = USB_DeviceState; - if (USB_DeviceState == DEVICE_STATE_Unattached) + if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) return ENDPOINT_RWCSTREAM_DeviceDisconnected; - else if (USB_DeviceState == DEVICE_STATE_Suspended) + else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended) return ENDPOINT_RWCSTREAM_BusSuspended; - + else if (Endpoint_IsSETUPReceived()) + return ENDPOINT_RWCSTREAM_HostAborted; + else if (Endpoint_IsOUTReceived()) + break; + if (Endpoint_IsINReady()) { uint16_t BytesInEndpoint = Endpoint_BytesInEndpoint(); @@ -40,9 +40,11 @@ uint8_t TEMPLATE_FUNC_NAME (const void* Buffer, while (!(Endpoint_IsOUTReceived())) { - if (USB_DeviceState == DEVICE_STATE_Unattached) + uint8_t USB_DeviceState_LCL = USB_DeviceState; + + if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) return ENDPOINT_RWCSTREAM_DeviceDisconnected; - else if (USB_DeviceState == DEVICE_STATE_Suspended) + else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended) return ENDPOINT_RWCSTREAM_BusSuspended; } diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c index fc54e115a..fc2bff154 100644 --- a/LUFA/Drivers/USB/LowLevel/Endpoint.c +++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c @@ -115,10 +115,12 @@ uint8_t Endpoint_WaitUntilReady(void) return ENDPOINT_READYWAIT_NoError; } - if (USB_DeviceState == DEVICE_STATE_Unattached) + uint8_t USB_DeviceState_LCL = USB_DeviceState; + + if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) return ENDPOINT_READYWAIT_DeviceDisconnected; - else if (USB_DeviceState == DEVICE_STATE_Suspended) - return ENDPOINT_READYWAIT_BusSuspended; + else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended) + return ENDPOINT_READYWAIT_BusSuspended; else if (Endpoint_IsStalled()) return ENDPOINT_READYWAIT_EndpointStalled; |