Changeset a694a58 in mainline for uspace/drv/usbkbd/kbddev.c
- Timestamp:
- 2011-04-07T21:18:37Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- cf81757
- Parents:
- c156c2d
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/usbkbd/kbddev.c
rc156c2d ra694a58 128 128 0x15, 0x00, // Logical Minimum (0), 129 129 0x25, 0x01, // Logical Maximum (1), 130 //0x85, 0x00, // Report ID, 131 //0xA4, // Push 130 132 0x81, 0x02, // Input (Data, Variable, Absolute), ; Modifier byte 131 0x95, 0x01, // Report Count (1), 132 0x75, 0x08, // Report Size (8), 133 //0xB4, // Pop 134 0x75, 0x08, // Report Size (1), 135 0x95, 0x01, // Report Count (8), 133 136 0x81, 0x01, // Input (Constant), ; Reserved byte 134 137 0x95, 0x05, // Report Count (5), … … 557 560 assert(kbd_dev != NULL); 558 561 559 usb_log_debug("Got keys from parser : %s\n",562 usb_log_debug("Got keys from parser (report id: %d): %s\n", modifiers, 560 563 usb_debug_str_buffer(key_codes, count, 0)); 561 564 … … 608 611 usb_hid_report_path_t *path = usb_hid_report_path(); 609 612 usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); 610 611 int rc = usb_hid_parse_report(kbd_dev->parser, buffer, 613 614 uint8_t *tmp_buf = malloc((actual_size+1)*sizeof(uint8_t)); 615 tmp_buf[0] = 0x00; 616 memcpy(tmp_buf+1, buffer, actual_size); 617 618 int rc = usb_hid_parse_report(kbd_dev->parser, tmp_buf, 612 619 actual_size, path, USB_HID_PATH_COMPARE_STRICT, callbacks, kbd_dev); 613 620 … … 730 737 731 738 /* Get the report descriptor and parse it. */ 732 rc = usb_hid_process_report_descriptor(kbd_dev->usb_dev,733 kbd_dev->parser);734 if ( rc != EOK) {739 //rc = usb_hid_process_report_descriptor(kbd_dev->usb_dev, 740 // kbd_dev->parser); 741 if (true || rc != EOK) { 735 742 usb_log_warning("Could not process report descriptor, " 736 743 "falling back to boot protocol.\n"); … … 776 783 kbd_dev->output_size = 0; 777 784 kbd_dev->output_buffer = usb_hid_report_output(kbd_dev->parser, 778 &kbd_dev->output_size );785 &kbd_dev->output_size, 0x00); 779 786 if (kbd_dev->output_buffer == NULL) { 780 787 usb_log_warning("Error creating output report buffer.\n"); … … 788 795 usb_hid_report_path_append_item( 789 796 kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0); 797 usb_hid_report_path_set_report_id(kbd_dev->led_path, 0x00); 790 798 791 799 kbd_dev->led_output_size = usb_hid_report_output_size(kbd_dev->parser,
Note:
See TracChangeset
for help on using the changeset viewer.