Changeset bd5f3b7 in mainline for uspace/drv/test/test1/test1.c

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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/test1/test1.c (modified) (2 diffs)

uspace/drv/test/test1/test1.c

@@ -74 +74 @@
         }
 
-        rc = ddf_fun_add_match_id(fun, str_dup(match_id), match_score);
+        rc = ddf_fun_add_match_id(fun, match_id, match_score);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
@@ -143 +143 @@
         }
 
-        ddf_fun_add_to_class(fun_a, "virtual");
+        ddf_fun_add_to_category(fun_a, "virtual");
 
         if (str_cmp(dev->name, "null") == 0) {
                 fun_a->ops = &char_device_ops;
-                ddf_fun_add_to_class(fun_a, "virt-null");
+                ddf_fun_add_to_category(fun_a, "virt-null");
         } else if (str_cmp(dev->name, "test1") == 0) {
                 (void) register_fun_verbose(dev,