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

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/kbd/generic/kbd.c (modified) (6 diffs)

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

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/kbd.h>
@@ -68 +67 @@
 static unsigned lock_keys;
 
-int cir_service = 0;
-int cir_phone = -1;
+bool irc_service = false;
+int irc_phone = -1;
 
 #define NUM_LAYOUTS 3
@@ -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);
         }       
 }
@@ -217 +216 @@
         sysarg_t obio;
         
-        if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
-                cir_service = SERVICE_FHC;
-        else if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
-                cir_service = SERVICE_OBIO;
-        
-        if (cir_service) {
-                while (cir_phone < 0) {
-                        cir_phone = ipc_connect_me_to_blocking(PHONE_NS, cir_service,
-                            0, 0);
-                }
+        if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
+            || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)))
+                irc_service = true;
+        
+        if (irc_service) {
+                while (irc_phone < 0)
+                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
         }