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

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/srv/hid/kbd/generic/kbd.c (moved) (moved from uspace/srv/kbd/generic/kbd.c ) (8 diffs)

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

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/kbd.h>
@@ -50 +49 @@
 #include <io/console.h>
 #include <io/keycode.h>
+#include <devmap.h>
 
 #include <kbd.h>
@@ -56 +56 @@
 #include <layout.h>
 
-#define NAME "kbd"
-
-int cons_connected = 0;
-int phone2cons = -1;
+#define NAME       "kbd"
+#define NAMESPACE  "hid_in"
+
+int client_phone = -1;
 
 /** Currently active modifiers. */
@@ -163 +163 @@
         ev.c = layout[active_layout]->parse_ev(&ev);
 
-        async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
-}
-
-static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
+        async_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
+}
+
+static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         ipc_callid_t callid;
@@ -172 +172 @@
         int retval;
 
-        if (cons_connected) {
-                ipc_answer_0(iid, ELIMIT);
-                return;
-        }
-        cons_connected = 1;
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        cons_connected = 0;
-                        ipc_hangup(phone2cons);
-                        phone2cons = -1;
-                        ipc_answer_0(callid, EOK);
+                        if (client_phone != -1) {
+                                async_hangup(client_phone);
+                                client_phone = -1;
+                        }
+                        
+                        async_answer_0(callid, EOK);
                         return;
                 case IPC_M_CONNECT_TO_ME:
-                        if (phone2cons != -1) {
+                        if (client_phone != -1) {
                                 retval = ELIMIT;
                                 break;
                         }
-                        phone2cons = IPC_GET_ARG5(call);
+                        client_phone = IPC_GET_ARG5(call);
                         retval = 0;
                         break;
@@ -207 +204 @@
                         retval = EINVAL;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }       
 }
@@ -214 +211 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS Keyboard service\n");
-        
-        ipcarg_t phonead;
-        
-        if (sysinfo_value("kbd.cir.fhc") == 1)
+        printf("%s: HelenOS Keyboard service\n", NAME);
+        
+        sysarg_t fhc;
+        sysarg_t obio;
+        
+        if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
                 cir_service = SERVICE_FHC;
-        else if (sysinfo_value("kbd.cir.obio") == 1)
+        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);
-                }
+                while (cir_phone < 0)
+                        cir_phone = service_connect_blocking(cir_service, 0, 0);
         }
         
@@ -241 +237 @@
         layout[active_layout]->reset();
         
-        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;
-        
+        /* Register driver */
+        int rc = devmap_driver_register(NAME, client_connection);
+        if (rc < 0) {
+                printf("%s: Unable to register driver (%d)\n", NAME, rc);
+                return -1;
+        }
+        
+        char kbd[DEVMAP_NAME_MAXLEN + 1];
+        snprintf(kbd, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
+        
+        devmap_handle_t devmap_handle;
+        if (devmap_device_register(kbd, &devmap_handle) != EOK) {
+                printf("%s: Unable to register device %s\n", NAME, kbd);
+                return -1;
+        }
+
         printf(NAME ": Accepting connections\n");
         async_manager();