Changeset 41811af in mainline for uspace/srv/hid/char_mouse/char_mouse.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/srv/hid/char_mouse/char_mouse.c (modified) (5 diffs)

uspace/srv/hid/char_mouse/char_mouse.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <errno.h>
 #include <devmap.h>
-
 #include <char_mouse.h>
 #include <mouse_port.h>
 #include <mouse_proto.h>
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 #define NAME       "mouse"
@@ -65 +68 @@
 /*      printf("ev_btn: button %d, press %d\n", button, press);*/
         if (client_phone != -1) {
-                async_msg_2(client_phone, MEVENT_BUTTON, button, press);
+                async_obsolete_msg_2(client_phone, MEVENT_BUTTON, button, press);
         }
 }
@@ -73 +76 @@
 /*      printf("ev_move: dx %d, dy %d\n", dx, dy);*/
         if (client_phone != -1)
-                async_msg_2(client_phone, MEVENT_MOVE, dx, dy);
+                async_obsolete_msg_2(client_phone, MEVENT_MOVE, dx, dy);
 }
 
@@ -86 +89 @@
         while (1) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!IPC_GET_IMETHOD(call)) {
                         if (client_phone != -1) {
-                                async_hangup(client_phone);
+                                async_obsolete_hangup(client_phone);
                                 client_phone = -1;
                         }
@@ -95 +98 @@
                         async_answer_0(callid, EOK);
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_CONNECT_TO_ME:
                         if (client_phone != -1) {