Combine PDIProtocol and TPIProtocol into a single XPROGProtocol set of files.
[pub/USBasp.git] / Demos / Device / LowLevel / MIDI / MIDI.h
index 3b9b938..992d54c 100644 (file)
@@ -65,7 +65,7 @@
                 *\r
                 *  \param[in] channel  MIDI channel number to address\r
                 */\r
-               #define MIDI_CHANNEL(channel)     (channel - 1)\r
+               #define MIDI_CHANNEL(channel)    ((channel) - 1)\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
@@ -95,8 +95,8 @@
                void SetupHardware(void);\r
                void MIDI_Task(void);\r
    \r
-               void EVENT_USB_Connect(void);\r
-               void EVENT_USB_Disconnect(void);\r
-               void EVENT_USB_ConfigurationChanged(void);\r
+               void EVENT_USB_Device_Connect(void);\r
+               void EVENT_USB_Device_Disconnect(void);\r
+               void EVENT_USB_Device_ConfigurationChanged(void);\r
                \r
 #endif\r