Changeset 40dc422 in mainline for uspace/app/tester

Timestamp:

2010-12-18T11:07:32Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

557c7d0, 78ffb70

Parents:

bbc74af7 (diff), 6e50466 (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 from lp:~vojtech-horky/helenos/ddf-fixes.

Location:

uspace/app/tester

Files:

• Makefile (modified) (1 diff)
• hw/misc/virtchar1.c (added)
• hw/misc/virtchar1.def (added)
• tester.c (modified) (1 diff)
• tester.h (modified) (1 diff)

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[];