Changes in uspace/drv/usbhid/kbd/kbddev.c [7304663:4125b7d] in mainline
- File:
-
- 1 edited
-
uspace/drv/usbhid/kbd/kbddev.c (modified) (14 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/usbhid/kbd/kbddev.c
r7304663 r4125b7d 177 177 /*----------------------------------------------------------------------------*/ 178 178 179 //static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count,180 //uint8_t report_id, void *arg);181 182 //static const usb_hid_report_in_callbacks_t usb_kbd_parser_callbacks = {183 //.keyboard = usb_kbd_process_keycodes184 //};179 static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count, 180 uint8_t report_id, void *arg); 181 182 static const usb_hid_report_in_callbacks_t usb_kbd_parser_callbacks = { 183 .keyboard = usb_kbd_process_keycodes 184 }; 185 185 186 186 /*----------------------------------------------------------------------------*/ … … 299 299 return; 300 300 } 301 301 302 unsigned i = 0; 303 302 304 /* Reset the LED data. */ 303 305 memset(kbd_dev->led_data, 0, kbd_dev->led_output_size * sizeof(int32_t)); 304 usb_log_debug("Creating output report:\n"); 305 306 usb_hid_report_field_t *field = usb_hid_report_get_sibling( 307 hid_dev->report, NULL, kbd_dev->led_path, 308 USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY | USB_HID_PATH_COMPARE_END, 309 USB_HID_REPORT_TYPE_OUTPUT); 310 311 while (field != NULL) { 312 313 if ((field->usage == USB_HID_LED_NUM_LOCK) 314 && (kbd_dev->mods & KM_NUM_LOCK)){ 315 field->value = 1; 316 } 317 318 if ((field->usage == USB_HID_LED_CAPS_LOCK) 319 && (kbd_dev->mods & KM_CAPS_LOCK)){ 320 field->value = 1; 321 } 322 323 if ((field->usage == USB_HID_LED_SCROLL_LOCK) 324 && (kbd_dev->mods & KM_SCROLL_LOCK)){ 325 field->value = 1; 326 } 327 328 field = usb_hid_report_get_sibling(hid_dev->report, field, 329 kbd_dev->led_path, USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY 330 | USB_HID_PATH_COMPARE_END, USB_HID_REPORT_TYPE_OUTPUT); 331 } 332 333 // TODO: what about the Report ID? 334 int rc = usb_hid_report_output_translate(hid_dev->report, 0, 335 kbd_dev->output_buffer, kbd_dev->output_size); 306 307 if ((kbd_dev->mods & KM_NUM_LOCK) && (i < kbd_dev->led_output_size)) { 308 kbd_dev->led_data[i++] = USB_HID_LED_NUM_LOCK; 309 } 310 311 if ((kbd_dev->mods & KM_CAPS_LOCK) && (i < kbd_dev->led_output_size)) { 312 kbd_dev->led_data[i++] = USB_HID_LED_CAPS_LOCK; 313 } 314 315 if ((kbd_dev->mods & KM_SCROLL_LOCK) 316 && (i < kbd_dev->led_output_size)) { 317 kbd_dev->led_data[i++] = USB_HID_LED_SCROLL_LOCK; 318 } 319 320 // TODO: COMPOSE and KANA 321 322 usb_log_debug("Creating output report.\n"); 323 324 int rc = usb_hid_report_output_translate(hid_dev->parser, 325 kbd_dev->led_path, 326 USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 327 kbd_dev->output_buffer, 328 kbd_dev->output_size, kbd_dev->led_data, kbd_dev->led_output_size); 336 329 337 330 if (rc != EOK) { … … 492 485 */ 493 486 static void usb_kbd_check_key_changes(usb_hid_dev_t *hid_dev, 494 usb_kbd_t *kbd_dev /*, const uint8_t *key_codes, size_t count*/)487 usb_kbd_t *kbd_dev, const uint8_t *key_codes, size_t count) 495 488 { 496 489 unsigned int key; … … 506 499 */ 507 500 i = 0; 508 while (i < kbd_dev->key_count && kbd_dev->keys[i] != ERROR_ROLLOVER) {501 while (i < count && key_codes[i] != ERROR_ROLLOVER) { 509 502 ++i; 510 503 } 511 if (i != kbd_dev->key_count) {504 if (i != count) { 512 505 usb_log_debug("Phantom state occured.\n"); 513 506 // phantom state, do nothing 514 507 return; 515 508 } 509 510 /* TODO: quite dummy right now, think of better implementation */ 511 assert(count == kbd_dev->key_count); 516 512 517 513 /* 518 514 * 1) Key releases 519 515 */ 520 for (j = 0; j < kbd_dev->key_count; ++j) {516 for (j = 0; j < count; ++j) { 521 517 // try to find the old key in the new key list 522 518 i = 0; 523 519 while (i < kbd_dev->key_count 524 && k bd_dev->keys[i] != kbd_dev->keys_old[j]) {520 && key_codes[i] != kbd_dev->keys[j]) { 525 521 ++i; 526 522 } 527 523 528 if (i == kbd_dev->key_count) {524 if (i == count) { 529 525 // not found, i.e. the key was released 530 key = usbhid_parse_scancode(kbd_dev->keys _old[j]);526 key = usbhid_parse_scancode(kbd_dev->keys[j]); 531 527 if (!usb_kbd_is_lock(key)) { 532 528 usb_kbd_repeat_stop(kbd_dev, key); … … 545 541 // try to find the new key in the old key list 546 542 j = 0; 547 while (j < kbd_dev->key_count 548 && kbd_dev->keys_old[j] != kbd_dev->keys[i]) { 543 while (j < count && kbd_dev->keys[j] != key_codes[i]) { 549 544 ++j; 550 545 } 551 546 552 if (j == kbd_dev->key_count) {547 if (j == count) { 553 548 // not found, i.e. new key pressed 554 key = usbhid_parse_scancode(k bd_dev->keys[i]);549 key = usbhid_parse_scancode(key_codes[i]); 555 550 usb_log_debug2("Key pressed: %d (keycode: %d)\n", key, 556 kbd_dev->keys[i]); 557 usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, key); 551 key_codes[i]); 552 usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, 553 key); 558 554 if (!usb_kbd_is_lock(key)) { 559 555 usb_kbd_repeat_start(kbd_dev, key); … … 564 560 } 565 561 566 // usb_log_debug("Old keys: "); 567 // for (i = 0; i < kbd_dev->key_count; ++i) { 568 // usb_log_debug("%d ", kbd_dev->keys_old[i]); 569 // } 570 // usb_log_debug("\n"); 571 572 573 // usb_log_debug("New keys: "); 574 // for (i = 0; i < kbd_dev->key_count; ++i) { 575 // usb_log_debug("%d ", kbd_dev->keys[i]); 576 // } 577 // usb_log_debug("\n"); 578 579 memcpy(kbd_dev->keys_old, kbd_dev->keys, kbd_dev->key_count * 4); 580 581 usb_log_debug2("New stored keys: "); 582 for (i = 0; i < kbd_dev->key_count; ++i) { 583 usb_log_debug2("%d ", kbd_dev->keys_old[i]); 584 } 585 usb_log_debug2("\n"); 562 memcpy(kbd_dev->keys, key_codes, count); 563 564 usb_log_debug("New stored keycodes: %s\n", 565 usb_debug_str_buffer(kbd_dev->keys, kbd_dev->key_count, 0)); 586 566 } 587 567 … … 605 585 * @sa usb_kbd_check_key_changes(), usb_kbd_check_modifier_changes() 606 586 */ 607 //static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count,608 //uint8_t report_id, void *arg)609 //{610 //if (arg == NULL) {611 //usb_log_warning("Missing argument in callback "612 //"usbhid_process_keycodes().\n");613 //return;614 //}615 616 //usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;617 618 //if (hid_dev->data == NULL) {619 //usb_log_warning("Missing KBD device structure in callback.\n");620 //return;621 //}622 623 //usb_kbd_t *kbd_dev = (usb_kbd_t *)hid_dev->data;624 625 //usb_log_debug("Got keys from parser (report id: %u): %s\n",626 //report_id, usb_debug_str_buffer(key_codes, count, 0));627 628 //if (count != kbd_dev->key_count) {629 //usb_log_warning("Number of received keycodes (%zu) differs from"630 //" expected (%zu).\n", count, kbd_dev->key_count);631 //return;632 //}633 634 /////usb_kbd_check_modifier_changes(kbd_dev, key_codes, count);635 //usb_kbd_check_key_changes(hid_dev, kbd_dev, key_codes, count);636 //}587 static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count, 588 uint8_t report_id, void *arg) 589 { 590 if (arg == NULL) { 591 usb_log_warning("Missing argument in callback " 592 "usbhid_process_keycodes().\n"); 593 return; 594 } 595 596 usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg; 597 598 if (hid_dev->data == NULL) { 599 usb_log_warning("Missing KBD device structure in callback.\n"); 600 return; 601 } 602 603 usb_kbd_t *kbd_dev = (usb_kbd_t *)hid_dev->data; 604 605 usb_log_debug("Got keys from parser (report id: %u): %s\n", 606 report_id, usb_debug_str_buffer(key_codes, count, 0)); 607 608 if (count != kbd_dev->key_count) { 609 usb_log_warning("Number of received keycodes (%zu) differs from" 610 " expected (%zu).\n", count, kbd_dev->key_count); 611 return; 612 } 613 614 ///usb_kbd_check_modifier_changes(kbd_dev, key_codes, count); 615 usb_kbd_check_key_changes(hid_dev, kbd_dev, key_codes, count); 616 } 637 617 638 618 /*----------------------------------------------------------------------------*/ … … 658 638 uint8_t *buffer, size_t actual_size) 659 639 { 660 assert(hid_dev->report != NULL); 661 assert(hid_dev != NULL); 662 assert(hid_dev->data != NULL); 663 664 usb_kbd_t *kbd_dev = (usb_kbd_t *)hid_dev->data; 640 assert(hid_dev->parser != NULL); 665 641 666 642 usb_log_debug("Calling usb_hid_parse_report() with " … … 672 648 usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); 673 649 //usb_hid_report_path_set_report_id(path, 0); 674 675 uint8_t report_id; 676 int rc = usb_hid_parse_report(hid_dev->report, buffer, actual_size, 677 &report_id); 650 651 int rc = usb_hid_parse_report(hid_dev->parser, buffer, 652 actual_size, path, 653 USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 654 &usb_kbd_parser_callbacks, hid_dev); 655 656 usb_hid_report_path_free(path); 678 657 679 658 if (rc != EOK) { 680 usb_log_warning("Error in usb_hid_ parse_report():"659 usb_log_warning("Error in usb_hid_boot_keyboard_input_report():" 681 660 "%s\n", str_error(rc)); 682 661 } 683 684 usb_hid_report_path_set_report_id (path, report_id);685 686 // fill in the currently pressed keys687 688 usb_hid_report_field_t *field = usb_hid_report_get_sibling(689 hid_dev->report, NULL, path,690 USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,691 USB_HID_REPORT_TYPE_INPUT);692 unsigned i = 0;693 694 while (field != NULL) {695 usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n",696 field, field->value, field->usage);697 698 assert(i < kbd_dev->key_count);699 // if (i == kbd_dev->key_count) {700 // break;701 // }702 703 // save the key usage704 /* TODO: maybe it's not good to save value, nor usage705 * as the value may be e.g. 1 for LEDs and usage may be706 * value of the LED. On the other hand, in case of normal707 * keys, the usage is more important and we must check708 * that. One possible solution: distinguish between those709 * two parts of the Report somehow.710 */711 if( field->value != 0 ) {712 kbd_dev->keys[i] = field->usage;713 }714 else {715 kbd_dev->keys[i] = 0;716 }717 usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]);718 719 ++i;720 field = usb_hid_report_get_sibling(hid_dev->report, field, path,721 USB_HID_PATH_COMPARE_END722 | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,723 USB_HID_REPORT_TYPE_INPUT);724 }725 726 usb_hid_report_path_free(path);727 728 usb_kbd_check_key_changes(hid_dev, kbd_dev);729 662 } 730 663 … … 814 747 815 748 kbd_dev->key_count = usb_hid_report_input_length( 816 hid_dev-> report, path,749 hid_dev->parser, path, 817 750 USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY); 818 751 usb_hid_report_path_free(path); … … 820 753 usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count); 821 754 822 kbd_dev->keys = ( int32_t *)calloc(kbd_dev->key_count, sizeof(int32_t));755 kbd_dev->keys = (uint8_t *)calloc(kbd_dev->key_count, sizeof(uint8_t)); 823 756 824 757 if (kbd_dev->keys == NULL) { … … 828 761 } 829 762 830 kbd_dev->keys_old =831 (int32_t *)calloc(kbd_dev->key_count, sizeof(int32_t));832 833 if (kbd_dev->keys_old == NULL) {834 usb_log_fatal("No memory!\n");835 free(kbd_dev->keys);836 free(kbd_dev);837 return ENOMEM;838 }839 840 763 /* 841 764 * Output report 842 765 */ 843 766 kbd_dev->output_size = 0; 844 kbd_dev->output_buffer = usb_hid_report_output(hid_dev-> report,845 &kbd_dev->output_size , 0);846 if (kbd_dev->output_buffer == NULL ) {767 kbd_dev->output_buffer = usb_hid_report_output(hid_dev->parser, 768 &kbd_dev->output_size); 769 if (kbd_dev->output_buffer == NULL && kbd_dev->output_size != 0) { 847 770 usb_log_warning("Error creating output report buffer.\n"); 848 771 free(kbd_dev->keys); 849 return ENOMEM; /* TODO: other error code */ 772 free(kbd_dev); 773 return ENOMEM; 850 774 } 851 775 … … 856 780 kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0); 857 781 858 kbd_dev->led_output_size = usb_hid_report_output_size(hid_dev-> report,782 kbd_dev->led_output_size = usb_hid_report_output_size(hid_dev->parser, 859 783 kbd_dev->led_path, 860 784 USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY); … … 1013 937 int usb_kbd_set_boot_protocol(usb_hid_dev_t *hid_dev) 1014 938 { 1015 int rc = usb_hid_parse_report_descriptor(hid_dev-> report,939 int rc = usb_hid_parse_report_descriptor(hid_dev->parser, 1016 940 USB_KBD_BOOT_REPORT_DESCRIPTOR, 1017 941 USB_KBD_BOOT_REPORT_DESCRIPTOR_SIZE);
Note:
See TracChangeset
for help on using the changeset viewer.
