Changeset c0cdcaf in mainline

Timestamp:

2007-09-17T17:31:33Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c3b25510

Parents:

b006bfb8

Message:

Turn the empty fs service into the beginning of FAT support.
Start implementing the VFS protocol for fat.c.

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• lib/libc/include/ipc/services.h (modified) (1 diff)
• srv/fs/fat/Makefile (moved) (moved from uspace/srv/fs/Makefile ) (2 diffs)
• srv/fs/fat/fat.c (moved) (moved from uspace/srv/fs/fs.c ) (2 diffs)
• srv/vfs/vfs.h (modified) (1 diff)

uspace/Makefile

@@ -41 +41 @@
         srv/console \
         srv/rd \
-        srv/fs \
+        srv/fs/fat \
         srv/vfs \
         app/tetris \

uspace/lib/libc/include/ipc/services.h

@@ -38 +38 @@
 #define LIBIPC_SERVICES_H_
 
-#define SERVICE_PCI             1
-#define SERVICE_KEYBOARD        2
-#define SERVICE_VIDEO           3
-#define SERVICE_CONSOLE         4
-#define SERVICE_RD              5
-#define SERVICE_FS              6
-#define SERVICE_VFS             7
+typedef enum {
+        SERVICE_PCI = 1,
+        SERVICE_KEYBOARD,
+        SERVICE_VIDEO,
+        SERVICE_CONSOLE,
+        SERVICE_RD,
+        SERVICE_VFS
+} services_t;
 
 /* Memory area to be received from NS */

uspace/srv/fs/fat/Makefile

@@ -30 +30 @@
 #
 
-LIBC_PREFIX = ../../lib/libc
-SOFTINT_PREFIX = ../../lib/softint
+LIBC_PREFIX = ../../../lib/libc
+SOFTINT_PREFIX = ../../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -39 +39 @@
 #
 
-OUTPUT = fs
+OUTPUT = fat
 SOURCES = \
-        fs.c
+        fat.c
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

uspace/srv/fs/fat/fat.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2007 Jakub Jermar
  * All rights reserved.
  *
@@ -32 +33 @@
 
 /**
- * @file        fs.c
- * @brief       File system driver for HelenOS.
+ * @file        fat.c
+ * @brief       FAT file system driver for HelenOS.
  */
 
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <errno.h>
+#include <unistd.h>
+#include "../../vfs/vfs.h"
+
+vfs_info_t fat_vfs_info = {
+        .name = "fat",
+        .ops = {
+                [IPC_METHOD_TO_VFS_OP(VFS_REGISTER)] = VFS_OP_DEFINED,
+                [IPC_METHOD_TO_VFS_OP(VFS_MOUNT)] = VFS_OP_DEFINED,
+                [IPC_METHOD_TO_VFS_OP(VFS_UNMOUNT)] = VFS_OP_DEFINED,
+                [IPC_METHOD_TO_VFS_OP(VFS_LOOKUP)] = VFS_OP_DEFINED,
+                [IPC_METHOD_TO_VFS_OP(VFS_OPEN)] = VFS_OP_DEFINED,
+                [IPC_METHOD_TO_VFS_OP(VFS_CREATE)] = VFS_OP_DEFINED,
+                [IPC_METHOD_TO_VFS_OP(VFS_CLOSE)] = VFS_OP_DEFINED,
+                [IPC_METHOD_TO_VFS_OP(VFS_READ)] = VFS_OP_DEFINED,
+                [IPC_METHOD_TO_VFS_OP(VFS_WRITE)] = VFS_OP_NULL,
+                [IPC_METHOD_TO_VFS_OP(VFS_SEEK)] = VFS_OP_DEFAULT
+        }
+};
 
 int main(int argc, char **argv)
 {
+        ipcarg_t vfs_phone;
+
+        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0);
+        while (vfs_phone != EOK) {
+                usleep(10000);
+                vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0);
+        }
+        
+        /* TODO: start making calls according to the VFS protocol */
+
         return 0;
 }

uspace/srv/vfs/vfs.h

@@ -35 +35 @@
 
 #include <ipc/ipc.h>
+#include <libadt/list.h>
 
 #define VFS_FIRST       FIRST_USER_METHOD