Changeset fedac2f in mainline for uspace/app

Timestamp:

2012-09-16T11:27:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

289fa65

Parents:

8930624 (diff), 00b4a68 (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

Files:

• logset/Makefile (added)
• logset/main.c (added)
• tester/Makefile (modified) (3 diffs)
• tester/ext2/ext2_1.c (moved) (moved from uspace/app/tester/libext2/libext2_1.c ) (1 diff)
• tester/ext2/ext2_1.def (moved) (moved from uspace/app/tester/libext2/libext2_1.def ) (1 diff)
• tester/float/float1.c (added)
• tester/float/float1.def (added)
• tester/float/softfloat1.c (added)
• tester/float/softfloat1.def (added)
• tester/stdio/logger1.c (added)
• tester/stdio/logger1.def (added)
• tester/stdio/logger2.c (added)
• tester/stdio/logger2.def (added)
• tester/tester.c (modified) (4 diffs)
• tester/tester.h (modified) (2 diffs)
• vuhid/main.c (modified) (1 diff)

uspace/app/tester/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX)
+LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX) -I$(LIBSOFTFLOAT_PREFIX)
 BINARY = tester
 
@@ -45 +45 @@
         stdio/stdio1.c \
         stdio/stdio2.c \
+        stdio/logger1.c \
+        stdio/logger2.c \
         fault/fault1.c \
         fault/fault2.c \
         fault/fault3.c \
+        float/float1.c \
+        float/softfloat1.c \
         vfs/vfs1.c \
         ipc/ping_pong.c \
@@ -59 +63 @@
         hw/misc/virtchar1.c \
         hw/serial/serial1.c \
-        libext2/libext2_1.c
+        ext2/ext2_1.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/tester/ext2/ext2_1.c

@@ -51 +51 @@
 }
 
-const char *test_libext2_1(void)
+const char *test_ext2_1(void)
 {
         ext2_superblock_t *fake1;
         
-        TPRINTF("Testing libext2 superblock getters...\n");
+        TPRINTF("Testing ext2 superblock getters...\n");
         TPRINTF("Simple test for correct position and byte order\n");
         

uspace/app/tester/ext2/ext2_1.def

@@ -1 +1 @@
 {
-        "libext2_1",
+        "ext2_1",
         "Superblock getters test",
-        &test_libext2_1,
+        &test_ext2_1,
         true
 },

uspace/app/tester/tester.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <str.h>
+#include <io/log.h>
 #include "tester.h"
 
@@ -55 +56 @@
 #include "stdio/stdio1.def"
 #include "stdio/stdio2.def"
+#include "stdio/logger1.def"
+#include "stdio/logger2.def"
 #include "fault/fault1.def"
 #include "fault/fault2.def"
 #include "fault/fault3.def"
+#include "float/float1.def"
+#include "float/softfloat1.def"
 #include "vfs/vfs1.def"
 #include "ipc/ping_pong.def"
@@ -68 +73 @@
 #include "hw/serial/serial1.def"
 #include "hw/misc/virtchar1.def"
-#include "libext2/libext2_1.def"
+#include "ext2/ext2_1.def"
         {NULL, NULL, NULL, false}
 };
@@ -138 +143 @@
         }
         
+        log_init("tester");
+
         test_quiet = false;
         test_argc = argc - 2;

uspace/app/tester/tester.h

@@ -88 +88 @@
 extern const char *test_stdio1(void);
 extern const char *test_stdio2(void);
+extern const char *test_logger1(void);
+extern const char *test_logger2(void);
 extern const char *test_fault1(void);
 extern const char *test_fault2(void);
 extern const char *test_fault3(void);
+extern const char *test_float1(void);
+extern const char *test_softfloat1(void);
 extern const char *test_vfs1(void);
 extern const char *test_ping_pong(void);
@@ -101 +105 @@
 extern const char *test_serial1(void);
 extern const char *test_virtchar1(void);
-extern const char *test_libext2_1(void);
+extern const char *test_ext2_1(void);
 extern const char *test_devman1(void);
 extern const char *test_devman2(void);

uspace/app/vuhid/main.c

@@ -155 +155 @@
         int rc;
 
-        usb_log_enable(USB_LOG_LEVEL_DEBUG2, "vusbhid");
+        log_init("vuhid");
 
         fibril_mutex_initialize(&vuhid_data.iface_count_mutex);