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.

12 files changed, 20 insertions, 20 deletions

diff --git a/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c b/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
index f856262d6..487cac6e2 100644
--- a/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
+++ b/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
@@ -70,7 +70,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 			return NoEndpointFound;

 		}

 		

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

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

 

 		/* Check if the endpoint is a bulk or interrupt type endpoint */

 		if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)

diff --git a/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c b/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c
index f9671e2b3..917df2776 100644
--- a/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c
@@ -122,7 +122,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 			}

 		}

 		

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

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

 

 		/* Check if the found endpoint is a interrupt or bulk type descriptor */

 		if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)

diff --git a/Demos/Host/LowLevel/GenericHIDHost/ConfigDescriptor.c b/Demos/Host/LowLevel/GenericHIDHost/ConfigDescriptor.c
index dba62fd06..6730fdba5 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/GenericHIDHost/ConfigDescriptor.c
@@ -89,7 +89,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);

 

 		/* If the endpoint is a IN type endpoint */

 		if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)

diff --git a/Demos/Host/LowLevel/KeyboardHost/ConfigDescriptor.c b/Demos/Host/LowLevel/KeyboardHost/ConfigDescriptor.c
index 46fb94ee2..7dc557478 100644
--- a/Demos/Host/LowLevel/KeyboardHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/KeyboardHost/ConfigDescriptor.c
@@ -81,7 +81,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 keyboard data pipe */

 	Pipe_ConfigurePipe(KEYBOARD_DATAPIPE, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c
index 7ab0a1887..d09e4c493 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c
@@ -81,7 +81,7 @@ 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 keyboard interface's data endpoint descriptor */

 	if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,

@@ -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 keyboard data pipe */

 	Pipe_ConfigurePipe(KEYBOARD_DATAPIPE, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
index db4032f6e..3c9f30491 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -166,8 +166,8 @@ void Keyboard_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)

 			{

diff --git a/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.c b/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.c
index 1ba3244ed..ca84e45e0 100644
--- a/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.c
@@ -84,7 +84,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 			return NoEndpointFound;

 		}

 		

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

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

 

 		/* Check if the endpoint is a bulk IN or bulk OUT endpoint, set appropriate globals */

 		if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)

diff --git a/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c b/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c
index 912f146bc..2e6a4c89b 100644
--- a/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c
@@ -81,7 +81,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/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"));

diff --git a/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.c b/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.c
index 22d84c5aa..5a8731da0 100644
--- a/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.c
@@ -61,8 +61,8 @@ uint8_t ProcessConfigurationDescriptor(void)
 		return NoInterfaceFound;

 	}

 	

-	PrinterInterfaceNumber = DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_Interface_t).InterfaceNumber;

-	PrinterAltSetting      = DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_Interface_t).AlternateSetting;

+	PrinterInterfaceNumber = DESCRIPTOR_CAST(CurrConfigLocation, USB_Descriptor_Interface_t).InterfaceNumber;

+	PrinterAltSetting      = DESCRIPTOR_CAST(CurrConfigLocation, USB_Descriptor_Interface_t).AlternateSetting;

 

 	/* Get the IN and OUT data endpoints for the printer interface */

 	while (FoundEndpoints != ((1 << PRINTER_DATA_OUT_PIPE) | (1 << PRINTER_DATA_IN_PIPE)))

@@ -74,7 +74,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 			return NoEndpointFound;

 		}

 		

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

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

 

 		/* Check if the endpoint is a bulk IN or bulk OUT endpoint, set appropriate globals */

 		if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)

diff --git a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c
index 4e7751d71..5b3664fd7 100644
--- a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c
@@ -84,7 +84,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 			return NoEndpointFound;

 		}

 		

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

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

 

 		/* Check if the found endpoint is a interrupt or bulk type descriptor */

 		if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)