Fixed programming errors in the AVRISP-MKII project when the programming packet is...

[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 c01e101..e217858 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -30,11 +30,11 @@
 
 /** \file
  *
 
 /** \file
  *

- *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special 
+ *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special

  *  computer-readable structures which the host requests upon device enumeration, to determine
  *  computer-readable structures which the host requests upon device enumeration, to determine

- *  the device's capabilities and functions.  
+ *  the device's capabilities and functions.

  */
  */

- 
+

 #include "Descriptors.h"
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
 #include "Descriptors.h"
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall


@@ -47,9 +47,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
        .USBSpecification       = VERSION_BCD(02.00),
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
        .USBSpecification       = VERSION_BCD(02.00),

-       .Class                  = 0x00,
-       .SubClass               = 0x00,
-       .Protocol               = 0x00,
+       .Class                  = USB_CSCP_NoDeviceClass,
+       .SubClass               = USB_CSCP_NoDeviceSubclass,
+       .Protocol               = USB_CSCP_NoDeviceProtocol,

 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 


@@ -71,7 +71,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
  */
 USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 {
  */
 USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 {

-       .Config = 
+       .Config =

                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
 
                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
 


@@ -86,23 +86,23 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)
                },
 
                        .MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)
                },
 

-       .Audio_ControlInterface = 
+       .Audio_ControlInterface =

                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
                        .InterfaceNumber          = 0,
                        .AlternateSetting         = 0,
                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
                        .InterfaceNumber          = 0,
                        .AlternateSetting         = 0,

-                       
+

                        .TotalEndpoints           = 0,
 
                        .TotalEndpoints           = 0,
 

-                       .Class                    = 0x01,
-                       .SubClass                 = 0x01,
-                       .Protocol                 = 0x00,
+                       .Class                    = AUDIO_CSCP_AudioClass,
+                       .SubClass                 = AUDIO_CSCP_ControlSubclass,
+                       .Protocol                 = AUDIO_CSCP_ControlProtocol,

 
                        .InterfaceStrIndex        = NO_DESCRIPTOR
                },
 
 
                        .InterfaceStrIndex        = NO_DESCRIPTOR
                },
 

-       .Audio_ControlInterface_SPC = 
+       .Audio_ControlInterface_SPC =

                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_Header,
                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_Header,


@@ -111,12 +111,12 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .TotalLength              = (sizeof(USB_Audio_Descriptor_Interface_AC_t) +
                                                     sizeof(USB_Audio_Descriptor_InputTerminal_t) +
                                                     sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
                        .TotalLength              = (sizeof(USB_Audio_Descriptor_Interface_AC_t) +
                                                     sizeof(USB_Audio_Descriptor_InputTerminal_t) +
                                                     sizeof(USB_Audio_Descriptor_OutputTerminal_t)),

-                       
+

                        .InCollection             = 1,
                        .InterfaceNumber          = 1,
                },
 
                        .InCollection             = 1,
                        .InterfaceNumber          = 1,
                },
 

-       .Audio_InputTerminal = 
+       .Audio_InputTerminal =

                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_InputTerminal_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_InputTerminal_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,


@@ -132,7 +132,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .TerminalStrIndex         = NO_DESCRIPTOR
                },
 
                        .TerminalStrIndex         = NO_DESCRIPTOR
                },
 

-       .Audio_OutputTerminal = 
+       .Audio_OutputTerminal =

                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_OutputTerminal_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_OutputTerminal_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,


@@ -146,7 +146,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .TerminalStrIndex         = NO_DESCRIPTOR
                },
 
                        .TerminalStrIndex         = NO_DESCRIPTOR
                },
 

-       .Audio_StreamInterface_Alt0 = 
+       .Audio_StreamInterface_Alt0 =

                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 


@@ -155,14 +155,14 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints           = 0,
 
 
                        .TotalEndpoints           = 0,
 

-                       .Class                    = 0x01,
-                       .SubClass                 = 0x02,
-                       .Protocol                 = 0x00,
+                       .Class                    = AUDIO_CSCP_AudioClass,
+                       .SubClass                 = AUDIO_CSCP_AudioStreamingSubclass,
+                       .Protocol                 = AUDIO_CSCP_StreamingProtocol,

 
                        .InterfaceStrIndex        = NO_DESCRIPTOR
                },
 
 
                        .InterfaceStrIndex        = NO_DESCRIPTOR
                },
 

-       .Audio_StreamInterface_Alt1 = 
+       .Audio_StreamInterface_Alt1 =

                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 


@@ -171,14 +171,14 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints           = 1,
 
 
                        .TotalEndpoints           = 1,
 

-                       .Class                    = 0x01,
-                       .SubClass                 = 0x02,
-                       .Protocol                 = 0x00,
+                       .Class                    = AUDIO_CSCP_AudioClass,
+                       .SubClass                 = AUDIO_CSCP_AudioStreamingSubclass,
+                       .Protocol                 = AUDIO_CSCP_StreamingProtocol,

 
                        .InterfaceStrIndex        = NO_DESCRIPTOR
                },
 
 
                        .InterfaceStrIndex        = NO_DESCRIPTOR
                },
 

-       .Audio_StreamInterface_SPC = 
+       .Audio_StreamInterface_SPC =

                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_Interface_AS_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_General,
                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_Interface_AS_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_General,


@@ -189,44 +189,44 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .AudioFormat              = 0x0001
                },
 
                        .AudioFormat              = 0x0001
                },
 

-       .Audio_AudioFormat = 
+       .Audio_AudioFormat =

                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_Format_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_FormatType,
 
                        .FormatType               = 0x01,
                        .Channels                 = 0x01,
                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_Format_t), .Type = DTYPE_CSInterface},
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_FormatType,
 
                        .FormatType               = 0x01,
                        .Channels                 = 0x01,

-                       
+

                        .SubFrameSize             = 0x02,
                        .BitResolution            = 16,
                        .SampleFrequencyType      = AUDIO_TOTAL_SAMPLE_RATES,
                        .SubFrameSize             = 0x02,
                        .BitResolution            = 16,
                        .SampleFrequencyType      = AUDIO_TOTAL_SAMPLE_RATES,

-               
+

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

-       
-       .Audio_StreamEndpoint = 
+
+       .Audio_StreamEndpoint =

                {
                {

-                       .Endpoint = 
+                       .Endpoint =

                                {
                                        .Header              = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
 
                                        .EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM),
                                        .Attributes          = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),
                                        .EndpointSize        = AUDIO_STREAM_EPSIZE,
                                {
                                        .Header              = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
 
                                        .EndpointAddress     = (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM),
                                        .Attributes          = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),
                                        .EndpointSize        = AUDIO_STREAM_EPSIZE,

-                                       .PollingIntervalMS   = 1
+                                       .PollingIntervalMS   = 0x01

                                },
                                },

-                       
+

                        .Refresh                  = 0,
                        .SyncEndpointNumber       = 0
                },
                        .Refresh                  = 0,
                        .SyncEndpointNumber       = 0
                },

-               
-       .Audio_StreamEndpoint_SPC = 
+
+       .Audio_StreamEndpoint_SPC =

                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Spc_t), .Type = DTYPE_CSEndpoint},
                        .Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,
                {
                        .Header                   = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Spc_t), .Type = DTYPE_CSEndpoint},
                        .Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,

-                       
+

                        .Attributes               = AUDIO_EP_ACCEPTS_SMALL_PACKETS,
                        .Attributes               = AUDIO_EP_ACCEPTS_SMALL_PACKETS,

-                       
+

                        .LockDelayUnits           = 0x00,
                        .LockDelay                = 0x0000
                }
                        .LockDelayUnits           = 0x00,
                        .LockDelay                = 0x0000
                }


@@ -287,30 +287,31 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                        Address = &DeviceDescriptor;
                        Size    = sizeof(USB_Descriptor_Device_t);
                        break;
                        Address = &DeviceDescriptor;
                        Size    = sizeof(USB_Descriptor_Device_t);
                        break;

-               case DTYPE_Configuration: 
+               case DTYPE_Configuration:

                        Address = &ConfigurationDescriptor;
                        Size    = sizeof(USB_Descriptor_Configuration_t);
                        break;
                        Address = &ConfigurationDescriptor;
                        Size    = sizeof(USB_Descriptor_Configuration_t);
                        break;

-               case DTYPE_String: 
+               case DTYPE_String:

                        switch (DescriptorNumber)
                        {
                        switch (DescriptorNumber)
                        {

-                               case 0x00: 
+                               case 0x00:

                                        Address = &LanguageString;
                                        Size    = pgm_read_byte(&LanguageString.Header.Size);
                                        break;
                                        Address = &LanguageString;
                                        Size    = pgm_read_byte(&LanguageString.Header.Size);
                                        break;

-                               case 0x01: 
+                               case 0x01:

                                        Address = &ManufacturerString;
                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);
                                        break;
                                        Address = &ManufacturerString;
                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);
                                        break;

-                               case 0x02: 
+                               case 0x02:

                                        Address = &ProductString;
                                        Size    = pgm_read_byte(&ProductString.Header.Size);
                                        break;
                        }
                                        Address = &ProductString;
                                        Size    = pgm_read_byte(&ProductString.Header.Size);
                                        break;
                        }

-                       
+

                        break;
        }
                        break;
        }

-       
+

        *DescriptorAddress = Address;
        return Size;
 }
        *DescriptorAddress = Address;
        return Size;
 }

+