Changeset e84d65a in mainline
- Timestamp:
- 2010-12-25T17:12:54Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 5f7d96e, dffabf0
- Parents:
- 467bf40 (diff), f8b00f1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Location:
- uspace
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/usbkbd/main.c
r467bf40 re84d65a 29 29 #include <driver.h> 30 30 #include <ipc/driver.h> 31 #include <ipc/kbd.h> 32 #include <io/keycode.h> 33 #include <io/console.h> 31 34 #include <errno.h> 32 35 #include <fibril.h> … … 41 44 #define GUESSED_POLL_ENDPOINT 1 42 45 46 static void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *); 47 static device_ops_t keyboard_ops = { 48 .default_handler = default_connection_handler 49 }; 50 51 static int console_callback_phone = -1; 52 53 /** Default handler for IPC methods not handled by DDF. 54 * 55 * @param dev Device handling the call. 56 * @param icallid Call id. 57 * @param icall Call data. 58 */ 59 void default_connection_handler(device_t *dev, 60 ipc_callid_t icallid, ipc_call_t *icall) 61 { 62 sysarg_t method = IPC_GET_IMETHOD(*icall); 63 64 if (method == IPC_M_CONNECT_TO_ME) { 65 int callback = IPC_GET_ARG5(*icall); 66 67 if (console_callback_phone != -1) { 68 ipc_answer_0(icallid, ELIMIT); 69 return; 70 } 71 72 console_callback_phone = callback; 73 ipc_answer_0(icallid, EOK); 74 return; 75 } 76 77 ipc_answer_0(icallid, EINVAL); 78 } 79 80 static void send_key(int key, int type, wchar_t c) { 81 async_msg_4(console_callback_phone, KBD_EVENT, type, key, 82 KM_NUM_LOCK, c); 83 } 84 85 static void send_alnum(int key, wchar_t c) { 86 printf(NAME ": sending key '%lc' to console\n", (wint_t) c); 87 send_key(key, KEY_PRESS, c); 88 send_key(key, KEY_RELEASE, c); 89 } 90 43 91 /* 44 92 * Callbacks for parser … … 183 231 sizeof(usb_hid_report_in_callbacks_t)); 184 232 callbacks->keyboard = usbkbd_process_keycodes; 233 234 if (console_callback_phone != -1) { 235 static size_t counter = 0; 236 counter++; 237 if (counter > 3) { 238 counter = 0; 239 send_alnum(KC_A, L'a'); 240 } 241 } 185 242 186 243 usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, … … 289 346 fibril_add_ready(fid); 290 347 348 dev->ops = &keyboard_ops; 349 350 add_device_to_class(dev, "keyboard"); 351 291 352 /* 292 353 * Hurrah, device is initialized. -
uspace/drv/vhc/hcd.c
r467bf40 re84d65a 72 72 73 73 /* 74 * Initialize address management.75 */76 address_init();77 78 /*79 74 * Initialize our hub and announce its presence. 80 75 */ … … 108 103 printf(NAME ": virtual USB host controller driver.\n"); 109 104 105 /* 106 * Initialize address management. 107 */ 108 address_init(); 109 110 /* 111 * Run the transfer scheduler. 112 */ 110 113 hc_manager(); 111 114 115 /* 116 * We are also a driver within devman framework. 117 */ 112 118 return driver_main(&vhc_driver); 113 119 } -
uspace/lib/c/include/ipc/kbd.h
r467bf40 re84d65a 39 39 40 40 #include <ipc/ipc.h> 41 #include <ipc/dev_iface.h> 41 42 42 43 typedef enum { 43 KBD_YIELD = IPC_FIRST_USER_METHOD,44 KBD_YIELD = DEV_FIRST_CUSTOM_METHOD, 44 45 KBD_RECLAIM 45 46 } kbd_request_t; -
uspace/srv/hid/console/console.c
r467bf40 re84d65a 317 317 static void change_console(console_t *cons) 318 318 { 319 if (cons == active_console) 319 if (cons == active_console) { 320 320 return; 321 } 321 322 322 323 fb_pending_flush(); … … 458 459 if (IPC_GET_ARG1(call) == 1) { 459 460 int newcon = gcons_mouse_btn((bool) IPC_GET_ARG2(call)); 460 if (newcon != -1) 461 if (newcon != -1) { 461 462 change_console(&consoles[newcon]); 463 } 462 464 } 463 465 retval = 0; … … 710 712 } 711 713 712 static bool console_init(char *input) 713 { 714 /* Connect to input device */ 715 int input_fd = open(input, O_RDONLY); 716 if (input_fd < 0) { 717 printf(NAME ": Failed opening %s\n", input); 718 return false; 719 } 720 721 kbd_phone = fd_phone(input_fd); 722 if (kbd_phone < 0) { 714 static int connect_keyboard(char *path) 715 { 716 int fd = open(path, O_RDONLY); 717 if (fd < 0) { 718 return fd; 719 } 720 721 int phone = fd_phone(fd); 722 if (phone < 0) { 723 723 printf(NAME ": Failed to connect to input device\n"); 724 return false;724 return phone; 725 725 } 726 726 727 727 /* NB: The callback connection is slotted for removal */ 728 728 sysarg_t phonehash; 729 if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) { 729 int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, SERVICE_CONSOLE, 730 0, 0, NULL, NULL, NULL, NULL, &phonehash); 731 if (rc != EOK) { 730 732 printf(NAME ": Failed to create callback from input device\n"); 733 return rc; 734 } 735 736 async_new_connection(phonehash, 0, NULL, keyboard_events); 737 738 printf(NAME ": we got a hit (new keyboard \"%s\").\n", path); 739 740 return phone; 741 } 742 743 744 static int check_new_keyboards(void *arg) 745 { 746 char *class_name = (char *) arg; 747 748 int index = 1; 749 750 while (true) { 751 async_usleep(1 * 500 * 1000); 752 char *path; 753 int rc = asprintf(&path, "/dev/class/%s\\%d", class_name, index); 754 if (rc < 0) { 755 continue; 756 } 757 rc = 0; 758 rc = connect_keyboard(path); 759 if (rc > 0) { 760 /* We do not allow unplug. */ 761 index++; 762 } 763 764 free(path); 765 } 766 767 return EOK; 768 } 769 770 771 /** Start a fibril monitoring hot-plugged keyboards. 772 */ 773 static void check_new_keyboards_in_background() 774 { 775 fid_t fid = fibril_create(check_new_keyboards, (void *)"keyboard"); 776 if (!fid) { 777 printf(NAME ": failed to create hot-plug-watch fibril.\n"); 778 return; 779 } 780 fibril_add_ready(fid); 781 } 782 783 static bool console_init(char *input) 784 { 785 /* Connect to input device */ 786 kbd_phone = connect_keyboard(input); 787 if (kbd_phone < 0) { 731 788 return false; 732 789 } 733 734 async_new_connection(phonehash, 0, NULL, keyboard_events); 735 790 736 791 /* Connect to mouse device */ 737 792 mouse_phone = -1; … … 749 804 } 750 805 806 sysarg_t phonehash; 751 807 if (ipc_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) { 752 808 printf(NAME ": Failed to create callback from mouse device\n"); … … 841 897 async_set_interrupt_received(interrupt_received); 842 898 899 /* Start fibril for checking on hot-plugged keyboards. */ 900 check_new_keyboards_in_background(); 901 843 902 return true; 844 903 } … … 860 919 if (!console_init(argv[1])) 861 920 return -1; 862 921 863 922 printf(NAME ": Accepting connections\n"); 864 923 async_manager();
Note:
See TracChangeset
for help on using the changeset viewer.