Changeset 925a21e in mainline for uspace/srv/hid/input/generic/input.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/input/generic/input.c (modified) (20 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>
@@ -62 +61 @@
 #include <mouse.h>
 
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
-
-/* In microseconds */
-#define DISCOVERY_POLL_INTERVAL  (10 * 1000 * 1000)
-
 #define NUM_LAYOUTS  3
 
@@ -79 +72 @@
 static void kbd_devs_reclaim(void);
 
-int client_phone = -1;
+async_sess_t *client_sess = NULL;
 
 /** List of keyboard devices */
@@ -88 +81 @@
 
 bool irc_service = false;
-int irc_phone = -1;
+async_sess_t *irc_sess = NULL;
 
 void kbd_push_data(kbd_dev_t *kdev, sysarg_t data)
@@ -172 +165 @@
         
         ev.c = layout_parse_ev(kdev->active_layout, &ev);
-        async_obsolete_msg_4(client_phone, INPUT_EVENT_KEY, ev.type, ev.key,
-            ev.mods, ev.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);
 }
 
@@ -179 +174 @@
 void mouse_push_event_move(mouse_dev_t *mdev, int dx, int dy)
 {
-        async_obsolete_msg_2(client_phone, INPUT_EVENT_MOVE, dx, dy);
+        async_exch_t *exch = async_exchange_begin(client_sess);
+        async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
+        async_exchange_end(exch);
 }
 
@@ -185 +182 @@
 void mouse_push_event_button(mouse_dev_t *mdev, int bnum, int press)
 {
-        async_obsolete_msg_2(client_phone, INPUT_EVENT_BUTTON, bnum, 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;
                         }
                         
@@ -209 +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);
         }
 }
@@ -275 +271 @@
         kdev->port_ops = port;
         kdev->ctl_ops = ctl;
-        kdev->dev_path = NULL;
+        kdev->svc_id = 0;
         
         /* Initialize port driver. */
@@ -303 +299 @@
         mdev->port_ops = port;
         mdev->proto_ops = proto;
-        mdev->dev_path = NULL;
+        mdev->svc_id = 0;
         
         /* Initialize port driver. */
@@ -324 +320 @@
 /** 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)
+static int kbd_add_kbdev(service_id_t service_id, kbd_dev_t **kdevp)
 {
         kbd_dev_t *kdev = kbd_dev_new();
@@ -333 +329 @@
                 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) {
@@ -343 +345 @@
         
         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;
@@ -352 +357 @@
 /** Add new mousedev device.
  *
- * @param dev_path Filesystem path to the device (/dev/class/...)
+ * @param service_id    Service ID of the mouse device
  *
  */
-static int mouse_add_mousedev(const char *dev_path)
+static int mouse_add_mousedev(service_id_t service_id, mouse_dev_t **mdevp)
 {
         mouse_dev_t *mdev = mouse_dev_new();
@@ -361 +366 @@
                 return -1;
         
-        mdev->dev_path = dev_path;
+        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) {
@@ -371 +382 @@
         
         list_append(&mdev->mouse_devs, &mouse_devs);
+        *mdevp = mdev;
         return EOK;
         
@@ -480 +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("%s: Connected keyboard device '%s'\n",
-                            NAME, 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_mousedev(dev_path) == EOK) {
-                        printf("%s: Connected mouse device '%s'\n",
-                            NAME, 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 = fibril_create(dev_discovery_fibril, NULL);
-        if (!fid) {
-                printf("%s: Failed to create device discovery fibril.\n",
+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;
-        }
-        
-        fibril_add_ready(fid);
+                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();
 }
 
@@ -561 +646 @@
         
         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);
         }
         
@@ -572 +658 @@
         
         /* 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;
         }