Changeset 8e7c9fe in mainline for uspace/drv/root/virt/virt.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/drv/root/virt/virt.c (moved) (moved from uspace/drv/infrastructure/rootvirt/rootvirt.c ) (15 diffs)

uspace/drv/root/virt/virt.c

@@ -28 +28 @@
 
 /**
- * @defgroup rootvirt Root device driver for virtual devices.
+ * @defgroup virt Root device driver for virtual devices.
  * @{
  */
@@ -42 +42 @@
 #include <ddf/log.h>
 
-#define NAME "rootvirt"
+#define NAME "virt"
 
 /** Virtual function entry */
@@ -62 +62 @@
 };
 
-static int rootvirt_dev_add(ddf_dev_t *dev);
-static int rootvirt_dev_remove(ddf_dev_t *dev);
-static int rootvirt_fun_online(ddf_fun_t *fun);
-static int rootvirt_fun_offline(ddf_fun_t *fun);
-
-static driver_ops_t rootvirt_ops = {
-        .dev_add = &rootvirt_dev_add,
-        .dev_remove = &rootvirt_dev_remove,
-        .fun_online = &rootvirt_fun_online,
-        .fun_offline = &rootvirt_fun_offline
+static int virt_dev_add(ddf_dev_t *dev);
+static int virt_dev_remove(ddf_dev_t *dev);
+static int virt_fun_online(ddf_fun_t *fun);
+static int virt_fun_offline(ddf_fun_t *fun);
+
+static driver_ops_t virt_ops = {
+        .dev_add = &virt_dev_add,
+        .dev_remove = &virt_dev_remove,
+        .fun_online = &virt_fun_online,
+        .fun_offline = &virt_fun_offline
 };
 
-static driver_t rootvirt_driver = {
+static driver_t virt_driver = {
         .name = NAME,
-        .driver_ops = &rootvirt_ops
+        .driver_ops = &virt_ops
 };
 
@@ -83 +83 @@
         ddf_dev_t *dev;
         list_t functions;
-} rootvirt_t;
+} virt_t;
 
 /* Function soft state */
@@ -89 +89 @@
         ddf_fun_t *fun;
         link_t dev_link;
-} rootvirt_fun_t;
+} virt_fun_t;
 
 static int instances = 0;
@@ -100 +100 @@
  * @return              EOK on success or negative error code.
  */
-static int rootvirt_add_fun(rootvirt_t *rootvirt, virtual_function_t *vfun)
-{
-        ddf_dev_t *vdev = rootvirt->dev;
+static int virt_add_fun(virt_t *virt, virtual_function_t *vfun)
+{
+        ddf_dev_t *vdev = virt->dev;
         ddf_fun_t *fun;
-        rootvirt_fun_t *rvfun;
+        virt_fun_t *rvfun;
         int rc;
 
@@ -116 +116 @@
         }
 
-        rvfun = ddf_fun_data_alloc(fun, sizeof(rootvirt_fun_t));
+        rvfun = ddf_fun_data_alloc(fun, sizeof(virt_fun_t));
         if (rvfun == NULL) {
                 ddf_msg(LVL_ERROR, "Failed allocating soft state for %s.",
@@ -142 +142 @@
         }
 
-        list_append(&rvfun->dev_link, &rootvirt->functions);
+        list_append(&rvfun->dev_link, &virt->functions);
 
         ddf_msg(LVL_NOTE, "Registered child device `%s'", vfun->name);
@@ -148 +148 @@
 }
 
-static int rootvirt_fun_remove(rootvirt_fun_t *rvfun)
+static int virt_fun_remove(virt_fun_t *rvfun)
 {
         int rc;
         const char *name = ddf_fun_get_name(rvfun->fun);
 
-        ddf_msg(LVL_DEBUG, "rootvirt_fun_remove('%s')", name);
+        ddf_msg(LVL_DEBUG, "virt_fun_remove('%s')", name);
         rc = ddf_fun_offline(rvfun->fun);
         if (rc != EOK) {
@@ -172 +172 @@
 
 
-static int rootvirt_dev_add(ddf_dev_t *dev)
-{
-        rootvirt_t *rootvirt;
+static int virt_dev_add(ddf_dev_t *dev)
+{
+        virt_t *virt;
 
         /*
@@ -185 +185 @@
         ddf_msg(LVL_DEBUG, "dev_add(handle=%d)", (int)ddf_dev_get_handle(dev));
 
-        rootvirt = ddf_dev_data_alloc(dev, sizeof(rootvirt_t));
-        if (rootvirt == NULL)
+        virt = ddf_dev_data_alloc(dev, sizeof(virt_t));
+        if (virt == NULL)
                 return ENOMEM;
 
-        rootvirt->dev = dev;
-        list_initialize(&rootvirt->functions);
+        virt->dev = dev;
+        list_initialize(&virt->functions);
 
         /*
@@ -198 +198 @@
         virtual_function_t *vfun = virtual_functions;
         while (vfun->name != NULL) {
-                (void) rootvirt_add_fun(rootvirt, vfun);
+                (void) virt_add_fun(virt, vfun);
                 vfun++;
         }
@@ -205 +205 @@
 }
 
-static int rootvirt_dev_remove(ddf_dev_t *dev)
-{
-        rootvirt_t *rootvirt = (rootvirt_t *)ddf_dev_data_get(dev);
+static int virt_dev_remove(ddf_dev_t *dev)
+{
+        virt_t *virt = (virt_t *)ddf_dev_data_get(dev);
         int rc;
 
-        while (!list_empty(&rootvirt->functions)) {
-                rootvirt_fun_t *rvfun = list_get_instance(
-                    list_first(&rootvirt->functions), rootvirt_fun_t,
+        while (!list_empty(&virt->functions)) {
+                virt_fun_t *rvfun = list_get_instance(
+                    list_first(&virt->functions), virt_fun_t,
                         dev_link);
 
-                rc = rootvirt_fun_remove(rvfun);
+                rc = virt_fun_remove(rvfun);
                 if (rc != EOK)
                         return rc;
@@ -224 +224 @@
 }
 
-static int rootvirt_fun_online(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "rootvirt_fun_online()");
+static int virt_fun_online(ddf_fun_t *fun)
+{
+        ddf_msg(LVL_DEBUG, "virt_fun_online()");
         return ddf_fun_online(fun);
 }
 
-static int rootvirt_fun_offline(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "rootvirt_fun_offline()");
+static int virt_fun_offline(ddf_fun_t *fun)
+{
+        ddf_msg(LVL_DEBUG, "virt_fun_offline()");
         return ddf_fun_offline(fun);
 }
@@ -241 +241 @@
 
         ddf_log_init(NAME);
-        return ddf_driver_main(&rootvirt_driver);
+        return ddf_driver_main(&virt_driver);
 }