Changeset bf75e3cb in mainline for uspace/srv/hid/console/console.c
- Timestamp:
- 2011-01-26T20:22:21Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4e7d3dd, 5b7a107, 875c629
- Parents:
- a0ce870 (diff), 4fe94c66 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/console/console.c
ra0ce870 rbf75e3cb 726 726 727 727 /* NB: The callback connection is slotted for removal */ 728 sysarg_t taskhash; 728 729 sysarg_t phonehash; 729 if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) { 730 if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &taskhash, 731 &phonehash) != 0) { 730 732 printf(NAME ": Failed to create callback from input device\n"); 731 733 return false; 732 734 } 733 735 734 async_new_connection( phonehash, 0, NULL, keyboard_events);736 async_new_connection(taskhash, phonehash, 0, NULL, keyboard_events); 735 737 736 738 /* Connect to mouse device */ … … 749 751 } 750 752 751 if (ipc_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) { 753 if (ipc_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, &taskhash, 754 &phonehash) != 0) { 752 755 printf(NAME ": Failed to create callback from mouse device\n"); 753 756 mouse_phone = -1; … … 755 758 } 756 759 757 async_new_connection( phonehash, 0, NULL, mouse_events);760 async_new_connection(taskhash, phonehash, 0, NULL, mouse_events); 758 761 skip_mouse: 759 762
Note:
See TracChangeset
for help on using the changeset viewer.