aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/USB/LowLevel
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-11-11 09:09:39 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-11-11 09:09:39 +0000
commit04774208b6d4131466a2b5e44af314252ab1734e (patch)
treedaf57c62f20881434ca23f2972e5ebee8c0eaf15 /LUFA/Drivers/USB/LowLevel
parent5de364163f5a7597ba2f54e37cdea493fbd1e7ff (diff)
downloadlufa-04774208b6d4131466a2b5e44af314252ab1734e.tar.gz
lufa-04774208b6d4131466a2b5e44af314252ab1734e.tar.bz2
lufa-04774208b6d4131466a2b5e44af314252ab1734e.zip
Minor code cleanups for clarity.
Diffstat (limited to 'LUFA/Drivers/USB/LowLevel')
-rw-r--r--LUFA/Drivers/USB/LowLevel/DevChapter9.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index bb6104fec..6e7b2c718 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -129,11 +129,11 @@ static void USB_Device_SetAddress(void)
return;
}
- UDADDR = ((1 << ADDEN) | DeviceAddress);
-
if (DeviceAddress)
USB_DeviceState = DEVICE_STATE_Addressed;
+ UDADDR = ((1 << ADDEN) | DeviceAddress);
+
return;
}
@@ -192,10 +192,7 @@ static void USB_Device_SetConfiguration(void)
Endpoint_ClearStatusStage();
- if (USB_ConfigurationNumber)
- USB_DeviceState = DEVICE_STATE_Configured;
- else
- USB_DeviceState = DEVICE_STATE_Addressed;
+ USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
EVENT_USB_Device_ConfigurationChanged();
}
@@ -225,10 +222,10 @@ static void USB_Device_GetInternalSerialDescriptor(void)
int16_t UnicodeString[20];
} SignatureDescriptor;
- SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);
- SignatureDescriptor.Header.Type = DTYPE_String;
+ SignatureDescriptor.Header.Type = DTYPE_String;
+ SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);
- uint8_t SigReadAddress = 0x0E;
+ uint8_t SigReadAddress = 0x0E;
for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)
{
@@ -358,16 +355,16 @@ static void USB_Device_ClearSetFeature(void)
if (Endpoint_IsEnabled())
{
- if (USB_ControlRequest.bRequest == REQ_ClearFeature)
+ if (USB_ControlRequest.bRequest == REQ_SetFeature)
{
- Endpoint_ClearStall();
- Endpoint_ResetFIFO(EndpointIndex);
- Endpoint_ResetDataToggle();
+ Endpoint_StallTransaction();
}
else
{
- Endpoint_StallTransaction();
- }
+ Endpoint_ClearStall();
+ Endpoint_ResetFIFO(EndpointIndex);
+ Endpoint_ResetDataToggle();
+ }
}
}