Changeset 6a44ee4 in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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.

Message:

Merge mainline changes.

File:

• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (8 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -42 +42 @@
 #include <io/console.h>
 #include <vfs/vfs.h>
-#include <ipc/mouse.h>
+#include <ipc/mouseev.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -50 +51 @@
 #include <errno.h>
 #include <inttypes.h>
-
 #include "s3c24xx_ts.h"
 
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
+
 #define NAME "s3c24ser"
-#define NAMESPACE "hid_in"
+#define NAMESPACE "hid"
 
 static irq_cmd_t ts_irq_cmds[] = {
@@ -70 +73 @@
 static s3c24xx_ts_t *ts;
 
-static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall);
+static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg);
 static void s3c24xx_ts_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 static void s3c24xx_ts_pen_down(s3c24xx_ts_t *ts);
@@ -280 +284 @@
         button = 1;
         press = 0;
-        async_msg_2(ts->client_phone, MEVENT_BUTTON, button, press);
+        async_obsolete_msg_2(ts->client_phone, MOUSEEV_BUTTON_EVENT, button, press);
 
         s3c24xx_ts_wait_for_int_mode(ts, updn_down);
@@ -321 +325 @@
 
         /* Send notifications to client. */
-        async_msg_2(ts->client_phone, MEVENT_MOVE, dx, dy);
-        async_msg_2(ts->client_phone, MEVENT_BUTTON, button, press);
+        async_obsolete_msg_2(ts->client_phone, MOUSEEV_MOVE_EVENT, dx, dy);
+        async_obsolete_msg_2(ts->client_phone, MOUSEEV_BUTTON_EVENT, button, press);
 
         ts->last_x = x_pos;
@@ -370 +374 @@
 
 /** Handle mouse client connection. */
-static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
 {
         ipc_callid_t callid;
@@ -380 +385 @@
         while (1) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!IPC_GET_IMETHOD(call)) {
                         if (ts->client_phone != -1) {
-                                async_hangup(ts->client_phone);
+                                async_obsolete_hangup(ts->client_phone);
                                 ts->client_phone = -1;
                         }
@@ -389 +394 @@
                         async_answer_0(callid, EOK);
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_CONNECT_TO_ME:
                         if (ts->client_phone != -1) {