Changeset 557c7d0 in mainline for uspace/app

Timestamp:

2010-12-19T10:12:49Z (15 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

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

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

uspace/app/tester/tester.c

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

uspace/app/tester/tester.h

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