Changes in uspace/srv/devman/main.c [6e50466:0b5a4131] in mainline

File:

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

uspace/srv/devman/main.c

@@ -36 +36 @@
  */
 
-#include <inttypes.h>
 #include <assert.h>
 #include <ipc/services.h>
@@ -74 +73 @@
         
         iid = async_get_call(&icall);
-        if (IPC_GET_IMETHOD(icall) != DEVMAN_DRIVER_REGISTER) {
+        if (IPC_GET_METHOD(icall) != DEVMAN_DRIVER_REGISTER) {
                 ipc_answer_0(iid, EREFUSED);
                 return NULL;
@@ -109 +108 @@
         ipc_call_t call;
         ipc_callid_t callid = async_get_call(&call);
-        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
+        if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
                 ipc_answer_0(callid, ENOTSUP);
                 ipc_answer_0(iid, ENOTSUP);
@@ -141 +140 @@
         
         callid = async_get_call(&call);
-        if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
+        if (DEVMAN_ADD_MATCH_ID != IPC_GET_METHOD(call)) {
                 printf(NAME ": ERROR: devman_receive_match_id - invalid "
                     "protocol.\n");
@@ -184 +183 @@
  * @return              Zero on success, negative error code otherwise.
  */
-static int devman_receive_match_ids(sysarg_t match_count,
+static int devman_receive_match_ids(ipcarg_t match_count,
     match_id_list_t *match_ids)
 {
@@ -197 +196 @@
 }
 
-static int assign_driver_fibril(void *arg)
-{
-        node_t *node = (node_t *) arg;
-        assign_driver(node, &drivers_list, &device_tree);
-        return EOK;
-}
-
 /** Handle child device registration.
  *
@@ -211 +203 @@
 {
         devman_handle_t parent_handle = IPC_GET_ARG1(*call);
-        sysarg_t match_count = IPC_GET_ARG2(*call);
+        ipcarg_t match_count = IPC_GET_ARG2(*call);
         dev_tree_t *tree = &device_tree;
         
@@ -244 +236 @@
         
         devman_receive_match_ids(match_count, &node->match_ids);
-
-        /*
-         * Try to find a suitable driver and assign it to the device.  We do
-         * not want to block the current fibril that is used for processing
-         * incoming calls: we will launch a separate fibril to handle the
-         * driver assigning. That is because assign_driver can actually include
-         * task spawning which could take some time.
-         */
-        fid_t assign_fibril = fibril_create(assign_driver_fibril, node);
-        if (assign_fibril == 0) {
-                /*
-                 * Fallback in case we are out of memory.
-                 * Probably not needed as we will die soon anyway ;-).
-                 */
-                (void) assign_driver_fibril(node);
-        } else {
-                fibril_add_ready(assign_fibril);
-        }
-
+        
         /* Return device handle to parent's driver. */
         ipc_answer_1(callid, EOK, node->handle);
+        
+        /* Try to find suitable driver and assign it to the device. */
+        assign_driver(node, &drivers_list, &device_tree);
 }
 
@@ -281 +258 @@
          * handle.
          */
-        devmap_device_register_with_iface(devmap_pathname,
-            &cli->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        devmap_device_register(devmap_pathname, &cli->devmap_handle);
         
         /*
@@ -320 +296 @@
         printf(NAME ": device '%s' added to class '%s', class name '%s' was "
             "asigned to it\n", dev->pathname, class_name, class_info->dev_name);
-
+        
         ipc_answer_0(callid, EOK);
 }
@@ -368 +344 @@
                 callid = async_get_call(&call);
                 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cont = false;
@@ -421 +397 @@
                 ipc_callid_t callid = async_get_call(&call);
                 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cont = false;
@@ -429 +405 @@
                         break;
                 default:
-                        ipc_answer_0(callid, ENOENT);
+                        if (!(callid & IPC_CALLID_NOTIFICATION))
+                                ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -441 +418 @@
         node_t *dev = find_dev_node(&device_tree, handle);
         if (dev == NULL) {
-                printf(NAME ": devman_forward error - no device with handle %" PRIun
-                    " was found.\n", handle);
+                printf(NAME ": devman_forward error - no device with handle %x "
+                    "was found.\n", handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -458 +435 @@
         
         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 is not in "
+                    "usable state.\n", handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -473 +450 @@
                 printf(NAME ": devman_forward: cound not forward to driver %s ",
                     driver->name);
-                printf("the driver's phone is %" PRIun ").\n", driver->phone);
+                printf("the driver's phone is %x).\n", driver->phone);
                 ipc_answer_0(iid, EINVAL);
                 return;
@@ -487 +464 @@
 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_METHOD(*icall);
         node_t *dev;
 
@@ -504 +481 @@
         }
         
+        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 +490 @@
 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_METHOD(*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))) {
+        switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
         case DEVMAN_DRIVER:
                 devman_connection_driver(iid, icall);
@@ -525 +520 @@
                 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 +577 @@
 
         /* Register device manager at naming service. */
-        sysarg_t phonead;
+        ipcarg_t phonead;
         if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAN, 0, 0, &phonead) != 0)
                 return -1;