More AVR32 achitecture ports.

[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 6702cc4..6cef842 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.h
+++ b/Demos/Device/ClassDriver/MIDI/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


@@ -61,16 +61,16 @@
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r
                        USB_Descriptor_Interface_t            AudioControlInterface;\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r
                        USB_Descriptor_Interface_t            AudioControlInterface;\r

-                       USB_AudioInterface_AC_t               AudioControlInterface_SPC;\r
+                       USB_Audio_Interface_AC_t              AudioControlInterface_SPC;\r

                        USB_Descriptor_Interface_t            AudioStreamInterface;\r
                        USB_Descriptor_Interface_t            AudioStreamInterface;\r

-                       USB_AudioInterface_MIDI_AS_t          AudioStreamInterface_SPC;\r
+                       USB_MIDI_AudioInterface_AS_t          AudioStreamInterface_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_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_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
                        USB_MIDI_Jack_Endpoint_t              MIDI_Out_Jack_Endpoint_SPC;\r
                } USB_Descriptor_Configuration_t;\r
                \r