Changeset 252cf2a in mainline for uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c

Timestamp:

2011-05-08T15:53:44Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

f55ded3

Parents:

cc5908e

Message:

Development changes merge
Correct parsing of usages in case of array items

File:

• uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c (modified) (4 diffs)

uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c

@@ -180 +180 @@
  * @param key Key code of the key according to HID Usage Tables.
  */
+/*
 static void usb_lgtch_push_ev(usb_hid_dev_t *hid_dev, int type, 
     unsigned int key)
@@ -206 +207 @@
             ev.mods, ev.c);
 }
-
+*/
 /*----------------------------------------------------------------------------*/
 
@@ -396 +397 @@
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
-            hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END 
+            hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_BEGIN 
             | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
             USB_HID_REPORT_TYPE_INPUT);
         
-        unsigned int key;
+//      unsigned int key;
         
         /*! @todo Is this iterating OK if done multiple times? 
@@ -409 +410 @@
                     field->usage);
                 
-                key = usb_lgtch_map_usage(field->usage);
-                usb_lgtch_push_ev(hid_dev, KEY_PRESS, key);
+//              key = usb_lgtch_map_usage(field->usage);
+//              usb_lgtch_push_ev(hid_dev, KEY_PRESS, key);
                 
                 field = usb_hid_report_get_sibling(
-                    hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
+                    hid_dev->report, field, path, USB_HID_PATH_COMPARE_BEGIN
                     | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
                     USB_HID_REPORT_TYPE_INPUT);