/trunk/uspace/lib/libfs/libfs.c |
---|
35,6 → 35,91 |
*/ |
#include "libfs.h" |
#include "../../srv/vfs/vfs.h" |
#include <errno.h> |
#include <async.h> |
#include <ipc/ipc.h> |
#include <as.h> |
/** Register file system server. |
* |
* This function abstracts away the tedious registration protocol from |
* file system implementations and lets them to reuse this registration glue |
* code. |
* |
* @param vfs_phone Open phone for communication with VFS. |
* @param reg File system registration structure. It will be |
* initialized by this function. |
* @param info VFS info structure supplied by the file system |
* implementation. |
* @param conn Connection fibril for handling all calls originating in |
* VFS. |
* |
* @return EOK on success or a non-zero error code on errror. |
*/ |
int fs_register(int vfs_phone, fs_reg_t *reg, vfs_info_t *info, |
async_client_conn_t conn) |
{ |
/* |
* 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_0(vfs_phone, VFS_REGISTER, &answer); |
/* |
* Send our VFS info structure to VFS. |
*/ |
int rc = ipc_data_send(vfs_phone, info, sizeof(*info)); |
if (rc != EOK) { |
async_wait_for(req, NULL); |
return rc; |
} |
/* |
* Ask VFS for callback connection. |
*/ |
ipc_connect_to_me(vfs_phone, 0, 0, 0, ®->vfs_phonehash); |
/* |
* Allocate piece of address space for PLB. |
*/ |
reg->plb_ro = as_get_mappable_page(PLB_SIZE); |
if (!reg->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) reg->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); |
reg->fs_handle = (int) IPC_GET_ARG1(answer); |
/* |
* Create a connection fibril to handle the callback connection. |
*/ |
async_new_connection(reg->vfs_phonehash, 0, NULL, conn); |
/* |
* Tell the async framework that other connections are to be handled by |
* the same connection fibril as well. |
*/ |
async_set_client_connection(conn); |
return IPC_GET_RETVAL(answer); |
} |
/** @} |
*/ |
/trunk/uspace/lib/libfs/libfs.h |
---|
36,6 → 36,19 |
#ifndef LIBFS_LIBFS_H_ |
#define LIBFS_LIBFS_H_ |
#include "../../srv/vfs/vfs.h" |
#include <stdint.h> |
#include <ipc/ipc.h> |
#include <async.h> |
typedef struct { |
int fs_handle; /**< File system handle. */ |
ipcarg_t vfs_phonehash; /**< Initial VFS phonehash. */ |
uint8_t *plb_ro; /**< Read-only PLB view. */ |
} fs_reg_t; |
extern int fs_register(int, fs_reg_t *, vfs_info_t *, async_client_conn_t); |
#endif |
/** @} |
/trunk/uspace/srv/fs/fat/fat.h |
---|
34,6 → 34,7 |
#define FAT_FAT_H_ |
#include <ipc/ipc.h> |
#include <libfs.h> |
#include <atomic.h> |
#include <sys/types.h> |
#include <bool.h> |
133,7 → 134,7 |
uint32_t size; |
} __attribute__ ((packed)) fat_dentry_t; |
extern uint8_t *plb_ro; |
extern fs_reg_t fat_reg; |
extern void fat_lookup(ipc_callid_t, ipc_call_t *); |
/trunk/uspace/srv/fs/fat/fat.c |
---|
43,7 → 43,7 |
#include <errno.h> |
#include <unistd.h> |
#include <stdio.h> |
#include <as.h> |
#include <libfs.h> |
#include "../../vfs/vfs.h" |
63,10 → 63,8 |
} |
}; |
uint8_t *plb_ro = NULL; |
fs_reg_t fat_reg; |
int fs_handle = 0; |
/** |
* This connection fibril processes VFS requests from VFS. |
* |
132,65 → 130,14 |
vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0); |
} |
/* |
* 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(); |
/* not reached */ |
/trunk/uspace/srv/fs/fat/fat_ops.c |
---|
41,7 → 41,7 |
#include <async.h> |
#include <errno.h> |
#define PLB_GET_CHAR(i) (plb_ro[(i) % PLB_SIZE]) |
#define PLB_GET_CHAR(i) (fat_reg.plb_ro[(i) % PLB_SIZE]) |
#define FAT_NAME_LEN 8 |
#define FAT_EXT_LEN 3 |
/trunk/uspace/srv/fs/fat/Makefile |
---|
30,11 → 30,14 |
# |
LIBC_PREFIX = ../../../lib/libc |
LIBFS_PREFIX = ../../../lib/libfs |
SOFTINT_PREFIX = ../../../lib/softint |
include $(LIBC_PREFIX)/Makefile.toolchain |
LIBS = $(LIBC_PREFIX)/libc.a |
CFLAGS += -I $(LIBFS_PREFIX) |
LIBS = $(LIBC_PREFIX)/libc.a $(LIBFS_PREFIX)/libfs.a |
## Sources |
# |