Changes in uspace/srv/devman/main.c [124c061:1f383dde] in mainline

File:

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

uspace/srv/devman/main.c

@@ -281 +281 @@
          * handle.
          */
-        devmap_device_register_with_iface(devmap_pathname,
-            &cli->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        devmap_device_register(devmap_pathname, &cli->devmap_handle);
         
         /*
@@ -478 +477 @@
         }
 
-        printf(NAME ": devman_forward: forward connection to device %s to "
-            "driver %s.\n", dev->pathname, driver->name);
+//      printf(NAME ": devman_forward: forward connection to device %s to "
+//          "driver %s.\n", dev->pathname, driver->name);
         ipc_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);
 }
@@ -487 +486 @@
 static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
 {
-        devmap_handle_t devmap_handle = IPC_GET_ARG2(*icall);
+        devmap_handle_t devmap_handle = IPC_GET_IMETHOD(*icall);
         node_t *dev;
 
@@ -504 +503 @@
         }
         
+        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);
 }
 
@@ -513 +512 @@
 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))) {
@@ -525 +542 @@
                 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. */
@@ -586 +599 @@
 
         /* Register device manager at naming service. */
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAN, 0, 0, NULL, NULL) != 0)
+        sysarg_t phonead;
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAN, 0, 0, &phonead) != 0)
                 return -1;