Changeset efd4a72 in mainline for uspace/srv/fs/fat/fat.c

Timestamp:

2007-12-16T16:25:26Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0c82d28

Parents:

74303b6

Message:

VFS work.
Move FS registration code to libfs.

File:

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

uspace/srv/fs/fat/fat.c

@@ -44 +44 @@
 #include <unistd.h>
 #include <stdio.h>
-#include <as.h>
+#include <libfs.h>
 #include "../../vfs/vfs.h"
 
@@ -64 +64 @@
 };
 
-uint8_t *plb_ro = NULL;
-
-int fs_handle = 0;
+fs_reg_t fat_reg;
 
 /**
@@ -133 +131 @@
         }
         
-        /*
-         * Tell VFS that we are here and want to get registered.
-         * We use the async framework because VFS will answer the request
-         * out-of-order, when it knows that the operation succeeded or failed.
-         */
-        ipc_call_t answer;
-        aid_t req = async_send_2(vfs_phone, VFS_REGISTER, 0, 0, &answer);
-
-        /*
-         * Send our VFS info structure to VFS.
-         */
-        int rc = ipc_data_send(vfs_phone, &fat_vfs_info, sizeof(fat_vfs_info)); 
+        int rc;
+        rc = fs_register(vfs_phone, &fat_reg, &fat_vfs_info, fat_connection);
         if (rc != EOK) {
-                async_wait_for(req, NULL);
+                printf("Failed to register the FAT file system (%d)\n", rc);
                 return rc;
         }
-
-        /*
-         * Ask VFS for callback connection.
-         */
-        ipcarg_t phonehash;
-        ipc_connect_to_me(vfs_phone, 0, 0, 0, &phonehash);
-
-        /*
-         * Allocate piece of address space for PLB.
-         */
-        plb_ro = as_get_mappable_page(PLB_SIZE);
-        if (!plb_ro) {
-                async_wait_for(req, NULL);
-                return ENOMEM;
-        }
-
-        /*
-         * Request sharing the Path Lookup Buffer with VFS.
-         */
-        rc = ipc_call_sync_2_0(vfs_phone, IPC_M_AS_AREA_RECV, (ipcarg_t) plb_ro,
-            PLB_SIZE);
-        if (rc) {
-                async_wait_for(req, NULL);
-                return rc;
-        }
-         
-        /*
-         * Pick up the answer for the request to the VFS_REQUEST call.
-         */
-        async_wait_for(req, NULL);
-        fs_handle = (int) IPC_GET_ARG1(answer);
-        dprintf("FAT filesystem registered, fs_handle=%d.\n", fs_handle);
-
-        /*
-         * Create a connection fibril to handle the callback connection.
-         */
-        async_new_connection(phonehash, 0, NULL, fat_connection);
         
-        /*
-         * Tell the async framework that other connections are to be handled by
-         * the same connection fibril as well.
-         */
-        async_set_client_connection(fat_connection);
+        dprintf("FAT filesystem registered, fs_handle=%d.\n", fat_reg.fs_handle);
 
         async_manager();