Ensure all USB device class drivers have the same three main functions as their inter...

diff --git a/Demos/Device/AudioInput/AudioInput.c b/Demos/Device/AudioInput/AudioInput.c
index 31b3159..93ffe0b 100644 (file)
--- a/Demos/Device/AudioInput/AudioInput.c
+++ b/Demos/Device/AudioInput/AudioInput.c
@@ -62,6 +62,7 @@ int main(void)
                if (Microphone_Audio_Interface.InterfaceEnabled)\r
                  ProcessNextSample();\r
 \r
                if (Microphone_Audio_Interface.InterfaceEnabled)\r
                  ProcessNextSample();\r
 \r

+               USB_Audio_USBTask(&Microphone_Audio_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r

diff --git a/Demos/Device/AudioOutput/AudioOutput.c b/Demos/Device/AudioOutput/AudioOutput.c
index 4ff2e74..8c3bf61 100644 (file)
--- a/Demos/Device/AudioOutput/AudioOutput.c
+++ b/Demos/Device/AudioOutput/AudioOutput.c
@@ -62,6 +62,7 @@ int main(void)
                if (Speaker_Audio_Interface.InterfaceEnabled)\r
                  ProcessNextSample();\r
 \r
                if (Speaker_Audio_Interface.InterfaceEnabled)\r
                  ProcessNextSample();\r
 \r

+               USB_Audio_USBTask(&Speaker_Audio_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r

diff --git a/Demos/Device/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c
index 4fef047..8881d1d 100644 (file)
--- a/Demos/Device/MIDI/MIDI.c
+++ b/Demos/Device/MIDI/MIDI.c
@@ -64,6 +64,7 @@ int main(void)
        {\r
                CheckJoystickMovement();\r
        \r
        {\r
                CheckJoystickMovement();\r
        \r

+               USB_MIDI_USBTask(&Keyboard_MIDI_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r


@@ -168,3 +169,9 @@ void EVENT_USB_ConfigurationChanged(void)
        if (!(USB_MIDI_ConfigureEndpoints(&Keyboard_MIDI_Interface)))\r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
        if (!(USB_MIDI_ConfigureEndpoints(&Keyboard_MIDI_Interface)))\r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r

+\r
+/** Event handler for the library USB Unhandled Control Packet event. */\r
+void EVENT_USB_UnhandledControlPacket(void)\r
+{\r
+       USB_MIDI_ProcessControlPacket(&Keyboard_MIDI_Interface);\r
+}\r

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c
index acd9f69..4651bf1 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -80,6 +80,11 @@ bool USB_Audio_ConfigureEndpoints(USB_ClassInfo_Audio_t* AudioInterfaceInfo)
        return true;\r
 }\r
 \r
        return true;\r
 }\r
 \r

+void USB_Audio_USBTask(USB_ClassInfo_Audio_t* AudioInterfaceInfo)\r
+{\r
+\r
+}\r
+\r

 int8_t USB_Audio_ReadSample8(void)\r
 {\r
        int8_t Sample;\r
 int8_t USB_Audio_ReadSample8(void)\r
 {\r
        int8_t Sample;\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index 42c0690..f96604b 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -30,6 +30,11 @@
 \r
 #include "MIDI.h"\r
 \r
 \r
 #include "MIDI.h"\r
 \r

+void USB_MIDI_ProcessControlPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+{\r
+\r
+}\r
+\r

 bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
 {\r
        if (MIDIInterfaceInfo->DataINEndpointNumber)\r
 bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
 {\r
        if (MIDIInterfaceInfo->DataINEndpointNumber)\r


@@ -55,6 +60,11 @@ bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)
        return true;\r
 }\r
 \r
        return true;\r
 }\r
 \r

+void USB_MIDI_USBTask(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+{\r
+\r
+}\r
+\r

 void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
 {\r
        if (!(USB_IsConnected))\r
 void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
 {\r
        if (!(USB_IsConnected))\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
index 890d3bb..d158722 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -155,6 +155,7 @@
                \r
        /* Function Prototypes: */\r
                bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo);\r
                \r
        /* Function Prototypes: */\r
                bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo);\r

+               void USB_MIDI_ProcessControlPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo);\r

                void USB_MIDI_USBTask(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo);\r
 \r
                void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r
                void USB_MIDI_USBTask(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo);\r
 \r
                void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r