Changeset e8d5f9f in mainline for uspace/app

Timestamp:

2011-05-31T23:11:28Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d1b3aa

Parents:

4ce90544 (diff), 25bef0ff (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:~jakub/helenos/fs.

Location:

uspace/app/tester

Files:

• Makefile (modified) (1 diff)
• tester.c (modified) (1 diff)
• tester.h (modified) (1 diff)

uspace/app/tester/Makefile

@@ -53 +53 @@
         mm/malloc3.c \
         devs/devman1.c \
+        devs/devman2.c \
         hw/misc/virtchar1.c \
         hw/serial/serial1.c

uspace/app/tester/tester.c

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

uspace/app/tester/tester.h

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