\r
#include "KeyboardMouse.h"\r
\r
+/** Buffer to hold the previously generated Keyboard HID report, for comparison purposes inside the HID class driver. */\r
+uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)];\r
+\r
+/** Buffer to hold the previously generated Mouse HID report, for comparison purposes inside the HID class driver. */\r
+uint8_t PrevMouseHIDReportBuffer[sizeof(USB_MouseReport_Data_t)];\r
+\r
/** LUFA HID Class driver interface configuration and state information. This structure is\r
* passed to all HID Class driver functions, so that multiple instances of the same class\r
* within a device can be differentiated from one another. This is for the keyboard HID\r
* interface within the device.\r
*/\r
-USB_ClassInfo_HID_t Keyboard_HID_Interface =\r
+USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =\r
{\r
- .InterfaceNumber = 0,\r
+ .Config =\r
+ {\r
+ .InterfaceNumber = 0,\r
\r
- .ReportINEndpointNumber = KEYBOARD_IN_EPNUM,\r
- .ReportINEndpointSize = HID_EPSIZE,\r
- \r
- .ReportINBufferSize = sizeof(USB_KeyboardReport_Data_t),\r
+ .ReportINEndpointNumber = KEYBOARD_IN_EPNUM,\r
+ .ReportINEndpointSize = HID_EPSIZE,\r
\r
- .IdleCount = 500,\r
+ .PrevReportINBuffer = PrevKeyboardHIDReportBuffer,\r
+ .PrevReportINBufferSize = sizeof(PrevKeyboardHIDReportBuffer),\r
+ },\r
};\r
\r
/** LUFA HID Class driver interface configuration and state information. This structure is\r
* within a device can be differentiated from one another. This is for the mouse HID\r
* interface within the device.\r
*/\r
-USB_ClassInfo_HID_t Mouse_HID_Interface =\r
+USB_ClassInfo_HID_Device_t Mouse_HID_Interface =\r
{\r
- .InterfaceNumber = 0,\r
+ .Config =\r
+ {\r
+ .InterfaceNumber = 0,\r
\r
- .ReportINEndpointNumber = MOUSE_IN_EPNUM,\r
- .ReportINEndpointSize = HID_EPSIZE,\r
+ .ReportINEndpointNumber = MOUSE_IN_EPNUM,\r
+ .ReportINEndpointSize = HID_EPSIZE,\r
\r
- .ReportINBufferSize = sizeof(USB_MouseReport_Data_t),\r
+ .PrevReportINBuffer = PrevMouseHIDReportBuffer,\r
+ .PrevReportINBufferSize = sizeof(PrevMouseHIDReportBuffer),\r
+ }, \r
};\r
\r
/** Main program entry point. This routine contains the overall program flow, including initial\r
\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
\r
/** Event handler for the library USB Connection event. */\r
-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r
{\r
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
}\r
\r
/** Event handler for the library USB Disconnection event. */\r
-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r
{\r
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
}\r
\r
/** Event handler for the library USB Configuration Changed event. */\r
-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\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
+/** Event handler for the library USB Unhandled Control Request event. */\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r
{\r
- USB_HID_ProcessControlPacket(&Keyboard_HID_Interface);\r
- USB_HID_ProcessControlPacket(&Mouse_HID_Interface);\r
+ HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);\r
+ HID_Device_ProcessControlRequest(&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
ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
{\r
- if (Keyboard_HID_Interface.IdleMSRemaining)\r
- Keyboard_HID_Interface.IdleMSRemaining--;\r
-\r
- if (Mouse_HID_Interface.IdleMSRemaining)\r
- Mouse_HID_Interface.IdleMSRemaining--;\r
+ HID_Device_MillisecondElapsed(&Keyboard_HID_Interface);\r
+ HID_Device_MillisecondElapsed(&Mouse_HID_Interface);\r
}\r
\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 ReportData Pointer to a buffer where the created report should be stored\r
+ * \param[in] HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced\r
+ * \param[in,out] ReportID Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID\r
+ * \param[out] ReportData Pointer to a buffer where the created report should be stored\r
+ * \param[out] ReportSize Number of bytes written in the report (or zero if no report is to be sent\r
*\r
- * \return Number of bytes written in the report (or zero if no report is to be sent\r
+ * \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent\r
*/\r
-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r
+bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\r
+ void* ReportData, uint16_t* ReportSize)\r
{\r
uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r
\r
if (JoyStatus_LCL & JOY_PRESS)\r
KeyboardReport->KeyCode[0] = 0x08; // E\r
- \r
- return sizeof(USB_KeyboardReport_Data_t);\r
+ \r
+ *ReportSize = sizeof(USB_KeyboardReport_Data_t);\r
+ return false;\r
}\r
else\r
{\r
if (JoyStatus_LCL & JOY_PRESS)\r
MouseReport->Button = (1 << 0);\r
\r
- return sizeof(USB_MouseReport_Data_t); \r
+ *ReportSize = sizeof(USB_MouseReport_Data_t);\r
+ return true; \r
}\r
}\r
\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 ReportData Pointer to a buffer where the created report has been stored\r
- * \param ReportSize Size in bytes of the received HID report\r
+ * \param[in] HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced\r
+ * \param[in] ReportID Report ID of the received report from the host\r
+ * \param[in] ReportData Pointer to a buffer where the created report has been stored\r
+ * \param[in] 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_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,\r
+ const void* ReportData, const uint16_t ReportSize)\r
{\r
if (HIDInterfaceInfo == &Keyboard_HID_Interface)\r
{\r
projects / pub / USBasp.git / blobdiff