Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset d57e08f in mainline


Ignore:
Timestamp:
2009-10-02T14:20:27Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
f563126
Parents:
f5af635 (diff), bbddafb (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 file system shell interaction improvements.

Location:
uspace/srv/fs
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/fs/devfs/devfs.c

    rf5af635 rd57e08f  
    4444#include <async.h>
    4545#include <errno.h>
     46#include <task.h>
    4647#include <libfs.h>
    4748#include "devfs.h"
     
    5152
    5253static vfs_info_t devfs_vfs_info = {
    53         .name = "devfs",
     54        .name = NAME,
    5455};
    5556
     
    131132       
    132133        printf(NAME ": Accepting connections\n");
     134        task_retval(0);
    133135        async_manager();
    134136       
  • uspace/srv/fs/fat/fat.c

    rf5af635 rd57e08f  
    4343#include <errno.h>
    4444#include <unistd.h>
     45#include <task.h>
    4546#include <stdio.h>
    4647#include <libfs.h>
    4748#include "../../vfs/vfs.h"
    4849
     50#define NAME    "fat"
    4951
    5052vfs_info_t fat_vfs_info = {
    51         .name = "fat",
     53        .name = NAME,
    5254};
    5355
     
    8385        }
    8486       
    85         dprintf("VFS-FAT connection established.\n");
     87        dprintf(NAME ": connection opened\n");
    8688        while (1) {
    8789                ipc_callid_t callid;
     
    137139        int rc;
    138140
    139         printf("fat: HelenOS FAT file system server.\n");
     141        printf(NAME ": HelenOS FAT file system server\n");
    140142
    141143        rc = fat_idx_init();
     
    145147        vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
    146148        if (vfs_phone < EOK) {
    147                 printf("fat: failed to connect to VFS\n");
     149                printf(NAME ": failed to connect to VFS\n");
    148150                return -1;
    149151        }
     
    155157        }
    156158       
    157         dprintf("FAT filesystem registered, fs_handle=%d.\n",
    158             fat_reg.fs_handle);
    159 
     159        printf(NAME ": Accepting connections\n");
     160        task_retval(0);
    160161        async_manager();
    161162        /* not reached */
     
    163164
    164165err:
    165         printf("Failed to register the FAT file system (%d)\n", rc);
     166        printf(NAME ": Failed to register file system (%d)\n", rc);
    166167        return rc;
    167168}
  • uspace/srv/fs/tmpfs/tmpfs.c

    rf5af635 rd57e08f  
    4848#include <unistd.h>
    4949#include <stdio.h>
     50#include <task.h>
    5051#include <libfs.h>
    5152#include "../../vfs/vfs.h"
     
    5556
    5657vfs_info_t tmpfs_vfs_info = {
    57         .name = "tmpfs",
     58        .name = NAME,
    5859};
    5960
     
    9091        }
    9192       
    92         dprintf("VFS-TMPFS connection established.\n");
     93        dprintf(NAME ": connection opened\n");
    9394        while (1) {
    9495                ipc_callid_t callid;
     
    162163
    163164        printf(NAME ": Accepting connections\n");
     165        task_retval(0);
    164166        async_manager();
    165167        /* not reached */
Note: See TracChangeset for help on using the changeset viewer.