Changeset 1affcdf3 in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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) (6 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -44 +44 @@
 #include <ipc/mouse.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"
@@ -280 +283 @@
         button = 1;
         press = 0;
-        async_msg_2(ts->client_phone, MEVENT_BUTTON, button, press);
+        async_obsolete_msg_2(ts->client_phone, MEVENT_BUTTON, button, press);
 
         s3c24xx_ts_wait_for_int_mode(ts, updn_down);
@@ -321 +324 @@
 
         /* 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, MEVENT_MOVE, dx, dy);
+        async_obsolete_msg_2(ts->client_phone, MEVENT_BUTTON, button, press);
 
         ts->last_x = x_pos;
@@ -380 +383 @@
         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 +392 @@
                         async_answer_0(callid, EOK);
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_CONNECT_TO_ME:
                         if (ts->client_phone != -1) {