Fix demos based on the device mode HID class driver, as well as the driver itself. Changed HID device class driver to require the user to give a buffer and size to hold the previously generated report, for comparison purposes, and altered the prototype of the CALLBACK_HID_Device_CreateHIDReport() function so that reports can be sent to the host even if there are no apparent changes (useful for relative movements in mice, etc.).

2 files changed, 16 insertions, 7 deletions

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
index 4315723f4..9db30cebf 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@ -36,6 +36,9 @@
 

 #include "GenericHID.h"

 

+/** Buffer to hold the previously generated HID report, for comparison purposes inside the HID class driver. */

+uint8_t PrevHIDReportBuffer[GENERIC_REPORT_SIZE];

+

 /** 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.

@@ -48,6 +51,9 @@ USB_ClassInfo_HID_Device_t Generic_HID_Interface =
 

 				.ReportINEndpointNumber  = GENERIC_IN_EPNUM,

 				.ReportINEndpointSize    = GENERIC_EPSIZE,

+				

+				.PrevReportINBuffer      = PrevHIDReportBuffer,

+				.PrevReportINBufferSize  = sizeof(PrevHIDReportBuffer),

 			},

 	};

 

@@ -126,14 +132,17 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  *  \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_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, void* ReportData)

+bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,

+                                         void* ReportData, uint16_t* ReportSize)

 {

 	// Create generic HID report here

 	

-	return 0;

+	*ReportSize = 0;

+	return true;

 }

 

 /** HID class driver callback function for the processing of HID reports from the host.

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.h b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
index 6d5de7177..50a92ec1e 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.h
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
@@ -72,9 +72,9 @@
 		void EVENT_USB_ConfigurationChanged(void);

 		void EVENT_USB_UnhandledControlPacket(void);

 

-		uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,

-		                                             void* ReportData);

-		void     CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, 

-		                                              const void* ReportData, const uint16_t ReportSize);

+		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const 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);

 		

 #endif