Changeset 557c7d0 in mainline for uspace/drv/test1/test1.c

Timestamp:

2010-12-19T10:12:49Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8dd039a, f568ee7

Parents:

11658b64 (diff), 40dc422 (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/test1/test1.c (modified) (3 diffs)

uspace/drv/test1/test1.c

@@ -34 +34 @@
 #include <errno.h>
 #include <str_error.h>
-#include <driver.h>
-
-#define NAME "test1"
+#include "test1.h"
 
 static int add_device(device_t *dev);
@@ -98 +96 @@
         add_device_to_class(dev, "virtual");
 
-        if (dev->parent == NULL) {
+        if (str_cmp(dev->name, "null") == 0) {
+                dev->ops = &char_device_ops;
+                add_device_to_class(dev, "virt-null");
+        } else if (dev->parent == NULL) {
                 register_child_verbose(dev, "cloning myself ;-)", "clone",
                     "virtual&test1", 10);
@@ -117 +118 @@
 }
 
-