Device mode class driver callbacks are now fired before the control request status...

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

diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.h b/Demos/Device/LowLevel/AudioOutput/Descriptors.h
index 9ad0299..b08ec2f 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/Descriptors.h
+++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\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
               \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
 \r

-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

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


@@ -125,7 +125,7 @@
                 *\r
                 *  \param[in] freq  Required audio sampling frequency in HZ\r
                 */\r
                 *\r
                 *  \param[in] freq  Required audio sampling frequency in HZ\r
                 */\r

-               #define SAMPLE_FREQ(freq)  {LowWord: ((uint32_t)freq & 0x00FFFF), HighByte: (((uint32_t)freq >> 16) & 0x0000FF)}\r
+               #define SAMPLE_FREQ(freq)  {LowWord: ((uint32_t)(freq) & 0x00FFFF), HighByte: (((uint32_t)(freq) >> 16) & 0x0000FF)}\r

                \r
                /** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint\r
                 *  accepts only filled endpoint packets of audio samples.\r
                \r
                /** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint\r
                 *  accepts only filled endpoint packets of audio samples.\r


@@ -274,7 +274,7 @@
                        USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */\r
 \r
                        uint8_t                   Refresh; /**< Always set to zero */\r
                        USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */\r
 \r
                        uint8_t                   Refresh; /**< Always set to zero */\r

-                       uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */\r
+                       uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronization information to, if needed (zero otherwise) */\r

                } USB_Audio_StreamEndpoint_Std_t;\r
                                        \r
                /** Type define for an Audio class specific extended endpoint descriptor. This contains extra information\r
                } USB_Audio_StreamEndpoint_Std_t;\r
                                        \r
                /** Type define for an Audio class specific extended endpoint descriptor. This contains extra information\r


@@ -299,16 +299,16 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r

-                       USB_Descriptor_Interface_t            AudioControlInterface;\r
-                       USB_Audio_Interface_AC_t              AudioControlInterface_SPC;\r
-                       USB_Audio_InputTerminal_t             InputTerminal;\r
-                       USB_Audio_OutputTerminal_t            OutputTerminal;\r
-                       USB_Descriptor_Interface_t            AudioStreamInterface_Alt0;\r
-                       USB_Descriptor_Interface_t            AudioStreamInterface_Alt1;\r
-                       USB_Audio_Interface_AS_t              AudioStreamInterface_SPC;\r
-                       USB_Audio_Format_t                    AudioFormat;\r
-                       USB_Audio_StreamEndpoint_Std_t        AudioEndpoint;\r
-                       USB_Audio_StreamEndpoint_Spc_t        AudioEndpoint_SPC;\r
+                       USB_Descriptor_Interface_t            Audio_ControlInterface;\r
+                       USB_Audio_Interface_AC_t              Audio_ControlInterface_SPC;\r
+                       USB_Audio_InputTerminal_t             Audio_InputTerminal;\r
+                       USB_Audio_OutputTerminal_t            Audio_OutputTerminal;\r
+                       USB_Descriptor_Interface_t            Audio_StreamInterface_Alt0;\r
+                       USB_Descriptor_Interface_t            Audio_StreamInterface_Alt1;\r
+                       USB_Audio_Interface_AS_t              Audio_StreamInterface_SPC;\r
+                       USB_Audio_Format_t                    Audio_AudioFormat;\r
+                       USB_Audio_StreamEndpoint_Std_t        Audio_StreamEndpoint;\r
+                       USB_Audio_StreamEndpoint_Spc_t        Audio_StreamEndpoint_SPC;\r

                } USB_Descriptor_Configuration_t;\r
                \r
        /* Function Prototypes: */\r
                } USB_Descriptor_Configuration_t;\r
                \r
        /* Function Prototypes: */\r