\r
#warning The HID Host mode Class driver is currently incomplete and is for preview purposes only.\r
\r
-uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint16_t ConfigDescriptorSize,\r
+uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint16_t ConfigDescriptorSize,\r
uint8_t* ConfigDescriptorData)\r
{\r
uint8_t FoundEndpoints = 0;\r
} while (HIDInterfaceInfo->Config.HIDInterfaceProtocol &&\r
(CurrentHIDInterface->Protocol != HIDInterfaceInfo->Config.HIDInterfaceProtocol));\r
\r
- HIDInterfaceInfo->State.InterfaceNumber =\r
- #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r
- CurrentHIDInterface->InterfaceNumber;\r
- #else\r
- CurrentHIDInterface->bInterfaceNumber;\r
- #endif\r
- HIDInterfaceInfo->State.SupportsBootSubClass = (CurrentHIDInterface->SubClass != 0);\r
+ HIDInterfaceInfo->State.InterfaceNumber = CurrentHIDInterface->InterfaceNumber;\r
+ HIDInterfaceInfo->State.SupportsBootProtocol = (CurrentHIDInterface->SubClass != HID_NON_BOOT_PROTOCOL);\r
+\r
+ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, DComp_NextHID) != DESCRIPTOR_SEARCH_COMP_Found)\r
+ {\r
+ return HID_ENUMERROR_NoHIDDescriptorFound;\r
+ }\r
+\r
+ HIDInterfaceInfo->State.HIDReportSize = DESCRIPTOR_CAST(ConfigDescriptorData, USB_HID_Descriptor_t).HIDReportLength;\r
\r
while (FoundEndpoints != (HID_FOUND_DATAPIPE_IN | HID_FOUND_DATAPIPE_OUT))\r
{\r
if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
DComp_HID_Host_NextHIDInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
{\r
- if (FoundEndpoints == (1 << HID_FOUND_DATAPIPE_IN))\r
+ if (FoundEndpoints & HID_FOUND_DATAPIPE_IN)\r
break;\r
\r
return HID_ENUMERROR_EndpointsNotFound;\r
EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
HIDInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
\r
+ HIDInterfaceInfo->State.DeviceUsesOUTPipe = true;\r
+ \r
FoundEndpoints |= HID_FOUND_DATAPIPE_OUT; \r
}\r
}\r
return DESCRIPTOR_SEARCH_NotFound;\r
}\r
\r
+static uint8_t DComp_NextHID(void* CurrentDescriptor)\r
+{\r
+ if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID)\r
+ return DESCRIPTOR_SEARCH_Found;\r
+ else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
+ return DESCRIPTOR_SEARCH_Fail;\r
+ else\r
+ return DESCRIPTOR_SEARCH_NotFound; \r
+}\r
+\r
static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* CurrentDescriptor)\r
{\r
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
return DESCRIPTOR_SEARCH_NotFound;\r
}\r
\r
-void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)\r
+void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
+{\r
+\r
+}\r
+\r
+uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, const bool ControlRequest,\r
+ uint8_t* ReportID, void* Buffer)\r
{\r
+ if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
+ return false;\r
+\r
+ if (ControlRequest)\r
+ {\r
+ USB_ControlRequest = (USB_Request_Header_t)\r
+ {\r
+ .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+ .bRequest = REQ_SetReport,\r
+ .wValue = *ReportID,\r
+ .wIndex = HIDInterfaceInfo->State.InterfaceNumber,\r
+ .wLength = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, *ReportID, REPORT_ITEM_TYPE_In),\r
+ };\r
+\r
+ Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+ \r
+ return USB_Host_SendControlRequest(Buffer);\r
+ }\r
+ else\r
+ {\r
+ uint8_t ErrorCode;\r
+ \r
+ Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);\r
+ Pipe_Unfreeze();\r
+ \r
+ uint16_t ReportSize;\r
+\r
+ if (HIDInterfaceInfo->State.UsingBootProtocol)\r
+ {\r
+ ReportSize = Pipe_BytesInPipe();\r
+ }\r
+ else\r
+ {\r
+ if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs)\r
+ *ReportID = Pipe_Read_Byte();\r
+ else\r
+ *ReportID = 0;\r
+ \r
+ ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, *ReportID, REPORT_ITEM_TYPE_In);\r
+ }\r
\r
+ if ((ErrorCode = Pipe_Read_Stream_LE(Buffer, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
+ return ErrorCode;\r
+ \r
+ Pipe_ClearIN(); \r
+ Pipe_Freeze();\r
+ \r
+ return PIPE_RWSTREAM_NoError; \r
+ }\r
}\r
\r
-bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)\r
+uint8_t HID_Host_SendReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint8_t ReportID, void* Buffer,\r
+ const uint16_t ReportSize)\r
+{\r
+ if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
+ return false;\r
+ \r
+ if (HIDInterfaceInfo->State.DeviceUsesOUTPipe)\r
+ {\r
+ USB_ControlRequest = (USB_Request_Header_t)\r
+ {\r
+ .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+ .bRequest = REQ_SetReport,\r
+ .wValue = ReportID,\r
+ .wIndex = HIDInterfaceInfo->State.InterfaceNumber,\r
+ .wLength = ReportSize,\r
+ };\r
+\r
+ Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+ \r
+ return USB_Host_SendControlRequest(Buffer);\r
+ }\r
+ else\r
+ {\r
+ uint8_t ErrorCode;\r
+ \r
+ Pipe_SelectPipe(HIDInterfaceInfo->Config.DataOUTPipeNumber);\r
+ Pipe_Unfreeze();\r
+ \r
+ if (ReportID)\r
+ Pipe_Write_Stream_LE(&ReportID, sizeof(ReportID), NO_STREAM_CALLBACK);\r
+ \r
+ if ((ErrorCode = Pipe_Write_Stream_LE(Buffer, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
+ return ErrorCode;\r
+ \r
+ Pipe_ClearOUT();\r
+ Pipe_Freeze();\r
+ \r
+ return PIPE_RWSTREAM_NoError;\r
+ }\r
+}\r
+\r
+bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
{\r
if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
return false;\r
Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);\r
Pipe_Unfreeze();\r
\r
- ReportReceived = Pipe_IsReadWriteAllowed();\r
+ ReportReceived = Pipe_IsINReceived();\r
\r
Pipe_Freeze();\r
-\r
+ \r
return ReportReceived;\r
}\r
\r
-uint8_t USB_HID_Host_SetProtocol(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, bool UseReportProtocol)\r
+uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
{\r
+ uint8_t ErrorCode;\r
+\r
USB_ControlRequest = (USB_Request_Header_t)\r
{\r
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
.bRequest = REQ_SetProtocol,\r
- .wValue = UseReportProtocol,\r
+ .wValue = 0,\r
.wIndex = HIDInterfaceInfo->State.InterfaceNumber,\r
.wLength = 0,\r
};\r
\r
Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
\r
- return USB_Host_SendControlRequest(NULL);\r
+ if (!(HIDInterfaceInfo->State.SupportsBootProtocol))\r
+ return HID_ERROR_LOGICAL;\r
+\r
+ if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
+ return ErrorCode;\r
+\r
+ HIDInterfaceInfo->State.UsingBootProtocol = true;\r
+ \r
+ return HOST_SENDCONTROL_Successful;\r
+}\r
+\r
+uint8_t USB_HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
+{\r
+ uint8_t ErrorCode;\r
+\r
+ uint8_t HIDReportData[HIDInterfaceInfo->State.HIDReportSize];\r
+ \r
+ USB_ControlRequest = (USB_Request_Header_t)\r
+ {\r
+ .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE),\r
+ .bRequest = REQ_GetDescriptor,\r
+ .wValue = (DTYPE_Report << 8),\r
+ .wIndex = HIDInterfaceInfo->State.InterfaceNumber,\r
+ .wLength = HIDInterfaceInfo->State.HIDReportSize,\r
+ };\r
+\r
+ Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r
+ if ((ErrorCode = USB_Host_SendControlRequest(HIDReportData)) != HOST_SENDCONTROL_Successful)\r
+ return ErrorCode;\r
+ \r
+ USB_ControlRequest = (USB_Request_Header_t)\r
+ {\r
+ .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+ .bRequest = REQ_SetProtocol,\r
+ .wValue = 1,\r
+ .wIndex = HIDInterfaceInfo->State.InterfaceNumber,\r
+ .wLength = 0,\r
+ };\r
+\r
+ if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
+ return ErrorCode;\r
+\r
+ HIDInterfaceInfo->State.UsingBootProtocol = false;\r
+ \r
+ if (HIDInterfaceInfo->Config.HIDParserData == NULL)\r
+ return HID_ERROR_LOGICAL;\r
+ \r
+ if ((ErrorCode = USB_ProcessHIDReport(HIDReportData, HIDInterfaceInfo->State.HIDReportSize,\r
+ HIDInterfaceInfo->Config.HIDParserData)) != HID_PARSE_Successful)\r
+ {\r
+ return HID_ERROR_LOGICAL | ErrorCode;\r
+ }\r
+\r
+ return 0;\r
}\r
\r
#endif\r
projects / pub / USBasp.git / blobdiff