diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-03-11 13:11:58 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-03-11 13:11:58 +0000 |
| commit | 0214e096a0274fd506b09812f47dc1183084851d (patch) | |
| tree | 127563aa958a3c9eee74b67d65f02e903719d4b0 /LUFA/Drivers | |
| parent | 38039765346c7441208dbcb3fd3cf8f13b7ced58 (diff) | |
| download | lufa-0214e096a0274fd506b09812f47dc1183084851d.tar.gz lufa-0214e096a0274fd506b09812f47dc1183084851d.tar.bz2 lufa-0214e096a0274fd506b09812f47dc1183084851d.zip | |
Renamed NO_CLEARSET_FEATURE_REQUEST compile time token to NO_FEATURELESS_CONTROL_ONLY_DEVICE and expanded its function to also remove parts of the Get Status chapter 9 request, to further reduce code usage.
Diffstat (limited to 'LUFA/Drivers')
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/DevChapter9.c | 8 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/DevChapter9.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c index 9ea3f417c..44493e698 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c @@ -55,7 +55,7 @@ void USB_Device_ProcessControlPacket(void) }
break;
-#if !defined(NO_CLEARSET_FEATURE_REQUEST)
+#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)
case REQ_ClearFeature:
case REQ_SetFeature:
if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT))
@@ -238,7 +238,9 @@ static void USB_Device_GetStatus(const uint8_t bmRequestType) Endpoint_Discard_Word();
+#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)
uint8_t wIndex_LSB = Endpoint_Read_Byte();
+#endif
switch (bmRequestType)
{
@@ -250,12 +252,14 @@ static void USB_Device_GetStatus(const uint8_t bmRequestType) CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;
break;
+#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)
case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):
Endpoint_SelectEndpoint(wIndex_LSB);
CurrentStatus = Endpoint_IsStalled();
break;
+#endif
}
Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
@@ -268,7 +272,7 @@ static void USB_Device_GetStatus(const uint8_t bmRequestType) Endpoint_ClearSetupOUT();
}
-#if !defined(NO_CLEARSET_FEATURE_REQUEST)
+#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)
static void USB_Device_ClearSetFeature(const uint8_t bRequest, const uint8_t bmRequestType)
{
uint16_t wValue = Endpoint_Read_Word_LE();
diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h index 5e1772a53..543c1a940 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h @@ -121,7 +121,7 @@ static void USB_Device_GetConfiguration(void);
static void USB_Device_GetDescriptor(void);
static void USB_Device_GetStatus(const uint8_t bmRequestType);
- #if !defined(NO_CLEARSET_FEATURE_REQUEST)
+ #if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)
static void USB_Device_ClearSetFeature(const uint8_t bRequest, const uint8_t bmRequestType);
#endif
#endif
|