Changed the parameters and behaviour of the USB_GetDeviceConfigDescriptor() function so that it now performs size checks and data validations internally, to simplify user code.

2 files changed, 20 insertions, 23 deletions

diff --git a/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c b/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
index 948c4fcc6..f856262d6 100644
--- a/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
+++ b/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
@@ -32,34 +32,30 @@
 

 uint8_t ProcessConfigurationDescriptor(void)

 {

-	uint8_t* ConfigDescriptorData;

-	uint16_t ConfigDescriptorSize;

+	uint8_t  ConfigDescriptorData[512];

+	uint8_t* CurrConfigLocation = ConfigDescriptorData;

+	uint16_t CurrConfigBytesRem;

 	uint8_t  FoundEndpoints = 0;

-	

-	/* Get Configuration Descriptor size from the device */

-	if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)

-	  return ControlErrorDuringConfigRead;

-	

-	/* Ensure that the Configuration Descriptor isn't too large */

-	if (ConfigDescriptorSize > MAX_CONFIG_DESCRIPTOR_SIZE)

-	  return DescriptorTooLarge;

-	  

-	/* Allocate enough memory for the entire config descriptor */

-	ConfigDescriptorData = alloca(ConfigDescriptorSize);

 

 	/* Retrieve the entire configuration descriptor into the allocated buffer */

-	USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData);

+	switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))

+	{

+		case HOST_GETCONFIG_Successful:

+			break;

+		case HOST_GETCONFIG_InvalidData:

+			return InvalidConfigDataReturned;

+		case HOST_GETCONFIG_BuffOverflow:

+			return DescriptorTooLarge;

+		default:

+			return ControlErrorDuringConfigRead;

+	}

 	

-	/* Validate returned data - ensure first entry is a configuration header descriptor */

-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)

-	  return InvalidConfigDataReturned;

-

 	/* The bluetooth USB transport addendium mandates that the data (not streaming voice) endpoints

 	   be in the first interface descriptor (interface 0) */

-	USB_GetNextDescriptorOfType(&ConfigDescriptorSize, &ConfigDescriptorData, DTYPE_Interface);

+	USB_GetNextDescriptorOfType(&CurrConfigBytesRem, &CurrConfigLocation, DTYPE_Interface);

 	

 	/* Ensure that an interface was found, and the end of the descriptor was not reached */

-	if (!(ConfigDescriptorSize))

+	if (!(CurrConfigBytesRem))

 	  return NoInterfaceFound;

 

 	/* Get the data IN, data OUT and event notification endpoints for the bluetooth interface */

@@ -67,8 +63,8 @@ uint8_t ProcessConfigurationDescriptor(void)
 	                          (1 << BLUETOOTH_EVENTS_PIPE)))

 	{

 		/* Fetch the next endpoint from the current bluetooth interface */

-		if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

-		                                   NextInterfaceBluetoothDataEndpoint))

+		if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,

+		                              NextInterfaceBluetoothDataEndpoint))

 		{

 			/* Descriptor not found, error out */

 			return NoEndpointFound;

diff --git a/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c b/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c
index f68f957c0..994352108 100644
--- a/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c
+++ b/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c
@@ -41,7 +41,8 @@ uint8_t ProcessDeviceDescriptor(void)
 	/* Validate returned data - ensure the returned data is a device descriptor */

 	if (DeviceDescriptor.Header.Type != DTYPE_Device)

 	  return InvalidDeviceDataReturned;

-	  

+	

+	/* Validate returned device Class, SubClass and Protocol values against the Bluetooth spec values */

 	if ((DeviceDescriptor.Class    != BLUETOOTH_DEVICE_CLASS)    ||

 	    (DeviceDescriptor.SubClass != BLUETOOTH_DEVICE_SUBCLASS) ||

 	    (DeviceDescriptor.Protocol != BLUETOOTH_DEVICE_PROTOCOL))