Ticket #5136: usb_hid.patch

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

@@ -10 +10 @@
 #include "HIDDevice.h"
 #include "HIDReport.h"
 #include "HIDReportItem.h"
+#include "HIDCollection.h"
 
 #include <new>
 #include <string.h>
@@ -55 +56 @@
 {
     HIDParser *parser = device->Parser();
 
+    HIDCollection *rootCollection = parser->RootCollection();
+    if (rootCollection == NULL)
+        return NULL;
+
+    uint32 usage = rootCollection->ExtendedUsage();
+    if ((usage >> 16) != HID_USAGE_PAGE_GENERIC_DESKTOP)
+        return NULL;
+    if ((usage & 0xffff) != HID_USAGE_ID_MOUSE)
+        return NULL;
+
     // try to find at least an x and y axis
     HIDReport *report = NULL;
     HIDReportItem *xAxis = NULL;

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

@@ -99 +99 @@
             {
                 main_item_data *mainData = (main_item_data *)&data;
                 if (item->tag == ITEM_TAG_MAIN_COLLECTION) {
+                    localState.usage_stack = usageStack;
+                    localState.usage_stack_used = usageStackUsed;
+
                     HIDCollection *newCollection
                         = new(std::nothrow) HIDCollection(collection,
                             (uint8)data, globalState, localState);

src/add-ons/kernel/drivers/input/usb_hid/HIDCollection.h

@@ -28 +28 @@
 
         void                    PrintToStream(uint32 indentLevel = 0);
 
+        uint32                  ExtendedUsage() { return fUsage; };
+
 private:
         HIDCollection *         fParent;