Changes in uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c [ffa2c8ef:c0699467] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
rffa2c8ef rc0699467 42 42 #include <io/console.h> 43 43 #include <vfs/vfs.h> 44 #include <ipc/mouse .h>44 #include <ipc/mouseev.h> 45 45 #include <async.h> 46 #include <async_obsolete.h> 46 47 #include <unistd.h> 47 48 #include <stdio.h> … … 50 51 #include <errno.h> 51 52 #include <inttypes.h> 52 53 53 #include "s3c24xx_ts.h" 54 54 55 // FIXME: remove this header 56 #include <abi/ipc/methods.h> 57 55 58 #define NAME "s3c24ser" 56 #define NAMESPACE "hid _in"59 #define NAMESPACE "hid" 57 60 58 61 static irq_cmd_t ts_irq_cmds[] = { … … 70 73 static s3c24xx_ts_t *ts; 71 74 72 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); 73 77 static void s3c24xx_ts_irq_handler(ipc_callid_t iid, ipc_call_t *call); 74 78 static void s3c24xx_ts_pen_down(s3c24xx_ts_t *ts); … … 280 284 button = 1; 281 285 press = 0; 282 async_ msg_2(ts->client_phone, MEVENT_BUTTON, button, press);286 async_obsolete_msg_2(ts->client_phone, MOUSEEV_BUTTON_EVENT, button, press); 283 287 284 288 s3c24xx_ts_wait_for_int_mode(ts, updn_down); … … 321 325 322 326 /* Send notifications to client. */ 323 async_ msg_2(ts->client_phone, MEVENT_MOVE, dx, dy);324 async_ msg_2(ts->client_phone, MEVENT_BUTTON, button, press);327 async_obsolete_msg_2(ts->client_phone, MOUSEEV_MOVE_EVENT, dx, dy); 328 async_obsolete_msg_2(ts->client_phone, MOUSEEV_BUTTON_EVENT, button, press); 325 329 326 330 ts->last_x = x_pos; … … 370 374 371 375 /** Handle mouse client connection. */ 372 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) 373 378 { 374 379 ipc_callid_t callid; … … 380 385 while (1) { 381 386 callid = async_get_call(&call); 382 switch (IPC_GET_IMETHOD(call)) {383 case IPC_M_PHONE_HUNGUP:387 388 if (!IPC_GET_IMETHOD(call)) { 384 389 if (ts->client_phone != -1) { 385 async_ hangup(ts->client_phone);390 async_obsolete_hangup(ts->client_phone); 386 391 ts->client_phone = -1; 387 392 } … … 389 394 async_answer_0(callid, EOK); 390 395 return; 396 } 397 398 switch (IPC_GET_IMETHOD(call)) { 391 399 case IPC_M_CONNECT_TO_ME: 392 400 if (ts->client_phone != -1) {
Note:
See TracChangeset
for help on using the changeset viewer.