aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Host/LowLevel/MouseHost
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-10-01 12:01:54 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-10-01 12:01:54 +0000
commitc8942ef4699362747efd6580975a7f61757a4cd6 (patch)
tree7f7c3bad1ed62680478964529cecbeaf9e4adf46 /Demos/Host/LowLevel/MouseHost
parentd36c96d6a526f74e3853466bcecf49261c58b9bd (diff)
downloadlufa-c8942ef4699362747efd6580975a7f61757a4cd6.tar.gz
lufa-c8942ef4699362747efd6580975a7f61757a4cd6.tar.bz2
lufa-c8942ef4699362747efd6580975a7f61757a4cd6.zip
Fixed LowLevel JoystickHostWithParser demo not saving the chosen HID interface's report descriptor size.
Simplified low level Host demo configuration descriptor parser routines.
Diffstat (limited to 'Demos/Host/LowLevel/MouseHost')
-rw-r--r--Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c b/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c
index 4ea8aefe9..b5d62236e 100644
--- a/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c
@@ -51,7 +51,8 @@ uint8_t ProcessConfigurationDescriptor(void)
void* CurrConfigLocation = ConfigDescriptorData;
uint16_t CurrConfigBytesRem;
- USB_Descriptor_Endpoint_t* DataINEndpoint = NULL;
+ USB_Descriptor_Interface_t* HIDInterface = NULL;
+ USB_Descriptor_Endpoint_t* DataINEndpoint = NULL;
/* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
@@ -65,19 +66,12 @@ uint8_t ProcessConfigurationDescriptor(void)
default:
return ControlError;
}
-
- /* Get the first HID interface from the configuration descriptor */
- if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,
- DComp_NextMouseInterface) != DESCRIPTOR_SEARCH_COMP_Found)
- {
- /* Descriptor not found, error out */
- return NoCompatibleInterfaceFound;
- }
while (!(DataINEndpoint))
{
- /* Get the next HID interface's data endpoint descriptor */
- if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,
+ /* See if we've found a likely compatible interface, and if there is an endpoint within that interface */
+ if (!(HIDInterface) ||
+ USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,
DComp_NextMouseInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
{
/* Get the next HID interface from the configuration descriptor */
@@ -88,6 +82,9 @@ uint8_t ProcessConfigurationDescriptor(void)
return NoCompatibleInterfaceFound;
}
+ /* Save the interface in case we need to refer back to it later */
+ HIDInterface = DESCRIPTOR_PCAST(CurrConfigLocation, USB_Descriptor_Interface_t);
+
/* Skip the remainder of the loop as we have not found an endpoint yet */
continue;
}