Changeset f240d30 in mainline

Timestamp:

2011-04-21T21:12:09Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1775ebc

Parents:

6513110

Message:

Fixes

Location:

uspace/drv

Files:

• uhci-hcd/hc.c (modified) (1 diff)
• usbhid/kbd/kbddev.c (modified) (3 diffs)
• usbhid/lgtch-ultrax/lgtch-ultrax.c (modified) (2 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -330 +330 @@
 {
         assert(instance);
-//      status |= 1; //Uncomment to work around qemu hang
+        status |= 1; //Uncomment to work around qemu hang
         /* Lower 2 bits are transaction error and transaction complete */
         if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {

uspace/drv/usbhid/kbd/kbddev.c

@@ -676 +676 @@
         int rc = usb_hid_parse_report(hid_dev->report, buffer, actual_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->report, NULL, path, USB_HID_PATH_COMPARE_END 
-            | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT);
-
-        usb_hid_report_path_free(path);
         
         if (rc != EOK) {
@@ -689 +682 @@
         }
         
+        usb_hid_report_path_set_report_id (path, report_id);
+        
         // fill in the currently pressed keys
         
-        field = usb_hid_report_get_sibling(hid_dev->report, NULL, path, 
+        usb_hid_report_field_t *field = usb_hid_report_get_sibling(
+            hid_dev->report, NULL, path, 
             USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
             USB_HID_REPORT_TYPE_INPUT);
         unsigned i = 0;
         
-        // TODO: remove this hack - skipping first field
-        field = usb_hid_report_get_sibling(hid_dev->report, field, path, 
-            USB_HID_PATH_COMPARE_END 
-            | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
-            USB_HID_REPORT_TYPE_INPUT);
-        
         while (field != NULL) {
                 usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", 
-                    field, field->value, field->usage);
+                    field, field->value, field->value);
                 
                 assert(i < kbd_dev->key_count);
@@ -712 +702 @@
                 
                 // save the key usage
-                kbd_dev->keys[i] = field->usage;
+                kbd_dev->keys[i] = field->value;
                 usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]);
                 

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

@@ -93 +93 @@
         
         while (field != NULL) {
-                usb_log_debug("KEY VALUE(%X) USAGE(%X)\n", field->value, 
+                usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)\n", field->value, 
                     field->usage);
         }
@@ -101 +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));
         }