All USB class drivers are now automatically included when LUFA/Drivers/USB.h is included, and no longer need to be seperately included.

All LowLevel demos changed to use the constants and types defined in the USB class drivers.

2 files changed, 2 insertions, 30 deletions

diff --git a/Demos/Host/LowLevel/MIDIHost/MIDIHost.c b/Demos/Host/LowLevel/MIDIHost/MIDIHost.c
index 63ed6da25..e004099fc 100644
--- a/Demos/Host/LowLevel/MIDIHost/MIDIHost.c
+++ b/Demos/Host/LowLevel/MIDIHost/MIDIHost.c
@@ -179,7 +179,7 @@ void MIDI_Host_Task(void)
 
 			if (Pipe_IsINReceived())
 			{
-				USB_MIDI_EventPacket_t MIDIEvent;
+				MIDI_EventPacket_t MIDIEvent;
 
 				Pipe_Read_Stream_LE(&MIDIEvent, sizeof(MIDIEvent));
 
@@ -244,7 +244,7 @@ void MIDI_Host_Task(void)
 				/* Check if a MIDI command is to be sent */
 				if (MIDICommand)
 				{
-					USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)
+					MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)
 						{
 							.CableNumber = 0,
 							.Command     = (MIDICommand >> 4),
diff --git a/Demos/Host/LowLevel/MIDIHost/MIDIHost.h b/Demos/Host/LowLevel/MIDIHost/MIDIHost.h
index f7fb57a91..86c51cb0a 100644
--- a/Demos/Host/LowLevel/MIDIHost/MIDIHost.h
+++ b/Demos/Host/LowLevel/MIDIHost/MIDIHost.h
@@ -55,22 +55,6 @@
 		#include "ConfigDescriptor.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
 
@@ -83,18 +67,6 @@
 		/** 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_Host_Task(void);