Changeset 903bac0a in mainline for uspace/srv/hid/console/console.c

Timestamp:

2011-08-19T09:00:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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/console/console.c (modified) (6 diffs)

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;
@@ -721 +721 @@
 }
 
-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);
@@ -773 +773 @@
         }
         
-        /* 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;
         }
@@ -820 +820 @@
                         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;
                         }