Changeset 15f3c3f in mainline for uspace/srv/hid

Timestamp:

2011-06-22T22:00:52Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

86ffa27f

Parents:

ef09a7a

Message:

Rename devmap to loc, devfs to locfs.

Location:

uspace/srv/hid

Files:

• console/console.c (modified) (6 diffs)
• input/generic/input.c (modified) (7 diffs)
• input/port/adb.c (modified) (3 diffs)
• input/port/adb_mouse.c (modified) (2 diffs)
• input/port/chardev.c (modified) (4 diffs)
• input/port/chardev_mouse.c (modified) (4 diffs)
• s3c24xx_ts/s3c24xx_ts.c (modified) (3 diffs)
• s3c24xx_ts/s3c24xx_ts.h (modified) (1 diff)

uspace/srv/hid/console/console.c

@@ -53 +53 @@
 #include <sysinfo.h>
 #include <event.h>
-#include <devmap.h>
+#include <loc.h>
 #include <fcntl.h>
 #include <vfs/vfs.h>
@@ -81 +81 @@
         size_t index;             /**< Console index */
         size_t refcount;          /**< Connection reference count */
-        devmap_handle_t devmap_handle;  /**< Device handle */
+        service_id_t service_id;  /**< Service ID */
         keybuffer_t keybuffer;    /**< Buffer for incoming keys. */
         screenbuffer_t scr;       /**< Screenbuffer for saving screen
@@ -582 +582 @@
                         continue;
                 
-                if (consoles[i].devmap_handle == (devmap_handle_t) IPC_GET_ARG1(*icall)) {
+                if (consoles[i].service_id == (service_id_t) IPC_GET_ARG1(*icall)) {
                         cons = &consoles[i];
                         break;
@@ -724 +724 @@
 }
 
-static async_sess_t *connect_input(const char *dev_path)
+static async_sess_t *connect_input(const char *svc_path)
 {
         async_sess_t *sess;
         async_exch_t *exch;
-        devmap_handle_t handle;
-        
-        int rc = devmap_device_get_handle(dev_path, &handle, 0);
+        service_id_t service_id;
+        
+        int rc = loc_service_get_id(svc_path, &service_id, 0);
         if (rc == EOK) {
-                sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0);
+                sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0);
                 if (sess == NULL) {
                         printf("%s: Failed to connect to input server\n", NAME);
@@ -776 +776 @@
         }
         
-        /* Register driver */
-        int rc = devmap_driver_register(NAME, client_connection);
+        /* Register server */
+        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 false;
         }
@@ -823 +823 @@
                         consoles[i].refcount = 0;
                         
-                        char vc[DEVMAP_NAME_MAXLEN + 1];
-                        snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i);
+                        char vc[LOC_NAME_MAXLEN + 1];
+                        snprintf(vc, LOC_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i);
                         
-                        if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) {
-                                printf("%s: Unable to register device %s\n", NAME, vc);
+                        if (loc_service_register(vc, &consoles[i].service_id) != EOK) {
+                                printf("%s: Unable to register service %s\n", NAME, vc);
                                 return false;
                         }

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

@@ -53 +53 @@
 #include <io/console.h>
 #include <io/keycode.h>
-#include <devmap.h>
+#include <loc.h>
 #include <input.h>
 #include <kbd.h>
@@ -324 +324 @@
 /** Add new kbdev device.
  *
- * @param dev_path Filesystem path to the device (/dev/class/...)
+ * @param dev_path Filesystem path to the device (/loc/class/...)
  *
  */
@@ -352 +352 @@
 /** Add new mousedev device.
  *
- * @param dev_path Filesystem path to the device (/dev/class/...)
+ * @param dev_path Filesystem path to the device (/loc/class/...)
  *
  */
@@ -486 +486 @@
 /** 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
@@ -504 +504 @@
                  * Check for new keyboard device
                  */
-                rc = asprintf(&dev_path, "/dev/class/keyboard\\%zu", kbd_id);
+                rc = asprintf(&dev_path, "/loc/class/keyboard\\%zu", kbd_id);
                 if (rc < 0)
                         continue;
@@ -521 +521 @@
                  * Check for new mouse device
                  */
-                rc = asprintf(&dev_path, "/dev/class/mouse\\%zu", mouse_id);
+                rc = asprintf(&dev_path, "/loc/class/mouse\\%zu", mouse_id);
                 if (rc < 0)
                         continue;
@@ -573 +573 @@
         /* Add legacy keyboard devices. */
         kbd_add_legacy_devs();
-        
+
         /* 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;
         }

uspace/srv/hid/input/port/adb.c

@@ -43 +43 @@
 #include <fcntl.h>
 #include <errno.h>
-#include <devmap.h>
+#include <loc.h>
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -66 +66 @@
 {
         const char *dev = "adb/kbd";
-        devmap_handle_t handle;
+        service_id_t service_id;
         async_exch_t *exch;
         int rc;
@@ -72 +72 @@
         kbd_dev = kdev;
         
-        rc = devmap_device_get_handle(dev, &handle, 0);
+        rc = loc_service_get_id(dev, &service_id, 0);
         if (rc != EOK)
                 return rc;
         
-        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0);
+        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0);
         if (dev_sess == NULL) {
                 printf("%s: Failed to connect to device\n", NAME);

uspace/srv/hid/input/port/adb_mouse.c

@@ -41 +41 @@
 #include <mouse.h>
 #include <errno.h>
-#include <devmap.h>
+#include <loc.h>
 
 static mouse_dev_t *mouse_dev;
@@ -78 +78 @@
         mouse_dev = mdev;
         
-        devmap_handle_t handle;
-        int rc = devmap_device_get_handle(dev, &handle, 0);
+        service_id_t service_id;
+        int rc = loc_service_get_id(dev, &service_id, 0);
         if (rc != EOK)
                 return rc;
         
-        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0);
+        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0);
         if (dev_sess == NULL) {
                 printf("%s: Failed to connect to device\n", NAME);

uspace/srv/hid/input/port/chardev.c

@@ -40 +40 @@
 #include <kbd_port.h>
 #include <kbd.h>
-#include <devmap.h>
+#include <loc.h>
 #include <errno.h>
 #include <stdio.h>
@@ -71 +71 @@
 static int chardev_port_init(kbd_dev_t *kdev)
 {
-        devmap_handle_t handle;
+        service_id_t service_id;
         async_exch_t *exch;
         unsigned int i;
@@ -79 +79 @@
         
         for (i = 0; i < num_devs; i++) {
-                rc = devmap_device_get_handle(in_devs[i], &handle, 0);
+                rc = loc_service_get_id(in_devs[i], &service_id, 0);
                 if (rc == EOK)
                         break;
@@ -89 +89 @@
         }
         
-        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle,
+        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id,
             IPC_FLAG_BLOCKING);
         if (dev_sess == NULL) {

uspace/srv/hid/input/port/chardev_mouse.c

@@ -39 +39 @@
 #include <async.h>
 #include <errno.h>
-#include <devmap.h>
+#include <loc.h>
 #include <input.h>
 #include <mouse_port.h>
@@ -82 +82 @@
 static int chardev_port_init(mouse_dev_t *mdev)
 {
-        devmap_handle_t handle;
+        service_id_t service_id;
         unsigned int i;
         int rc;
@@ -89 +89 @@
         
         for (i = 0; i < num_devs; i++) {
-                rc = devmap_device_get_handle(in_devs[i], &handle, 0);
+                rc = loc_service_get_id(in_devs[i], &service_id, 0);
                 if (rc == EOK)
                         break;
@@ -99 +99 @@
         }
         
-        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle,
+        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id,
             IPC_FLAG_BLOCKING);
         if (dev_sess == NULL) {

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -39 +39 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <devmap.h>
+#include <loc.h>
 #include <io/console.h>
 #include <vfs/vfs.h>
@@ -90 +90 @@
         printf(NAME ": S3C24xx touchscreen driver\n");
 
-        rc = devmap_driver_register(NAME, s3c24xx_ts_connection);
+        rc = loc_server_register(NAME, s3c24xx_ts_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");
@@ -103 +103 @@
                 return -1;
 
-        rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle);
+        rc = loc_service_register(NAMESPACE "/mouse", &ts->service_id);
         if (rc != EOK) {
                 printf(NAME ": Unable to register device %s.\n",

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h

@@ -124 +124 @@
         int client_phone;
 
-        /** Device handle */
-        devmap_handle_t devmap_handle;
+        /** Service ID */
+        service_id_t service_id;
 
         /** Device/driver state */