Changes in uspace/srv/hid/kbd/generic/kbd.c [ffa2c8ef:991f645] in mainline

File:

• uspace/srv/hid/kbd/generic/kbd.c (modified) (4 diffs)

uspace/srv/hid/kbd/generic/kbd.c

@@ -36 +36 @@
  */
 
+#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/kbd.h>
@@ -172 +173 @@
         int retval;
 
-        async_answer_0(iid, EOK);
+        ipc_answer_0(iid, EOK);
 
         while (1) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         if (client_phone != -1) {
-                                async_hangup(client_phone);
+                                ipc_hangup(client_phone);
                                 client_phone = -1;
                         }
                         
-                        async_answer_0(callid, EOK);
+                        ipc_answer_0(callid, EOK);
                         return;
                 case IPC_M_CONNECT_TO_ME:
@@ -204 +205 @@
                         retval = EINVAL;
                 }
-                async_answer_0(callid, retval);
+                ipc_answer_0(callid, retval);
         }       
 }
@@ -222 +223 @@
         
         if (cir_service) {
-                while (cir_phone < 0)
-                        cir_phone = service_connect_blocking(cir_service, 0, 0);
+                while (cir_phone < 0) {
+                        cir_phone = ipc_connect_me_to_blocking(PHONE_NS, cir_service,
+                            0, 0);
+                }
         }