diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-29 05:57:29 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-29 05:57:29 +0000 |
| commit | c6a7a028bd1f6a41195ed95e3c6b4291105ef448 (patch) | |
| tree | efbd7420de34d73a174bcf80340b28bbafabdbfd /LUFA/Drivers/USB | |
| parent | 75da0d187741fa272a19073da26e94aa7c3c5263 (diff) | |
| download | lufa-c6a7a028bd1f6a41195ed95e3c6b4291105ef448.tar.gz lufa-c6a7a028bd1f6a41195ed95e3c6b4291105ef448.tar.bz2 lufa-c6a7a028bd1f6a41195ed95e3c6b4291105ef448.zip | |
Merge over core library changes from the MultiArchDemos branch.
Diffstat (limited to 'LUFA/Drivers/USB')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Device/HID.c | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/ConfigDescriptor.c | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/StdDescriptors.h | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c index 40351cc5d..3b0f87a61 100644 --- a/LUFA/Drivers/USB/Class/Device/HID.c +++ b/LUFA/Drivers/USB/Class/Device/HID.c @@ -137,7 +137,7 @@ bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_Device_t* const HIDInterfac { memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State)); HIDInterfaceInfo->State.UsingReportProtocol = true; - HIDInterfaceInfo->State.IdleCount = 500; + HIDInterfaceInfo->State.IdleCount = 500; if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN, HIDInterfaceInfo->Config.ReportINEndpointSize, diff --git a/LUFA/Drivers/USB/Core/ConfigDescriptor.c b/LUFA/Drivers/USB/Core/ConfigDescriptor.c index 35a01995d..3e0cce5cc 100644 --- a/LUFA/Drivers/USB/Core/ConfigDescriptor.c +++ b/LUFA/Drivers/USB/Core/ConfigDescriptor.c @@ -54,7 +54,7 @@ uint8_t USB_Host_GetDeviceConfigDescriptor(const uint8_t ConfigNumber, if ((ErrorCode = USB_Host_SendControlRequest(ConfigHeader)) != HOST_SENDCONTROL_Successful) return ErrorCode; - *ConfigSizePtr = DESCRIPTOR_PCAST(ConfigHeader, USB_Descriptor_Configuration_Header_t)->TotalConfigurationSize; + *ConfigSizePtr = le16_to_cpu(DESCRIPTOR_PCAST(ConfigHeader, USB_Descriptor_Configuration_Header_t)->TotalConfigurationSize); if (*ConfigSizePtr > BufferSize) return HOST_GETCONFIG_BuffOverflow; diff --git a/LUFA/Drivers/USB/Core/StdDescriptors.h b/LUFA/Drivers/USB/Core/StdDescriptors.h index 7840bcb8e..864a1c482 100644 --- a/LUFA/Drivers/USB/Core/StdDescriptors.h +++ b/LUFA/Drivers/USB/Core/StdDescriptors.h @@ -93,6 +93,9 @@ * Decimal format for descriptor fields requiring BCD encoding, such as the USB version number in the * standard device descriptor. * + * \note This value is automatically converted into Little Endian, suitable for direct use inside device + * descriptors on all architectures without endianness conversion macros. + * * \param[in] x Version number to encode as a 16-bit little-endian number, as a floating point number. */ #define VERSION_BCD(x) CPU_TO_LE16((((VERSION_TENS(x) << 4) | VERSION_ONES(x)) << 8) | \ @@ -101,7 +104,7 @@ /** String language ID for the English language. Should be used in \ref USB_Descriptor_String_t descriptors * to indicate that the English language is supported by the device in its string descriptors. */ - #define LANGUAGE_ID_ENG CPU_TO_LE16(0x0409) + #define LANGUAGE_ID_ENG 0x0409 /** \name Endpoint Address Direction Masks */ //@{ |