Changeset efdfebc in mainline for uspace/drv/test/test3/test3.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/test/test3/test3.c (modified) (3 diffs)

uspace/drv/test/test3/test3.c

@@ -133 +133 @@
 
         ddf_msg(LVL_DEBUG, "dev_add(name=\"%s\", handle=%d)",
-            dev->name, (int) dev->handle);
+            ddf_dev_get_name(dev), (int) ddf_dev_get_handle(dev));
 
         test3 = ddf_dev_data_alloc(dev, sizeof(test3_t));
@@ -155 +155 @@
 static int test3_dev_remove(ddf_dev_t *dev)
 {
-        test3_t *test3 = (test3_t *)dev->driver_data;
+        test3_t *test3 = (test3_t *)ddf_dev_data_get(dev);
         char *fun_name;
         int rc;
@@ -193 +193 @@
 {
         printf(NAME ": HelenOS test3 virtual device driver\n");
-        ddf_log_init(NAME, LVL_ERROR);
+        ddf_log_init(NAME);
         return ddf_driver_main(&test3_driver);
 }