Added multiple Report ID support to the HID class driver. Removed OUT endpoint support from HID driver (all OUT reports are now processed through control requests) as a seperate endpoint had issues with determining the exact output report length.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@570 d5102386-fcda-11dd-9fdb-3debd5008f28

1 files changed, 3 insertions, 5 deletions

diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c
index b933e450..172df7fa 100644
--- a/Demos/Device/GenericHID/GenericHID.c
+++ b/Demos/Device/GenericHID/GenericHID.c
@@ -47,9 +47,6 @@ USB_ClassInfo_HID_t Generic_HID_Interface =
 		.ReportINEndpointNumber  = GENERIC_IN_EPNUM,

 		.ReportINEndpointSize    = GENERIC_EPSIZE,

 		

-		.ReportOUTEndpointNumber = GENERIC_OUT_EPNUM,

-		.ReportOUTEndpointSize   = GENERIC_EPSIZE,

-		

 		.ReportINBufferSize      = GENERIC_REPORT_SIZE,

 

 		.UsingReportProtocol     = true,

@@ -133,7 +130,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  *

  *  \return Number of bytes written in the report (or zero if no report is to be sent

  */

-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData)

+uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)

 {

 	// Create generic HID report here

 	

@@ -146,7 +143,8 @@ uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceI
  *  \param ReportData  Pointer to a buffer where the created report has been stored

  *  \param ReportSize  Size in bytes of the received HID report

  */

-void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData, uint16_t ReportSize)

+void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,

+                                               void* ReportData, uint16_t ReportSize)

 {

 	// Process received generic HID report here

 }