diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-09-09 13:17:04 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-09-09 13:17:04 +0000 |
| commit | b221e7d175e4b5ca463fdd6d05b8c3fc71bd7c40 (patch) | |
| tree | 8a546e950f53d4ab3457ec0e238b46d3f0e9c417 /LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c | |
| parent | 524decdeb3a0a4c7adbeb4af906556e7bc6dd77c (diff) | |
| download | lufa-b221e7d175e4b5ca463fdd6d05b8c3fc71bd7c40.tar.gz lufa-b221e7d175e4b5ca463fdd6d05b8c3fc71bd7c40.tar.bz2 lufa-b221e7d175e4b5ca463fdd6d05b8c3fc71bd7c40.zip | |
Remove USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token, split out standard descriptors into seperate USB_Descriptor_* and USB_StdDescriptor_* structures so that both can be used within the one project.
Add guard to the HID Host Class driver SetProtocol command, to ensure that the device supports boot protocol mode before issuing the request.
Diffstat (limited to 'LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c')
| -rw-r--r-- | LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c index 4c6fbfdab..6b20f4642 100644 --- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c +++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c @@ -51,11 +51,7 @@ uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const Conf if ((ErrorCode = USB_Host_SendControlRequest(ConfigHeader)) != HOST_SENDCONTROL_Successful)
return ErrorCode;
- #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)
*ConfigSizePtr = DESCRIPTOR_CAST(ConfigHeader, USB_Descriptor_Configuration_Header_t).TotalConfigurationSize;
- #else
- *ConfigSizePtr = DESCRIPTOR_CAST(ConfigHeader, USB_Descriptor_Configuration_Header_t).wTotalLength;
- #endif
if (*ConfigSizePtr > BufferSize)
return HOST_GETCONFIG_BuffOverflow;
|