USB_Init() no longer calls sei() to enable global interrupts - this must now be done...

[pub/lufa.git] / Bootloaders / Incomplete / MIDI / BootloaderMIDI.c

diff --git a/Bootloaders/Incomplete/MIDI/BootloaderMIDI.c b/Bootloaders/Incomplete/MIDI/BootloaderMIDI.c
index 8d26d56..8638201 100644 (file)
--- a/Bootloaders/Incomplete/MIDI/BootloaderMIDI.c
+++ b/Bootloaders/Incomplete/MIDI/BootloaderMIDI.c
@@ -42,8 +42,6 @@
 int main(void)\r
 {\r
        SetupHardware();\r
 int main(void)\r
 {\r
        SetupHardware();\r

-       \r
-       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r

 \r
        for (;;)\r
        {\r
 \r
        for (;;)\r
        {\r


@@ -63,48 +61,22 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r
        clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r

-       LEDs_Init();\r

        USB_Init();\r
 }\r
 \r
        USB_Init();\r
 }\r
 \r

-/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */\r
-void EVENT_USB_Device_Connect(void)\r
-{\r
-       /* Indicate USB enumerating */\r
-       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
-}\r
-\r
-/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
- *  the status LEDs, disables the sample update and PWM output timers and stops the USB and MIDI management tasks.\r
- */\r
-void EVENT_USB_Device_Disconnect(void)\r
-{\r
-       /* Indicate USB not ready */\r
-       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
-}\r
-\r

 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
  *  of the USB device after enumeration - the device endpoints are configured and the MIDI management task started.\r
  */\r
 void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
  *  of the USB device after enumeration - the device endpoints are configured and the MIDI management task started.\r
  */\r
 void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r

-       /* Indicate USB connected and ready */\r
-       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
-\r

        /* Setup MIDI stream endpoints */\r
        /* Setup MIDI stream endpoints */\r

-       if (!(Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK,\r
-                                            ENDPOINT_DIR_OUT, MIDI_STREAM_EPSIZE,\r
-                                        ENDPOINT_BANK_SINGLE)))\r
-       {\r
-               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-       }       \r
+       Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK,\r
+                                  ENDPOINT_DIR_OUT, MIDI_STREAM_EPSIZE,\r
+                                  ENDPOINT_BANK_SINGLE);\r

        \r
        \r

-       if (!(Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK,\r
-                                            ENDPOINT_DIR_IN, MIDI_STREAM_EPSIZE,\r
-                                        ENDPOINT_BANK_SINGLE)))\r
-       {\r
-               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-       }\r
+       Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK,\r
+                                  ENDPOINT_DIR_IN, MIDI_STREAM_EPSIZE,\r
+                                  ENDPOINT_BANK_SINGLE);\r

 }\r
 \r
 /** Task to handle the generation of MIDI note change events in response to presses of the board joystick, and send them\r
 }\r
 \r
 /** Task to handle the generation of MIDI note change events in response to presses of the board joystick, and send them\r


@@ -122,9 +94,7 @@ void MIDI_Task(void)
        if (Endpoint_IsOUTReceived())\r
        {\r
                USB_MIDI_EventPacket_t InPacket;\r
        if (Endpoint_IsOUTReceived())\r
        {\r
                USB_MIDI_EventPacket_t InPacket;\r

-               Endpoint_Read_Stream_LE(&InPacket, sizeof(InPacket));\r
-                       \r
-               LEDs_SetAllLEDs(InPacket.Data2 > 64 ? LEDS_LED1 : LEDS_LED2);   \r
+               Endpoint_Read_Stream_LE(&InPacket, sizeof(InPacket));                   \r

                Endpoint_ClearOUT();\r
 \r
                uint8_t Channel = InPacket.Data1;\r
                Endpoint_ClearOUT();\r
 \r
                uint8_t Channel = InPacket.Data1;\r