Changeset efdfebc in mainline for uspace/drv/infrastructure/rootvirt/rootvirt.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/infrastructure/rootvirt/rootvirt.c (modified) (4 diffs)

uspace/drv/infrastructure/rootvirt/rootvirt.c

@@ -151 +151 @@
 {
         int rc;
-        const char *name = rvfun->fun->name;
+        const char *name = ddf_fun_get_name(rvfun->fun);
 
         ddf_msg(LVL_DEBUG, "rootvirt_fun_remove('%s')", name);
@@ -183 +183 @@
         }
 
-        ddf_msg(LVL_DEBUG, "dev_add(handle=%d)", (int)dev->handle);
+        ddf_msg(LVL_DEBUG, "dev_add(handle=%d)", (int)ddf_dev_get_handle(dev));
 
         rootvirt = ddf_dev_data_alloc(dev, sizeof(rootvirt_t));
@@ -207 +207 @@
 static int rootvirt_dev_remove(ddf_dev_t *dev)
 {
-        rootvirt_t *rootvirt = (rootvirt_t *)dev->driver_data;
+        rootvirt_t *rootvirt = (rootvirt_t *)ddf_dev_data_get(dev);
         int rc;
 
@@ -240 +240 @@
         printf(NAME ": HelenOS virtual devices root driver\n");
 
-        ddf_log_init(NAME, LVL_ERROR);
+        ddf_log_init(NAME);
         return ddf_driver_main(&rootvirt_driver);
 }