| /trunk/uspace/srv/fs/fat/fat.h |
|---|
| 197,16 → 197,6 |
| bool dirty; |
| } 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; |
| extern void fat_mounted(ipc_callid_t, ipc_call_t *); |
| /trunk/uspace/srv/fs/fat/fat_fat.c |
|---|
| 40,6 → 40,7 |
| #include "fat.h" |
| #include "../../vfs/vfs.h" |
| #include <libfs.h> |
| #include <libblock.h> |
| #include <errno.h> |
| #include <byteorder.h> |
| #include <align.h> |
| /trunk/uspace/srv/fs/fat/fat_ops.c |
|---|
| 40,6 → 40,7 |
| #include "fat_fat.h" |
| #include "../../vfs/vfs.h" |
| #include <libfs.h> |
| #include <libblock.h> |
| #include <ipc/ipc.h> |
| #include <ipc/services.h> |
| #include <ipc/devmap.h> |
| 60,48 → 61,6 |
| /** 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) |
| { |
| futex_initialize(&node->lock, 1); |
| /trunk/uspace/srv/fs/fat/Makefile |
|---|
| 31,12 → 31,16 |
| 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 |
| # |