this software.\r
*/\r
\r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
#include "HID.h"\r
\r
-void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
+void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r
{\r
if (!(Endpoint_IsSETUPReceived()))\r
return;\r
\r
- if (USB_ControlRequest.wIndex != HIDInterfaceInfo->InterfaceNumber)\r
+ if (USB_ControlRequest.wIndex != HIDInterfaceInfo->Config.InterfaceNumber)\r
return;\r
\r
switch (USB_ControlRequest.bRequest)\r
{\r
Endpoint_ClearSETUP(); \r
\r
- uint8_t ReportINData[HIDInterfaceInfo->ReportBufferSize];\r
- uint16_t ReportINSize;\r
-\r
- memset(ReportINData, 0, sizeof(ReportINData));\r
+ uint16_t ReportINSize = 0;\r
+ uint8_t ReportID = (USB_ControlRequest.wValue & 0xFF);\r
\r
- ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, ReportINData);\r
+ memset(HIDInterfaceInfo->Config.PrevReportINBuffer, 0, HIDInterfaceInfo->Config.PrevReportINBufferSize);\r
+ \r
+ CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID,\r
+ HIDInterfaceInfo->Config.PrevReportINBuffer, &ReportINSize);\r
\r
- Endpoint_Write_Control_Stream_LE(ReportINData, ReportINSize);\r
+ Endpoint_Write_Control_Stream_LE(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINSize);\r
Endpoint_ClearOUT();\r
}\r
\r
\r
uint16_t ReportOUTSize = USB_ControlRequest.wLength;\r
uint8_t ReportOUTData[ReportOUTSize];\r
+ uint8_t ReportID = (USB_ControlRequest.wValue & 0xFF);\r
\r
Endpoint_Read_Control_Stream_LE(ReportOUTData, ReportOUTSize);\r
Endpoint_ClearIN();\r
\r
- CALLBACK_USB_HID_ProcessReceivedHIDReport(HIDInterfaceInfo, ReportOUTData, ReportOUTSize);\r
+ CALLBACK_HID_Device_ProcessHIDReport(HIDInterfaceInfo, ReportID, ReportOUTData, ReportOUTSize);\r
}\r
\r
break;\r
{\r
Endpoint_ClearSETUP();\r
\r
- Endpoint_Write_Byte(HIDInterfaceInfo->UsingReportProtocol);\r
+ Endpoint_Write_Byte(HIDInterfaceInfo->State.UsingReportProtocol);\r
Endpoint_ClearIN();\r
\r
- while (!(Endpoint_IsOUTReceived()));\r
- Endpoint_ClearOUT();\r
+ Endpoint_ClearStatusStage();\r
}\r
\r
break;\r
{\r
Endpoint_ClearSETUP();\r
\r
- HIDInterfaceInfo->UsingReportProtocol = (USB_ControlRequest.wValue != 0x0000);\r
+ HIDInterfaceInfo->State.UsingReportProtocol = (USB_ControlRequest.wValue != 0x0000);\r
\r
- while (!(Endpoint_IsINReady()));\r
- Endpoint_ClearIN();\r
+ Endpoint_ClearStatusStage();\r
}\r
\r
break;\r
if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
{\r
Endpoint_ClearSETUP();\r
- \r
- HIDInterfaceInfo->IdleCount = ((USB_ControlRequest.wValue >> 8) << 2);\r
- \r
- while (!(Endpoint_IsINReady()));\r
- Endpoint_ClearIN();\r
+ \r
+ HIDInterfaceInfo->State.IdleCount = ((USB_ControlRequest.wValue & 0xFF00) >> 6);\r
+ \r
+ Endpoint_ClearStatusStage();\r
}\r
\r
break;\r
{ \r
Endpoint_ClearSETUP();\r
\r
- Endpoint_Write_Byte(HIDInterfaceInfo->IdleCount >> 2);\r
+ Endpoint_Write_Byte(HIDInterfaceInfo->State.IdleCount >> 2);\r
Endpoint_ClearIN();\r
\r
- while (!(Endpoint_IsOUTReceived()));\r
- Endpoint_ClearOUT();\r
+ Endpoint_ClearStatusStage();\r
}\r
\r
break;\r
}\r
}\r
\r
-bool USB_HID_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
+bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r
{\r
- HIDInterfaceInfo->UsingReportProtocol = true;\r
+ memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));\r
+ HIDInterfaceInfo->State.UsingReportProtocol = true;\r
+ HIDInterfaceInfo->State.IdleCount = 500;\r
\r
- if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->ReportINEndpointNumber, EP_TYPE_INTERRUPT,\r
- ENDPOINT_DIR_IN, HIDInterfaceInfo->ReportINEndpointSize, ENDPOINT_BANK_SINGLE)))\r
+ if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber, EP_TYPE_INTERRUPT,\r
+ ENDPOINT_DIR_IN, HIDInterfaceInfo->Config.ReportINEndpointSize, ENDPOINT_BANK_SINGLE)))\r
{\r
return false;\r
}\r
\r
- if (HIDInterfaceInfo->ReportOUTEndpointNumber)\r
- {\r
- if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->ReportOUTEndpointNumber, EP_TYPE_INTERRUPT,\r
- ENDPOINT_DIR_OUT, HIDInterfaceInfo->ReportOUTEndpointSize, ENDPOINT_BANK_SINGLE)))\r
- {\r
- return false;\r
- }\r
- }\r
- \r
return true;\r
}\r
-\r
-void USB_HID_RegisterStartOfFrame(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
-{\r
- if (HIDInterfaceInfo->IdleMSRemaining)\r
- HIDInterfaceInfo->IdleMSRemaining--;\r
-}\r
\r
-void USB_HID_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
+void HID_Device_USBTask(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r
{\r
- if (!(USB_IsConnected))\r
+ if (USB_DeviceState != DEVICE_STATE_Configured)\r
return;\r
\r
- Endpoint_SelectEndpoint(HIDInterfaceInfo->ReportINEndpointNumber);\r
+ Endpoint_SelectEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber);\r
\r
- if (Endpoint_IsReadWriteAllowed() &&\r
- !(HIDInterfaceInfo->IdleCount && HIDInterfaceInfo->IdleMSRemaining))\r
+ if (Endpoint_IsReadWriteAllowed())\r
{\r
- if (HIDInterfaceInfo->IdleCount && !(HIDInterfaceInfo->IdleMSRemaining))\r
- HIDInterfaceInfo->IdleMSRemaining = HIDInterfaceInfo->IdleCount;\r
-\r
- uint8_t ReportINData[HIDInterfaceInfo->ReportBufferSize];\r
- uint16_t ReportINSize;\r
+ uint8_t ReportINData[HIDInterfaceInfo->Config.PrevReportINBufferSize];\r
+ uint8_t ReportID = 0;\r
+ uint16_t ReportINSize = 0;\r
\r
memset(ReportINData, 0, sizeof(ReportINData));\r
\r
- ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, ReportINData);\r
+ bool ForceSend = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportINData, &ReportINSize);\r
\r
- if (ReportINSize)\r
- {\r
- Endpoint_Write_Stream_LE(ReportINData, ReportINSize\r
- #if !defined(NO_STREAM_CALLBACKS)\r
- , NO_STREAM_CALLBACK\r
- #endif\r
- );\r
- }\r
+ bool StatesChanged = (memcmp(ReportINData, HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINSize) != 0);\r
+ bool IdlePeriodElapsed = (HIDInterfaceInfo->State.IdleCount && !(HIDInterfaceInfo->State.IdleMSRemaining));\r
\r
- Endpoint_ClearIN();\r
- }\r
- \r
- if (HIDInterfaceInfo->ReportOUTEndpointNumber)\r
- {\r
- Endpoint_SelectEndpoint(HIDInterfaceInfo->ReportOUTEndpointNumber);\r
- \r
- if (Endpoint_IsOUTReceived())\r
+ memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINData, ReportINSize);\r
+\r
+ if (ReportINSize && (ForceSend || StatesChanged || IdlePeriodElapsed))\r
{\r
- uint16_t ReportOUTSize = Endpoint_BytesInEndpoint();\r
- uint8_t ReportOUTData[ReportOUTSize];\r
- \r
- if (ReportOUTSize)\r
- {\r
- Endpoint_Read_Stream_LE(ReportOUTData, ReportOUTSize\r
- #if !defined(NO_STREAM_CALLBACKS)\r
- , NO_STREAM_CALLBACK\r
- #endif\r
- );\r
- }\r
- \r
- CALLBACK_USB_HID_ProcessReceivedHIDReport(HIDInterfaceInfo, ReportOUTData, ReportOUTSize);\r
+ HIDInterfaceInfo->State.IdleMSRemaining = HIDInterfaceInfo->State.IdleCount;\r
+\r
+ if (ReportID)\r
+ Endpoint_Write_Byte(ReportID);\r
+\r
+ Endpoint_Write_Stream_LE(ReportINData, ReportINSize, NO_STREAM_CALLBACK);\r
\r
- Endpoint_ClearOUT();\r
+ Endpoint_ClearIN();\r
}\r
}\r
}\r
+\r
+void HID_Device_MillisecondElapsed(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo)\r
+{\r
+ if (HIDInterfaceInfo->State.IdleMSRemaining)\r
+ HIDInterfaceInfo->State.IdleMSRemaining--;\r
+}\r
+\r
+#endif\r
projects / pub / USBasp.git / blobdiff