Changeset 19a1800 in mainline for uspace/srv/hid/kbd/generic/kbd.c

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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 with the current development

File:

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

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

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