Changeset 9934f7d in mainline for uspace/srv/hid
- Timestamp:
- 2011-06-13T19:53:48Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a07a454
- Parents:
- 43ac0cc
- Location:
- uspace/srv/hid
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/adb_mouse/adb_dev.c
r43ac0cc r9934f7d 48 48 #include "adb_dev.h" 49 49 50 static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall );50 static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall, void *arg); 51 51 52 52 int adb_dev_init(void) … … 68 68 69 69 /* NB: The callback connection is slotted for removal */ 70 if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) { 70 if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events, 71 NULL) != 0) { 71 72 printf(NAME ": Failed to create callback from device\n"); 72 73 return false; … … 76 77 } 77 78 78 static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall )79 static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall, void *arg) 79 80 { 80 81 /* Ignore parameters, the connection is already opened */ -
uspace/srv/hid/adb_mouse/adb_mouse.c
r43ac0cc r9934f7d 52 52 #include <kernel/ipc/ipc_methods.h> 53 53 54 static void client_connection(ipc_callid_t iid, ipc_call_t *icall );54 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg); 55 55 static void mouse_ev_btn(int button, int press); 56 56 static void mouse_ev_move(int dx, int dy); … … 94 94 } 95 95 96 static void client_connection(ipc_callid_t iid, ipc_call_t *icall )96 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) 97 97 { 98 98 ipc_callid_t callid; -
uspace/srv/hid/char_mouse/char_mouse.c
r43ac0cc r9934f7d 79 79 } 80 80 81 static void client_connection(ipc_callid_t iid, ipc_call_t *icall )81 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) 82 82 { 83 83 ipc_callid_t callid; -
uspace/srv/hid/char_mouse/chardev.c
r43ac0cc r9934f7d 45 45 #include <mouse_port.h> 46 46 47 static void chardev_events(ipc_callid_t iid, ipc_call_t *icall );47 static void chardev_events(ipc_callid_t iid, ipc_call_t *icall, void *arg); 48 48 49 49 static int dev_phone; … … 69 69 70 70 /* NB: The callback connection is slotted for removal */ 71 if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) { 71 if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, chardev_events, 72 NULL) != 0) { 72 73 printf(NAME ": Failed to create callback from device\n"); 73 74 return false; … … 90 91 } 91 92 92 static void chardev_events(ipc_callid_t iid, ipc_call_t *icall )93 static void chardev_events(ipc_callid_t iid, ipc_call_t *icall, void *arg) 93 94 { 94 95 /* Ignore parameters, the connection is already opened */ -
uspace/srv/hid/console/console.c
r43ac0cc r9934f7d 427 427 428 428 /** Handler for keyboard */ 429 static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall )429 static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall, void *arg) 430 430 { 431 431 /* Ignore parameters, the connection is already opened */ … … 474 474 475 475 /** Handler for mouse events */ 476 static void mouse_events(ipc_callid_t iid, ipc_call_t *icall )476 static void mouse_events(ipc_callid_t iid, ipc_call_t *icall, void *arg) 477 477 { 478 478 /* Ignore parameters, the connection is already opened */ … … 597 597 598 598 /** Default thread for new connections */ 599 static void client_connection(ipc_callid_t iid, ipc_call_t *icall )599 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) 600 600 { 601 601 console_t *cons = NULL; … … 759 759 if (client_receiver != NULL) 760 760 async_new_connection(task_hash, phone_hash, phone_hash, NULL, 761 client_receiver );761 client_receiver, NULL); 762 762 763 763 if (hash != NULL) -
uspace/srv/hid/fb/ega.c
r43ac0cc r9934f7d 256 256 } 257 257 258 static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall) 258 static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall, 259 void *arg) 259 260 { 260 261 size_t intersize = 0; -
uspace/srv/hid/fb/fb.c
r43ac0cc r9934f7d 1576 1576 * 1577 1577 */ 1578 static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall) 1578 static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall, 1579 void *arg) 1579 1580 { 1580 1581 unsigned int vp = 0; -
uspace/srv/hid/fb/serial_console.c
r43ac0cc r9934f7d 315 315 * Main function of the thread serving client connections. 316 316 */ 317 void serial_client_connection(ipc_callid_t iid, ipc_call_t *icall )317 void serial_client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) 318 318 { 319 319 keyfield_t *interbuf = NULL; -
uspace/srv/hid/fb/serial_console.h
r43ac0cc r9934f7d 52 52 extern void serial_set_scroll_region(sysarg_t); 53 53 extern void serial_console_init(putc_function_t, sysarg_t, sysarg_t); 54 extern void serial_client_connection(ipc_callid_t, ipc_call_t * );54 extern void serial_client_connection(ipc_callid_t, ipc_call_t *, void *arg); 55 55 56 56 #endif -
uspace/srv/hid/input/ctl/kbdev.c
r43ac0cc r9934f7d 54 54 static void kbdev_ctl_set_ind(kbd_dev_t *, unsigned); 55 55 56 static void kbdev_callback_conn(ipc_callid_t, ipc_call_t * );56 static void kbdev_callback_conn(ipc_callid_t, ipc_call_t *, void *arg); 57 57 58 58 kbd_ctl_ops_t kbdev_ctl = { … … 73 73 int fd; 74 74 } kbdev_t; 75 76 /** XXX Need to pass data from async_connect_to_me() to connection handler */77 static kbdev_t *unprotected_kbdev;78 75 79 76 static kbdev_t *kbdev_new(kbd_dev_t *kdev) … … 140 137 } 141 138 142 /* 143 * XXX We need to pass kbdev to the connection handler. Since the 144 * framework does not support this, use a global variable. 145 * This needs to be fixed ASAP. 146 */ 147 unprotected_kbdev = kbdev; 148 149 rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn); 139 rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev); 150 140 if (rc != EOK) { 151 141 printf(NAME ": Failed creating callback connection from '%s'.\n", … … 177 167 } 178 168 179 static void kbdev_callback_conn(ipc_callid_t iid, ipc_call_t *icall )169 static void kbdev_callback_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) 180 170 { 181 171 kbdev_t *kbdev; … … 183 173 int type, key; 184 174 185 kbdev = unprotected_kbdev; 175 /* Kbdev device structure */ 176 kbdev = arg; 186 177 187 178 while (true) { -
uspace/srv/hid/input/generic/input.c
r43ac0cc r9934f7d 178 178 } 179 179 180 static void client_connection(ipc_callid_t iid, ipc_call_t *icall )180 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) 181 181 { 182 182 ipc_callid_t callid; -
uspace/srv/hid/input/port/adb.c
r43ac0cc r9934f7d 46 46 #include <devmap_obsolete.h> 47 47 48 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall );48 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg); 49 49 static void adb_kbd_reg0_data(uint16_t data); 50 50 … … 82 82 83 83 /* NB: The callback connection is slotted for removal */ 84 rc = async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events); 84 rc = async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events, 85 NULL); 85 86 if (rc != EOK) { 86 87 printf(NAME ": Failed to create callback from device\n"); … … 104 105 } 105 106 106 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall )107 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg) 107 108 { 108 109 /* Ignore parameters, the connection is already opened */ -
uspace/srv/hid/input/port/chardev.c
r43ac0cc r9934f7d 45 45 #include <stdio.h> 46 46 47 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall );47 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg); 48 48 49 49 static int chardev_port_init(kbd_dev_t *); … … 96 96 97 97 /* NB: The callback connection is slotted for removal */ 98 if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) { 98 if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events, 99 NULL) != 0) { 99 100 printf(NAME ": Failed to create callback from device\n"); 100 101 return -1; … … 117 118 } 118 119 119 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall )120 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg) 120 121 { 121 122 /* Ignore parameters, the connection is already opened */ -
uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
r43ac0cc r9934f7d 73 73 static s3c24xx_ts_t *ts; 74 74 75 static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall); 75 static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall, 76 void *arg); 76 77 static void s3c24xx_ts_irq_handler(ipc_callid_t iid, ipc_call_t *call); 77 78 static void s3c24xx_ts_pen_down(s3c24xx_ts_t *ts); … … 373 374 374 375 /** Handle mouse client connection. */ 375 static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall) 376 static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall, 377 void *arg) 376 378 { 377 379 ipc_callid_t callid;
Note:
See TracChangeset
for help on using the changeset viewer.