Changeset 969585f in mainline for uspace/app/tester

Timestamp:

2011-04-01T20:49:28Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0053fa38, 5542b83, c6ba274

Parents:

8e7d724 (diff), ebcb05a (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

Location:

uspace/app/tester

Files:

• Makefile (modified) (1 diff)
• devs/devman1.c (added)
• devs/devman1.def (added)
• tester.c (modified) (1 diff)
• tester.h (modified) (1 diff)

uspace/app/tester/Makefile

@@ -54 +54 @@
         mm/malloc1.c \
         mm/mapping1.c \
+        devs/devman1.c \
         hw/misc/virtchar1.c \
         hw/serial/serial1.c

uspace/app/tester/tester.c

@@ -66 +66 @@
 #include "adt/usbaddrkeep.def"
 #include "hw/misc/virtchar1.def"
+#include "devs/devman1.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h

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