eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects 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.

This commit is contained in:
Dean Camera 2009-07-27 10:55:21 +00:00
parent 84c3c4a3d9
commit b9dd51cd63
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,17 +77,10 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; 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); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;

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

@ -79,17 +79,10 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; 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); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;

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

@ -66,8 +66,13 @@
uint8_t DataINPipeNumber; /**< Pipe number of the HID interface's IN data pipe */ 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 */ uint8_t DataOUTPipeNumber; /**< Pipe number of the HID interface's OUT data pipe */
bool MatchInterfaceProtocol; bool MatchInterfaceProtocol; /**< Indicates whether the driver should match the device's
uint8_t HIDInterfaceProtocol; * 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 } 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. * <b>must</b> be set or the interface will fail to enumerate and operate correctly.
*/ */