Fixed broken HID_REQ_GetReport request handler in the Low Level GenericHID demo.

[pub/USBasp.git] / Projects / Incomplete / MIDIToneGenerator / Descriptors.h

diff --git a/Projects/Incomplete/MIDIToneGenerator/Descriptors.h b/Projects/Incomplete/MIDIToneGenerator/Descriptors.h
index ffd261e..b56fb6f 100644 (file)
--- a/Projects/Incomplete/MIDIToneGenerator/Descriptors.h
+++ b/Projects/Incomplete/MIDIToneGenerator/Descriptors.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
      Copyright (C) Dean Camera, 2010.\r
-              \r
+\r
   dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
+           www.lufa-lib.org\r
 */\r
 \r
 /*\r
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
-  Permission to use, copy, modify, distribute, and sell this \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
+  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
+  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
@@ -32,13 +32,12 @@
  *\r
  *  Header file for Descriptors.c.\r
  */\r
- \r
+\r
 #ifndef _DESCRIPTORS_H_\r
 #define _DESCRIPTORS_H_\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/MIDI.h>\r
 \r
                #include <avr/pgmspace.h>\r
 \r
@@ -51,7 +50,7 @@
 \r
                /** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */\r
                #define MIDI_STREAM_EPSIZE          64\r
-               \r
+\r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r
                 *  application code, as the configuration descriptor contains several sub-descriptors which\r
@@ -59,23 +58,26 @@
                 */\r
                typedef struct\r
                {\r
-                       USB_Descriptor_Configuration_Header_t Config;\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_MIDI_AudioInterface_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_Audio_StreamEndpoint_Std_t        MIDI_In_Jack_Endpoint;\r
-                       USB_MIDI_Jack_Endpoint_t              MIDI_In_Jack_Endpoint_SPC;\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_Header_t     Config;\r
+                       USB_Descriptor_Interface_t                Audio_ControlInterface;\r
+                       USB_Audio_Descriptor_Interface_AC_t       Audio_ControlInterface_SPC;\r
+                       USB_Descriptor_Interface_t                Audio_StreamInterface;\r
+                       USB_MIDI_Descriptor_AudioInterface_AS_t   Audio_StreamInterface_SPC;\r
+                       USB_MIDI_Descriptor_InputJack_t           MIDI_In_Jack_Emb;\r
+                       USB_MIDI_Descriptor_InputJack_t           MIDI_In_Jack_Ext;\r
+                       USB_MIDI_Descriptor_OutputJack_t          MIDI_Out_Jack_Emb;\r
+                       USB_MIDI_Descriptor_OutputJack_t          MIDI_Out_Jack_Ext;\r
+                       USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_In_Jack_Endpoint;\r
+                       USB_MIDI_Descriptor_Jack_Endpoint_t       MIDI_In_Jack_Endpoint_SPC;\r
+                       USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_Out_Jack_Endpoint;\r
+                       USB_MIDI_Descriptor_Jack_Endpoint_t       MIDI_Out_Jack_Endpoint_SPC;\r
                } USB_Descriptor_Configuration_t;\r
-               \r
+\r
        /* Function Prototypes: */\r
-               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
-                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,\r
+                                                   const uint8_t wIndex,\r
+                                                   const void** const DescriptorAddress)\r
+                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
 \r
 #endif\r
+\r