/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
this software.\r
*/\r
\r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
#include "MIDI.h"\r
\r
-bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r
+{\r
+\r
+}\r
+\r
+bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r
{\r
- if (MIDIInterfaceInfo->DataINEndpointNumber)\r
+ memset(&MIDIInterfaceInfo->State, 0x00, sizeof(MIDIInterfaceInfo->State));\r
+\r
+ if (MIDIInterfaceInfo->Config.DataINEndpointNumber)\r
{\r
- if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,\r
- ENDPOINT_DIR_IN, MIDIInterfaceInfo->DataINEndpointSize,\r
- ENDPOINT_BANK_SINGLE)))\r
+ if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_BULK,\r
+ ENDPOINT_DIR_IN, MIDIInterfaceInfo->Config.DataINEndpointSize,\r
+ MIDIInterfaceInfo->Config.DataINEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r
{\r
return false;\r
}\r
}\r
\r
- if (MIDIInterfaceInfo->DataOUTEndpointNumber)\r
+ if (MIDIInterfaceInfo->Config.DataOUTEndpointNumber)\r
{\r
- if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,\r
- ENDPOINT_DIR_OUT, MIDIInterfaceInfo->DataOUTEndpointSize,\r
- ENDPOINT_BANK_SINGLE)))\r
+ if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_BULK,\r
+ ENDPOINT_DIR_OUT, MIDIInterfaceInfo->Config.DataOUTEndpointSize,\r
+ MIDIInterfaceInfo->Config.DataOUTEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r
{\r
return false;\r
}\r
return true;\r
}\r
\r
-void USB_MIDI_SendNoteChange(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, const uint8_t Pitch, const bool OnOff,\r
- const uint8_t CableID, const uint8_t Channel)\r
+uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
{\r
- if (!(USB_IsConnected))\r
- return;\r
+ if (USB_DeviceState != DEVICE_STATE_Configured)\r
+ return ENDPOINT_RWSTREAM_DeviceDisconnected;\r
\r
- Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r
- while (!(Endpoint_IsReadWriteAllowed()));\r
+ Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);\r
\r
- uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+ if (Endpoint_IsReadWriteAllowed());\r
+ {\r
+ uint8_t ErrorCode;\r
\r
- Endpoint_Write_Byte((CableID << 4) | (Command >> 4));\r
+ if ((ErrorCode = Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != ENDPOINT_RWSTREAM_NoError)\r
+ return ErrorCode;\r
\r
- Endpoint_Write_Byte(Command | Channel);\r
- Endpoint_Write_Byte(Pitch);\r
- Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\r
+ if (!(Endpoint_IsReadWriteAllowed()))\r
+ Endpoint_ClearIN();\r
+ }\r
\r
- Endpoint_ClearIN();\r
+ return ENDPOINT_RWSTREAM_NoError;\r
}\r
\r
-void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
+uint8_t MIDI_Device_Flush(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r
{\r
- if (!(USB_IsConnected))\r
- return;\r
+ if (USB_DeviceState != DEVICE_STATE_Configured)\r
+ return ENDPOINT_RWSTREAM_DeviceDisconnected;\r
\r
- Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r
- while (!(Endpoint_IsReadWriteAllowed()));\r
+ uint8_t ErrorCode;\r
\r
- Endpoint_Write_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
- Endpoint_ClearIN();\r
+ Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);\r
+\r
+ if (Endpoint_BytesInEndpoint())\r
+ {\r
+ Endpoint_ClearIN();\r
+\r
+ if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)\r
+ return ErrorCode;\r
+ }\r
+\r
+ return ENDPOINT_READYWAIT_NoError;\r
}\r
\r
-bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
+bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
{\r
- if (!(USB_IsConnected))\r
+ if (USB_DeviceState != DEVICE_STATE_Configured)\r
return false;\r
\r
- Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber);\r
+ Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber);\r
\r
if (!(Endpoint_IsReadWriteAllowed()))\r
return false;\r
\r
- Endpoint_Read_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
- Endpoint_ClearOUT();\r
+ Endpoint_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
+ \r
+ if (!(Endpoint_IsReadWriteAllowed()))\r
+ Endpoint_ClearOUT();\r
\r
return true;\r
}\r
+\r
+#endif\r
projects / pub / USBasp.git / blobdiff