Move out many of the common class driver constants into grouped enums, to make them...

[pub/USBasp.git] / Demos / Device / LowLevel / AudioInput / Descriptors.c

diff --git a/Demos/Device/LowLevel/AudioInput/Descriptors.c b/Demos/Device/LowLevel/AudioInput/Descriptors.c
index 46b43ac..3074396 100644 (file)
--- a/Demos/Device/LowLevel/AudioInput/Descriptors.c
+++ b/Demos/Device/LowLevel/AudioInput/Descriptors.c
@@ -104,8 +104,8 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
        
        .Audio_ControlInterface_SPC = 
                {
        
        .Audio_ControlInterface_SPC = 
                {

-                       .Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},
-                       .Subtype                  = DSUBTYPE_Header,
+                       .Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_CSInterface},
+                       .Subtype                  = DSUBTYPE_AudioHeader,

                        
                        .ACSpecification          = VERSION_BCD(01.00),
                        .TotalLength              = (sizeof(USB_Audio_Interface_AC_t) +
                        
                        .ACSpecification          = VERSION_BCD(01.00),
                        .TotalLength              = (sizeof(USB_Audio_Interface_AC_t) +


@@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .Audio_InputTerminal = 
                {
 
        .Audio_InputTerminal = 
                {

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

                        .Subtype                  = DSUBTYPE_InputTerminal,
                
                        .TerminalID               = 0x01,
                        .Subtype                  = DSUBTYPE_InputTerminal,
                
                        .TerminalID               = 0x01,


@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .Audio_OutputTerminal = 
                {
 
        .Audio_OutputTerminal = 
                {

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

                        .Subtype                  = DSUBTYPE_OutputTerminal,
                
                        .TerminalID               = 0x02,
                        .Subtype                  = DSUBTYPE_OutputTerminal,
                
                        .TerminalID               = 0x02,


@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                
        .Audio_StreamInterface_SPC = 
                {
                
        .Audio_StreamInterface_SPC = 
                {

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

                        .Subtype                  = DSUBTYPE_General,
                        
                        .TerminalLink             = 0x02,
                        .Subtype                  = DSUBTYPE_General,
                        
                        .TerminalLink             = 0x02,


@@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                
        .Audio_AudioFormat = 
                {
                
        .Audio_AudioFormat = 
                {

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

                        .Subtype                  = DSUBTYPE_Format,
 
                        .FormatType               = 0x01,
                        .Subtype                  = DSUBTYPE_Format,
 
                        .FormatType               = 0x01,


@@ -223,7 +223,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                
        .Audio_StreamEndpoint_SPC = 
                {
                
        .Audio_StreamEndpoint_SPC = 
                {

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

                        .Subtype                  = DSUBTYPE_General,
                        
                        .Attributes               = 0x00,
                        .Subtype                  = DSUBTYPE_General,
                        
                        .Attributes               = 0x00,