X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/c75f8bf2236bc69511d0ff0bc79bfaf1f62e3bfd..a459f10b0c1a3e02f160ff3a1a2a0b45ae5b69a7:/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c index 30e90f4a9..e21999049 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c +++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c @@ -37,21 +37,29 @@ #include "KeyboardMouse.h" +/** Buffer to hold the previously generated Keyboard HID report, for comparison purposes inside the HID class driver. */ +uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)]; + +/** Buffer to hold the previously generated Mouse HID report, for comparison purposes inside the HID class driver. */ +uint8_t PrevMouseHIDReportBuffer[sizeof(USB_MouseReport_Data_t)]; + /** LUFA HID Class driver interface configuration and state information. This structure is * passed to all HID Class driver functions, so that multiple instances of the same class * within a device can be differentiated from one another. This is for the keyboard HID * interface within the device. */ -USB_ClassInfo_HID_t Keyboard_HID_Interface = +USB_ClassInfo_HID_Device_t Keyboard_HID_Interface = { - .InterfaceNumber = 0, + .Config = + { + .InterfaceNumber = 0, - .ReportINEndpointNumber = KEYBOARD_IN_EPNUM, - .ReportINEndpointSize = HID_EPSIZE, - - .ReportINBufferSize = sizeof(USB_KeyboardReport_Data_t), + .ReportINEndpointNumber = KEYBOARD_IN_EPNUM, + .ReportINEndpointSize = HID_EPSIZE, - .IdleCount = 500, + .PrevReportINBuffer = PrevKeyboardHIDReportBuffer, + .PrevReportINBufferSize = sizeof(PrevKeyboardHIDReportBuffer), + }, }; /** LUFA HID Class driver interface configuration and state information. This structure is @@ -59,14 +67,18 @@ USB_ClassInfo_HID_t Keyboard_HID_Interface = * within a device can be differentiated from one another. This is for the mouse HID * interface within the device. */ -USB_ClassInfo_HID_t Mouse_HID_Interface = +USB_ClassInfo_HID_Device_t Mouse_HID_Interface = { - .InterfaceNumber = 0, + .Config = + { + .InterfaceNumber = 0, - .ReportINEndpointNumber = MOUSE_IN_EPNUM, - .ReportINEndpointSize = HID_EPSIZE, + .ReportINEndpointNumber = MOUSE_IN_EPNUM, + .ReportINEndpointSize = HID_EPSIZE, - .ReportINBufferSize = sizeof(USB_MouseReport_Data_t), + .PrevReportINBuffer = PrevMouseHIDReportBuffer, + .PrevReportINBufferSize = sizeof(PrevMouseHIDReportBuffer), + }, }; /** Main program entry point. This routine contains the overall program flow, including initial @@ -109,19 +121,19 @@ void SetupHardware() } /** Event handler for the library USB Connection event. */ -void EVENT_USB_Connect(void) +void EVENT_USB_Device_Connect(void) { LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** Event handler for the library USB Disconnection event. */ -void EVENT_USB_Disconnect(void) +void EVENT_USB_Device_Disconnect(void) { LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** Event handler for the library USB Configuration Changed event. */ -void EVENT_USB_ConfigurationChanged(void) +void EVENT_USB_Device_ConfigurationChanged(void) { LEDs_SetAllLEDs(LEDMASK_USB_READY); @@ -132,32 +144,31 @@ void EVENT_USB_ConfigurationChanged(void) LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } -/** Event handler for the library USB Unhandled Control Packet event. */ -void EVENT_USB_UnhandledControlPacket(void) +/** Event handler for the library USB Unhandled Control Request event. */ +void EVENT_USB_Device_UnhandledControlRequest(void) { - HID_Device_ProcessControlPacket(&Keyboard_HID_Interface); - HID_Device_ProcessControlPacket(&Mouse_HID_Interface); + HID_Device_ProcessControlRequest(&Keyboard_HID_Interface); + HID_Device_ProcessControlRequest(&Mouse_HID_Interface); } /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */ ISR(TIMER0_COMPA_vect, ISR_BLOCK) { - if (Keyboard_HID_Interface.IdleMSRemaining) - Keyboard_HID_Interface.IdleMSRemaining--; - - if (Mouse_HID_Interface.IdleMSRemaining) - Mouse_HID_Interface.IdleMSRemaining--; + HID_Device_MillisecondElapsed(&Keyboard_HID_Interface); + HID_Device_MillisecondElapsed(&Mouse_HID_Interface); } /** HID class driver callback function for the creation of HID reports to the host. * - * \param HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced - * \param ReportID Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID - * \param ReportData Pointer to a buffer where the created report should be stored + * \param[in] HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced + * \param[in,out] ReportID Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID + * \param[out] ReportData Pointer to a buffer where the created report should be stored + * \param[out] ReportSize Number of bytes written in the report (or zero if no report is to be sent * - * \return Number of bytes written in the report (or zero if no report is to be sent + * \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent */ -uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, + void* ReportData, uint16_t* ReportSize) { uint8_t JoyStatus_LCL = Joystick_GetStatus(); uint8_t ButtonStatus_LCL = Buttons_GetStatus(); @@ -182,8 +193,9 @@ uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_t* HIDInterfaceIn if (JoyStatus_LCL & JOY_PRESS) KeyboardReport->KeyCode[0] = 0x08; // E - - return sizeof(USB_KeyboardReport_Data_t); + + *ReportSize = sizeof(USB_KeyboardReport_Data_t); + return false; } else { @@ -206,19 +218,20 @@ uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_t* HIDInterfaceIn if (JoyStatus_LCL & JOY_PRESS) MouseReport->Button = (1 << 0); - return sizeof(USB_MouseReport_Data_t); + *ReportSize = sizeof(USB_MouseReport_Data_t); + return true; } } /** HID class driver callback function for the processing of HID reports from the host. * - * \param HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced - * \param ReportID Report ID of the received report from the host - * \param ReportData Pointer to a buffer where the created report has been stored - * \param ReportSize Size in bytes of the received HID report + * \param[in] HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced + * \param[in] ReportID Report ID of the received report from the host + * \param[in] ReportData Pointer to a buffer where the created report has been stored + * \param[in] ReportSize Size in bytes of the received HID report */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID, - void* ReportData, uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, + const void* ReportData, const uint16_t ReportSize) { if (HIDInterfaceInfo == &Keyboard_HID_Interface) {