forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Collapse configuration descriptor size retrieval and size testing into a single if statement within the new host mode class driver demos for clarity.

Browse Source
pull/1469/head
Dean Camera 16 years ago
parent 84c3c4a3d9
commit b9dd51cd63
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File

13
Demos/Host/ClassDriver/CDCHost/CDCHost.c
Unescape View File

@ -77,17 +77,10 @@ int main(void)
uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)
if ((USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful) ||
(ConfigDescriptorSize > sizeof(ConfigDescriptorData)))
{
printf("Error Retrieving Device Descriptor.\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break;
}
if (ConfigDescriptorSize > 512)
{
printf("Device Descriptor Too Large To Process.\r\n");
printf("Error Retrieving Configuration Descriptor.\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break;

13
Demos/Host/ClassDriver/MouseHost/MouseHost.c
Unescape View File

@ -79,22 +79,15 @@ int main(void)
uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)
if ((USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful) ||
(ConfigDescriptorSize > sizeof(ConfigDescriptorData)))
{
printf("Error Retrieving Device Descriptor.\r\n");
printf("Error Retrieving Configuration Descriptor.\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break;
}
if (ConfigDescriptorSize > 512)
{
printf("Device Descriptor Too Large To Process.\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break;
}
USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData);
if (HID_Host_ConfigurePipes(&Mouse_HID_Interface,

9
LUFA/Drivers/USB/Class/Host/HID.h
Unescape View File

@ -66,8 +66,13 @@
uint8_t DataINPipeNumber; /**< Pipe number of the HID interface's IN data pipe */
uint8_t DataOUTPipeNumber; /**< Pipe number of the HID interface's OUT data pipe */
bool MatchInterfaceProtocol;
uint8_t HIDInterfaceProtocol;
bool MatchInterfaceProtocol; /**< Indicates whether the driver should match the device's
* HID interface protocol's value to the \ref HIDInterfaceProtocol
* suppled (otherwise just accept all HID class devices)
*/
uint8_t HIDInterfaceProtocol; /**< HID interface protocol value to match against if the
* \ref MatchInterfaceProtocol is set to true (ignored otherwise)
*/
} Config; /**< Config data for the USB class interface within the device. All elements in this section
* <b>must</b> be set or the interface will fail to enumerate and operate correctly.
*/

Write Preview
Loading…
Cancel
Save