X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f1b6ddb7107fd9534cc6a8d6ab2d46f349d9cdb7..0da99447d3e88e83f9977501bee56af5c7aa56c0:/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h

diff --git a/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h b/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h
index 60b0908f3..25b80b7d4 100644
--- a/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h
+++ b/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h
@@ -84,8 +84,20 @@
 		 *  addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.
 		 *
 		 *  \param[in] channel  MIDI channel number to address.
+		 *
+		 *  \return Constructed MIDI channel ID.
 		 */
 		#define MIDI_CHANNEL(channel)        ((channel) - 1)
+		
+		/** Constructs a MIDI event ID from a given MIDI command and a virtual MIDI cable index. This can then be
+		 *  used to create and decode \ref MIDI_EventPacket_t MIDI event packets.
+		 *
+		 *  \param[in] virtualcable  Index of the virtual MIDI cable the event relates to
+		 *  \param[in] command       MIDI command to send through the virtual MIDI cable
+		 *
+		 *  \return Constructed MIDI event ID.
+		 */
+		#define MIDI_EVENT(virtualcable, command) ((virtualcable << 4) | (command >> 4))
 
 	/* Enums: */
 		/** Enum for the possible MIDI jack types in a MIDI device jack descriptor. */
@@ -290,8 +302,7 @@
 		 */
 		typedef struct
 		{
-			unsigned Command     : 4; /**< Upper nibble of the MIDI command being sent or received in the event packet. */
-			unsigned CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface. */
+			uint8_t Event; /**< MIDI event type, constructed with the \ref MIDI_EVENT() macro. */
 
 			uint8_t  Data1; /**< First byte of data in the MIDI event. */
 			uint8_t  Data2; /**< Second byte of data in the MIDI event. */