/*\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
#define INCLUDE_FROM_HID_CLASS_HOST_C\r
#include "HID.h"\r
\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* const HIDInterfaceInfo, uint16_t ConfigDescriptorSize,\r
- uint8_t* ConfigDescriptorData)\r
+ void* ConfigDescriptorData)\r
{\r
uint8_t FoundEndpoints = 0;\r
\r
if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
{\r
Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,\r
- EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+ EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
+ HIDInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
HIDInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
\r
FoundEndpoints |= HID_FOUND_DATAPIPE_IN;\r
else\r
{\r
Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_OUT,\r
- EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+ EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
+ HIDInterfaceInfo->Config.DataOUTPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
HIDInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
\r
HIDInterfaceInfo->State.DeviceUsesOUTPipe = true;\r
}\r
}\r
\r
+ HIDInterfaceInfo->State.LargestReportSize = 8;\r
HIDInterfaceInfo->State.IsActive = true;\r
return HID_ENUMERROR_NoError;\r
}\r
\r
-static uint8_t DComp_HID_Host_NextHIDInterface(void* CurrentDescriptor)\r
+static uint8_t DComp_HID_Host_NextHIDInterface(void* const CurrentDescriptor)\r
{\r
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
{\r
return DESCRIPTOR_SEARCH_NotFound;\r
}\r
\r
-static uint8_t DComp_NextHID(void* CurrentDescriptor)\r
+static uint8_t DComp_NextHID(void* const CurrentDescriptor)\r
{\r
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID)\r
return DESCRIPTOR_SEARCH_Found;\r
return DESCRIPTOR_SEARCH_NotFound; \r
}\r
\r
-static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* CurrentDescriptor)\r
+static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescriptor)\r
{\r
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
{\r
return DESCRIPTOR_SEARCH_NotFound;\r
}\r
\r
-void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, const uint8_t ReportID, void* Buffer)\r
{\r
+ USB_ControlRequest = (USB_Request_Header_t)\r
+ {\r
+ .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+ .bRequest = REQ_SetReport,\r
+ .wValue = (REPORT_ITEM_TYPE_In << 8) | ReportID,\r
+ .wIndex = HIDInterfaceInfo->State.InterfaceNumber,\r
+ .wLength = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In),\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
+ Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+ \r
+ return USB_Host_SendControlRequest(Buffer);\r
+} \r
+#endif\r
+ \r
+uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, void* Buffer)\r
{\r
if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
- return false;\r
+ return PIPE_READYWAIT_DeviceDisconnected;\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
+ uint8_t ErrorCode;\r
\r
- Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
- \r
- return USB_Host_SendControlRequest(Buffer);\r
- }\r
- else\r
- {\r
- uint8_t ErrorCode;\r
+ Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);\r
+ Pipe_Unfreeze();\r
\r
- Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);\r
- Pipe_Unfreeze();\r
- \r
- uint16_t ReportSize;\r
+ uint16_t ReportSize;\r
\r
- if (HIDInterfaceInfo->State.UsingBootProtocol)\r
- {\r
- ReportSize = Pipe_BytesInPipe();\r
- }\r
- else\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+ if (!(HIDInterfaceInfo->State.UsingBootProtocol))\r
+ {\r
+ uint8_t ReportID = 0;\r
+ \r
+ if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs)\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
+ ReportID = Pipe_Read_Byte();\r
+ *((uint8_t*)Buffer++) = ReportID;\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
+ ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In);\r
}\r
+ else\r
+#endif\r
+ {\r
+ ReportSize = Pipe_BytesInPipe();\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
-uint8_t HID_Host_SendReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint8_t ReportID, void* Buffer,\r
- const uint16_t ReportSize)\r
+uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+ const uint8_t ReportID,\r
+#endif\r
+ void* Buffer, const uint16_t ReportSize)\r
{\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\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
+ if (HIDInterfaceInfo->State.DeviceUsesOUTPipe)\r
{\r
uint8_t ErrorCode;\r
\r
\r
return PIPE_RWSTREAM_NoError;\r
}\r
+ else\r
+#endif\r
+ {\r
+ USB_ControlRequest = (USB_Request_Header_t)\r
+ {\r
+ .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+ .bRequest = REQ_SetReport,\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+ .wValue = (REPORT_ITEM_TYPE_Out << 8) | ReportID,\r
+#else\r
+ .wValue = 0,\r
+#endif\r
+ .wIndex = HIDInterfaceInfo->State.InterfaceNumber,\r
+ .wLength = ReportSize,\r
+ };\r
+\r
+ Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+ \r
+ return USB_Host_SendControlRequest(Buffer);\r
+ }\r
}\r
\r
bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
return ReportReceived;\r
}\r
\r
-uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
+uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
{\r
uint8_t ErrorCode;\r
\r
if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
return ErrorCode;\r
\r
+ HIDInterfaceInfo->State.LargestReportSize = 8;\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
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
{\r
uint8_t ErrorCode;\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
+ if (HIDInterfaceInfo->State.UsingBootProtocol)\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
+ HIDInterfaceInfo->State.UsingBootProtocol = false;\r
+ }\r
\r
if (HIDInterfaceInfo->Config.HIDParserData == NULL)\r
return HID_ERROR_LOGICAL;\r
- \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
+ uint8_t LargestReportSizeBits = HIDInterfaceInfo->Config.HIDParserData->LargestReportSizeBits;\r
+ HIDInterfaceInfo->State.LargestReportSize = (LargestReportSizeBits >> 3) + ((LargestReportSizeBits & 0x07) != 0);\r
+\r
return 0;\r
}\r
+#endif\r
\r
#endif\r
projects / pub / USBasp.git / blobdiff