Changeset ba38f72c in mainline for uspace/srv/devman/main.c

Timestamp:

2011-02-07T22:15:37Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1b367b4

Parents:

8b5690f

Message:

Split device tree node into dev_node_t (device node) and fun_node_t (function node).

File:

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

uspace/srv/devman/main.c

@@ -199 +199 @@
 static int assign_driver_fibril(void *arg)
 {
-        node_t *node = (node_t *) arg;
-        assign_driver(node, &drivers_list, &device_tree);
+        dev_node_t *dev_node = (dev_node_t *) arg;
+        assign_driver(dev_node, &drivers_list, &device_tree);
         return EOK;
 }
@@ -215 +215 @@
         
         fibril_rwlock_write_lock(&tree->rwlock);
-        node_t *parent = find_dev_node_no_lock(&device_tree, parent_handle);
-        
-        if (parent == NULL) {
+        dev_node_t *pdev = find_dev_node_no_lock(&device_tree, parent_handle);
+        
+        if (pdev == NULL) {
                 fibril_rwlock_write_unlock(&tree->rwlock);
                 async_answer_0(callid, ENOENT);
@@ -223 +223 @@
         }
         
-        char *dev_name = NULL;
-        int rc = async_data_write_accept((void **)&dev_name, true, 0, 0, 0, 0);
+        char *fun_name = NULL;
+        int rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&tree->rwlock);
@@ -231 +231 @@
         }
         
-        node_t *node = create_dev_node();
-        if (!insert_dev_node(&device_tree, node, dev_name, parent)) {
+        fun_node_t *fun = create_fun_node();
+        if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) {
                 fibril_rwlock_write_unlock(&tree->rwlock);
-                delete_dev_node(node);
+                delete_fun_node(fun);
                 async_answer_0(callid, ENOMEM);
                 return;
         }
 
+        dev_node_t *dev;
+
+        dev = create_dev_node();
+        if (dev == NULL) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                delete_fun_node(fun);
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
+
+        insert_dev_node(tree, dev, fun);
+
         fibril_rwlock_write_unlock(&tree->rwlock);
         
-        printf(NAME ": devman_add_child %s\n", node->pathname);
-        
-        devman_receive_match_ids(match_count, &node->match_ids);
+        printf(NAME ": devman_add_child %s\n", fun->pathname);
+        
+        devman_receive_match_ids(match_count, &fun->match_ids);
 
         /*
@@ -252 +264 @@
          * task spawning which could take some time.
          */
-        fid_t assign_fibril = fibril_create(assign_driver_fibril, node);
+        fid_t assign_fibril = fibril_create(assign_driver_fibril, dev);
         if (assign_fibril == 0) {
                 /*
@@ -258 +270 @@
                  * Probably not needed as we will die soon anyway ;-).
                  */
-                (void) assign_driver_fibril(node);
+                (void) assign_driver_fibril(fun);
         } else {
                 fibril_add_ready(assign_fibril);
@@ -264 +276 @@
 
         /* Return device handle to parent's driver. */
-        async_answer_1(callid, EOK, node->handle);
+        async_answer_1(callid, EOK, fun->handle);
 }
 
@@ -288 +300 @@
          * mapper.
          */
-        class_add_devmap_device(&class_list, cli);
+        class_add_devmap_function(&class_list, cli);
         
         free(devmap_pathname);
 }
 
-static void devman_add_device_to_class(ipc_callid_t callid, ipc_call_t *call)
+static void devman_add_function_to_class(ipc_callid_t callid, ipc_call_t *call)
 {
         devman_handle_t handle = IPC_GET_ARG1(*call);
@@ -306 +318 @@
         }       
         
-        node_t *dev = find_dev_node(&device_tree, handle);
-        if (dev == NULL) {
+        fun_node_t *fun = find_fun_node(&device_tree, handle);
+        if (fun == NULL) {
                 async_answer_0(callid, ENOENT);
                 return;
@@ -313 +325 @@
         
         dev_class_t *cl = get_dev_class(&class_list, class_name);
-        dev_class_info_t *class_info = add_device_to_class(dev, cl, NULL);
+        dev_class_info_t *class_info = add_function_to_class(fun, cl, NULL);
         
         /* Register the device's class alias by devmapper. */
         devmap_register_class_dev(class_info);
         
-        printf(NAME ": device '%s' added to class '%s', class name '%s' was "
-            "asigned to it\n", dev->pathname, class_name, class_info->dev_name);
+        printf(NAME ": function'%s' added to class '%s', class name '%s' was "
+            "asigned to it\n", fun->pathname, class_name, class_info->dev_name);
 
         async_answer_0(callid, EOK);
@@ -376 +388 @@
                         break;
                 case DEVMAN_ADD_DEVICE_TO_CLASS:
-                        devman_add_device_to_class(callid, &call);
+                        devman_add_function_to_class(callid, &call);
                         break;
                 default:
@@ -387 +399 @@
 /** Find handle for the device instance identified by the device's path in the
  * device tree. */
-static void devman_device_get_handle(ipc_callid_t iid, ipc_call_t *icall)
+static void devman_function_get_handle(ipc_callid_t iid, ipc_call_t *icall)
 {
         char *pathname;
@@ -397 +409 @@
         }
         
-        node_t * dev = find_dev_node_by_path(&device_tree, pathname);
+        fun_node_t * fun = find_fun_node_by_path(&device_tree, pathname);
         
         free(pathname);
 
-        if (dev == NULL) {
+        if (fun == NULL) {
                 async_answer_0(iid, ENOENT);
                 return;
         }
         
-        async_answer_1(iid, EOK, dev->handle);
+        async_answer_1(iid, EOK, fun->handle);
 }
 
@@ -426 +438 @@
                         continue;
                 case DEVMAN_DEVICE_GET_HANDLE:
-                        devman_device_get_handle(callid, &call);
+                        devman_function_get_handle(callid, &call);
                         break;
                 default:
@@ -439 +451 @@
         devman_handle_t handle = IPC_GET_ARG2(*icall);
         
-        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);
+        fun_node_t *fun = find_fun_node(&device_tree, handle);
+        if (fun == NULL) {
+                printf(NAME ": devman_forward error - no device function with "
+                    "handle %" PRIun " was found.\n", handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -450 +462 @@
         
         if (drv_to_parent) {
-                if (dev->parent != NULL)
-                        driver = dev->parent->drv;
-        } else if (dev->state == DEVICE_USABLE) {
-                driver = dev->drv;
+                if (fun->dev->pfun != NULL)
+                        driver = fun->dev->pfun->dev->drv;
+        } else if (fun->dev->state == DEVICE_USABLE) {
+                driver = fun->dev->drv;
                 assert(driver != NULL);
         }
@@ -478 +490 @@
         }
 
-        printf(NAME ": devman_forward: forward connection to device %s to "
-            "driver %s.\n", dev->pathname, driver->name);
-        async_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);
+        printf(NAME ": devman_forward: forward connection to function %s to "
+            "driver %s.\n", fun->pathname, driver->name);
+        async_forward_fast(iid, driver->phone, method, fun->handle, 0, IPC_FF_NONE);
 }
 
@@ -488 +500 @@
 {
         devmap_handle_t devmap_handle = IPC_GET_ARG2(*icall);
-        node_t *dev;
-
-        dev = find_devmap_tree_device(&device_tree, devmap_handle);
-        if (dev == NULL)
-                dev = find_devmap_class_device(&class_list, devmap_handle);
-        
-        if (dev == NULL || dev->drv == NULL) {
+        fun_node_t *fun;
+        dev_node_t *dev;
+
+        fun = find_devmap_tree_function(&device_tree, devmap_handle);
+        if (fun == NULL)
+                fun = find_devmap_class_function(&class_list, devmap_handle);
+        
+        if (fun == NULL || fun->dev->drv == NULL) {
                 async_answer_0(iid, ENOENT);
                 return;
         }
+        
+        dev = fun->dev;
         
         if (dev->state != DEVICE_USABLE || dev->drv->phone <= 0) {
@@ -507 +522 @@
             IPC_FF_NONE);
         printf(NAME ": devman_connection_devmapper: forwarded connection to "
-            "device %s to driver %s.\n", dev->pathname, dev->drv->name);
+            "device %s to driver %s.\n", fun->pathname, dev->drv->name);
 }