Change AVRISP project's timeout to be interrupt based again, but make the interrupt...

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

diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.c b/Demos/Device/LowLevel/AudioOutput/Descriptors.c
index 6480c20..17a9d30 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/Descriptors.c
+++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.c
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
@@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
-       .AudioControlInterface = \r
+       .Audio_ControlInterface = \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
@@ -102,7 +102,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceStrIndex        = NO_DESCRIPTOR\r
                },\r
        \r
-       .AudioControlInterface_SPC = \r
+       .Audio_ControlInterface_SPC = \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_Header,\r
@@ -116,7 +116,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceNumbers         = {1},\r
                },\r
 \r
-       .InputTerminal = \r
+       .Audio_InputTerminal = \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_InputTerminal,\r
@@ -132,7 +132,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .TerminalStrIndex         = NO_DESCRIPTOR\r
                },\r
 \r
-       .OutputTerminal = \r
+       .Audio_OutputTerminal = \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_OutputTerminal,\r
@@ -146,7 +146,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .TerminalStrIndex         = NO_DESCRIPTOR                       \r
                },\r
 \r
-       .AudioStreamInterface_Alt0 = \r
+       .Audio_StreamInterface_Alt0 = \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
@@ -162,7 +162,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceStrIndex        = NO_DESCRIPTOR\r
                },\r
 \r
-       .AudioStreamInterface_Alt1 = \r
+       .Audio_StreamInterface_Alt1 = \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
@@ -178,7 +178,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceStrIndex        = NO_DESCRIPTOR\r
                },\r
                \r
-       .AudioStreamInterface_SPC = \r
+       .Audio_StreamInterface_SPC = \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_General,\r
@@ -189,7 +189,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .AudioFormat              = 0x0001\r
                },\r
                \r
-       .AudioFormat = \r
+       .Audio_AudioFormat = \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_Format,\r
@@ -200,11 +200,12 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .SubFrameSize             = 0x02,\r
                        .BitResolution            = 16,\r
 \r
-                       .SampleFrequencyType      = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(Audio_SampleFreq_t)),               \r
+                       .SampleFrequencyType      = (sizeof(ConfigurationDescriptor.Audio_AudioFormat.SampleFrequencies) /\r
+                                                    sizeof(Audio_SampleFreq_t)),               \r
                        .SampleFrequencies        = {SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}\r
                },\r
        \r
-       .AudioEndpoint = \r
+       .Audio_StreamEndpoint = \r
                {\r
                        .Endpoint = \r
                                {\r
@@ -220,7 +221,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .SyncEndpointNumber       = 0\r
                },\r
                \r
-       .AudioEndpoint_SPC = \r
+       .Audio_StreamEndpoint_SPC = \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},\r
                        .Subtype                  = DSUBTYPE_General,\r