Changeset 903bac0a in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2011-08-19T09:00:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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/lib/drv/generic/driver.c (modified) (3 diffs)

uspace/lib/drv/generic/driver.c

@@ -582 +582 @@
 int ddf_fun_bind(ddf_fun_t *fun)
 {
+        assert(fun->bound == false);
         assert(fun->name != NULL);
         
@@ -598 +599 @@
 }
 
+/** Unbind a function node.
+ *
+ * Unbind the specified function from the system. This effectively makes
+ * the function invisible to the system.
+ *
+ * @param fun           Function to bind
+ * @return              EOK on success or negative error code
+ */
+int ddf_fun_unbind(ddf_fun_t *fun)
+{
+        int res;
+        
+        assert(fun->bound == true);
+        
+        add_to_functions_list(fun);
+        res = devman_remove_function(fun->handle);
+        if (res != EOK)
+                return res;
+
+        remove_from_functions_list(fun);
+        
+        fun->bound = false;
+        return EOK;
+}
+
 /** Add single match ID to inner function.
  *
@@ -635 +661 @@
 }
 
-/** Add exposed function to class.
+/** Add exposed function to category.
  *
  * Must only be called when the function is bound.
  */
-int ddf_fun_add_to_class(ddf_fun_t *fun, const char *class_name)
+int ddf_fun_add_to_category(ddf_fun_t *fun, const char *cat_name)
 {
         assert(fun->bound == true);
         assert(fun->ftype == fun_exposed);
         
-        return devman_add_device_to_class(fun->handle, class_name);
+        return devman_add_device_to_category(fun->handle, cat_name);
 }