diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-15 08:02:30 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-15 08:02:30 +0000 |
| commit | 76d5e99bb8765030a7f99e7b5adf9bae7f92e0ba (patch) | |
| tree | 3d21b280a0648adcf2f3d66b9e3fa5c0c00c7f6e /Demos/Host/GenericHIDHost | |
| parent | fabfdd454a11440a5789a70f6476889b02928438 (diff) | |
| download | lufa-76d5e99bb8765030a7f99e7b5adf9bae7f92e0ba.tar.gz lufa-76d5e99bb8765030a7f99e7b5adf9bae7f92e0ba.tar.bz2 lufa-76d5e99bb8765030a7f99e7b5adf9bae7f92e0ba.zip | |
Fix to previous patch (make CDCHost demo deallocate pipes when an invalid CDC interface is skipped).
Remove the saving of the USB_GetNextDescriptorComp() return value in all host demos, since it went unused anyway; replaced with a simple check against the success error code for clarity.
Diffstat (limited to 'Demos/Host/GenericHIDHost')
| -rw-r--r-- | Demos/Host/GenericHIDHost/ConfigDescriptor.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Demos/Host/GenericHIDHost/ConfigDescriptor.c b/Demos/Host/GenericHIDHost/ConfigDescriptor.c index ef99359a9..1c0a6b291 100644 --- a/Demos/Host/GenericHIDHost/ConfigDescriptor.c +++ b/Demos/Host/GenericHIDHost/ConfigDescriptor.c @@ -71,7 +71,8 @@ uint8_t ProcessConfigurationDescriptor(void) return InvalidConfigDataReturned;
/* Get the HID interface from the configuration descriptor */
- if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextHIDInterface))
+ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
+ NextHIDInterface) != DESCRIPTOR_SEARCH_COMP_Found)
{
/* Descriptor not found, error out */
return NoHIDInterfaceFound;
@@ -80,7 +81,8 @@ uint8_t ProcessConfigurationDescriptor(void) while (FoundEndpoints != ((1 << HID_DATA_IN_PIPE) | (1 << HID_DATA_OUT_PIPE)))
{
/* Get the next HID interface's data endpoint descriptor */
- if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextInterfaceHIDDataEndpoint))
+ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
+ NextInterfaceHIDDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
{
/* Not all HID devices have an OUT endpoint - if we've reached the end of the HID descriptor
* but only found the mandatory IN endpoint, it's safe to continue with the device enumeration */
|