Mark build test makefiles as being incompatible with parallel make builds, as they...

[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 ca3219a..8384444 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.h
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              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
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -42,11 +42,11 @@
                #include <avr/pgmspace.h>
 
        /* Macros: */
                #include <avr/pgmspace.h>
 
        /* Macros: */

-               /** Endpoint number of the MIDI streaming data IN endpoint, for device-to-host data transfers. */
-               #define MIDI_STREAM_IN_EPNUM        2
+               /** Endpoint address of the MIDI streaming data IN endpoint, for device-to-host data transfers. */
+               #define MIDI_STREAM_IN_EPADDR       (ENDPOINT_DIR_IN  | 2)

 
 

-               /** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */
-               #define MIDI_STREAM_OUT_EPNUM       1
+               /** Endpoint address of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */
+               #define MIDI_STREAM_OUT_EPADDR      (ENDPOINT_DIR_OUT | 1)

 
                /** 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


@@ -59,8 +59,12 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t     Config;
                typedef struct
                {
                        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;
                        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_Descriptor_Interface_t                Audio_StreamInterface;
                        USB_MIDI_Descriptor_AudioInterface_AS_t   Audio_StreamInterface_SPC;
                        USB_MIDI_Descriptor_InputJack_t           MIDI_In_Jack_Emb;