diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-10-06 10:16:02 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-10-06 10:16:02 +0000 |
| commit | 3ae9e6042fc1ebc876e32142dde606f7890518b2 (patch) | |
| tree | dc543d0f197986bafee383442e147acd3254ddd4 /LUFA/Drivers/USB/HighLevel/Template | |
| parent | 93793679c95198e3272de565c6904f14ab257795 (diff) | |
| download | lufa-3ae9e6042fc1ebc876e32142dde606f7890518b2.tar.gz lufa-3ae9e6042fc1ebc876e32142dde606f7890518b2.tar.bz2 lufa-3ae9e6042fc1ebc876e32142dde606f7890518b2.zip | |
Cache the USB_DeviceState variable internally in the library core when multiple checks are required in a single loop iteration, to reduce compiled code size.
Diffstat (limited to 'LUFA/Drivers/USB/HighLevel/Template')
| -rw-r--r-- | LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_R.c | 15 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_Control_W.c | 22 |
2 files changed, 21 insertions, 16 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; } |