\r
for (;;)\r
{\r
- USB_HID_USBTask(&Keyboard_HID_Interface);\r
- USB_HID_USBTask(&Mouse_HID_Interface);\r
+ HID_Device_USBTask(&Keyboard_HID_Interface);\r
+ HID_Device_USBTask(&Mouse_HID_Interface);\r
USB_USBTask();\r
}\r
}\r
{\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
\r
- if (!(USB_HID_ConfigureEndpoints(&Keyboard_HID_Interface)))\r
+ if (!(HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface)))\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
\r
- if (!(USB_HID_ConfigureEndpoints(&Mouse_HID_Interface)))\r
+ if (!(HID_Device_ConfigureEndpoints(&Mouse_HID_Interface)))\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
}\r
\r
/** Event handler for the library USB Unhandled Control Packet event. */\r
void EVENT_USB_UnhandledControlPacket(void)\r
{\r
- USB_HID_ProcessControlPacket(&Keyboard_HID_Interface);\r
- USB_HID_ProcessControlPacket(&Mouse_HID_Interface);\r
+ HID_Device_ProcessControlPacket(&Keyboard_HID_Interface);\r
+ HID_Device_ProcessControlPacket(&Mouse_HID_Interface);\r
}\r
\r
/** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */\r
/** HID class driver callback function for the creation of HID reports to the host.\r
*\r
* \param HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced\r
+ * \param ReportID Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID\r
* \param ReportData Pointer to a buffer where the created report should be stored\r
*\r
* \return Number of bytes written in the report (or zero if no report is to be sent\r
*/\r
-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r
+uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r
{\r
uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r
/** HID class driver callback function for the processing of HID reports from the host.\r
*\r
* \param HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced\r
+ * \param ReportID Report ID of the received report from the host\r
* \param ReportData Pointer to a buffer where the created report has been stored\r
* \param ReportSize Size in bytes of the received HID report\r
*/\r
-void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,\r
- void* ReportData, uint16_t ReportSize)\r
+void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,\r
+ void* ReportData, uint16_t ReportSize)\r
{\r
if (HIDInterfaceInfo == &Keyboard_HID_Interface)\r
{\r