Changeset fc840d9 in mainline for uspace/srv/fs/fat

Timestamp:

2008-10-27T16:53:38Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7a5cdded

Parents:

04619ba

Message:

Move libfs_blockread(), block_get() and block_put() to libblock.

Location:

uspace/srv/fs/fat

Files:

• Makefile (modified) (1 diff)
• fat.h (modified) (1 diff)
• fat_fat.c (modified) (1 diff)
• fat_ops.c (modified) (2 diffs)

uspace/srv/fs/fat/Makefile

@@ -32 +32 @@
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs
+LIBBLOCK_PREFIX = ../../../lib/libblock
 SOFTINT_PREFIX = ../../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 
-CFLAGS += -I $(LIBFS_PREFIX)
+CFLAGS += -I $(LIBFS_PREFIX) -I $(LIBBLOCK_PREFIX)
 
-LIBS = $(LIBC_PREFIX)/libc.a $(LIBFS_PREFIX)/libfs.a
+LIBS = \
+        $(LIBC_PREFIX)/libc.a \
+        $(LIBFS_PREFIX)/libfs.a \
+        $(LIBBLOCK_PREFIX)/libblock.a
 
 ## Sources

uspace/srv/fs/fat/fat.h

@@ -198 +198 @@
 } fat_node_t;
 
-/* TODO move somewhere else */
-typedef struct block {
-        void *data;
-        size_t size;
-        bool dirty;
-} block_t;
-
-extern block_t *block_get(dev_handle_t, off_t, size_t);
-extern void block_put(block_t *);
-
 extern fs_reg_t fat_reg;
 

uspace/srv/fs/fat/fat_fat.c

@@ -41 +41 @@
 #include "../../vfs/vfs.h"
 #include <libfs.h>
+#include <libblock.h>
 #include <errno.h>
 #include <byteorder.h>

uspace/srv/fs/fat/fat_ops.c

@@ -41 +41 @@
 #include "../../vfs/vfs.h"
 #include <libfs.h>
+#include <libblock.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
@@ -60 +61 @@
 /** List of cached free FAT nodes. */
 static LIST_INITIALIZE(ffn_head);
-
-static int dev_phone = -1;              /* FIXME */
-static void *dev_buffer = NULL;         /* FIXME */
-
-block_t *block_get(dev_handle_t dev_handle, off_t offset, size_t bs)
-{
-        /* FIXME */
-        block_t *b;
-        off_t bufpos = 0;
-        size_t buflen = 0;
-        off_t pos = offset * bs;
-
-        assert(dev_phone != -1);
-        assert(dev_buffer);
-
-        b = malloc(sizeof(block_t));
-        if (!b)
-                return NULL;
-        
-        b->data = malloc(bs);
-        if (!b->data) {
-                free(b);
-                return NULL;
-        }
-        b->size = bs;
-
-        if (!libfs_blockread(dev_phone, dev_buffer, &bufpos, &buflen, &pos,
-            b->data, bs, bs)) {
-                free(b->data);
-                free(b);
-                return NULL;
-        }
-
-        return b;
-}
-
-void block_put(block_t *block)
-{
-        /* FIXME */
-        free(block->data);
-        free(block);
-}
 
 static void fat_node_initialize(fat_node_t *node)