Changeset 77cea41 in mainline for uspace/app

Timestamp:

2010-12-24T17:00:35Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

700af62

Parents:

1522b42 (diff), ab49a0d (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 development/ changes

Location:

uspace/app

Files:

• init/init.c (modified) (3 diffs)
• tester/Makefile (modified) (1 diff)
• tester/ipc/connect.c (deleted)
• tester/ipc/connect.def (deleted)
• tester/ipc/register.c (deleted)
• tester/ipc/register.def (deleted)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (1 diff)
• tester/vfs/vfs1.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -57 +57 @@
 #define DEVFS_MOUNT_POINT  "/dev"
 
-#define SCRATCH_FS_TYPE      "tmpfs"
-#define SCRATCH_MOUNT_POINT  "/scratch"
+#define TMPFS_FS_TYPE      "tmpfs"
+#define TMPFS_MOUNT_POINT  "/tmp"
 
 #define DATA_FS_TYPE      "fat"
@@ -235 +235 @@
 }
 
-static bool mount_scratch(void)
-{
-        int rc = mount(SCRATCH_FS_TYPE, SCRATCH_MOUNT_POINT, "", "", 0);
-        return mount_report("Scratch filesystem", SCRATCH_MOUNT_POINT,
-            SCRATCH_FS_TYPE, NULL, rc);
+static bool mount_tmpfs(void)
+{
+        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0);
+        return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
+            TMPFS_FS_TYPE, NULL, rc);
 }
 
@@ -271 +271 @@
         }
         
-        mount_scratch();
+        mount_tmpfs();
         
         spawn("/srv/fhc");

uspace/app/tester/Makefile

@@ -51 +51 @@
         vfs/vfs1.c \
         ipc/ping_pong.c \
-        ipc/register.c \
-        ipc/connect.c \
         loop/loop1.c \
         mm/malloc1.c \

uspace/app/tester/tester.c

@@ -60 +60 @@
 #include "vfs/vfs1.def"
 #include "ipc/ping_pong.def"
-#include "ipc/register.def"
-#include "ipc/connect.def"
 #include "loop/loop1.def"
 #include "mm/malloc1.def"

uspace/app/tester/tester.h

@@ -77 +77 @@
 extern const char *test_vfs1(void);
 extern const char *test_ping_pong(void);
-extern const char *test_register(void);
-extern const char *test_connect(void);
 extern const char *test_loop1(void);
 extern const char *test_malloc1(void);

uspace/app/tester/vfs/vfs1.c

@@ -40 +40 @@
 #include "../tester.h"
 
-#define FS_TYPE      "tmpfs"
-#define MOUNT_POINT  "/tmp"
-#define OPTIONS      ""
-#define FLAGS        0
-
-#define TEST_DIRECTORY  MOUNT_POINT "/testdir"
+#define TEST_DIRECTORY  "/tmp/testdir"
 #define TEST_FILE       TEST_DIRECTORY "/testfile"
 #define TEST_FILE2      TEST_DIRECTORY "/nextfile"
@@ -75 +70 @@
 const char *test_vfs1(void)
 {
-        if (mkdir(MOUNT_POINT, 0) != 0)
+        int rc;
+        if ((rc = mkdir(TEST_DIRECTORY, 0)) != 0) {
+                TPRINTF("rc=%d\n", rc);
                 return "mkdir() failed";
-        TPRINTF("Created directory %s\n", MOUNT_POINT);
-        
-        int rc = mount(FS_TYPE, MOUNT_POINT, "", OPTIONS, FLAGS);
-        switch (rc) {
-        case EOK:
-                TPRINTF("Mounted %s on %s\n", FS_TYPE, MOUNT_POINT);
-                break;
-        case EBUSY:
-                TPRINTF("(INFO) Filesystem already mounted on %s\n", MOUNT_POINT);
-                break;
-        default:
-                TPRINTF("(ERR) IPC returned errno %d (is tmpfs loaded?)\n", rc);
-                return "mount() failed";
         }
-        
-        if (mkdir(TEST_DIRECTORY, 0) != 0)
-                return "mkdir() failed";
         TPRINTF("Created directory %s\n", TEST_DIRECTORY);