Changes in uspace/lib/drv/generic/driver.c [b72efe8:45059d6b] in mainline

File:

• uspace/lib/drv/generic/driver.c (modified) (6 diffs)

uspace/lib/drv/generic/driver.c

@@ -314 +314 @@
                     " %" PRIun " was found.\n", driver->name, handle);
                 async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        if (fun->conn_handler != NULL) {
+                /* Driver has a custom connection handler. */
+                (*fun->conn_handler)(iid, icall, (void *)fun);
                 return;
         }
@@ -422 +428 @@
 static void driver_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+        sysarg_t conn_type;
+
+        if (iid == 0) {
+                /* Callback connection from devman */
+                /* XXX Use separate handler for this type of connection */
+                conn_type = DRIVER_DEVMAN;
+        } else {
+                conn_type = IPC_GET_ARG1(*icall);
+        }
+
         /* Select interface */
-        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
+        switch (conn_type) {
         case DRIVER_DEVMAN:
                 /* Handle request from device manager */
@@ -576 +592 @@
 int ddf_fun_bind(ddf_fun_t *fun)
 {
+        assert(fun->bound == false);
         assert(fun->name != NULL);
         
@@ -592 +609 @@
 }
 
+/** 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.
  *
@@ -614 +656 @@
                 return ENOMEM;
         
-        match_id->id = match_id_str;
+        match_id->id = str_dup(match_id_str);
         match_id->score = 90;
         
@@ -629 +671 @@
 }
 
-/** 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);
 }