Changes in uspace/srv/devman/devtree.c [a35b458:1b20da0] in mainline

File:

• uspace/srv/devman/devtree.c (modified) (14 diffs)

uspace/srv/devman/devtree.c

@@ -127 +127 @@
         fun_node_t *fun;
         dev_node_t *dev;
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "create_root_nodes()");
-
+        
         fibril_rwlock_write_lock(&tree->rwlock);
-
+        
         /*
          * Create root function. This is a pseudo function to which
@@ -138 +138 @@
          * the parent function.
          */
-
+        
         fun = create_fun_node();
         if (fun == NULL) {
@@ -144 +144 @@
                 return false;
         }
-
+        
         fun_add_ref(fun);
         insert_fun_node(tree, fun, str_dup(""), NULL);
-
+        
         match_id_t *id = create_match_id();
         id->id = str_dup("root");
@@ -153 +153 @@
         add_match_id(&fun->match_ids, id);
         tree->root_node = fun;
-
+        
         /*
          * Create root device node.
@@ -162 +162 @@
                 return false;
         }
-
+        
         dev_add_ref(dev);
         insert_dev_node(tree, dev, fun);
-
+        
         fibril_rwlock_write_unlock(&tree->rwlock);
-
+        
         return dev != NULL;
 }
@@ -182 +182 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "init_device_tree()");
-
+        
         tree->current_handle = 0;
-
+        
         hash_table_create(&tree->devman_devices, 0, 0, &devman_devices_ops);
         hash_table_create(&tree->devman_functions, 0, 0, &devman_functions_ops);
         hash_table_create(&tree->loc_functions, 0, 0, &loc_devices_ops);
-
+        
         fibril_rwlock_initialize(&tree->rwlock);
-
+        
         /* Create root function and root device and add them to the device tree. */
         if (!create_root_nodes(tree))
                 return false;
-
+    
         /* Find suitable driver and start it. */
         dev_node_t *rdev = tree->root_node->child;
@@ -200 +200 @@
         bool rc = assign_driver(rdev, drivers_list, tree);
         dev_del_ref(rdev);
-
+        
         return rc;
 }
@@ -216 +216 @@
 {
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])",
             dev, pfun, pfun->pathname);
@@ -227 +227 @@
         dev->pfun = pfun;
         pfun->child = dev;
-
+        
         return true;
 }
@@ -239 +239 @@
 {
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "remove_dev_node(dev=%p)", dev);
-
+        
         /* Remove node from the handle-to-node map. */
         hash_table_remove(&tree->devman_devices, &dev->handle);
-
+        
         /* Unlink from parent function. */
         dev->pfun->child = NULL;
         dev->pfun = NULL;
-
+        
         dev->state = DEVICE_REMOVED;
 }
@@ -267 +267 @@
 {
         fun_node_t *pfun;
-
+        
         assert(fun_name != NULL);
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
-
+        
         /*
          * The root function is a special case, it does not belong to any
@@ -276 +276 @@
          */
         pfun = (dev != NULL) ? dev->pfun : NULL;
-
+        
         fun->name = fun_name;
         if (!set_fun_path(tree, fun, pfun)) {
                 return false;
         }
-
+        
         /* Add the node to the handle-to-node map. */
         fun->handle = ++tree->current_handle;
@@ -290 +290 @@
         if (dev != NULL)
                 list_append(&fun->dev_functions, &dev->functions);
-
+        
         return true;
 }
@@ -302 +302 @@
 {
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
-
+        
         /* Remove the node from the handle-to-node map. */
         hash_table_remove(&tree->devman_functions, &fun->handle);
-
+        
         /* Remove the node from the list of its parent's children. */
         if (fun->dev != NULL)
                 list_remove(&fun->dev_functions);
-
+        
         fun->dev = NULL;
         fun->state = FUN_REMOVED;