Changeset 424558a in mainline

Timestamp:

2010-12-17T21:29:22Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0bff73a

Parents:

87b4baa

Message:

Add null char device and test for it

Currently, the test only verifies whether connection through devmap
to devman drivers work (it does not).

Location:

uspace

Files:

• app/tester/Makefile (modified) (1 diff)
• app/tester/hw/misc/virtchar1.c (added)
• app/tester/hw/misc/virtchar1.def (added)
• app/tester/tester.c (modified) (1 diff)
• app/tester/tester.h (modified) (1 diff)
• drv/rootvirt/devices.def (modified) (1 diff)
• drv/test1/Makefile (modified) (1 diff)
• drv/test1/char.c (added)
• drv/test1/test1.c (modified) (3 diffs)
• drv/test1/test1.h (added)

uspace/app/tester/Makefile

@@ -51 +51 @@
         loop/loop1.c \
         mm/malloc1.c \
+        hw/misc/virtchar1.c \
         hw/serial/serial1.c
 

uspace/app/tester/tester.c

@@ -65 +65 @@
 #include "mm/malloc1.def"
 #include "hw/serial/serial1.def"
+#include "hw/misc/virtchar1.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h

@@ -82 +82 @@
 extern const char *test_malloc1(void);
 extern const char *test_serial1(void);
+extern const char *test_virtchar1(void);
 
 extern test_t tests[];

uspace/drv/rootvirt/devices.def

@@ -17 +17 @@
         .match_id = "virtual&test2"
 },
+{
+        .name = "null",
+        .match_id = "virtual&test1"
+},
 #endif

uspace/drv/test1/Makefile

@@ -33 +33 @@
 
 SOURCES = \
+        char.c \
         test1.c
 

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;
+        } else if (dev->parent == NULL) {
                 register_child_verbose(dev, "cloning myself ;-)", "clone",
                     "virtual&test1", 10);
@@ -117 +117 @@
 }
 
-