Changes in uspace/srv/hid/input/generic/input.c [333c233:cce8a83] in mainline

File:

• uspace/srv/hid/input/generic/input.c (modified) (15 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>
@@ -53 +54 @@
 #include <io/console.h>
 #include <io/keycode.h>
-#include <devmap.h>
+#include <loc.h>
 #include <input.h>
 #include <kbd.h>
@@ -63 +64 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 /* In microseconds */
@@ -275 +276 @@
         kdev->port_ops = port;
         kdev->ctl_ops = ctl;
-        kdev->dev_path = NULL;
+        kdev->svc_id = 0;
         
         /* Initialize port driver. */
@@ -303 +304 @@
         mdev->port_ops = port;
         mdev->proto_ops = proto;
-        mdev->dev_path = NULL;
+        mdev->svc_id = 0;
         
         /* Initialize port driver. */
@@ -324 +325 @@
 /** 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 +334 @@
                 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 +350 @@
         
         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 +362 @@
 /** 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 +371 @@
                 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 +387 @@
         
         list_append(&mdev->mouse_devs, &mouse_devs);
+        *mdevp = mdev;
         return EOK;
         
@@ -482 +499 @@
 /** Periodically check for new input devices.
  *
- * Looks under /dev/class/keyboard and /dev/class/mouse.
+ * Looks under /loc/class/keyboard and /loc/class/mouse.
  *
  * @param arg Ignored
@@ -489 +506 @@
 static int dev_discovery_fibril(void *arg)
 {
-        char *dev_path;
-        size_t kbd_id = 1;
-        size_t mouse_id = 1;
+        category_id_t keyboard_cat, mouse_cat;
+        service_id_t *svcs;
+        size_t count, i;
+        bool already_known;
         int rc;
+        
+        rc = loc_category_get_id("keyboard", &keyboard_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed resolving category 'keyboard'.\n", NAME);
+                return ENOENT;
+        }
+        
+        rc = loc_category_get_id("mouse", &mouse_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed resolving category 'mouse'.\n", NAME);
+                return ENOENT;
+        }
         
         while (true) {
@@ -498 +528 @@
                 
                 /*
-                 * Check for new keyboard device
+                 * Check for new keyboard devices
                  */
-                rc = asprintf(&dev_path, "/dev/class/keyboard\\%zu", kbd_id);
-                if (rc < 0)
+                rc = loc_category_get_svcs(keyboard_cat, &svcs, &count);
+                if (rc != EOK) {
+                        printf("%s: Failed getting list of keyboard devices.\n",
+                            NAME);
                         continue;
-                
-                if (kbd_add_kbdev(dev_path) == EOK) {
-                        printf("%s: Connected keyboard device '%s'\n",
-                            NAME, dev_path);
+                }
+
+                for (i = 0; i < count; i++) {
+                        already_known = false;
                         
-                        /* XXX Handle device removal */
-                        ++kbd_id;
+                        /* 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;
+                                }
+                        }
+
+                        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);
+                /* XXX Handle device removal */
                 
                 /*
-                 * Check for new mouse device
+                 * Check for new mouse devices
                  */
-                rc = asprintf(&dev_path, "/dev/class/mouse\\%zu", mouse_id);
-                if (rc < 0)
+                rc = loc_category_get_svcs(mouse_cat, &svcs, &count);
+                if (rc != EOK) {
+                        printf("%s: Failed getting list of mouse devices.\n",
+                            NAME);
                         continue;
-                
-                if (mouse_add_mousedev(dev_path) == EOK) {
-                        printf("%s: Connected mouse device '%s'\n",
-                            NAME, dev_path);
+                }
+
+                for (i = 0; i < count; i++) {
+                        already_known = false;
                         
-                        /* XXX Handle device removal */
-                        ++mouse_id;
+                        /* 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(dev_path);
+                /* XXX Handle device removal */
         }
         
@@ -572 +636 @@
         
         /* 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;
         }