Ticket #17699: hid_report_size_calc_fix.patch

src/add-ons/kernel/drivers/input/hid_shared/HIDParser.cpp

@@ -430 +430 @@
 
 size_t
 HIDParser::MaxReportSize()
+{
+    return MaxReportSize(HID_REPORT_TYPE_ANY);
+}
+
+size_t
+HIDParser::MaxReportSize(uint8 type)
 {
     size_t maxSize = 0;
     for (int32 i = 0; i < fReports.Count(); i++) {
         HIDReport *report = fReports[i];
         if (report == NULL)
             continue;
+        
+        if (type != HID_REPORT_TYPE_ANY && report->Type() != type)
+            continue;
 
         if (report->ReportSize() > maxSize)
             maxSize = report->ReportSize();

src/add-ons/kernel/drivers/input/hid_shared/HIDParser.h

@@ -30 +30 @@
         uint8                   CountReports(uint8 type);
         HIDReport *             ReportAt(uint8 type, uint8 index);
         size_t                  MaxReportSize();
+        size_t                  MaxReportSize(uint8 type);
 
         HIDCollection *         RootCollection() { return fRootCollection; };
 

src/add-ons/kernel/drivers/input/hid_shared/KeyboardProtocolHandler.cpp

@@ -110 +110 @@
 #ifdef USB_KDL
         sDebugKeyboardPipe = fInputReport.Device()->InterruptPipe();
 #endif
-        sDebugKeyboardReportSize = fInputReport.Parser()->MaxReportSize();
+        sDebugKeyboardReportSize = fInputReport.Parser()->MaxReportSize(HID_REPORT_TYPE_INPUT);
         if (outputReport != NULL)
             sDebugKeyboardFound = true;
     }
@@ -794 +794 @@
                         = fInputReport.Device()->InterruptPipe();
 #endif
                     sDebugKeyboardReportSize
-                        = fInputReport.Parser()->MaxReportSize();
+                        = fInputReport.Parser()->MaxReportSize(HID_REPORT_TYPE_INPUT);
 #endif
 
                     char letter = current[i] - 4 + 'a';

src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp

@@ -181 +181 @@
         return;
     }
 
-    fTransferBufferSize = fParser.MaxReportSize();
+    fTransferBufferSize = fParser.MaxReportSize(HID_REPORT_TYPE_INPUT);
     if (fTransferBufferSize == 0) {
         TRACE_ALWAYS("report claims a report size of 0\n");
         return;