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.

8 files changed, 35 insertions, 36 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 */

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

diff --git a/Demos/Host/KeyboardHost/ConfigDescriptor.c b/Demos/Host/KeyboardHost/ConfigDescriptor.c
index 14db19846..1735401cf 100644
--- a/Demos/Host/KeyboardHost/ConfigDescriptor.c
+++ b/Demos/Host/KeyboardHost/ConfigDescriptor.c
@@ -51,7 +51,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	uint16_t ConfigDescriptorSize;

 	

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

@@ -62,21 +62,21 @@ 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 keyboard interface from the configuration descriptor */

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

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

 	{

 		/* Descriptor not found, error out */

 		return NoHIDInterfaceFound;

 	}

 

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

-	if (USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

+	if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

 	                                   NextInterfaceKeyboardDataEndpoint))

 	{

 		/* Descriptor not found, error out */

diff --git a/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c
index 2c962cbcb..73f0ce216 100644
--- a/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c
+++ b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c
@@ -52,7 +52,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	uint8_t  ErrorCode;

 	

 	/* 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,21 +63,21 @@ 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 keyboard interface from the configuration descriptor */

-	if ((ErrorCode = USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextKeyboardInterface)))

+	if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextKeyboardInterface)))

 	{

 		/* Descriptor not found, error out */

 		return NoHIDInterfaceFound;

 	}

 	

 	/* Get the keyboard interface's HID descriptor */

-	if ((ErrorCode = USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextHID)))

+	if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextHID)))

 	{

 		/* Descriptor not found, error out */

 		return NoHIDDescriptorFound;

@@ -87,7 +87,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	HIDReportSize = DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_HID_t).HIDReportLength;

 

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

-	if ((ErrorCode = USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

+	if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

 	                                                NextInterfaceKeyboardDataEndpoint)))

 	{

 		/* Descriptor not found, error out */

diff --git a/Demos/Host/MassStorageHost/ConfigDescriptor.c b/Demos/Host/MassStorageHost/ConfigDescriptor.c
index 53e448757..1540590ff 100644
--- a/Demos/Host/MassStorageHost/ConfigDescriptor.c
+++ b/Demos/Host/MassStorageHost/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 mass storage interface from the configuration descriptor */

-	if ((ErrorCode = USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

+	if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

 	                                                NextMassStorageInterface)))

 	{

 		/* Descriptor not found, error out */

@@ -82,7 +82,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	while (FoundEndpoints != ((1 << MASS_STORE_DATA_IN_PIPE) | (1 << MASS_STORE_DATA_OUT_PIPE)))

 	{

 		/* Fetch the next bulk endpoint from the current mass storage interface */

-		if ((ErrorCode = USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

+		if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

 		                                                NextInterfaceBulkDataEndpoint)))

 		{

 			/* Descriptor not found, error out */

diff --git a/Demos/Host/MouseHost/ConfigDescriptor.c b/Demos/Host/MouseHost/ConfigDescriptor.c
index 4a7c3cad6..2c842ac99 100644
--- a/Demos/Host/MouseHost/ConfigDescriptor.c
+++ b/Demos/Host/MouseHost/ConfigDescriptor.c
@@ -51,7 +51,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	uint16_t ConfigDescriptorSize;

 	

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

@@ -62,7 +62,7 @@ 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)

diff --git a/Demos/Host/MouseHostWithParser/ConfigDescriptor.c b/Demos/Host/MouseHostWithParser/ConfigDescriptor.c
index 31e1aa13e..9f0c444e2 100644
--- a/Demos/Host/MouseHostWithParser/ConfigDescriptor.c
+++ b/Demos/Host/MouseHostWithParser/ConfigDescriptor.c
@@ -52,7 +52,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	uint8_t  ErrorCode;

 	

 	/* 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,21 +63,21 @@ 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 mouse interface from the configuration descriptor */

-	if ((ErrorCode = USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextMouseInterface)))

+	if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextMouseInterface)))

 	{

 		/* Descriptor not found, error out */

 		return NoHIDInterfaceFound;

 	}

 	

 	/* Get the mouse interface's HID descriptor */

-	if ((ErrorCode = USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextHID)))

+	if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, NextHID)))

 	{

 		/* Descriptor not found, error out */

 		return NoHIDDescriptorFound;

@@ -87,7 +87,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	HIDReportSize = DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_HID_t).HIDReportLength;

 

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

-	if ((ErrorCode = USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

+	if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

 	                                                NextInterfaceMouseDataEndpoint)))

 	{

 		/* Descriptor not found, error out */

diff --git a/Demos/Host/StillImageHost/ConfigDescriptor.c b/Demos/Host/StillImageHost/ConfigDescriptor.c
index a336c1f5e..2456e35af 100644
--- a/Demos/Host/StillImageHost/ConfigDescriptor.c
+++ b/Demos/Host/StillImageHost/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 Still Image interface from the configuration descriptor */

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

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

 	{

 		/* Descriptor not found, error out */

 		return NoInterfaceFound;

@@ -80,7 +80,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	while (FoundEndpoints != ((1 << SIMAGE_EVENTS_PIPE) | (1 << SIMAGE_DATA_IN_PIPE) | (1 << SIMAGE_DATA_OUT_PIPE)))

 	{

 		/* Fetch the next endpoint from the current Still Image interface */

-		if (USB_Host_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

+		if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

 		                                   NextSImageInterfaceDataEndpoint))

 		{

 			/* Descriptor not found, error out */