Changeset f240d30 in mainline
- Timestamp:
- 2011-04-21T21:12:09Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 1775ebc
- Parents:
- 6513110
- Location:
- uspace/drv
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/uhci-hcd/hc.c
r6513110 rf240d30 330 330 { 331 331 assert(instance); 332 //status |= 1; //Uncomment to work around qemu hang332 status |= 1; //Uncomment to work around qemu hang 333 333 /* Lower 2 bits are transaction error and transaction complete */ 334 334 if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) { -
uspace/drv/usbhid/kbd/kbddev.c
r6513110 rf240d30 676 676 int rc = usb_hid_parse_report(hid_dev->report, buffer, actual_size, 677 677 &report_id); 678 usb_hid_report_path_set_report_id (path, report_id);679 680 usb_hid_report_field_t *field = usb_hid_report_get_sibling(681 hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END682 | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT);683 684 usb_hid_report_path_free(path);685 678 686 679 if (rc != EOK) { … … 689 682 } 690 683 684 usb_hid_report_path_set_report_id (path, report_id); 685 691 686 // fill in the currently pressed keys 692 687 693 field = usb_hid_report_get_sibling(hid_dev->report, NULL, path, 688 usb_hid_report_field_t *field = usb_hid_report_get_sibling( 689 hid_dev->report, NULL, path, 694 690 USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 695 691 USB_HID_REPORT_TYPE_INPUT); 696 692 unsigned i = 0; 697 693 698 // TODO: remove this hack - skipping first field699 field = usb_hid_report_get_sibling(hid_dev->report, field, path,700 USB_HID_PATH_COMPARE_END701 | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,702 USB_HID_REPORT_TYPE_INPUT);703 704 694 while (field != NULL) { 705 695 usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", 706 field, field->value, field-> usage);696 field, field->value, field->value); 707 697 708 698 assert(i < kbd_dev->key_count); … … 712 702 713 703 // save the key usage 714 kbd_dev->keys[i] = field-> usage;704 kbd_dev->keys[i] = field->value; 715 705 usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]); 716 706 -
uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c
r6513110 rf240d30 93 93 94 94 while (field != NULL) { 95 usb_log_debug( "KEY VALUE(%X) USAGE(%X)\n", field->value,95 usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)\n", field->value, 96 96 field->usage); 97 97 } … … 101 101 102 102 if (rc != EOK) { 103 usb_log_warning( "Error in usb_hid_boot_keyboard_input_report():"103 usb_log_warning(NAME "Error in usb_hid_boot_keyboard_input_report():" 104 104 "%s\n", str_error(rc)); 105 105 }
Note:
See TracChangeset
for help on using the changeset viewer.