Update UC3 platform driver support to use the bitmasks defined in the header files...

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

diff --git a/Demos/Device/LowLevel/MIDI/MIDI.h b/Demos/Device/LowLevel/MIDI/MIDI.h
index 72512f7..6a9ece8 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/MIDI.h
+++ b/Demos/Device/LowLevel/MIDI/MIDI.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  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
-  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
-  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
@@ -32,7 +32,7 @@
  *
  *  Header file for AudioOutput.c.
  */
- 
+
 #ifndef _AUDIO_OUTPUT_H_
 #define _AUDIO_OUTPUT_H_
 
@@ -44,7 +44,7 @@
                #include <stdbool.h>
 
                #include "Descriptors.h"
-                               
+
                #include <LUFA/Version.h>
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Board/Joystick.h>
@@ -52,22 +52,6 @@
                #include <LUFA/Drivers/Board/Buttons.h>
 
    /* Macros: */
-               /** MIDI command for a note on (activation) event */
-               #define MIDI_COMMAND_NOTE_ON      0x90
-
-               /** MIDI command for a note off (deactivation) event */
-               #define MIDI_COMMAND_NOTE_OFF     0x80
-
-               /** Standard key press velocity value used for all note events, as no pressure sensor is mounted */
-               #define MIDI_STANDARD_VELOCITY    64
-               
-               /** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel
-                *  addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.
-                *
-                *  \param[in] channel  MIDI channel number to address
-                */
-               #define MIDI_CHANNEL(channel)    ((channel) - 1)
-
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
                #define LEDMASK_USB_NOTREADY      LEDS_LED1
 
@@ -80,24 +64,13 @@
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)
 
-       /* Type Defines: */
-               /** Type define for a USB MIDI event packet, used to encapsulate sent and received MIDI messages from a USB MIDI interface. */
-               typedef struct
-               {
-                       unsigned char Command     : 4; /**< MIDI command being sent or received in the event packet */
-                       unsigned char CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface */
-                       
-                       uint8_t Data1; /**< First byte of data in the MIDI event */
-                       uint8_t Data2; /**< Second byte of data in the MIDI event */
-                       uint8_t Data3; /**< Third byte of data in the MIDI event */             
-               } USB_MIDI_EventPacket_t;
-               
    /* Function Prototypes: */
                void SetupHardware(void);
                void MIDI_Task(void);
-   
+
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
-               
+
 #endif
+