Changeset 93fb170c in mainline for uspace/srv/devman/main.c

Timestamp:

2011-01-08T18:51:31Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

15be932

Parents:

8f748215 (diff), a523af4 (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 from main branch

File:

• uspace/srv/devman/main.c (modified) (6 diffs)

uspace/srv/devman/main.c

@@ -281 +281 @@
          * handle.
          */
-        devmap_device_register(devmap_pathname, &cli->devmap_handle);
+        devmap_device_register_with_iface(devmap_pathname,
+            &cli->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
         
         /*
@@ -457 +458 @@
         
         if (driver == NULL) {
-                printf(NAME ": devman_forward error - the device is not in %" PRIun
-                    " usable state.\n", handle);
+                printf(NAME ": devman_forward error - the device %" PRIun \
+                    " (%s) is not in usable state.\n",
+                    handle, dev->pathname);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -486 +488 @@
 static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
 {
-        devmap_handle_t devmap_handle = IPC_GET_IMETHOD(*icall);
+        devmap_handle_t devmap_handle = IPC_GET_ARG2(*icall);
         node_t *dev;
 
@@ -503 +505 @@
         }
         
-        printf(NAME ": devman_connection_devmapper: forward connection to "
-            "device %s to driver %s.\n", dev->pathname, dev->drv->name);
         ipc_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, dev->handle, 0,
             IPC_FF_NONE);
+        printf(NAME ": devman_connection_devmapper: forwarded connection to "
+            "device %s to driver %s.\n", dev->pathname, dev->drv->name);
 }
 
@@ -512 +514 @@
 static void devman_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-        /*
-         * Silly hack to enable the device manager to register as a driver by
-         * the device mapper. If the ipc method is not IPC_M_CONNECT_ME_TO, this
-         * is not the forwarded connection from naming service, so it must be a
-         * connection from the devmapper which thinks this is a devmapper-style
-         * driver. So pretend this is a devmapper-style driver. (This does not
-         * work for device with handle == IPC_M_CONNECT_ME_TO, because devmapper
-         * passes device handle to the driver as an ipc method.)
-         */
-        if (IPC_GET_IMETHOD(*icall) != IPC_M_CONNECT_ME_TO)
-                devman_connection_devmapper(iid, icall);
-
-        /*
-         * ipc method is IPC_M_CONNECT_ME_TO, so this is forwarded connection
-         * from naming service by which we registered as device manager, so be
-         * device manager.
-         */
-        
         /* Select interface. */
         switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
@@ -542 +526 @@
                 devman_forward(iid, icall, false);
                 break;
+        case DEVMAN_CONNECT_FROM_DEVMAP:
+                /* Someone connected through devmap node. */
+                devman_connection_devmapper(iid, icall);
+                break;
         case DEVMAN_CONNECT_TO_PARENTS_DEVICE:
                 /* Connect client to selected device. */