Oops - with new changes to the way the device Configuration Descriptor is retrieved from the device, ensure that the correct position pointer is cast when extracting descriptor parameters.

2 files changed, 6 insertions, 6 deletions

diff --git a/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.c b/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.c
index fa0674118..901119eec 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.c
@@ -63,7 +63,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 		default:

 			return ControlError;

 	}

-	

+

 	/* Get the mouse interface from the configuration descriptor */

 	if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,

 	                              DComp_NextMouseInterface) != DESCRIPTOR_SEARCH_COMP_Found)

@@ -81,8 +81,8 @@ uint8_t ProcessConfigurationDescriptor(void)
 	}

 

 	/* Save the HID report size for later use */

-	HIDReportSize = DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_HID_t).HIDReportLength;

-

+	HIDReportSize = DESCRIPTOR_CAST(CurrConfigLocation, USB_Descriptor_HID_t).HIDReportLength;

+	

 	/* Get the mouse interface's data endpoint descriptor */

 	if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,

 	                              DComp_NextInterfaceMouseDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)

@@ -92,7 +92,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	}

 	

 	/* Retrieve the endpoint address from the endpoint descriptor */

-	USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);

+	USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(CurrConfigLocation, USB_Descriptor_Endpoint_t);

 

 	/* Configure the mouse data pipe */

 	Pipe_ConfigurePipe(MOUSE_DATAPIPE, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,

diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
index 31820be15..69ba64b13 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
@@ -166,7 +166,7 @@ void Mouse_HID_Task(void)
 				break;

 			}

 			

-			puts_P(PSTR("Processing HID Report.\r\n"));

+			printf_P(PSTR("Processing HID Report (Size %d Bytes).\r\n"), HIDReportSize);

 

 			/* Get and process the device's first HID report descriptor */

 			if ((ErrorCode = GetHIDReportData()) != ParseSuccessful)

@@ -179,7 +179,7 @@ void Mouse_HID_Task(void)
 				

 				/* Wait until USB device disconnected */

 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;

-				break;			

+				break;

 			}

 

 			puts_P(PSTR("Mouse Enumerated.\r\n"));