Add tag for the 120219 release.

[pub/USBasp.git] / Demos / Device / ClassDriver / MIDI / Descriptors.h

diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.h b/Demos/Device/ClassDriver/MIDI/Descriptors.h
index 9933d06..c5dc2e2 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.h
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

   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 2012  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


@@ -32,13 +32,12 @@
  *
  *  Header file for Descriptors.c.
  */
  *
  *  Header file for Descriptors.c.
  */

- 
+

 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>

-               #include <LUFA/Drivers/USB/Class/MIDI.h>

 
                #include <avr/pgmspace.h>
 
 
                #include <avr/pgmspace.h>
 


@@ -51,7 +50,7 @@
 
                /** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */
                #define MIDI_STREAM_EPSIZE          64
 
                /** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */
                #define MIDI_STREAM_EPSIZE          64

-               
+

        /* Type Defines: */
                /** Type define for the device configuration descriptor structure. This must be defined in the
                 *  application code, as the configuration descriptor contains several sub-descriptors which
        /* Type Defines: */
                /** Type define for the device configuration descriptor structure. This must be defined in the
                 *  application code, as the configuration descriptor contains several sub-descriptors which


@@ -59,23 +58,30 @@
                 */
                typedef struct
                {
                 */
                typedef struct
                {

-                       USB_Descriptor_Configuration_Header_t Config;
-                       USB_Descriptor_Interface_t            Audio_ControlInterface;
-                       USB_Audio_Interface_AC_t              Audio_ControlInterface_SPC;
-                       USB_Descriptor_Interface_t            Audio_StreamInterface;
-                       USB_MIDI_AudioInterface_AS_t          Audio_StreamInterface_SPC;
-                       USB_MIDI_In_Jack_t                    MIDI_In_Jack_Emb;
-                       USB_MIDI_In_Jack_t                    MIDI_In_Jack_Ext;
-                       USB_MIDI_Out_Jack_t                   MIDI_Out_Jack_Emb;
-                       USB_MIDI_Out_Jack_t                   MIDI_Out_Jack_Ext;
-                       USB_Audio_StreamEndpoint_Std_t        MIDI_In_Jack_Endpoint;
-                       USB_MIDI_Jack_Endpoint_t              MIDI_In_Jack_Endpoint_SPC;
-                       USB_Audio_StreamEndpoint_Std_t        MIDI_Out_Jack_Endpoint;
-                       USB_MIDI_Jack_Endpoint_t              MIDI_Out_Jack_Endpoint_SPC;
+                       USB_Descriptor_Configuration_Header_t     Config;
+
+                       // MIDI Audio Control Interface
+                       USB_Descriptor_Interface_t                Audio_ControlInterface;
+                       USB_Audio_Descriptor_Interface_AC_t       Audio_ControlInterface_SPC;
+
+                       // MIDI Audio Streaming Interface
+                       USB_Descriptor_Interface_t                Audio_StreamInterface;
+                       USB_MIDI_Descriptor_AudioInterface_AS_t   Audio_StreamInterface_SPC;
+                       USB_MIDI_Descriptor_InputJack_t           MIDI_In_Jack_Emb;
+                       USB_MIDI_Descriptor_InputJack_t           MIDI_In_Jack_Ext;
+                       USB_MIDI_Descriptor_OutputJack_t          MIDI_Out_Jack_Emb;
+                       USB_MIDI_Descriptor_OutputJack_t          MIDI_Out_Jack_Ext;
+                       USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_In_Jack_Endpoint;
+                       USB_MIDI_Descriptor_Jack_Endpoint_t       MIDI_In_Jack_Endpoint_SPC;
+                       USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_Out_Jack_Endpoint;
+                       USB_MIDI_Descriptor_Jack_Endpoint_t       MIDI_Out_Jack_Endpoint_SPC;

                } USB_Descriptor_Configuration_t;
                } USB_Descriptor_Configuration_t;

-               
+

        /* Function Prototypes: */
        /* Function Prototypes: */

-               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
-                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                                   const uint8_t wIndex,
+                                                   const void** const DescriptorAddress)
+                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

 
 #endif
 
 #endif

+