Added new ReportType parameter to the HID Device Class driver CALLBACK_HID_Device_CreateHIDReport() callback to indicate the report type to generate.

17 files changed, 21 insertions, 16 deletions

diff --git a/Demos/Device/ClassDriver/CDCMouse/CDCMouse.c b/Demos/Device/ClassDriver/CDCMouse/CDCMouse.c
index e21e0bcb4..3c7fe5b81 100644
--- a/Demos/Device/ClassDriver/CDCMouse/CDCMouse.c
+++ b/Demos/Device/ClassDriver/CDCMouse/CDCMouse.c
@@ -198,7 +198,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent

  */

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

-                                         void* ReportData, uint16_t* ReportSize)

+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)

 {

 	USB_MouseReport_Data_t* MouseReport = (USB_MouseReport_Data_t*)ReportData;

 		

diff --git a/Demos/Device/ClassDriver/CDCMouse/CDCMouse.h b/Demos/Device/ClassDriver/CDCMouse/CDCMouse.h
index 002fe3be9..bee1b0435 100644
--- a/Demos/Device/ClassDriver/CDCMouse/CDCMouse.h
+++ b/Demos/Device/ClassDriver/CDCMouse/CDCMouse.h
@@ -76,7 +76,7 @@
 		void EVENT_USB_Device_StartOfFrame(void);

 

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

-                                                 void* ReportData, uint16_t* ReportSize);

+                                                 const uint8_t ReportType, 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

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
index 5e265805f..7ff886e73 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@ -142,7 +142,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent

  */

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

-                                         void* ReportData, uint16_t* ReportSize)

+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)

 {

 	if (HIDReportEcho.ReportID)

 	  *ReportID = HIDReportEcho.ReportID;

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.h b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
index 004daf54a..4a13c426f 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.h
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
@@ -72,7 +72,7 @@
 		void EVENT_USB_Device_StartOfFrame(void);

 

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

-                                                 void* ReportData, uint16_t* ReportSize);

+                                                 const uint8_t ReportType, 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);

 		

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.c b/Demos/Device/ClassDriver/Joystick/Joystick.c
index 00bcb6fe4..987fe1055 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.c
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.c
@@ -136,7 +136,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent

  */

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

-                                         void* ReportData, uint16_t* ReportSize)

+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)

 {

 	USB_JoystickReport_Data_t* JoystickReport = (USB_JoystickReport_Data_t*)ReportData;

 	

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.h b/Demos/Device/ClassDriver/Joystick/Joystick.h
index d25ccc139..c87c1c6ed 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.h
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.h
@@ -85,7 +85,7 @@
 		void EVENT_USB_Device_StartOfFrame(void);

 

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

-                                                 void* ReportData, uint16_t* ReportSize);

+                                                 const uint8_t ReportType, 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);

 

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
index 002d24ac9..5ba15cdd9 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
@@ -137,7 +137,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent

  */

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

-                                         void* ReportData, uint16_t* ReportSize)

+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)

 {

 	USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;

 	

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.h b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
index c6310cf9c..098501c66 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.h
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
@@ -77,7 +77,7 @@
 		void EVENT_USB_Device_StartOfFrame(void);

 

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

-                                                 void* ReportData, uint16_t* ReportSize);

+                                                 const uint8_t ReportType, 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);

 

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
index caa33f907..8db728339 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -165,7 +165,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent

  */

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

-                                         void* ReportData, uint16_t* ReportSize)

+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)

 {

 	uint8_t JoyStatus_LCL    = Joystick_GetStatus();

 	uint8_t ButtonStatus_LCL = Buttons_GetStatus();

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
index a9368a4de..8c73521b4 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
@@ -71,7 +71,7 @@
 		void EVENT_USB_Device_StartOfFrame(void);

 

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

-                                                 void* ReportData, uint16_t* ReportSize);

+                                                 const uint8_t ReportType, 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);

 		

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
index 4e68f5c97..3d734e0e4 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
@@ -187,7 +187,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent

  */

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

-                                         void* ReportData, uint16_t* ReportSize)

+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)

 {

 	USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;

 	

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h
index 3ca03f105..c82fb7836 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h
@@ -91,7 +91,7 @@
 		bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

 

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

-                                                 void* ReportData, uint16_t* ReportSize);

+                                                 const uint8_t ReportType, 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);

 

diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.c b/Demos/Device/ClassDriver/Mouse/Mouse.c
index c29cc15ef..36ef71bf9 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.c
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.c
@@ -136,7 +136,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent

  */

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

-                                         void* ReportData, uint16_t* ReportSize)

+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)

 {

 	USB_MouseReport_Data_t* MouseReport = (USB_MouseReport_Data_t*)ReportData;

 		

diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.h b/Demos/Device/ClassDriver/Mouse/Mouse.h
index 635736d0f..6ab919f25 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.h
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.h
@@ -76,7 +76,7 @@
 		void EVENT_USB_Device_StartOfFrame(void);

 

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

-                                                 void* ReportData, uint16_t* ReportSize);

+                                                 const uint8_t ReportType, 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);

 

diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c
index 47a191350..532b1a1a2 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c
@@ -104,7 +104,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent

  */

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

-                                         void* ReportData, uint16_t* ReportSize)

+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)

 {

 	USB_MouseReport_Data_t* MouseReport = (USB_MouseReport_Data_t*)ReportData;

 		

diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.h b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.h
index 5fc2d84e9..37026df97 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.h
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.h
@@ -43,6 +43,11 @@
 		extern USB_ClassInfo_HID_Device_t Mouse_HID_Device_Interface;

 		

 	/* Function Prototypes: */

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

+                                                 const uint8_t ReportType, 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);

+

 		void EVENT_USB_Device_Connect(void);

 		void EVENT_USB_Device_Disconnect(void);

 		void EVENT_USB_Device_ConfigurationChanged(void);

diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
index a503f1c7c..eb0252ac7 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
@@ -50,7 +50,7 @@ USB_ClassInfo_HID_Host_t Mouse_HID_Host_Interface =
 				.HIDInterfaceProtocol   = HID_BOOT_MOUSE_PROTOCOL,

 			},

 	};

-	

+

 

 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and

  *  starts the library USB task to begin the enumeration and USB management process.