projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that the USB_DeviceState variable is properly set upon wakeup events, to the...
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
Class
/
Device
/
MIDI.c
diff --git
a/LUFA/Drivers/USB/Class/Device/MIDI.c
b/LUFA/Drivers/USB/Class/Device/MIDI.c
index
0dcc94d
..
3643275
100644
(file)
--- a/
LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/
LUFA/Drivers/USB/Class/Device/MIDI.c
@@
-33,12
+33,12
@@
\r
#include "MIDI.h"
\r
\r
\r
#include "MIDI.h"
\r
\r
-void MIDI_Device_ProcessControlPacket(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo)
\r
+void MIDI_Device_ProcessControlPacket(USB_ClassInfo_MIDI_Device_t*
const
MIDIInterfaceInfo)
\r
{
\r
\r
}
\r
\r
{
\r
\r
}
\r
\r
-bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo)
\r
+bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t*
const
MIDIInterfaceInfo)
\r
{
\r
if (MIDIInterfaceInfo->Config.DataINEndpointNumber)
\r
{
\r
{
\r
if (MIDIInterfaceInfo->Config.DataINEndpointNumber)
\r
{
\r
@@
-63,14
+63,14
@@
bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceIn
return true;
\r
}
\r
\r
return true;
\r
}
\r
\r
-void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo)
\r
+void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t*
const
MIDIInterfaceInfo)
\r
{
\r
\r
}
\r
\r
{
\r
\r
}
\r
\r
-void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t*
MIDIInterfaceInfo, MIDI_EventPacket_t*
Event)
\r
+void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t*
const MIDIInterfaceInfo, MIDI_EventPacket_t* const
Event)
\r
{
\r
{
\r
- if (
!(USB_IsConnected)
)
\r
+ if (
USB_DeviceState != DEVICE_STATE_Configured
)
\r
return;
\r
\r
Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);
\r
return;
\r
\r
Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);
\r
@@
-82,9
+82,9
@@
void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo,
}
\r
}
\r
\r
}
\r
}
\r
\r
-bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t*
MIDIInterfaceInfo, MIDI_EventPacket_t*
Event)
\r
+bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t*
const MIDIInterfaceInfo, MIDI_EventPacket_t* const
Event)
\r
{
\r
{
\r
- if (
!(USB_IsConnected)
)
\r
+ if (
USB_DeviceState != DEVICE_STATE_Configured
)
\r
return false;
\r
\r
Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber);
\r
return false;
\r
\r
Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber);
\r