Changeset ea186c6 in mainline for uspace/srv/devman/devman.c

Timestamp:

2011-08-18T20:27:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

921b84f

Parents:

1f44b056 (diff), ef7052ec (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 mainline changes.

File:

• uspace/srv/devman/devman.c (modified) (1 diff)

uspace/srv/devman/devman.c

@@ -1100 +1100 @@
 }
 
+/** Remove function from device tree.
+ *
+ * @param tree          Device tree
+ * @param node          Function node to remove
+ */
+void remove_fun_node(dev_tree_t *tree, fun_node_t *fun)
+{
+        assert(tree != NULL);
+        assert(fun != NULL);
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
+        
+        /* Remove the node from the handle-to-node map. */
+        unsigned long key = fun->handle;
+        hash_table_remove(&tree->devman_functions, &key, 1);
+        
+        /* Remove the node from the list of its parent's children. */
+        if (fun->dev != NULL)
+                list_remove(&fun->dev_functions);
+}
+
 /** Find function node with a specified path in the device tree.
  *