Changes in uspace/srv/hid/kbd/generic/kbd.c [57d129e:d9fae235] in mainline

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>
@@ -67 +68 @@
 static unsigned lock_keys;
 
-bool irc_service = false;
-int irc_phone = -1;
+int cir_service = 0;
+int cir_phone = -1;
 
 #define NUM_LAYOUTS 3
@@ -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);
         }       
 }
@@ -216 +217 @@
         sysarg_t obio;
         
-        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);
+        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);
+                }
         }
         
@@ -246 +250 @@
         snprintf(kbd, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
         
-        devmap_handle_t devmap_handle;
-        if (devmap_device_register(kbd, &devmap_handle) != EOK) {
+        dev_handle_t dev_handle;
+        if (devmap_device_register(kbd, &dev_handle) != EOK) {
                 printf("%s: Unable to register device %s\n", NAME, kbd);
                 return -1;