Changes in uspace/srv/hid/input/generic/input.c [5da7199:99ac5cf] in mainline

File:

• uspace/srv/hid/input/generic/input.c (modified) (9 diffs)

uspace/srv/hid/input/generic/input.c

@@ -47 +47 @@
 #include <stdio.h>
 #include <ns.h>
+#include <ns_obsolete.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <errno.h>
 #include <adt/fifo.h>
@@ -61 +63 @@
 #include <mouse.h>
 
+// FIXME: remove this header
+#include <abi/ipc/methods.h>
+
 #define NUM_LAYOUTS  3
 
@@ -72 +77 @@
 static void kbd_devs_reclaim(void);
 
-async_sess_t *client_sess = NULL;
+int client_phone = -1;
 
 /** List of keyboard devices */
@@ -81 +86 @@
 
 bool irc_service = false;
-async_sess_t *irc_sess = NULL;
+int irc_phone = -1;
 
 void kbd_push_data(kbd_dev_t *kdev, sysarg_t data)
@@ -165 +170 @@
         
         ev.c = layout_parse_ev(kdev->active_layout, &ev);
-        
-        async_exch_t *exch = async_exchange_begin(client_sess);
-        async_msg_4(exch, INPUT_EVENT_KEY, ev.type, ev.key, ev.mods, ev.c);
-        async_exchange_end(exch);
+        async_obsolete_msg_4(client_phone, INPUT_EVENT_KEY, ev.type, ev.key,
+            ev.mods, ev.c);
 }
 
@@ -174 +177 @@
 void mouse_push_event_move(mouse_dev_t *mdev, int dx, int dy)
 {
-        async_exch_t *exch = async_exchange_begin(client_sess);
-        async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
-        async_exchange_end(exch);
+        async_obsolete_msg_2(client_phone, INPUT_EVENT_MOVE, dx, dy);
 }
 
@@ -182 +183 @@
 void mouse_push_event_button(mouse_dev_t *mdev, int bnum, int press)
 {
-        async_exch_t *exch = async_exchange_begin(client_sess);
-        async_msg_2(exch, INPUT_EVENT_BUTTON, bnum, press);
-        async_exchange_end(exch);
+        async_obsolete_msg_2(client_phone, INPUT_EVENT_BUTTON, bnum, press);
 }
 
 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+        ipc_callid_t callid;
+        ipc_call_t call;
+        int retval;
+        
         async_answer_0(iid, EOK);
         
         while (true) {
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
+                callid = async_get_call(&call);
                 
                 if (!IPC_GET_IMETHOD(call)) {
-                        if (client_sess != NULL) {
-                                async_hangup(client_sess);
-                                client_sess = NULL;
+                        if (client_phone != -1) {
+                                async_obsolete_hangup(client_phone);
+                                client_phone = -1;
                         }
                         
@@ -205 +207 @@
                 }
                 
-                async_sess_t *sess =
-                    async_callback_receive_start(EXCHANGE_SERIALIZE, &call);
-                if (sess != NULL) {
-                        if (client_sess == NULL) {
-                                client_sess = sess;
-                                async_answer_0(callid, EOK);
-                        } else
-                                async_answer_0(callid, ELIMIT);
-                } else {
-                        switch (IPC_GET_IMETHOD(call)) {
-                        case INPUT_YIELD:
-                                kbd_devs_yield();
-                                async_answer_0(callid, EOK);
+                switch (IPC_GET_IMETHOD(call)) {
+                case IPC_M_CONNECT_TO_ME:
+                        if (client_phone != -1) {
+                                retval = ELIMIT;
                                 break;
-                        case INPUT_RECLAIM:
-                                kbd_devs_reclaim();
-                                async_answer_0(callid, EOK);
-                                break;
-                        default:
-                                async_answer_0(callid, EINVAL);
                         }
+                        client_phone = IPC_GET_ARG5(call);
+                        retval = 0;
+                        break;
+                case INPUT_YIELD:
+                        kbd_devs_yield();
+                        retval = 0;
+                        break;
+                case INPUT_RECLAIM:
+                        kbd_devs_reclaim();
+                        retval = 0;
+                        break;
+                default:
+                        retval = EINVAL;
                 }
+                
+                async_answer_0(callid, retval);
         }
 }
@@ -646 +648 @@
         
         if (irc_service) {
-                while (irc_sess == NULL)
-                        irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-                            SERVICE_IRC, 0, 0);
+                while (irc_phone < 0)
+                        irc_phone = service_obsolete_connect_blocking(SERVICE_IRC, 0, 0);
         }