Index: uspace/lib/libc/Makefile =================================================================== --- uspace/lib/libc/Makefile (revision ff9244a50908fdf6a76f151cae83e6d253d15921) +++ uspace/lib/libc/Makefile (revision 986332aa78a4b59155771728c5e5e162b1b6f278) @@ -74,5 +74,6 @@ generic/err.c \ generic/stdlib.c \ - generic/mman.c + generic/mman.c \ + generic/vfs.c ARCH_SOURCES += \ Index: uspace/lib/libc/generic/vfs.c =================================================================== --- uspace/lib/libc/generic/vfs.c (revision 986332aa78a4b59155771728c5e5e162b1b6f278) +++ uspace/lib/libc/generic/vfs.c (revision 986332aa78a4b59155771728c5e5e162b1b6f278) @@ -0,0 +1,157 @@ +/* + * Copyright (c) 2007 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "../../srv/vfs/vfs.h" + +int vfs_phone = -1; +atomic_t vfs_phone_futex = FUTEX_INITIALIZER; + +static int vfs_connect(void) +{ + if (vfs_phone < 0) + vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0); + return vfs_phone; +} + +int mount(const char *fs_name, const char *mp, const char *dev) +{ + int res; + ipcarg_t rc; + aid_t req; + + int dev_handle = 0; /* TODO */ + + futex_down(&vfs_phone_futex); + async_serialize_start(); + if (vfs_phone < 0) { + res = vfs_connect(); + if (res < 0) { + async_serialize_end(); + futex_up(&vfs_phone_futex); + return res; + } + } + req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL); + rc = ipc_data_write_send(vfs_phone, (void *)fs_name, strlen(fs_name)); + if (rc != EOK) { + async_wait_for(req, NULL); + async_serialize_end(); + futex_up(&vfs_phone_futex); + return (int) rc; + } + rc = ipc_data_write_send(vfs_phone, (void *)mp, strlen(mp)); + if (rc != EOK) { + async_wait_for(req, NULL); + async_serialize_end(); + futex_up(&vfs_phone_futex); + return (int) rc; + } + async_wait_for(req, &rc); + async_serialize_end(); + futex_up(&vfs_phone_futex); + return (int) rc; +} + + +int open(const char *name, int oflag, ...) +{ + int res; + ipcarg_t rc; + ipc_call_t answer; + aid_t req; + + futex_down(&vfs_phone_futex); + async_serialize_start(); + if (vfs_phone < 0) { + res = vfs_connect(); + if (res < 0) { + async_serialize_end(); + futex_up(&vfs_phone_futex); + return res; + } + } + req = async_send_2(vfs_phone, VFS_OPEN, oflag, 0, &answer); + rc = ipc_data_write_send(vfs_phone, name, strlen(name)); + if (rc != EOK) { + async_wait_for(req, NULL); + async_serialize_end(); + futex_up(&vfs_phone_futex); + return (int) rc; + } + async_wait_for(req, &rc); + async_serialize_end(); + futex_up(&vfs_phone_futex); + return (int) IPC_GET_ARG1(answer); +} + +ssize_t read(int fildes, void *buf, size_t nbyte) +{ + int res; + ipcarg_t rc; + ipc_call_t answer; + aid_t req; + + futex_down(&vfs_phone_futex); + async_serialize_start(); + if (vfs_phone < 0) { + res = vfs_connect(); + if (res < 0) { + async_serialize_end(); + futex_up(&vfs_phone_futex); + return res; + } + } + req = async_send_1(vfs_phone, VFS_READ, 0, &answer); + if (ipc_data_read_send(vfs_phone, buf, sizeof(buf)) != EOK) { + async_wait_for(req, NULL); + async_serialize_end(); + futex_up(&vfs_phone_futex); + return (ssize_t) rc; + } + async_wait_for(req, &rc); + async_serialize_end(); + futex_up(&vfs_phone_futex); + return (ssize_t) IPC_GET_ARG1(answer); +} + +/** @} + */ Index: uspace/lib/libc/include/vfs.h =================================================================== --- uspace/lib/libc/include/vfs.h (revision 986332aa78a4b59155771728c5e5e162b1b6f278) +++ uspace/lib/libc/include/vfs.h (revision 986332aa78a4b59155771728c5e5e162b1b6f278) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2007 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_VFS_H_ +#define LIBC_VFS_H_ + +#include + +extern int mount(const char *, const char *, const char *); +extern int open(const char *, int, ...); +extern ssize_t read(int, void *, size_t); + +#endif + +/** @} + */