Removed "Host_" section of the function names in ConfigDescriptor.h, as most of the routines can now be used in device mode on the device descriptor.

Renamed functions in the HID parser to have a "USB_" prefix and the acronym "HID" in the name.

Further module-level documentation updates.

1 files changed, 4 insertions, 5 deletions

diff --git a/Demos/Host/GenericHIDHost/ConfigDescriptor.c b/Demos/Host/GenericHIDHost/ConfigDescriptor.c
index 653b961b7..caf88ef05 100644
--- a/Demos/Host/GenericHIDHost/ConfigDescriptor.c
+++ b/Demos/Host/GenericHIDHost/ConfigDescriptor.c
@@ -53,7 +53,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	uint8_t  FoundEndpoints = 0;

 	

 	/* Get Configuration Descriptor size from the device */

-	if (USB_Host_GetDeviceConfigDescriptor(&ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)

+	if (USB_GetDeviceConfigDescriptor(&ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)

 	  return ControlError;

 	

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

@@ -64,14 +64,14 @@ uint8_t ProcessConfigurationDescriptor(void)
 	ConfigDescriptorData = alloca(ConfigDescriptorSize);

 

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

-	USB_Host_GetDeviceConfigDescriptor(&ConfigDescriptorSize, ConfigDescriptorData);

+	USB_GetDeviceConfigDescriptor(&ConfigDescriptorSize, ConfigDescriptorData);

 	

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

 	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)

 	  return InvalidConfigDataReturned;

 	

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

-	if (USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextHIDInterface))

+	if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextHIDInterface))

 	{

 		/* Descriptor not found, error out */

 		return NoHIDInterfaceFound;

@@ -80,8 +80,7 @@ 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_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

-										   NextInterfaceHIDDataEndpoint))

+		if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextInterfaceHIDDataEndpoint))

 		{

 			/* 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 */