Changes in uspace/srv/kbd/generic/kbd.c [47a350f:e795203] in mainline

File:

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

uspace/srv/kbd/generic/kbd.c

@@ -50 +50 @@
 #include <io/console.h>
 #include <io/keycode.h>
-#include <devmap.h>
 
 #include <kbd.h>
@@ -57 +56 @@
 #include <layout.h>
 
-#define NAME       "kbd"
-#define NAMESPACE  "hid_in"
-
+#define NAME "kbd"
+
+int cons_connected = 0;
 int phone2cons = -1;
 
@@ -173 +172 @@
         int retval;
 
+        if (cons_connected) {
+                ipc_answer_0(iid, ELIMIT);
+                return;
+        }
+        cons_connected = 1;
         ipc_answer_0(iid, EOK);
 
@@ -179 +183 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        if (phone2cons != -1) {
-                                ipc_hangup(phone2cons);
-                                phone2cons = -1;
-                        }
-                        
+                        cons_connected = 0;
+                        ipc_hangup(phone2cons);
+                        phone2cons = -1;
                         ipc_answer_0(callid, EOK);
                         return;
@@ -214 +216 @@
         printf(NAME ": HelenOS Keyboard service\n");
         
+        ipcarg_t phonead;
+        
         if (sysinfo_value("kbd.cir.fhc") == 1)
                 cir_service = SERVICE_FHC;
@@ -237 +241 @@
         layout[active_layout]->reset();
         
-        /* Register driver */
-        int rc = devmap_driver_register(NAME, console_connection);
-        if (rc < 0) {
-                printf(NAME ": Unable to register driver (%d)\n", rc);
+        async_set_client_connection(console_connection);
+
+        /* Register service at nameserver. */
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
                 return -1;
-        }
-        
-        char kbd[DEVMAP_NAME_MAXLEN + 1];
-        snprintf(kbd, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
-        
-        dev_handle_t dev_handle;
-        if (devmap_device_register(kbd, &dev_handle) != EOK) {
-                printf(NAME ": Unable to register device %s\n", kbd);
-                return -1;
-        }
-
+        
         printf(NAME ": Accepting connections\n");
         async_manager();