Minor updates to the Benito programmer - remove redundant PORT register manipulations.

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

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
index 8bb7660..c47c4fc 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
@@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 \r
        .AudioControlInterface_SPC = \r
                {\r
 \r
        .AudioControlInterface_SPC = \r
                {\r

-                       .Header                   = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},\r
+                       .Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r

                        .Subtype                  = DSUBTYPE_Header,\r
 \r
                        .ACSpecification          = VERSION_BCD(01.00),\r
                        .Subtype                  = DSUBTYPE_Header,\r
 \r
                        .ACSpecification          = VERSION_BCD(01.00),\r

-                       .TotalLength              = (sizeof(USB_AudioInterface_AC_t) +\r
-                                                    sizeof(USB_AudioInputTerminal_t) +\r
-                                                    sizeof(USB_AudioOutputTerminal_t)),\r
+                       .TotalLength              = (sizeof(USB_Audio_Interface_AC_t) +\r
+                                                    sizeof(USB_Audio_InputTerminal_t) +\r
+                                                    sizeof(USB_Audio_OutputTerminal_t)),\r

                        \r
                        .InCollection             = 1,\r
                        .InterfaceNumbers         = {1},\r
                        \r
                        .InCollection             = 1,\r
                        .InterfaceNumbers         = {1},\r


@@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 \r
        .InputTerminal = \r
                {\r
 \r
        .InputTerminal = \r
                {\r

-                       .Header                   = {.Size = sizeof(USB_AudioInputTerminal_t), .Type = DTYPE_AudioInterface},\r
+                       .Header                   = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},\r

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


@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 \r
        .OutputTerminal = \r
                {\r
 \r
        .OutputTerminal = \r
                {\r

-                       .Header                   = {.Size = sizeof(USB_AudioOutputTerminal_t), .Type = DTYPE_AudioInterface},\r
+                       .Header                   = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},\r

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


@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 \r
        .AudioStreamInterface_SPC = \r
                {\r
 \r
        .AudioStreamInterface_SPC = \r
                {\r

-                       .Header                   = {.Size = sizeof(USB_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},\r
+                       .Header                   = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},\r

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


@@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 \r
        .AudioFormat = \r
                {\r
 \r
        .AudioFormat = \r
                {\r

-                       .Header                   = {.Size = sizeof(USB_AudioFormat_t), .Type = DTYPE_AudioInterface},\r
+                       .Header                   = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},\r

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


@@ -199,7 +199,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        \r
                        .SubFrameSize             = 0x02,\r
                        .BitResolution            = 16,\r
                        \r
                        .SubFrameSize             = 0x02,\r
                        .BitResolution            = 16,\r

-                       .SampleFrequencyType      = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(AudioSampleFreq_t)),\r
+                       .SampleFrequencyType      = (AUDIO_TOTAL_SAMPLE_RATES * sizeof(USB_Audio_SampleFreq_t)),\r

                \r
                        .SampleFrequencies        = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}\r
                },\r
                \r
                        .SampleFrequencies        = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}\r
                },\r


@@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                {\r
                        .Endpoint = \r
                                {\r
                {\r
                        .Endpoint = \r
                                {\r

-                                       .Header              = {.Size = sizeof(USB_AudioStreamEndpoint_Std_t), .Type = DTYPE_Endpoint},\r
+                                       .Header              = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},\r

 \r
                                        .EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM),\r
                                        .Attributes          = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),\r
 \r
                                        .EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM),\r
                                        .Attributes          = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),\r


@@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                \r
        .AudioEndpoint_SPC = \r
                {\r
                \r
        .AudioEndpoint_SPC = \r
                {\r

-                       .Header                   = {.Size = sizeof(USB_AudioStreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},\r
+                       .Header                   = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},\r

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