Changes in uspace/drv/rootvirt/rootvirt.c [af6b5157:6f9e7fea] in mainline

File:

• uspace/drv/rootvirt/rootvirt.c (modified) (5 diffs)

uspace/drv/rootvirt/rootvirt.c

@@ -39 +39 @@
 #include <errno.h>
 #include <str_error.h>
-#include <ddf/driver.h>
+#include <driver.h>
 
 #define NAME "rootvirt"
 
-/** Virtual function entry */
+/** Virtual device entry. */
 typedef struct {
-        /** Function name */
+        /** Device name. */
         const char *name;
-        /** Function match ID */
+        /** Device match id. */
         const char *match_id;
-} virtual_function_t;
+} virtual_device_t;
 
-/** List of existing virtual functions */
-virtual_function_t virtual_functions[] = {
+/** List of existing virtual devices. */
+virtual_device_t virtual_devices[] = {
 #include "devices.def"
-        /* Terminating item */
+        /* Terminating item. */
         {
                 .name = NULL,
@@ -61 +61 @@
 };
 
-static int rootvirt_add_device(ddf_dev_t *dev);
+static int add_device(device_t *dev);
 
 static driver_ops_t rootvirt_ops = {
-        .add_device = &rootvirt_add_device
+        .add_device = &add_device
 };
 
@@ -72 +72 @@
 };
 
-/** Add function to the virtual device.
+/** Add child device.
  *
- * @param vdev          The virtual device
- * @param vfun          Virtual function description
- * @return              EOK on success or negative error code.
+ * @param parent Parent device.
+ * @param virt_dev Virtual device to add.
+ * @return Error code.
  */
-static int rootvirt_add_fun(ddf_dev_t *vdev, virtual_function_t *vfun)
+static int add_child(device_t *parent, virtual_device_t *virt_dev)
 {
-        ddf_fun_t *fun;
-        int rc;
+        printf(NAME ": registering child device `%s' (match \"%s\")\n",
+            virt_dev->name, virt_dev->match_id);
 
-        printf(NAME ": registering function `%s' (match \"%s\")\n",
-            vfun->name, vfun->match_id);
+        int rc = child_device_register_wrapper(parent, virt_dev->name,
+            virt_dev->match_id, 10);
 
-        fun = ddf_fun_create(vdev, fun_inner, vfun->name);
-        if (fun == NULL) {
-                printf(NAME ": error creating function %s\n", vfun->name);
-                return ENOMEM;
+        if (rc == EOK) {
+                printf(NAME ": registered child device `%s'\n",
+                    virt_dev->name);
+        } else {
+                printf(NAME ": failed to register child device `%s': %s\n",
+                    virt_dev->name, str_error(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;
+        return rc;
 }
 
-static int rootvirt_add_device(ddf_dev_t *dev)
+static int add_device(device_t *dev)
 {
         static int instances = 0;
@@ -124 +109 @@
         }
 
-        printf(NAME ": add_device(handle=%d)\n", (int)dev->handle);
-
+        printf(NAME ": add_device(name=\"%s\", handle=%d)\n",
+            dev->name, dev->handle);
+        
         /*
-         * Go through all virtual functions and try to add them.
+         * Go through all virtual devices and try to add them.
          * We silently ignore failures.
          */
-        virtual_function_t *vfun = virtual_functions;
-        while (vfun->name != NULL) {
-                (void) rootvirt_add_fun(dev, vfun);
-                vfun++;
+        virtual_device_t *virt_dev = virtual_devices;
+        while (virt_dev->name != NULL) {
+                (void) add_child(dev, virt_dev);
+                virt_dev++;
         }
 
@@ -142 +128 @@
 {
         printf(NAME ": HelenOS virtual devices root driver\n");
-        return ddf_driver_main(&rootvirt_driver);
+        return driver_main(&rootvirt_driver);
 }