Changeset 3a6e423 in mainline for uspace/drv/usbhid/subdrivers.c

Timestamp:

2011-05-08T19:38:24Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7aaf403e

Parents:

7b6f116

Message:

Parsing of usages in case of array items repaired

File:

• uspace/drv/usbhid/subdrivers.c (modified) (4 diffs)

uspace/drv/usbhid/subdrivers.c

@@ -42 +42 @@
 
 static usb_hid_subdriver_usage_t path_kbd[] = {
-        {USB_HIDUT_PAGE_KEYBOARD, 0}, 
+        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD}, 
         {0, 0}
 };
 
 static usb_hid_subdriver_usage_t path_mouse2[] = {
-        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_X},
+        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE}, 
         {0, 0}
 };
@@ -59 +59 @@
         {
                 path_kbd,
-                -1,
-                USB_HID_PATH_COMPARE_END 
-                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                0,
+                USB_HID_PATH_COMPARE_BEGIN,
                 -1,
                 -1,
@@ -75 +74 @@
                 lgtch_path,
                 1,
-                USB_HID_PATH_COMPARE_END 
-                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                USB_HID_PATH_COMPARE_BEGIN
+                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,         
                 0x046d,
                 0xc30e,
@@ -88 +87 @@
         {
                 path_mouse2,
-                -1,
-                USB_HID_PATH_COMPARE_END 
-                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                0,
+                USB_HID_PATH_COMPARE_BEGIN,
                 -1,
                 -1,