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