Standardized the naming scheme given to configuration descriptor sub-elements in the Device mode demos, bootloaders and projects.

Fix errors in the MouseHostWithParser demo from incorrect use of the HID_ALIGN_DATA() macro.

5 files changed, 24 insertions, 23 deletions

diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.c b/Projects/XPLAINBridge/AVRISPDescriptors.c
index 2f9db6a9c..e19178391 100644
--- a/Projects/XPLAINBridge/AVRISPDescriptors.c
+++ b/Projects/XPLAINBridge/AVRISPDescriptors.c
@@ -86,7 +86,7 @@ AVRISP_USB_Descriptor_Configuration_t PROGMEM AVRISP_ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 

-	.AVRISPInterface = 

+	.AVRISP_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -102,7 +102,7 @@ AVRISP_USB_Descriptor_Configuration_t PROGMEM AVRISP_ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.DataInEndpoint = 

+	.AVRISP_DataInEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -112,7 +112,7 @@ AVRISP_USB_Descriptor_Configuration_t PROGMEM AVRISP_ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 

-	.DataOutEndpoint =

+	.AVRISP_DataOutEndpoint =

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.h b/Projects/XPLAINBridge/AVRISPDescriptors.h
index dfd5315eb..7287ce639 100644
--- a/Projects/XPLAINBridge/AVRISPDescriptors.h
+++ b/Projects/XPLAINBridge/AVRISPDescriptors.h
@@ -56,9 +56,9 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t    Config;

-			USB_Descriptor_Interface_t               AVRISPInterface;

-			USB_Descriptor_Endpoint_t                DataInEndpoint;

-			USB_Descriptor_Endpoint_t                DataOutEndpoint;

+			USB_Descriptor_Interface_t               AVRISP_Interface;

+			USB_Descriptor_Endpoint_t                AVRISP_DataInEndpoint;

+			USB_Descriptor_Endpoint_t                AVRISP_DataOutEndpoint;

 		} AVRISP_USB_Descriptor_Configuration_t;

 

 	/* Function Prototypes: */

diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c
index 60c25321c..d1158b232 100644
--- a/Projects/XPLAINBridge/USARTDescriptors.c
+++ b/Projects/XPLAINBridge/USARTDescriptors.c
@@ -98,7 +98,7 @@ USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.CCI_Interface = 

+	.CDC_CCI_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -146,7 +146,7 @@ USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor =
 			.Data                   = {0x00, 0x01}

 		},

 

-	.ManagementEndpoint = 

+	.CDC_ManagementEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -156,7 +156,7 @@ USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor =
 			.PollingIntervalMS      = 0xFF

 		},

 

-	.DCI_Interface = 

+	.CDC_DCI_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -172,7 +172,7 @@ USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.DataOutEndpoint = 

+	.CDC_DataOutEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -182,7 +182,7 @@ USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 		

-	.DataInEndpoint = 

+	.CDC_DataInEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h
index 7b5a39112..a5e235cc0 100644
--- a/Projects/XPLAINBridge/USARTDescriptors.h
+++ b/Projects/XPLAINBridge/USARTDescriptors.h
@@ -66,15 +66,15 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t    Config;

-			USB_Descriptor_Interface_t               CCI_Interface;

+			USB_Descriptor_Interface_t               CDC_CCI_Interface;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_CallManagement;

 			CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;

-			USB_Descriptor_Endpoint_t                ManagementEndpoint;

-			USB_Descriptor_Interface_t               DCI_Interface;

-			USB_Descriptor_Endpoint_t                DataOutEndpoint;

-			USB_Descriptor_Endpoint_t                DataInEndpoint;

+			USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;

+			USB_Descriptor_Interface_t               CDC_DCI_Interface;

+			USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;

+			USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;

 		} USART_USB_Descriptor_Configuration_t;

 

 	/* Function Prototypes: */

diff --git a/Projects/XPLAINBridge/XPLAINBridge.txt b/Projects/XPLAINBridge/XPLAINBridge.txt
index a117560db..f967d3b76 100644
--- a/Projects/XPLAINBridge/XPLAINBridge.txt
+++ b/Projects/XPLAINBridge/XPLAINBridge.txt
@@ -47,20 +47,21 @@
  *  \section SSec_Description Project Description: 

  *

  *  This project serves a dual purpose. When loaded into the USB AVR on the XPLAIN board, it will act as either a USB to Serial

- *  converter for the XPLAIN's hardware USART (at a speed of 9600 baud), or a PDI programmer for the XMEGA. This project replaces

- *  the firmware preloaded onto the XPLAIN's onboard AT90USB1287 microcontroller.

+ *  converter for the XPLAIN's hardware USART (at a speed of 9600 baud), or an AVRStudio compaible PDI programmer for the XMEGA.

+ *  This project replaces the firmware preloaded onto the XPLAIN's onboard AT90USB1287 microcontroller.

  *

- *  When inserted, the JTAG port's TDI pin is read. If the pin is left high, the device will enumerate as a regular COM port on

- *  the host, which can then be opened and data exchanged between the XMEGA and Host as if the XMEGA was connected directly to

- *  the host's serial port. If the pin is pulled low, the device will enumerate as an AVRISP-MKII to the host, so that the XMEGA

- *  can be reprogrammed by AVRStudio or other compatible software such as avrdude.

+ *  When power to the board is applied, the TDI pin (pin 9) of the USB AVR's JTAG port is read. If the pin is left high, the device

+ *  will enumerate as a regular COM port on the host, which can then be opened and data exchanged between the XMEGA and Host as if

+ *  the XMEGA was connected directly to the host's serial port. If the pin is pulled low by shorting it to GND (pin 10), the device

+ *  will enumerate as an AVRISP-MKII to the host, so that the XMEGA can be reprogrammed by AVRStudio or other compatible software

+ *  such as avrdude.

  *

  *  After running this project for the first time on a new computer, you will need to supply the .INF file located in this project

  *  project's directory as the device's driver when running under Windows. This will enable Windows to use its inbuilt CDC drivers,

  *  negating the need for custom drivers for the device. Other Operating Systems should automatically use their own inbuilt CDC-ACM

  *  drivers.

  *

- *  This project relies on files from the LUFA AVRISP-MKII project.

+ *  This project relies on files from the LUFA AVRISP-MKII project for compilation.

  *

  *  \section SSec_Options Project Options

  *