Reduce struct name pollution - group typedef struct names by class driver name where appropriate.

23 files changed, 133 insertions, 133 deletions

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
index 8bb766075..c47c4fcfc 100644
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
@@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.AudioControlInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Header,

 

 			.ACSpecification          = VERSION_BCD(01.00),

-			.TotalLength              = (sizeof(USB_AudioInterface_AC_t) +

-			                             sizeof(USB_AudioInputTerminal_t) +

-			                             sizeof(USB_AudioOutputTerminal_t)),

+			.TotalLength              = (sizeof(USB_Audio_Interface_AC_t) +

+			                             sizeof(USB_Audio_InputTerminal_t) +

+			                             sizeof(USB_Audio_OutputTerminal_t)),

 			

 			.InCollection             = 1,

 			.InterfaceNumbers         = {1},

@@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.InputTerminal = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInputTerminal_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_InputTerminal,

 

 			.TerminalID               = 0x01,

@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.OutputTerminal = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioOutputTerminal_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_OutputTerminal,

 

 			.TerminalID               = 0x02,

@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.AudioStreamInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_General,

 

 			.TerminalLink             = 0x02,

@@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.AudioFormat = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioFormat_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Format,

 

 			.FormatType               = 0x01,

@@ -199,7 +199,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			

 			.SubFrameSize             = 0x02,

 			.BitResolution            = 16,

-			.SampleFrequencyType      = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(AudioSampleFreq_t)),

+			.SampleFrequencyType      = (AUDIO_TOTAL_SAMPLE_RATES * sizeof(USB_Audio_SampleFreq_t)),

 		

 			.SampleFrequencies        = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}

 		},

@@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		{

 			.Endpoint = 

 				{

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

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

 

 					.EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM),

 					.Attributes          = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),

@@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioEndpoint_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioStreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

+			.Header                   = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

 			.Subtype                  = DSUBTYPE_General,

 			

 			.Attributes               = 0x00,

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.h b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
index 302437f37..dca176117 100644
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
@@ -68,15 +68,15 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            AudioControlInterface;

-			USB_AudioInterface_AC_t               AudioControlInterface_SPC;

-			USB_AudioInputTerminal_t              InputTerminal;

-			USB_AudioOutputTerminal_t             OutputTerminal;

+			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_AudioInterface_AS_t               AudioStreamInterface_SPC;

-			USB_AudioFormat_t                     AudioFormat;

-			USB_AudioStreamEndpoint_Std_t         AudioEndpoint;

-			USB_AudioStreamEndpoint_Spc_t         AudioEndpoint_SPC;

+			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_Configuration_t;

 

 	/* Function Prototypes: */

diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c
index 01d3bc786..8604c45f0 100644
--- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c
+++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c
@@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 	

 	.AudioControlInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Header,

 			

 			.ACSpecification          = VERSION_BCD(01.00),

-			.TotalLength              = (sizeof(USB_AudioInterface_AC_t) +

-			                             sizeof(USB_AudioInputTerminal_t) +

-			                             sizeof(USB_AudioOutputTerminal_t)),

+			.TotalLength              = (sizeof(USB_Audio_Interface_AC_t) +

+			                             sizeof(USB_Audio_InputTerminal_t) +

+			                             sizeof(USB_Audio_OutputTerminal_t)),

 			

 			.InCollection             = 1,

 			.InterfaceNumbers         = {1},

@@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.InputTerminal = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInputTerminal_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_InputTerminal,

 		

 			.TerminalID               = 0x01,

@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.OutputTerminal = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioOutputTerminal_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_OutputTerminal,

 		

 			.TerminalID               = 0x02,

@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioStreamInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_General,

 			

 			.TerminalLink             = 0x01,

@@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioFormat = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioFormat_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Format,

 

 			.FormatType               = 0x01,

@@ -200,7 +200,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.SubFrameSize             = 0x02,

 			.BitResolution            = 16,

 

-			.SampleFrequencyType      = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(AudioSampleFreq_t)),		

+			.SampleFrequencyType      = (AUDIO_TOTAL_SAMPLE_RATES * sizeof(USB_Audio_SampleFreq_t)),		

 			.SampleFrequencies        = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}

 		},

 	

@@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		{

 			.Endpoint = 

 				{

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

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

 

 					.EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_OUT | AUDIO_STREAM_EPNUM),

 					.Attributes          = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),

@@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioEndpoint_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioStreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

+			.Header                   = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

 			.Subtype                  = DSUBTYPE_General,

 			

 			.Attributes               = EP_ACCEPTS_SMALL_PACKETS,

diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
index 1ee63efe3..bc894285c 100644
--- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
@@ -68,15 +68,15 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            AudioControlInterface;

-			USB_AudioInterface_AC_t               AudioControlInterface_SPC;

-			USB_AudioInputTerminal_t              InputTerminal;

-			USB_AudioOutputTerminal_t             OutputTerminal;

+			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_AudioInterface_AS_t               AudioStreamInterface_SPC;

-			USB_AudioFormat_t                     AudioFormat;

-			USB_AudioStreamEndpoint_Std_t         AudioEndpoint;

-			USB_AudioStreamEndpoint_Spc_t         AudioEndpoint_SPC;

+			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_Configuration_t;

 		

 	/* Function Prototypes: */

diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.c b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
index 6988166b3..0ce3c560e 100644
--- a/Demos/Device/ClassDriver/GenericHID/Descriptors.c
+++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
@@ -130,7 +130,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.GenericHID = 

 		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},

+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 									 

 			.HIDSpec                = VERSION_BCD(01.11),

 			.CountryCode            = 0x00,

@@ -227,7 +227,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			break;

 		case DTYPE_HID: 

 			Address = (void*)&ConfigurationDescriptor.GenericHID;

-			Size    = sizeof(USB_Descriptor_HID_t);

+			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report: 

 			Address = (void*)&GenericReport;

diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.h b/Demos/Device/ClassDriver/GenericHID/Descriptors.h
index 8d613b11e..88f16e03e 100644
--- a/Demos/Device/ClassDriver/GenericHID/Descriptors.h
+++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.h
@@ -51,7 +51,7 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            Interface;

-			USB_Descriptor_HID_t                  GenericHID;

+			USB_HID_Descriptor_t                  GenericHID;

 	        USB_Descriptor_Endpoint_t             GenericINEndpoint;

 		} USB_Descriptor_Configuration_t;

 

diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.c b/Demos/Device/ClassDriver/Joystick/Descriptors.c
index f3313e020..84901b618 100644
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.c
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c
@@ -140,7 +140,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.JoystickHID = 

 		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},

+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 			

 			.HIDSpec                = VERSION_BCD(01.11),

 			.CountryCode            = 0x00,

@@ -237,7 +237,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			break;

 		case DTYPE_HID: 

 			Address = (void*)&ConfigurationDescriptor.JoystickHID;

-			Size    = sizeof(USB_Descriptor_HID_t);

+			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report: 

 			Address = (void*)&JoystickReport;

diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.h b/Demos/Device/ClassDriver/Joystick/Descriptors.h
index 963ed1bb4..aaee98232 100644
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.h
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.h
@@ -51,7 +51,7 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            Interface;

-			USB_Descriptor_HID_t                  JoystickHID;

+			USB_HID_Descriptor_t                  JoystickHID;

 	        USB_Descriptor_Endpoint_t             JoystickEndpoint;

 		} USB_Descriptor_Configuration_t;

 

diff --git a/Demos/Device/ClassDriver/Keyboard/Descriptors.c b/Demos/Device/ClassDriver/Keyboard/Descriptors.c
index 8914909d7..49852eb4a 100644
--- a/Demos/Device/ClassDriver/Keyboard/Descriptors.c
+++ b/Demos/Device/ClassDriver/Keyboard/Descriptors.c
@@ -147,7 +147,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.KeyboardHID = 

 		{  

-			.Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},

+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 			

 			.HIDSpec                = VERSION_BCD(01.11),

 			.CountryCode            = 0x00,

@@ -244,7 +244,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			break;

 		case DTYPE_HID: 

 			Address = (void*)&ConfigurationDescriptor.KeyboardHID;

-			Size    = sizeof(USB_Descriptor_HID_t);

+			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report: 

 			Address = (void*)&KeyboardReport;

diff --git a/Demos/Device/ClassDriver/Keyboard/Descriptors.h b/Demos/Device/ClassDriver/Keyboard/Descriptors.h
index 6ed05e1ac..fc2321b79 100644
--- a/Demos/Device/ClassDriver/Keyboard/Descriptors.h
+++ b/Demos/Device/ClassDriver/Keyboard/Descriptors.h
@@ -52,7 +52,7 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            Interface;

-			USB_Descriptor_HID_t                  KeyboardHID;

+			USB_HID_Descriptor_t                  KeyboardHID;

 	        USB_Descriptor_Endpoint_t             KeyboardEndpoint;

 		} USB_Descriptor_Configuration_t;

 					

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
index c9a778feb..40917f04b 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.KeyboardHID = 

 		{  

-			.Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},

+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 			

 			.HIDSpec                = VERSION_BCD(01.11),

 			.CountryCode            = 0x00,

@@ -217,7 +217,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.MouseHID = 

 		{  

-			.Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},

+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 			

 			.HIDSpec                = VERSION_BCD(01.11),

 			.CountryCode            = 0x00,

@@ -316,12 +316,12 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			if (!(wIndex))

 			{

 				Address = (void*)&ConfigurationDescriptor.KeyboardHID;

-				Size    = sizeof(USB_Descriptor_HID_t);

+				Size    = sizeof(USB_HID_Descriptor_t);

 			}

 			else

 			{

 				Address = (void*)&ConfigurationDescriptor.MouseHID;

-				Size    = sizeof(USB_Descriptor_HID_t);			

+				Size    = sizeof(USB_HID_Descriptor_t);			

 			}

 			break;

 		case DTYPE_Report: 

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
index 514e8c030..94cdd3b0f 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
@@ -52,10 +52,10 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            KeyboardInterface;

-			USB_Descriptor_HID_t                  KeyboardHID;

+			USB_HID_Descriptor_t                  KeyboardHID;

 	        USB_Descriptor_Endpoint_t             KeyboardInEndpoint;

 			USB_Descriptor_Interface_t            MouseInterface;

-			USB_Descriptor_HID_t                  MouseHID;

+			USB_HID_Descriptor_t                  MouseHID;

 	        USB_Descriptor_Endpoint_t             MouseInEndpoint;

 		} USB_Descriptor_Configuration_t;

 					

diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.c b/Demos/Device/ClassDriver/MIDI/Descriptors.c
index 2ff22ceae..0185c7702 100644
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.c
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.c
@@ -104,11 +104,11 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 	

 	.AudioControlInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Header,

 			

 			.ACSpecification          = VERSION_BCD(01.00),

-			.TotalLength              = sizeof(USB_AudioInterface_AC_t),

+			.TotalLength              = sizeof(USB_Audio_Interface_AC_t),

 			

 			.InCollection             = 1,

 			.InterfaceNumbers         = {1},

@@ -132,7 +132,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioStreamInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_MIDI_AS_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_MIDI_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_General,

 

 			.AudioSpecification       = VERSION_BCD(01.00),

@@ -196,7 +196,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		{

 			.Endpoint = 

 				{

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

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

 

 					.EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_OUT | MIDI_STREAM_OUT_EPNUM),

 					.Attributes          = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

@@ -221,7 +221,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		{

 			.Endpoint = 

 				{

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

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

 

 					.EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_IN | MIDI_STREAM_IN_EPNUM),

 					.Attributes          = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.h b/Demos/Device/ClassDriver/MIDI/Descriptors.h
index 6702cc461..bc2a6d5cb 100644
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.h
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h
@@ -61,16 +61,16 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            AudioControlInterface;

-			USB_AudioInterface_AC_t               AudioControlInterface_SPC;

+			USB_Audio_Interface_AC_t              AudioControlInterface_SPC;

 			USB_Descriptor_Interface_t            AudioStreamInterface;

-			USB_AudioInterface_MIDI_AS_t          AudioStreamInterface_SPC;

+			USB_MIDI_AudioInterface_AS_t          AudioStreamInterface_SPC;

 			USB_MIDI_In_Jack_t                    MIDI_In_Jack_Emb;

 			USB_MIDI_In_Jack_t                    MIDI_In_Jack_Ext;

 			USB_MIDI_Out_Jack_t                   MIDI_Out_Jack_Emb;

 			USB_MIDI_Out_Jack_t                   MIDI_Out_Jack_Ext;

-			USB_AudioStreamEndpoint_Std_t         MIDI_In_Jack_Endpoint;

+			USB_Audio_StreamEndpoint_Std_t        MIDI_In_Jack_Endpoint;

 			USB_MIDI_Jack_Endpoint_t              MIDI_In_Jack_Endpoint_SPC;

-			USB_AudioStreamEndpoint_Std_t         MIDI_Out_Jack_Endpoint;

+			USB_Audio_StreamEndpoint_Std_t        MIDI_Out_Jack_Endpoint;

 			USB_MIDI_Jack_Endpoint_t              MIDI_Out_Jack_Endpoint_SPC;

 		} USB_Descriptor_Configuration_t;

 		

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index 3dca7430a..a6c31ee47 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -72,7 +72,7 @@ int main(void)
 	{

 		CheckJoystickMovement();

 		

-		USB_MIDI_EventPacket_t DummyMIDIEvent;

+		MIDI_EventPacket_t DummyMIDIEvent;

 		MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &DummyMIDIEvent);

 	

 		MIDI_Device_USBTask(&Keyboard_MIDI_Interface);

@@ -144,7 +144,7 @@ void CheckJoystickMovement(void)
 	

 	if (MIDICommand)

 	{

-		USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)

+		MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)

 			{

 				.CableNumber = 0,

 				.Command     = (MIDICommand >> 4),

diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.c b/Demos/Device/ClassDriver/Mouse/Descriptors.c
index 7c32b3f10..65ba83ec5 100644
--- a/Demos/Device/ClassDriver/Mouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/Mouse/Descriptors.c
@@ -140,7 +140,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.MouseHID = 

 		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},

+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 

 			.HIDSpec                = VERSION_BCD(01.11),

 			.CountryCode            = 0x00,

@@ -237,7 +237,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			break;

 		case DTYPE_HID: 

 			Address = (void*)&ConfigurationDescriptor.MouseHID;

-			Size    = sizeof(USB_Descriptor_HID_t);

+			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report: 

 			Address = (void*)&MouseReport;

diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.h b/Demos/Device/ClassDriver/Mouse/Descriptors.h
index 5d0babb49..0c3434260 100644
--- a/Demos/Device/ClassDriver/Mouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/Mouse/Descriptors.h
@@ -51,7 +51,7 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            Interface;

-			USB_Descriptor_HID_t                  MouseHID;

+			USB_HID_Descriptor_t                  MouseHID;

 	        USB_Descriptor_Endpoint_t             MouseEndpoint;

 		} USB_Descriptor_Configuration_t;

 					

diff --git a/Demos/Device/LowLevel/AudioInput/Descriptors.c b/Demos/Device/LowLevel/AudioInput/Descriptors.c
index 809e5421b..ad7439ed9 100644
--- a/Demos/Device/LowLevel/AudioInput/Descriptors.c
+++ b/Demos/Device/LowLevel/AudioInput/Descriptors.c
@@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 	

 	.AudioControlInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Header,

 			

 			.ACSpecification          = VERSION_BCD(01.00),

-			.TotalLength              = (sizeof(USB_AudioInterface_AC_t) +

-			                             sizeof(USB_AudioInputTerminal_t) +

-			                             sizeof(USB_AudioOutputTerminal_t)),

+			.TotalLength              = (sizeof(USB_Audio_Interface_AC_t) +

+			                             sizeof(USB_Audio_InputTerminal_t) +

+			                             sizeof(USB_Audio_OutputTerminal_t)),

 			

 			.InCollection             = 1,

 			.InterfaceNumbers         = {1},

@@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.InputTerminal = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInputTerminal_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_InputTerminal,

 		

 			.TerminalID               = 0x01,

@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.OutputTerminal = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioOutputTerminal_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_OutputTerminal,

 		

 			.TerminalID               = 0x02,

@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioStreamInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_General,

 			

 			.TerminalLink             = 0x02,

@@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioFormat = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioFormat_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Format,

 

 			.FormatType               = 0x01,

@@ -199,7 +199,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			

 			.SubFrameSize             = 0x02,

 			.BitResolution            = 16,

-			.SampleFrequencyType      = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(AudioSampleFreq_t)),

+			.SampleFrequencyType      = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(Audio_SampleFreq_t)),

 		

 			.SampleFrequencies        = {SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}

 		},

@@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		{

 			.Endpoint = 

 				{

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

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

 

 					.EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM),

 					.Attributes          = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),

@@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioEndpoint_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioStreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

+			.Header                   = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

 			.Subtype                  = DSUBTYPE_General,

 			

 			.Attributes               = 0x00,

diff --git a/Demos/Device/LowLevel/AudioInput/Descriptors.h b/Demos/Device/LowLevel/AudioInput/Descriptors.h
index 9180ce969..2cbd1cbd1 100644
--- a/Demos/Device/LowLevel/AudioInput/Descriptors.h
+++ b/Demos/Device/LowLevel/AudioInput/Descriptors.h
@@ -168,7 +168,7 @@
 			

 			uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */

 			uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */

-		} USB_AudioInterface_AC_t;

+		} USB_Audio_Interface_AC_t;

 		

 		/** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features

 		 *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio

@@ -186,7 +186,7 @@
 			uint8_t                   ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel */

 			

 			uint8_t                   FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device */

-		} USB_AudioFeatureUnit_t;

+		} USB_Audio_FeatureUnit_t;

 

 		/** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device

 		 *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,

@@ -207,7 +207,7 @@
 			

 			uint8_t                   ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device */

 			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */

-		} USB_AudioInputTerminal_t;

+		} USB_Audio_InputTerminal_t;

 

 		/** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device

 		 *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,

@@ -226,7 +226,7 @@
 			uint8_t                   SourceID; /**< ID value of the unit this terminal's audio is sourced from */

 			

 			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */

-		} USB_AudioOutputTerminal_t;

+		} USB_Audio_OutputTerminal_t;

 		

 		/** Type define for an Audio class specific streaming interface descriptor. This indicates to the host

 		 *  how audio streams within the device are formatted. See the USB Audio specification for more details.

@@ -240,7 +240,7 @@
 			

 			uint8_t                   FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output */

 			uint16_t                  AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification */

-		} USB_AudioInterface_AS_t;

+		} USB_Audio_Interface_AS_t;

 		

 		/** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,

 		 *  this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.

@@ -249,7 +249,7 @@
 		{

 			uint16_t                  LowWord; /**< Low 16 bits of the 24-bit value */

 			uint8_t                   HighByte; /**< Upper 8 bits of the 24-bit value */

-		} AudioSampleFreq_t;

+		} Audio_SampleFreq_t;

 

 		/** Type define for an Audio class specific audio format descriptor. This is used to give the host full details

 		 *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used

@@ -267,8 +267,8 @@
 			uint8_t                   BitResolution; /**< Bits of resolution of each channel's samples in the stream */

 

 			uint8_t                   SampleFrequencyType; /**< Total number of sample frequencies supported by the device */			

-			AudioSampleFreq_t         SampleFrequencies[1]; /**< Sample frequencies supported by the device */

-		} USB_AudioFormat_t;

+			Audio_SampleFreq_t        SampleFrequencies[1]; /**< Sample frequencies supported by the device */

+		} USB_Audio_Format_t;

 		

 		/** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint 

 		 *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.

@@ -279,7 +279,7 @@
 

 			uint8_t                   Refresh; /**< Always set to zero */

 			uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */

-		} USB_AudioStreamEndpoint_Std_t;

+		} USB_Audio_StreamEndpoint_Std_t;

 					

 		/** Type define for an Audio class specific extended endpoint descriptor. This contains extra information

 		 *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio

@@ -294,7 +294,7 @@
 

 			uint8_t                   LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification */

 			uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */

-		} USB_AudioStreamEndpoint_Spc_t;

+		} USB_Audio_StreamEndpoint_Spc_t;

 		

 		/** Type define for the device configuration descriptor structure. This must be defined in the

 		 *  application code, as the configuration descriptor contains several sub-descriptors which

@@ -304,15 +304,15 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            AudioControlInterface;

-			USB_AudioInterface_AC_t               AudioControlInterface_SPC;

-			USB_AudioInputTerminal_t              InputTerminal;

-			USB_AudioOutputTerminal_t             OutputTerminal;

+			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_AudioInterface_AS_t               AudioStreamInterface_SPC;

-			USB_AudioFormat_t                     AudioFormat;

-			USB_AudioStreamEndpoint_Std_t         AudioEndpoint;

-			USB_AudioStreamEndpoint_Spc_t         AudioEndpoint_SPC;

+			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_Configuration_t;

 		

 	/* Function Prototypes: */

diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.c b/Demos/Device/LowLevel/AudioOutput/Descriptors.c
index 8dfb6e1cb..55f5e9809 100644
--- a/Demos/Device/LowLevel/AudioOutput/Descriptors.c
+++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.c
@@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 	

 	.AudioControlInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Header,

 			

 			.ACSpecification          = VERSION_BCD(01.00),

-			.TotalLength              = (sizeof(USB_AudioInterface_AC_t) +

-			                             sizeof(USB_AudioInputTerminal_t) +

-			                             sizeof(USB_AudioOutputTerminal_t)),

+			.TotalLength              = (sizeof(USB_Audio_Interface_AC_t) +

+			                             sizeof(USB_Audio_InputTerminal_t) +

+			                             sizeof(USB_Audio_OutputTerminal_t)),

 			

 			.InCollection             = 1,

 			.InterfaceNumbers         = {1},

@@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.InputTerminal = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInputTerminal_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_InputTerminal,

 		

 			.TerminalID               = 0x01,

@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 

 	.OutputTerminal = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioOutputTerminal_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_OutputTerminal,

 		

 			.TerminalID               = 0x02,

@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioStreamInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_General,

 			

 			.TerminalLink             = 0x01,

@@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioFormat = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioFormat_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Format,

 

 			.FormatType               = 0x01,

@@ -200,7 +200,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.SubFrameSize             = 0x02,

 			.BitResolution            = 16,

 

-			.SampleFrequencyType      = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(AudioSampleFreq_t)),		

+			.SampleFrequencyType      = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(Audio_SampleFreq_t)),		

 			.SampleFrequencies        = {SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}

 		},

 	

@@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		{

 			.Endpoint = 

 				{

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

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

 

 					.EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_OUT | AUDIO_STREAM_EPNUM),

 					.Attributes          = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),

@@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioEndpoint_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioStreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

+			.Header                   = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

 			.Subtype                  = DSUBTYPE_General,

 			

 			.Attributes               = EP_ACCEPTS_SMALL_PACKETS,

diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.h b/Demos/Device/LowLevel/AudioOutput/Descriptors.h
index d7abc5d1b..f09bd087f 100644
--- a/Demos/Device/LowLevel/AudioOutput/Descriptors.h
+++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.h
@@ -168,7 +168,7 @@
 			

 			uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */

 			uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */

-		} USB_AudioInterface_AC_t;

+		} USB_Audio_Interface_AC_t;

 		

 		/** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features

 		 *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio

@@ -186,7 +186,7 @@
 			uint8_t                   ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel */

 			

 			uint8_t                   FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device */

-		} USB_AudioFeatureUnit_t;

+		} USB_Audio_FeatureUnit_t;

 

 		/** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device

 		 *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,

@@ -207,7 +207,7 @@
 			

 			uint8_t                   ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device */

 			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */

-		} USB_AudioInputTerminal_t;

+		} USB_Audio_InputTerminal_t;

 

 		/** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device

 		 *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,

@@ -226,7 +226,7 @@
 			uint8_t                   SourceID; /**< ID value of the unit this terminal's audio is sourced from */

 			

 			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */

-		} USB_AudioOutputTerminal_t;

+		} USB_Audio_OutputTerminal_t;

 		

 		/** Type define for an Audio class specific streaming interface descriptor. This indicates to the host

 		 *  how audio streams within the device are formatted. See the USB Audio specification for more details.

@@ -240,7 +240,7 @@
 			

 			uint8_t                   FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output */

 			uint16_t                  AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification */

-		} USB_AudioInterface_AS_t;

+		} USB_Audio_Interface_AS_t;

 		

 		/** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,

 		 *  this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.

@@ -249,7 +249,7 @@
 		{

 			uint16_t                  LowWord; /**< Low 16 bits of the 24-bit value */

 			uint8_t                   HighByte; /**< Upper 8 bits of the 24-bit value */

-		} AudioSampleFreq_t;

+		} Audio_SampleFreq_t;

 

 		/** Type define for an Audio class specific audio format descriptor. This is used to give the host full details

 		 *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used

@@ -267,8 +267,8 @@
 			uint8_t                   BitResolution; /**< Bits of resolution of each channel's samples in the stream */

 

 			uint8_t                   SampleFrequencyType; /**< Total number of sample frequencies supported by the device */			

-			AudioSampleFreq_t         SampleFrequencies[1]; /**< Sample frequencies supported by the device */

-		} USB_AudioFormat_t;

+			Audio_SampleFreq_t        SampleFrequencies[1]; /**< Sample frequencies supported by the device */

+		} USB_Audio_Format_t;

 		

 		/** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint 

 		 *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.

@@ -279,7 +279,7 @@
 

 			uint8_t                   Refresh; /**< Always set to zero */

 			uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */

-		} USB_AudioStreamEndpoint_Std_t;

+		} USB_Audio_StreamEndpoint_Std_t;

 					

 		/** Type define for an Audio class specific extended endpoint descriptor. This contains extra information

 		 *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio

@@ -294,7 +294,7 @@
 

 			uint8_t                   LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification */

 			uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */

-		} USB_AudioStreamEndpoint_Spc_t;	

+		} USB_Audio_StreamEndpoint_Spc_t;	

 

 		/** Type define for the device configuration descriptor structure. This must be defined in the

 		 *  application code, as the configuration descriptor contains several sub-descriptors which

@@ -304,15 +304,15 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            AudioControlInterface;

-			USB_AudioInterface_AC_t               AudioControlInterface_SPC;

-			USB_AudioInputTerminal_t              InputTerminal;

-			USB_AudioOutputTerminal_t             OutputTerminal;

+			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_AudioInterface_AS_t               AudioStreamInterface_SPC;

-			USB_AudioFormat_t                     AudioFormat;

-			USB_AudioStreamEndpoint_Std_t         AudioEndpoint;

-			USB_AudioStreamEndpoint_Spc_t         AudioEndpoint_SPC;

+			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_Configuration_t;

 		

 	/* Function Prototypes: */

diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.c b/Demos/Device/LowLevel/MIDI/Descriptors.c
index 2007858dd..e00855b89 100644
--- a/Demos/Device/LowLevel/MIDI/Descriptors.c
+++ b/Demos/Device/LowLevel/MIDI/Descriptors.c
@@ -104,11 +104,11 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 	

 	.AudioControlInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Header,

 			

 			.ACSpecification          = VERSION_BCD(01.00),

-			.TotalLength              = sizeof(USB_AudioInterface_AC_t),

+			.TotalLength              = sizeof(USB_Audio_Interface_AC_t),

 			

 			.InCollection             = 1,

 			.InterfaceNumbers         = {1},			

@@ -132,7 +132,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		

 	.AudioStreamInterface_SPC = 

 		{

-			.Header                   = {.Size = sizeof(USB_AudioInterface_MIDI_AS_t), .Type = DTYPE_AudioInterface},

+			.Header                   = {.Size = sizeof(USB_Audio_Interface_MIDI_AS_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_General,

 

 			.AudioSpecification       = VERSION_BCD(01.00),

@@ -196,7 +196,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		{

 			.Endpoint = 

 				{

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

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

 

 					.EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_OUT | MIDI_STREAM_OUT_EPNUM),

 					.Attributes          = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

@@ -221,7 +221,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 		{

 			.Endpoint = 

 				{

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

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

 

 					.EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_IN | MIDI_STREAM_IN_EPNUM),

 					.Attributes          = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.h b/Demos/Device/LowLevel/MIDI/Descriptors.h
index 616acab86..86da65725 100644
--- a/Demos/Device/LowLevel/MIDI/Descriptors.h
+++ b/Demos/Device/LowLevel/MIDI/Descriptors.h
@@ -90,7 +90,7 @@
 			

 			uint8_t                   InCollection; /** Total number of audio class interfaces within this device */

 			uint8_t                   InterfaceNumbers[1]; /** Interface numbers of each audio interface */

-		} USB_AudioInterface_AC_t;

+		} USB_Audio_Interface_AC_t;

 		

 		/** Type define for an Audio class specific MIDI streaming interface descriptor. This indicates to the host

 		 *  how MIDI the specification compliance of the device and the total length of the Audio class specific descriptors.

@@ -103,7 +103,7 @@
 			

 			uint16_t                  AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */

 			uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */

-		} USB_AudioInterface_MIDI_AS_t;

+		} USB_Audio_Interface_MIDI_AS_t;

 		

 		/** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint 

 		 *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.

@@ -114,7 +114,7 @@
 

 			uint8_t                   Refresh; /**< Always set to zero */

 			uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */

-		} USB_AudioStreamEndpoint_Std_t;

+		} USB_Audio_StreamEndpoint_Std_t;

 

 		/** Type define for an Audio class specific MIDI IN jack. This gives information to the host on a MIDI input, either

 		 *  a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint).

@@ -169,16 +169,16 @@
 		{

 			USB_Descriptor_Configuration_Header_t Config;

 			USB_Descriptor_Interface_t            AudioControlInterface;

-			USB_AudioInterface_AC_t               AudioControlInterface_SPC;

+			USB_Audio_Interface_AC_t              AudioControlInterface_SPC;

 			USB_Descriptor_Interface_t            AudioStreamInterface;

-			USB_AudioInterface_MIDI_AS_t          AudioStreamInterface_SPC;

+			USB_Audio_Interface_MIDI_AS_t         AudioStreamInterface_SPC;

 			USB_MIDI_In_Jack_t                    MIDI_In_Jack_Emb;

 			USB_MIDI_In_Jack_t                    MIDI_In_Jack_Ext;

 			USB_MIDI_Out_Jack_t                   MIDI_Out_Jack_Emb;

 			USB_MIDI_Out_Jack_t                   MIDI_Out_Jack_Ext;

-			USB_AudioStreamEndpoint_Std_t         MIDI_In_Jack_Endpoint;

+			USB_Audio_StreamEndpoint_Std_t        MIDI_In_Jack_Endpoint;

 			USB_MIDI_Jack_Endpoint_t              MIDI_In_Jack_Endpoint_SPC;

-			USB_AudioStreamEndpoint_Std_t         MIDI_Out_Jack_Endpoint;

+			USB_Audio_StreamEndpoint_Std_t        MIDI_Out_Jack_Endpoint;

 			USB_MIDI_Jack_Endpoint_t              MIDI_Out_Jack_Endpoint_SPC;

 		} USB_Descriptor_Configuration_t;