Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset f240d30 in mainline


Ignore:
Timestamp:
2011-04-21T21:12:09Z (11 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master
Children:
1775ebc
Parents:
6513110
Message:

Fixes

Location:
uspace/drv
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/uhci-hcd/hc.c

    r6513110 rf240d30  
    330330{
    331331        assert(instance);
    332 //      status |= 1; //Uncomment to work around qemu hang
     332        status |= 1; //Uncomment to work around qemu hang
    333333        /* Lower 2 bits are transaction error and transaction complete */
    334334        if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {
  • uspace/drv/usbhid/kbd/kbddev.c

    r6513110 rf240d30  
    676676        int rc = usb_hid_parse_report(hid_dev->report, buffer, actual_size,
    677677            &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_END
    682             | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT);
    683 
    684         usb_hid_report_path_free(path);
    685678       
    686679        if (rc != EOK) {
     
    689682        }
    690683       
     684        usb_hid_report_path_set_report_id (path, report_id);
     685       
    691686        // fill in the currently pressed keys
    692687       
    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,
    694690            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
    695691            USB_HID_REPORT_TYPE_INPUT);
    696692        unsigned i = 0;
    697693       
    698         // TODO: remove this hack - skipping first field
    699         field = usb_hid_report_get_sibling(hid_dev->report, field, path,
    700             USB_HID_PATH_COMPARE_END
    701             | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
    702             USB_HID_REPORT_TYPE_INPUT);
    703        
    704694        while (field != NULL) {
    705695                usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n",
    706                     field, field->value, field->usage);
     696                    field, field->value, field->value);
    707697               
    708698                assert(i < kbd_dev->key_count);
     
    712702               
    713703                // save the key usage
    714                 kbd_dev->keys[i] = field->usage;
     704                kbd_dev->keys[i] = field->value;
    715705                usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]);
    716706               
  • uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c

    r6513110 rf240d30  
    9393       
    9494        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,
    9696                    field->usage);
    9797        }
     
    101101       
    102102        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():"
    104104                    "%s\n", str_error(rc));
    105105        }
Note: See TracChangeset for help on using the changeset viewer.