Changeset 8b655705 in mainline for uspace/drv/rootvirt/rootvirt.c

Timestamp:

2011-04-15T19:38:07Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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/drv/rootvirt/rootvirt.c (modified) (5 diffs)

uspace/drv/rootvirt/rootvirt.c

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