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, 7 insertions, 7 deletions

diff --git a/Demos/Host/CDCHost/ConfigDescriptor.c b/Demos/Host/CDCHost/ConfigDescriptor.c
index 3b919bd9b..972d3e68c 100644
--- a/Demos/Host/CDCHost/ConfigDescriptor.c
+++ b/Demos/Host/CDCHost/ConfigDescriptor.c
@@ -52,7 +52,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 */

@@ -63,14 +63,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 CDC control interface from the configuration descriptor */

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

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

 	{

 		/* Descriptor not found, error out */

 		return NoCDCInterfaceFound;

@@ -80,14 +80,14 @@ uint8_t ProcessConfigurationDescriptor(void)
 	while (FoundEndpoints != ((1 << CDC_NOTIFICATIONPIPE) | (1 << CDC_DATAPIPE_IN) | (1 << CDC_DATAPIPE_OUT)))

 	{

 		/* Fetch the next bulk or interrupt endpoint from the current CDC interface */

-		if (USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

+		if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

 		                                   NextInterfaceCDCDataEndpoint))

 		{

 			/* Check to see if the control interface's notification pipe has been found, if so search for the data interface */

 			if (FoundEndpoints & (1 << CDC_NOTIFICATIONPIPE))

 			{

 				/* Get the next CDC data interface from the configuration descriptor (CDC class has two CDC interfaces) */

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

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

 				{

 					/* Descriptor not found, error out */

 					return NoCDCInterfaceFound;

@@ -96,7 +96,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 			else

 			{

 				/* Get the next CDC control interface from the configuration descriptor (CDC class has two CDC interfaces) */

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

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

 				{

 					/* Descriptor not found, error out */

 					return NoCDCInterfaceFound;

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

 

 			/* Fetch the next bulk or interrupt endpoint from the current CDC interface */

-			if (USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

+			if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

 											   NextInterfaceCDCDataEndpoint))

 			{

 				/* Descriptor not found, error out */