Changeset 3a6e423 in mainline for uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.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/lgtch-ultrax/lgtch-ultrax.c (modified) (3 diffs)

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

@@ -300 +300 @@
         usb_hid_report_path_set_report_id(path, 1);
         
-        lgtch_dev->key_count = usb_hid_report_input_length(
-            hid_dev->report, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
+        lgtch_dev->key_count = usb_hid_report_size(
+            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT);
         usb_hid_report_path_free(path);
         
@@ -400 +399 @@
             USB_HID_REPORT_TYPE_INPUT);
         
-        unsigned int key;
+//      unsigned int key;
         
         /*! @todo Is this iterating OK if done multiple times? 
@@ -406 +405 @@
          */
         while (field != NULL) {
-                usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)\n", field->value, 
-                    field->usage);
+                if(field->value != 0) {
+                        usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)\n", field->value, 
+                            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, field->usage);
+                }
                 
                 field = usb_hid_report_get_sibling(