Added incomplete MIDIToneGenerator project.

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

diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.h b/Demos/Device/LowLevel/MIDI/Descriptors.h
index 616acab..fffe866 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/Descriptors.h
+++ b/Demos/Device/LowLevel/MIDI/Descriptors.h
@@ -1,21 +1,21 @@
 /*\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
-\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
+  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
+  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
@@ -90,7 +90,7 @@
                        \r
                        uint8_t                   InCollection; /** Total number of audio class interfaces within this device */\r
                        uint8_t                   InterfaceNumbers[1]; /** Interface numbers of each audio interface */\r
-               } USB_AudioInterface_AC_t;\r
+               } USB_Audio_Interface_AC_t;\r
                \r
                /** Type define for an Audio class specific MIDI streaming interface descriptor. This indicates to the host\r
                 *  how MIDI the specification compliance of the device and the total length of the Audio class specific descriptors.\r
@@ -103,7 +103,7 @@
                        \r
                        uint16_t                  AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */\r
                        uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */\r
-               } USB_AudioInterface_MIDI_AS_t;\r
+               } USB_Audio_Interface_MIDI_AS_t;\r
                \r
                /** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint \r
                 *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.\r
@@ -113,8 +113,8 @@
                        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
-               } USB_AudioStreamEndpoint_Std_t;\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 MIDI IN jack. This gives information to the host on a MIDI input, either\r
                 *  a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint).\r
@@ -168,17 +168,17 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r
-                       USB_Descriptor_Interface_t            AudioControlInterface;\r
-                       USB_AudioInterface_AC_t               AudioControlInterface_SPC;\r
-                       USB_Descriptor_Interface_t            AudioStreamInterface;\r
-                       USB_AudioInterface_MIDI_AS_t          AudioStreamInterface_SPC;\r
+                       USB_Descriptor_Interface_t            Audio_ControlInterface;\r
+                       USB_Audio_Interface_AC_t              Audio_ControlInterface_SPC;\r
+                       USB_Descriptor_Interface_t            Audio_StreamInterface;\r
+                       USB_Audio_Interface_MIDI_AS_t         Audio_StreamInterface_SPC;\r
                        USB_MIDI_In_Jack_t                    MIDI_In_Jack_Emb;\r
                        USB_MIDI_In_Jack_t                    MIDI_In_Jack_Ext;\r
                        USB_MIDI_Out_Jack_t                   MIDI_Out_Jack_Emb;\r
                        USB_MIDI_Out_Jack_t                   MIDI_Out_Jack_Ext;\r
-                       USB_AudioStreamEndpoint_Std_t         MIDI_In_Jack_Endpoint;\r
+                       USB_Audio_StreamEndpoint_Std_t        MIDI_In_Jack_Endpoint;\r
                        USB_MIDI_Jack_Endpoint_t              MIDI_In_Jack_Endpoint_SPC;\r
-                       USB_AudioStreamEndpoint_Std_t         MIDI_Out_Jack_Endpoint;\r
+                       USB_Audio_StreamEndpoint_Std_t        MIDI_Out_Jack_Endpoint;\r
                        USB_MIDI_Jack_Endpoint_t              MIDI_Out_Jack_Endpoint_SPC;\r
                } USB_Descriptor_Configuration_t;\r
                \r