Changes in uspace/srv/fs/fat/fat.c [ffa2c8ef:852b801] in mainline

File:

• uspace/srv/fs/fat/fat.c (modified) (9 diffs)

uspace/srv/fs/fat/fat.c

@@ -38 +38 @@
 
 #include "fat.h"
+#include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <ipc/ns.h>
 #include <async.h>
 #include <errno.h>
 #include <unistd.h>
-#include <task.h>
 #include <stdio.h>
 #include <libfs.h>
 #include "../../vfs/vfs.h"
 
-#define NAME    "fat"
 
 vfs_info_t fat_vfs_info = {
-        .name = NAME,
-        .concurrent_read_write = false,
-        .write_retains_size = false,    
+        .name = "fat",
 };
 
@@ -84 +80 @@
                  * created by IPC_M_CONNECT_TO_ME.
                  */
-                async_answer_0(iid, EOK);
+                ipc_answer_0(iid, EOK);
         }
         
-        dprintf(NAME ": connection opened\n");
+        dprintf("VFS-FAT connection established.\n");
         while (1) {
                 ipc_callid_t callid;
@@ -93 +89 @@
         
                 callid = async_get_call(&call);
-                switch  (IPC_GET_IMETHOD(call)) {
+                switch  (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         return;
@@ -101 +97 @@
                 case VFS_OUT_MOUNT:
                         fat_mount(callid, &call);
-                        break;
-                case VFS_OUT_UNMOUNTED:
-                        fat_unmounted(callid, &call);
-                        break;
-                case VFS_OUT_UNMOUNT:
-                        fat_unmount(callid, &call);
                         break;
                 case VFS_OUT_LOOKUP:
@@ -136 +126 @@
                         break;
                 default:
-                        async_answer_0(callid, ENOTSUP);
+                        ipc_answer_0(callid, ENOTSUP);
                         break;
                 }
@@ -147 +137 @@
         int rc;
 
-        printf(NAME ": HelenOS FAT file system server\n");
+        printf("fat: HelenOS FAT file system server.\n");
 
         rc = fat_idx_init();
@@ -153 +143 @@
                 goto err;
 
-        vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
+        vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
         if (vfs_phone < EOK) {
-                printf(NAME ": failed to connect to VFS\n");
+                printf("fat: failed to connect to VFS\n");
                 return -1;
         }
@@ -165 +155 @@
         }
         
-        printf(NAME ": Accepting connections\n");
-        task_retval(0);
+        dprintf("FAT filesystem registered, fs_handle=%d.\n",
+            fat_reg.fs_handle);
+
         async_manager();
         /* not reached */
@@ -172 +163 @@
 
 err:
-        printf(NAME ": Failed to register file system (%d)\n", rc);
+        printf("Failed to register the FAT file system (%d)\n", rc);
         return rc;
 }