Changeset 6843a9c in mainline for uspace/drv/infrastructure/rootvirt/rootvirt.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/drv/infrastructure/rootvirt/rootvirt.c (modified) (4 diffs)

uspace/drv/infrastructure/rootvirt/rootvirt.c

@@ -62 +62 @@
 };
 
-static int rootvirt_add_device(ddf_dev_t *dev);
+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);
@@ -68 +68 @@
 
 static driver_ops_t rootvirt_ops = {
-        .add_device = &rootvirt_add_device,
+        .dev_add = &rootvirt_dev_add,
         .dev_remove = &rootvirt_dev_remove,
         .fun_online = &rootvirt_fun_online,
@@ -172 +172 @@
 
 
-static int rootvirt_add_device(ddf_dev_t *dev)
+static int rootvirt_dev_add(ddf_dev_t *dev)
 {
         rootvirt_t *rootvirt;
@@ -183 +183 @@
         }
 
-        ddf_msg(LVL_DEBUG, "add_device(handle=%d)", (int)dev->handle);
+        ddf_msg(LVL_DEBUG, "dev_add(handle=%d)", (int)dev->handle);
 
         rootvirt = ddf_dev_data_alloc(dev, sizeof(rootvirt_t));