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

Timestamp:

2011-04-22T09:26:50Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

7304663

Parents:

1553cbf (diff), 1775ebc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

new report structure and usbhid merge

File:

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

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

@@ -83 +83 @@
 
         uint8_t report_id;
-        int rc = usb_hid_parse_report(hid_dev->parser, buffer, buffer_size, &report_id);
+        
+        int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
+            &report_id);
         usb_hid_report_path_set_report_id(path, report_id);
 
-        usb_hid_report_field_t *field = usb_hid_report_get_sibling(hid_dev->parser, NULL, path, USB_HID_PATH_COMPARE_END , USB_HID_REPORT_TYPE_INPUT);
-        while(field != NULL) {
-                usb_log_debug("KEY VALUE(%X) USAGE(%X)\n", field->value, field->usage);
+        usb_hid_report_field_t *field = usb_hid_report_get_sibling(
+            hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END , 
+            USB_HID_REPORT_TYPE_INPUT);
+        
+        while (field != NULL) {
+                usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)\n", field->value, 
+                    field->usage);
         }
         
@@ -95 +101 @@
         
         if (rc != EOK) {
-                usb_log_warning("Error in usb_hid_boot_keyboard_input_report():"
+                usb_log_warning(NAME "Error in usb_hid_boot_keyboard_input_report():"
                     "%s\n", str_error(rc));
         }