Changeset f3e2663 in mainline for uspace/app/tester

Timestamp:

2011-04-03T11:17:45Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

106743d

Parents:

10eb754 (diff), b2a081ae (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)
• fault/fault2.c (modified) (2 diffs)
• tester.c (modified) (1 diff)
• tester.h (modified) (1 diff)

uspace/app/tester/Makefile

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

uspace/app/tester/fault/fault2.c

@@ -29 +29 @@
 
 #include "../tester.h"
+#include <stdio.h>
 
 typedef int __attribute__((may_alias)) aliasing_int;
@@ -38 +39 @@
         
         var1 = *((aliasing_int *) (((char *) (&var)) + 1));
+        printf("Read %d\n", var1);
         
         return "Survived unaligned read";

uspace/app/tester/tester.c

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

uspace/app/tester/tester.h

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