Changeset d3a9ae74 in mainline

Timestamp:

2011-09-27T15:48:31Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

8c9e71a

Parents:

5dd4f77a

Message:

Stubs for VFS and libfs operations.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/srv/fs/ext4fs/Makefile (modified) (1 diff)
• uspace/srv/fs/ext4fs/ext4fs.c (modified) (2 diffs)
• uspace/srv/fs/ext4fs/ext4fs.h (modified) (1 diff)
• uspace/srv/fs/ext4fs/ext4fs_ops.c (added)

boot/Makefile.common

@@ -106 +106 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
+        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \

uspace/Makefile

@@ -88 +88 @@
         srv/fs/locfs \
         srv/fs/ext2fs \
+        srv/fs/ext4fs \
         srv/hid/console \
         srv/hid/s3c24xx_ts \

uspace/srv/fs/ext4fs/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        ext4fs.c
+        ext4fs.c \
+        ext4fs_ops.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/fs/ext4fs/ext4fs.c

@@ -36 +36 @@
  */
 
+#include <async.h>
+#include <errno.h>
+#include <libfs.h>
+#include <ns.h>
+#include <stdio.h>
+#include <task.h>
+#include <ipc/services.h>
+#include "ext4fs.h"
+#include "../../vfs/vfs.h"
+
 #define NAME    "ext4fs"
 
@@ -56 +66 @@
         }
 
-        // TODO initialization and VFS connection
+        async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+                SERVICE_VFS, 0, 0);
+        if (!vfs_sess) {
+                printf(NAME ": failed to connect to VFS\n");
+                return -1;
+        }
+
+        int rc = ext4fs_global_init();
+        if (rc != EOK) {
+                printf(NAME ": Failed global initialization\n");
+                return 1;
+        }
+
+        rc = fs_register(vfs_sess, &ext4fs_vfs_info, &ext4fs_ops,
+            &ext4fs_libfs_ops);
+        if (rc != EOK) {
+                fprintf(stdout, NAME ": Failed to register fs (%d)\n", rc);
+                return 1;
+        }
 
         printf(NAME ": Accepting connections\n");
-        /* TODO uncomment when initialization
         task_retval(0);
         async_manager();
-        */
         /* not reached */
         return 0;
 }
 
-
 /**
  * @}

uspace/srv/fs/ext4fs/ext4fs.h

@@ -34 +34 @@
 #define EXT4FS_EXT4FS_H_
 
+#include <libfs.h>
+
+extern vfs_out_ops_t ext4fs_ops;
+extern libfs_ops_t ext4fs_libfs_ops;
+
+extern int ext4fs_global_init(void);
+extern int ext4fs_global_fini(void);
+
 
 #endif