Changeset cd0684d in mainline for uspace/drv/rootvirt/rootvirt.c

Timestamp:

2011-02-14T22:14:52Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

659ca07

Parents:

97a62fe

Message:

Remove register_function_wrapper() since it became practically useless.
Provide ddf_fun_add_match_id() instead.

File:

• uspace/drv/rootvirt/rootvirt.c (modified) (1 diff)

uspace/drv/rootvirt/rootvirt.c

@@ -80 +80 @@
 static int rootvirt_add_fun(device_t *vdev, virtual_function_t *vfun)
 {
+        function_t *fun;
+        int rc;
+
         printf(NAME ": registering function `%s' (match \"%s\")\n",
             vfun->name, vfun->match_id);
 
-        int rc = register_function_wrapper(vdev, vfun->name,
-            vfun->match_id, 10);
-
-        if (rc == EOK) {
-                printf(NAME ": registered child device `%s'\n",
-                    vfun->name);
-        } else {
-                printf(NAME ": failed to register child device `%s': %s\n",
-                    vfun->name, str_error(rc));
+        fun = ddf_fun_create(vdev, fun_inner, vfun->name);
+        if (fun == NULL) {
+                printf(NAME ": error creating function %s\n", vfun->name);
+                return ENOMEM;
         }
 
-        return rc;
+        rc = ddf_fun_add_match_id(fun, vfun->match_id, 10);
+        if (rc != EOK) {
+                printf(NAME ": error adding match IDs to function %s\n",
+                    vfun->name);
+                ddf_fun_destroy(fun);
+                return rc;
+        }
+
+        rc = ddf_fun_bind(fun);
+        if (rc != EOK) {
+                printf(NAME ": error binding function %s: %s\n", vfun->name,
+                    str_error(rc));
+                ddf_fun_destroy(fun);
+                return rc;
+        }
+
+        printf(NAME ": registered child device `%s'\n", vfun->name);
+        return EOK;
 }