Changes in uspace/srv/hid/input/generic/input.c [b72efe8:5da7199] in mainline

File:

• uspace/srv/hid/input/generic/input.c (modified) (18 diffs)

uspace/srv/hid/input/generic/input.c

@@ -38 +38 @@
 
 #include <adt/list.h>
+#include <bool.h>
 #include <ipc/services.h>
 #include <ipc/input.h>
@@ -46 +47 @@
 #include <stdio.h>
 #include <ns.h>
-#include <ns_obsolete.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <errno.h>
 #include <adt/fifo.h>
 #include <io/console.h>
 #include <io/keycode.h>
-#include <devmap.h>
+#include <loc.h>
 #include <input.h>
 #include <kbd.h>
 #include <kbd_port.h>
 #include <kbd_ctl.h>
+#include <mouse_proto.h>
 #include <layout.h>
 #include <mouse.h>
 
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
-
-/* In microseconds */
-#define DISCOVERY_POLL_INTERVAL         (10*1000*1000)
-
-static void kbd_devs_yield(void);
-static void kbd_devs_reclaim(void);
-
-static void input_event_key(int, unsigned int, unsigned, wchar_t);
-
-int client_phone = -1;
-
-/** List of keyboard devices */
-static list_t kbd_devs;
-
-/** List of mouse devices */
-list_t mouse_devs;
-
-bool irc_service = false;
-int irc_phone = -1;
-
-#define NUM_LAYOUTS 3
+#define NUM_LAYOUTS  3
 
 static layout_ops_t *layout[NUM_LAYOUTS] = {
@@ -91 +69 @@
 };
 
-void kbd_push_scancode(kbd_dev_t *kdev, int scancode)
-{
-/*      printf("scancode: 0x%x\n", scancode);*/
-        (*kdev->ctl_ops->parse_scancode)(scancode);
-}
-
-void kbd_push_ev(kbd_dev_t *kdev, int type, unsigned int key)
+static void kbd_devs_yield(void);
+static void kbd_devs_reclaim(void);
+
+async_sess_t *client_sess = NULL;
+
+/** List of keyboard devices */
+static list_t kbd_devs;
+
+/** List of mouse devices */
+static list_t mouse_devs;
+
+bool irc_service = false;
+async_sess_t *irc_sess = NULL;
+
+void kbd_push_data(kbd_dev_t *kdev, sysarg_t data)
+{
+        (*kdev->ctl_ops->parse)(data);
+}
+
+void mouse_push_data(mouse_dev_t *mdev, sysarg_t data)
+{
+        (*mdev->proto_ops->parse)(data);
+}
+
+void kbd_push_event(kbd_dev_t *kdev, int type, unsigned int key)
 {
         kbd_event_t ev;
-        unsigned mod_mask;
-
+        unsigned int mod_mask;
+        
         switch (key) {
         case KC_LCTRL: mod_mask = KM_LCTRL; break;
@@ -111 +107 @@
         default: mod_mask = 0; break;
         }
-
+        
         if (mod_mask != 0) {
                 if (type == KEY_PRESS)
@@ -118 +114 @@
                         kdev->mods = kdev->mods & ~mod_mask;
         }
-
+        
         switch (key) {
         case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break;
@@ -125 +121 @@
         default: mod_mask = 0; break;
         }
-
+        
         if (mod_mask != 0) {
                 if (type == KEY_PRESS) {
@@ -135 +131 @@
                         kdev->mods = kdev->mods ^ (mod_mask & ~kdev->lock_keys);
                         kdev->lock_keys = kdev->lock_keys | mod_mask;
-
+                        
                         /* Update keyboard lock indicator lights. */
                         (*kdev->ctl_ops->set_ind)(kdev, kdev->mods);
@@ -142 +138 @@
                 }
         }
-/*
-        printf("type: %d\n", type);
-        printf("mods: 0x%x\n", mods);
-        printf("keycode: %u\n", key);
-*/
+        
         if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
-                key == KC_F1) {
+            key == KC_F1) {
                 layout_destroy(kdev->active_layout);
                 kdev->active_layout = layout_create(layout[0]);
                 return;
         }
-
+        
         if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
-                key == KC_F2) {
+            key == KC_F2) {
                 layout_destroy(kdev->active_layout);
                 kdev->active_layout = layout_create(layout[1]);
                 return;
         }
-
+        
         if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
-                key == KC_F3) {
+            key == KC_F3) {
                 layout_destroy(kdev->active_layout);
                 kdev->active_layout = layout_create(layout[2]);
                 return;
         }
-
+        
         ev.type = type;
         ev.key = key;
         ev.mods = kdev->mods;
-
+        
         ev.c = layout_parse_ev(kdev->active_layout, &ev);
-        input_event_key(ev.type, ev.key, ev.mods, ev.c);
-}
-
-/** Key has been pressed or released. */
-static void input_event_key(int type, unsigned int key, unsigned mods,
-    wchar_t c)
-{
-        async_obsolete_msg_4(client_phone, INPUT_EVENT_KEY, type, key,
-            mods, c);
+        
+        async_exch_t *exch = async_exchange_begin(client_sess);
+        async_msg_4(exch, INPUT_EVENT_KEY, ev.type, ev.key, ev.mods, ev.c);
+        async_exchange_end(exch);
 }
 
 /** Mouse pointer has moved. */
-void input_event_move(int dx, int dy)
-{
-        async_obsolete_msg_2(client_phone, INPUT_EVENT_MOVE, dx, dy);
+void mouse_push_event_move(mouse_dev_t *mdev, int dx, int dy)
+{
+        async_exch_t *exch = async_exchange_begin(client_sess);
+        async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
+        async_exchange_end(exch);
 }
 
 /** Mouse button has been pressed. */
-void input_event_button(int bnum, int press)
-{
-        async_obsolete_msg_2(client_phone, INPUT_EVENT_BUTTON, bnum, press);
+void mouse_push_event_button(mouse_dev_t *mdev, int bnum, int press)
+{
+        async_exch_t *exch = async_exchange_begin(client_sess);
+        async_msg_2(exch, INPUT_EVENT_BUTTON, bnum, press);
+        async_exchange_end(exch);
 }
 
 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        ipc_callid_t callid;
-        ipc_call_t call;
-        int retval;
-
         async_answer_0(iid, EOK);
-
+        
         while (true) {
-                callid = async_get_call(&call);
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
                 
                 if (!IPC_GET_IMETHOD(call)) {
-                        if (client_phone != -1) {
-                                async_obsolete_hangup(client_phone);
-                                client_phone = -1;
+                        if (client_sess != NULL) {
+                                async_hangup(client_sess);
+                                client_sess = NULL;
                         }
                         
@@ -217 +205 @@
                 }
                 
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_CONNECT_TO_ME:
-                        if (client_phone != -1) {
-                                retval = ELIMIT;
+                async_sess_t *sess =
+                    async_callback_receive_start(EXCHANGE_SERIALIZE, &call);
+                if (sess != NULL) {
+                        if (client_sess == NULL) {
+                                client_sess = sess;
+                                async_answer_0(callid, EOK);
+                        } else
+                                async_answer_0(callid, ELIMIT);
+                } else {
+                        switch (IPC_GET_IMETHOD(call)) {
+                        case INPUT_YIELD:
+                                kbd_devs_yield();
+                                async_answer_0(callid, EOK);
                                 break;
+                        case INPUT_RECLAIM:
+                                kbd_devs_reclaim();
+                                async_answer_0(callid, EOK);
+                                break;
+                        default:
+                                async_answer_0(callid, EINVAL);
                         }
-                        client_phone = IPC_GET_ARG5(call);
-                        retval = 0;
-                        break;
-                case INPUT_YIELD:
-                        kbd_devs_yield();
-                        retval = 0;
-                        break;
-                case INPUT_RECLAIM:
-                        kbd_devs_reclaim();
-                        retval = 0;
-                        break;
-                default:
-                        retval = EINVAL;
                 }
-                async_answer_0(callid, retval);
-        }       
+        }
 }
 
 static kbd_dev_t *kbd_dev_new(void)
 {
-        kbd_dev_t *kdev;
-
-        kdev = calloc(1, sizeof(kbd_dev_t));
+        kbd_dev_t *kdev = calloc(1, sizeof(kbd_dev_t));
         if (kdev == NULL) {
-                printf(NAME ": Error allocating keyboard device. "
-                    "Out of memory.\n");
+                printf("%s: Error allocating keyboard device. "
+                    "Out of memory.\n", NAME);
                 return NULL;
         }
-
+        
         link_initialize(&kdev->kbd_devs);
-
+        
         kdev->mods = KM_NUM_LOCK;
         kdev->lock_keys = 0;
         kdev->active_layout = layout_create(layout[0]);
-
+        
         return kdev;
+}
+
+static mouse_dev_t *mouse_dev_new(void)
+{
+        mouse_dev_t *mdev = calloc(1, sizeof(mouse_dev_t));
+        if (mdev == NULL) {
+                printf("%s: Error allocating keyboard device. "
+                    "Out of memory.\n", NAME);
+                return NULL;
+        }
+        
+        link_initialize(&mdev->mouse_devs);
+        
+        return mdev;
 }
 
@@ -264 +265 @@
 static void kbd_add_dev(kbd_port_ops_t *port, kbd_ctl_ops_t *ctl)
 {
-        kbd_dev_t *kdev;
-
-        kdev = kbd_dev_new();
+        kbd_dev_t *kdev = kbd_dev_new();
         if (kdev == NULL)
                 return;
-
+        
         kdev->port_ops = port;
         kdev->ctl_ops = ctl;
-        kdev->dev_path = NULL;
-
+        kdev->svc_id = 0;
+        
         /* Initialize port driver. */
         if ((*kdev->port_ops->init)(kdev) != 0)
                 goto fail;
-
+        
         /* Initialize controller driver. */
         if ((*kdev->ctl_ops->init)(kdev) != 0) {
@@ -283 +282 @@
                 goto fail;
         }
-
+        
         list_append(&kdev->kbd_devs, &kbd_devs);
         return;
+        
 fail:
         free(kdev);
 }
 
+/** Add new legacy mouse device. */
+static void mouse_add_dev(mouse_port_ops_t *port, mouse_proto_ops_t *proto)
+{
+        mouse_dev_t *mdev = mouse_dev_new();
+        if (mdev == NULL)
+                return;
+        
+        mdev->port_ops = port;
+        mdev->proto_ops = proto;
+        mdev->svc_id = 0;
+        
+        /* Initialize port driver. */
+        if ((*mdev->port_ops->init)(mdev) != 0)
+                goto fail;
+        
+        /* Initialize protocol driver. */
+        if ((*mdev->proto_ops->init)(mdev) != 0) {
+                /* XXX Uninit port */
+                goto fail;
+        }
+        
+        list_append(&mdev->mouse_devs, &mouse_devs);
+        return;
+        
+fail:
+        free(mdev);
+}
+
 /** Add new kbdev device.
  *
- * @param dev_path      Filesystem path to the device (/dev/class/...)
+ * @param service_id    Service ID of the keyboard device
+ *
  */
-static int kbd_add_kbdev(const char *dev_path)
-{
-        kbd_dev_t *kdev;
-
-        kdev = kbd_dev_new();
+static int kbd_add_kbdev(service_id_t service_id, kbd_dev_t **kdevp)
+{
+        kbd_dev_t *kdev = kbd_dev_new();
         if (kdev == NULL)
                 return -1;
-
-        kdev->dev_path = dev_path;
+        
+        kdev->svc_id = service_id;
         kdev->port_ops = NULL;
         kdev->ctl_ops = &kbdev_ctl;
-
+        
+        int rc = loc_service_get_name(service_id, &kdev->svc_name);
+        if (rc != EOK) {
+                kdev->svc_name = NULL;
+                goto fail;
+        }
+        
         /* Initialize controller driver. */
         if ((*kdev->ctl_ops->init)(kdev) != 0) {
                 goto fail;
         }
-
+        
         list_append(&kdev->kbd_devs, &kbd_devs);
+        *kdevp = kdev;
         return EOK;
+        
 fail:
+        if (kdev->svc_name != NULL)
+                free(kdev->svc_name);
         free(kdev);
+        return -1;
+}
+
+/** Add new mousedev device.
+ *
+ * @param service_id    Service ID of the mouse device
+ *
+ */
+static int mouse_add_mousedev(service_id_t service_id, mouse_dev_t **mdevp)
+{
+        mouse_dev_t *mdev = mouse_dev_new();
+        if (mdev == NULL)
+                return -1;
+        
+        mdev->svc_id = service_id;
+        mdev->port_ops = NULL;
+        mdev->proto_ops = &mousedev_proto;
+        
+        int rc = loc_service_get_name(service_id, &mdev->svc_name);
+        if (rc != EOK) {
+                mdev->svc_name = NULL;
+                goto fail;
+        }
+        
+        /* Initialize controller driver. */
+        if ((*mdev->proto_ops->init)(mdev) != 0) {
+                goto fail;
+        }
+        
+        list_append(&mdev->mouse_devs, &mouse_devs);
+        *mdevp = mdev;
+        return EOK;
+        
+fail:
+        free(mdev);
         return -1;
 }
@@ -350 +422 @@
 #endif
 #if defined(MACHINE_msim)
-        kbd_add_dev(&msim_port, &pc_ctl);
+        kbd_add_dev(&msim_port, &stty_ctl);
 #endif
 #if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)
@@ -364 +436 @@
         kbd_add_dev(&niagara_port, &stty_ctl);
 #endif
-#if defined(UARCH_sparc64) && defined(MACHINE_serengeti)
-        kbd_add_dev(&sgcn_port, &stty_ctl);
-#endif
 #if defined(UARCH_sparc64) && defined(MACHINE_generic)
-        kbd_add_dev(&z8530_port, &sun_ctl);
         kbd_add_dev(&ns16550_port, &sun_ctl);
 #endif
         /* Silence warning on abs32le about kbd_add_dev() being unused */
         (void) kbd_add_dev;
+}
+
+/** Add legacy drivers/devices. */
+static void mouse_add_legacy_devs(void)
+{
+        /*
+         * Need to add these drivers based on config unless we can probe
+         * them automatically.
+         */
+#if defined(UARCH_amd64)
+        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
+#endif
+#if defined(UARCH_ia32)
+        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
+#endif
+#if defined(MACHINE_i460GX)
+        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
+#endif
+#if defined(UARCH_ppc32)
+        mouse_add_dev(&adb_mouse_port, &adb_proto);
+#endif
+        /* Silence warning on abs32le about mouse_add_dev() being unused */
+        (void) mouse_add_dev;
 }
 
@@ -381 +472 @@
                 kbd_dev_t *kdev = list_get_instance(kdev_link, kbd_dev_t,
                     kbd_devs);
-
+                
                 /* Yield port */
                 if (kdev->port_ops != NULL)
@@ -394 +485 @@
                 kbd_dev_t *kdev = list_get_instance(kdev_link, kbd_dev_t,
                     kbd_devs);
-
+                
                 /* Reclaim port */
                 if (kdev->port_ops != NULL)
@@ -401 +492 @@
 }
 
-/** Periodically check for new input devices.
- *
- * Looks under /dev/class/keyboard and /dev/class/mouse.
- *
- * @param arg   Ignored
- */
-static int dev_discovery_fibril(void *arg)
-{
-        char *dev_path;
-        size_t kbd_id = 1;
-        size_t mouse_id = 1;
+static int dev_check_new_kbdevs(void)
+{
+        category_id_t keyboard_cat;
+        service_id_t *svcs;
+        size_t count, i;
+        bool already_known;
         int rc;
-
-        while (true) {
-                async_usleep(DISCOVERY_POLL_INTERVAL);
-
-                /*
-                 * Check for new keyboard device
-                 */
-                rc = asprintf(&dev_path, "/dev/class/keyboard\\%zu", kbd_id);
-                if (rc < 0)
-                        continue;
-
-                if (kbd_add_kbdev(dev_path) == EOK) {
-                        printf(NAME ": Connected keyboard device '%s'\n",
-                            dev_path);
-
-                        /* XXX Handle device removal */
-                        ++kbd_id;
+        
+        rc = loc_category_get_id("keyboard", &keyboard_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed resolving category 'keyboard'.\n", NAME);
+                return ENOENT;
+        }
+        
+        /*
+         * Check for new keyboard devices
+         */
+        rc = loc_category_get_svcs(keyboard_cat, &svcs, &count);
+        if (rc != EOK) {
+                printf("%s: Failed getting list of keyboard devices.\n",
+                    NAME);
+                return EIO;
+        }
+
+        for (i = 0; i < count; i++) {
+                already_known = false;
+                
+                /* Determine whether we already know this device. */
+                list_foreach(kbd_devs, kdev_link) {
+                        kbd_dev_t *kdev = list_get_instance(kdev_link,
+                            kbd_dev_t, kbd_devs);
+                        if (kdev->svc_id == svcs[i]) {
+                                already_known = true;
+                                break;
+                        }
                 }
-
-                free(dev_path);
-
-                /*
-                 * Check for new mouse device
-                 */
-                rc = asprintf(&dev_path, "/dev/class/mouse\\%zu", mouse_id);
-                if (rc < 0)
-                        continue;
-
-                if (mouse_add_dev(dev_path) == EOK) {
-                        printf(NAME ": Connected mouse device '%s'\n",
-                            dev_path);
-
-                        /* XXX Handle device removal */
-                        ++mouse_id;
+                
+                if (!already_known) {
+                        kbd_dev_t *kdev;
+                        if (kbd_add_kbdev(svcs[i], &kdev) == EOK) {
+                                printf("%s: Connected keyboard device '%s'\n",
+                                    NAME, kdev->svc_name);
+                        }
                 }
-
-                free(dev_path);
-        }
-
+        }
+        
+        free(svcs);
+        
+        /* XXX Handle device removal */
+        
         return EOK;
 }
 
-/** Start a fibril for discovering new devices. */
-static void input_start_dev_discovery(void)
-{
-        fid_t fid;
-
-        fid = fibril_create(dev_discovery_fibril, NULL);
-        if (!fid) {
-                printf(NAME ": Failed to create device discovery fibril.\n");
-                return;
-        }
-
-        fibril_add_ready(fid);
+static int dev_check_new_mousedevs(void)
+{
+        category_id_t mouse_cat;
+        service_id_t *svcs;
+        size_t count, i;
+        bool already_known;
+        int rc;
+        
+        rc = loc_category_get_id("mouse", &mouse_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed resolving category 'mouse'.\n", NAME);
+                return ENOENT;
+        }
+        
+        /*
+         * Check for new mouse devices
+         */
+        rc = loc_category_get_svcs(mouse_cat, &svcs, &count);
+        if (rc != EOK) {
+                printf("%s: Failed getting list of mouse devices.\n",
+                    NAME);
+                return EIO;
+        }
+        
+        for (i = 0; i < count; i++) {
+                already_known = false;
+                
+                /* Determine whether we already know this device. */
+                list_foreach(mouse_devs, mdev_link) {
+                        mouse_dev_t *mdev = list_get_instance(mdev_link,
+                            mouse_dev_t, mouse_devs);
+                        if (mdev->svc_id == svcs[i]) {
+                                already_known = true;
+                                break;
+                        }
+                }
+                
+                if (!already_known) {
+                        mouse_dev_t *mdev;
+                        if (mouse_add_mousedev(svcs[i], &mdev) == EOK) {
+                                printf("%s: Connected mouse device '%s'\n",
+                                    NAME, mdev->svc_name);
+                        }
+                }
+        }
+        
+        free(svcs);
+        
+        /* XXX Handle device removal */
+        
+        return EOK;
+}
+
+static int dev_check_new(void)
+{
+        int rc;
+        
+        rc = dev_check_new_kbdevs();
+        if (rc != EOK)
+                return rc;
+        
+        rc = dev_check_new_mousedevs();
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+static void cat_change_cb(void)
+{
+        dev_check_new();
+}
+
+/** Start listening for new devices. */
+static int input_start_dev_discovery(void)
+{
+        int rc;
+
+        rc = loc_register_cat_change_cb(cat_change_cb);
+        if (rc != EOK) {
+                printf("%s: Failed registering callback for device discovery. "
+                    "(%d)\n", NAME, rc);
+                return rc;
+        }
+
+        return dev_check_new();
 }
 
@@ -473 +637 @@
         printf("%s: HelenOS input service\n", NAME);
         
-        sysarg_t fhc;
         sysarg_t obio;
         
@@ -479 +642 @@
         list_initialize(&mouse_devs);
         
-        if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
-            || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)))
+        if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
                 irc_service = true;
         
         if (irc_service) {
-                while (irc_phone < 0)
-                        irc_phone = service_obsolete_connect_blocking(SERVICE_IRC, 0, 0);
+                while (irc_sess == NULL)
+                        irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+                            SERVICE_IRC, 0, 0);
         }
         
         /* Add legacy keyboard devices. */
         kbd_add_legacy_devs();
-
-        /* Add legacy (devmap-style) mouse device. */
-        (void) mouse_add_dev("/dev/hid_in/mouse");
+        
+        /* Add legacy mouse devices. */
+        mouse_add_legacy_devs();
         
         /* Register driver */
-        int rc = devmap_driver_register(NAME, client_connection);
+        int rc = loc_server_register(NAME, client_connection);
         if (rc < 0) {
-                printf("%s: Unable to register driver (%d)\n", NAME, rc);
+                printf("%s: Unable to register server (%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);
+        char kbd[LOC_NAME_MAXLEN + 1];
+        snprintf(kbd, LOC_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
+        
+        service_id_t service_id;
+        if (loc_service_register(kbd, &service_id) != EOK) {
+                printf("%s: Unable to register service %s\n", NAME, kbd);
                 return -1;
         }
-
+        
         /* Start looking for new input devices */
         input_start_dev_discovery();
-
-        printf(NAME ": Accepting connections\n");
+        
+        printf("%s: Accepting connections\n", NAME);
         async_manager();
-
+        
         /* Not reached. */
         return 0;