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

Timestamp:

2017-11-25T11:12:23Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

98cb5e0d

Parents:

f571ca49 (diff), 0851a3d (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 branch 'master' into callcaps

File:

• uspace/drv/test/test1/test1.c (modified) (1 diff)

uspace/drv/test/test1/test1.c

@@ -177 +177 @@
         ddf_fun_add_to_category(fun_a, "virtual");
 
-        if (str_cmp(dev_name, "null") == 0) {
-                ddf_fun_set_ops(fun_a,  &char_device_ops);
-                ddf_fun_add_to_category(fun_a, "virt-null");
-        } else if (str_cmp(dev_name, "test1") == 0) {
+        if (str_cmp(dev_name, "test1") == 0) {
                 (void) register_fun_verbose(dev,
                     "cloning myself ;-)", "clone",