From 49b09a2042368947ab34f788f00b710183912285 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Mon, 22 Mar 2010 07:12:25 +0000
Subject: 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.
---
 Demos/Device/ClassDriver/AudioInput/Descriptors.c | 20 ++++++++++----------
 Demos/Device/ClassDriver/AudioInput/Descriptors.h | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'Demos/Device/ClassDriver/AudioInput')

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
index 42da1a83f..784ce79da 100644
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
@@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)
 		},
 
-	.AudioControlInterface = 
+	.Audio_ControlInterface = 
 		{
 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
@@ -102,7 +102,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR
 		},
 
-	.AudioControlInterface_SPC = 
+	.Audio_ControlInterface_SPC = 
 		{
 			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},
 			.Subtype                  = DSUBTYPE_Header,
@@ -116,7 +116,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceNumbers         = {1},
 		},
 
-	.InputTerminal = 
+	.Audio_InputTerminal = 
 		{
 			.Header                   = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},
 			.Subtype                  = DSUBTYPE_InputTerminal,
@@ -132,7 +132,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.TerminalStrIndex         = NO_DESCRIPTOR
 		},
 
-	.OutputTerminal = 
+	.Audio_OutputTerminal = 
 		{
 			.Header                   = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},
 			.Subtype                  = DSUBTYPE_OutputTerminal,
@@ -146,7 +146,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.TerminalStrIndex         = NO_DESCRIPTOR
 		},
 
-	.AudioStreamInterface_Alt0 = 
+	.Audio_StreamInterface_Alt0 = 
 		{
 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
@@ -162,7 +162,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR
 		},
 
-	.AudioStreamInterface_Alt1 = 
+	.Audio_StreamInterface_Alt1 = 
 		{
 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
@@ -178,7 +178,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR
 		},
 
-	.AudioStreamInterface_SPC = 
+	.Audio_StreamInterface_SPC = 
 		{
 			.Header                   = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},
 			.Subtype                  = DSUBTYPE_General,
@@ -189,7 +189,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.AudioFormat              = 0x0001
 		},
 
-	.AudioFormat = 
+	.Audio_AudioFormat = 
 		{
 			.Header                   = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},
 			.Subtype                  = DSUBTYPE_Format,
@@ -204,7 +204,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.SampleFrequencies        = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}
 		},
 	
-	.AudioEndpoint = 
+	.Audio_StreamEndpoint = 
 		{
 			.Endpoint = 
 				{
@@ -220,7 +220,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.SyncEndpointNumber       = 0
 		},
 		
-	.AudioEndpoint_SPC = 
+	.Audio_StreamEndpoint_SPC = 
 		{
 			.Header                   = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},
 			.Subtype                  = DSUBTYPE_General,
diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.h b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
index 892b2ec4d..9bc94f39f 100644
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
@@ -63,16 +63,16 @@
 		typedef struct
 		{
 			USB_Descriptor_Configuration_Header_t Config;
-			USB_Descriptor_Interface_t            AudioControlInterface;
-			USB_Audio_Interface_AC_t              AudioControlInterface_SPC;
-			USB_Audio_InputTerminal_t             InputTerminal;
-			USB_Audio_OutputTerminal_t            OutputTerminal;
-			USB_Descriptor_Interface_t            AudioStreamInterface_Alt0;
-			USB_Descriptor_Interface_t            AudioStreamInterface_Alt1;
-			USB_Audio_Interface_AS_t              AudioStreamInterface_SPC;
-			USB_Audio_Format_t                    AudioFormat;
-			USB_Audio_StreamEndpoint_Std_t        AudioEndpoint;
-			USB_Audio_StreamEndpoint_Spc_t        AudioEndpoint_SPC;
+			USB_Descriptor_Interface_t            Audio_ControlInterface;
+			USB_Audio_Interface_AC_t              Audio_ControlInterface_SPC;
+			USB_Audio_InputTerminal_t             Audio_InputTerminal;
+			USB_Audio_OutputTerminal_t            Audio_OutputTerminal;
+			USB_Descriptor_Interface_t            Audio_StreamInterface_Alt0;
+			USB_Descriptor_Interface_t            Audio_StreamInterface_Alt1;
+			USB_Audio_Interface_AS_t              Audio_StreamInterface_SPC;
+			USB_Audio_Format_t                    Audio_AudioFormat;
+			USB_Audio_StreamEndpoint_Std_t        Audio_StreamEndpoint;
+			USB_Audio_StreamEndpoint_Spc_t        Audio_StreamEndpoint_SPC;
 		} USB_Descriptor_Configuration_t;
 
 	/* Function Prototypes: */
-- 
cgit v1.2.3