Changeset 19f24fd in mainline for uspace/app

Timestamp:

2010-02-05T22:25:52Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (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:

• bdsh/Makefile (modified) (1 diff)
• bdsh/cmds/modules/module_aliases.h (modified) (1 diff)
• bdsh/cmds/modules/modules.h (modified) (2 diffs)
• bdsh/cmds/modules/unmount/entry.h (added)
• bdsh/cmds/modules/unmount/unmount.c (added)
• bdsh/cmds/modules/unmount/unmount.h (added)
• bdsh/cmds/modules/unmount/unmount_def.h (added)
• init/init.c (modified) (6 diffs)
• init/init.h (modified) (1 diff)
• mkfat/mkfat.c (modified) (2 diffs)
• taskdump/taskdump.c (modified) (7 diffs)
• tester/vfs/vfs1.c (modified) (1 diff)
• trace/ipcp.c (modified) (4 diffs)
• trace/trace.c (modified) (8 diffs)

uspace/app/bdsh/Makefile

@@ -48 +48 @@
         cmds/modules/mv/mv.c \
         cmds/modules/mount/mount.c \
+        cmds/modules/unmount/unmount.c \
         cmds/modules/kcon/kcon.c \
         cmds/builtins/exit/exit.c \

uspace/app/bdsh/cmds/modules/module_aliases.h

@@ -14 +14 @@
 char *mod_aliases[] = {
         "ren", "mv",
+        "umount", "unmount",
         NULL, NULL
 };

uspace/app/bdsh/cmds/modules/modules.h

@@ -31 +31 @@
 #include "mv/entry.h"
 #include "mount/entry.h"
+#include "unmount/entry.h"
 #include "kcon/entry.h"
 
@@ -51 +52 @@
 #include "mv/mv_def.h"
 #include "mount/mount_def.h"
+#include "unmount/unmount_def.h"
 #include "kcon/kcon_def.h"
 

uspace/app/init/init.c

@@ -94 +94 @@
 static bool mount_devfs(void)
 {
-        char null[MAX_DEVICE_NAME];
-        int null_id = devmap_null_create();
-        
-        if (null_id == -1) {
-                printf(NAME ": Unable to create null device\n");
-                return false;
-        }
-        
-        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
-        int rc = mount("devfs", DEVFS_MOUNT_POINT, null, "", IPC_FLAG_BLOCKING);
+        int rc = mount("devfs", DEVFS_MOUNT_POINT, "", "", IPC_FLAG_BLOCKING);
         
         switch (rc) {
@@ -111 +102 @@
         case EBUSY:
                 printf(NAME ": Device filesystem already mounted\n");
-                devmap_null_destroy(null_id);
                 return false;
         case ELIMIT:
                 printf(NAME ": Unable to mount device filesystem\n");
-                devmap_null_destroy(null_id);
                 return false;
         case ENOENT:
                 printf(NAME ": Unknown filesystem type (devfs)\n");
-                devmap_null_destroy(null_id);
                 return false;
         default:
                 printf(NAME ": Error mounting device filesystem (%d)\n", rc);
-                devmap_null_destroy(null_id);
                 return false;
         }
@@ -184 +171 @@
 {
         char *argv[3];
-        char hid_in[MAX_DEVICE_NAME];
+        char hid_in[DEVMAP_NAME_MAXLEN];
         int rc;
         
-        snprintf(hid_in, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
         
         printf(NAME ": Spawning %s with %s\n", SRV_CONSOLE, hid_in);
@@ -209 +196 @@
 {
         char *argv[4];
-        char term[MAX_DEVICE_NAME];
+        char term[DEVMAP_NAME_MAXLEN];
         int rc;
         
-        snprintf(term, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
         
         printf(NAME ": Spawning %s with %s %s\n", APP_GETTERM, term, app);
@@ -287 +274 @@
         spawn("/srv/fhc");
         spawn("/srv/obio");
+        srv_start("/srv/cuda_adb");
         srv_start("/srv/i8042");
-        srv_start("/srv/c_mouse");
+        srv_start("/srv/adb_ms");
+        srv_start("/srv/char_ms");
 
         spawn("/srv/fb");
@@ -320 +309 @@
         getterm("term/vc5", "/app/bdsh");
         getterm("term/vc6", "/app/klog");
-        
+
         return 0;
 }

uspace/app/init/init.h

@@ -39 +39 @@
 #define NAME  "init"
 
-#define MAX_DEVICE_NAME  32
-
 #endif
 

uspace/app/mkfat/mkfat.c

@@ -44 +44 @@
 #include <devmap.h>
 #include <byteorder.h>
+#include <sys/types.h>
+#include <sys/typefmt.h>
+#include <inttypes.h>
 #include <errno.h>
 #include "fat.h"
@@ -157 +160 @@
                 printf(NAME ": Warning, failed to obtain block device size.\n");
         } else {
-                printf(NAME ": Block device has %llu blocks.\n", dev_nblocks);
+                printf(NAME ": Block device has %" PRIuBN " blocks.\n",
+                    dev_nblocks);
                 cfg.total_sectors = dev_nblocks;
         }

uspace/app/taskdump/taskdump.c

@@ -41 +41 @@
 #include <task.h>
 #include <kernel/mm/as.h>
+#include <sys/types.h>
+#include <sys/typefmt.h>
 #include <libarch/istate.h>
 #include <macros.h>
@@ -93 +95 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %lld.\n", task_id);
+                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
                 return 1;
         }
@@ -100 +102 @@
         app_symtab = NULL;
 
-        printf("Dumping task '%s' (task ID %lld).\n", app_name, task_id);
+        printf("Dumping task '%s' (task ID %" PRIdTASKID ").\n", app_name, task_id);
         autoload_syms();
         putchar('\n');
@@ -134 +136 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%lld) -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -245 +247 @@
         printf("Threads:\n");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] hash: 0x%lx\n", 1+i, thash_buf[i]);
+                printf(" [%d] hash: %p\n", 1+i, thash_buf[i]);
 
                 thread_dump(thash_buf[i]);
@@ -289 +291 @@
         printf("Address space areas:\n");
         for (i = 0; i < n_areas; i++) {
-                printf(" [%d] flags: %c%c%c%c base: 0x%lx size: 0x%lx\n", 1+i,
+                printf(" [%d] flags: %c%c%c%c base: %p size: %p\n", 1+i,
                     (ainfo_buf[i].flags & AS_AREA_READ) ? 'R' : '-',
                     (ainfo_buf[i].flags & AS_AREA_WRITE) ? 'W' : '-',
@@ -328 +330 @@
 
         sym_pc = fmt_sym_address(pc);
-        printf("Thread 0x%lx crashed at %s. FP = 0x%lx\n", thash, sym_pc, fp);
+        printf("Thread %p crashed at %s. FP = %p\n", thash, sym_pc, fp);
         free(sym_pc);
 

uspace/app/tester/vfs/vfs1.c

@@ -79 +79 @@
         TPRINTF("Created directory %s\n", MOUNT_POINT);
         
-        char null[MAX_DEVICE_NAME];
-        int null_id = devmap_null_create();
-        
-        if (null_id == -1)
-                return "Unable to create null device";
-        
-        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
-        int rc = mount(FS_TYPE, MOUNT_POINT, null, OPTIONS, FLAGS);
+        int rc = mount(FS_TYPE, MOUNT_POINT, "", OPTIONS, FLAGS);
         switch (rc) {
         case EOK:
-                TPRINTF("Mounted /dev/%s as %s on %s\n", null, FS_TYPE, MOUNT_POINT);
+                TPRINTF("Mounted %s on %s\n", FS_TYPE, MOUNT_POINT);
                 break;
         case EBUSY:

uspace/app/trace/ipcp.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <adt/hash_table.h>
+#include <sys/typefmt.h>
 
 #include "ipc_desc.h"
@@ -200 +201 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Call ID: 0x%lx, phone: %d, proto: %s, method: ", hash,
+                printf("Call ID: %p, phone: %d, proto: %s, method: ", hash,
                         phone, (proto ? proto->name : "n/a"));
                 ipc_m_print(proto, IPC_GET_METHOD(*call));
-                printf(" args: (%lu, %lu, %lu, %lu, %lu)\n", args[1], args[2],
+                printf(" args: (%" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
+                    ", %" PRIuIPCARG ", %" PRIuIPCARG ")\n", args[1], args[2],
                     args[3], args[4], args[5]);
         }
@@ -279 +281 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Response to 0x%lx: retval=%ld, args = (%lu, %lu, %lu, %lu, %lu)\n",
-                        hash, retval, IPC_GET_ARG1(*answer),
-                        IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
-                        IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
+                printf("Response to %p: retval=%ld, args = (%" PRIuIPCARG
+                    ", %" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
+                    ", %" PRIuIPCARG ")\n",
+                    hash, retval, IPC_GET_ARG1(*answer),
+                    IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
+                    IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
         }
 
@@ -336 +340 @@
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
-                        printf("Not a response (hash 0x%lx)\n", hash);
+                        printf("Not a response (hash %p)\n", hash);
                 }
                 return;

uspace/app/trace/trace.c

@@ -49 +49 @@
 #include <io/keycode.h>
 #include <fibril_synch.h>
+#include <sys/types.h>
+#include <sys/typefmt.h>
 
 #include <libc.h>
@@ -159 +161 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%lld) -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -198 +200 @@
         printf("Threads:");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] (hash 0x%lx)", 1+i, thread_hash_buf[i]);
+                printf(" [%d] (hash %p)", 1+i, thread_hash_buf[i]);
         }
         printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t));
@@ -222 +224 @@
         case V_HASH:
         case V_PTR:
-                printf("0x%08lx", val);
+                printf("%p", val);
                 break;
 
@@ -275 +277 @@
 
         putchar('(');
-        if (n > 0) printf("%ld", sc_args[0]);
+        if (n > 0) printf("%" PRIdSYSARG, sc_args[0]);
         for (i = 1; i < n; i++) {
-                printf(", %ld", sc_args[i]);
+                printf(", %" PRIdSYSARG, sc_args[i]);
         }
         putchar(')');
@@ -508 +510 @@
         }
 
-        printf("Start tracing thread [%d] (hash 0x%lx).\n", thread_id, thread_hash);
+        printf("Start tracing thread [%d] (hash %p).\n", thread_id, thread_hash);
 
         while (!abort_trace) {
@@ -552 +554 @@
                                 break;
                         case UDEBUG_EVENT_THREAD_E:
-                                printf("Thread 0x%lx exited.\n", val0);
+                                printf("Thread %p exited.\n", val0);
                                 fibril_mutex_lock(&state_lock);
                                 abort_trace = true;
@@ -972 +974 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %lld.\n", task_id);
+                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
                 return 1;
         }
 
-        printf("Connected to task %lld.\n", task_id);
+        printf("Connected to task %" PRIdTASKID ".\n", task_id);
 
         if (task_ldr != NULL)