Changeset beb9336 in mainline for uspace/drv/test/test2/test2.c

Timestamp:

2012-08-24T14:07:52Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

File:

• uspace/drv/test/test2/test2.c (modified) (4 diffs)

uspace/drv/test/test2/test2.c

@@ -196 +196 @@
 {
         test2_t *test2;
+        const char *dev_name = ddf_dev_get_name(dev);
 
         ddf_msg(LVL_DEBUG, "test2_dev_add(name=\"%s\", handle=%d)",
-            dev->name, (int) dev->handle);
+            dev_name, (int) ddf_dev_get_handle(dev));
 
         test2 = ddf_dev_data_alloc(dev, sizeof(test2_t));
@@ -208 +209 @@
         test2->dev = dev;
 
-        if (str_cmp(dev->name, "child") != 0) {
+        if (str_cmp(dev_name, "child") != 0) {
                 fid_t postpone = fibril_create(plug_unplug, test2);
                 if (postpone == 0) {
@@ -225 +226 @@
 static int test2_dev_remove(ddf_dev_t *dev)
 {
-        test2_t *test2 = (test2_t *)dev->driver_data;
+        test2_t *test2 = (test2_t *)ddf_dev_data_get(dev);
         int rc;
 
@@ -259 +260 @@
 static int test2_dev_gone(ddf_dev_t *dev)
 {
-        test2_t *test2 = (test2_t *)dev->driver_data;
+        test2_t *test2 = (test2_t *)ddf_dev_data_get(dev);
         int rc;