From 34641f4338a2c67dae96b9a197688de82eebf5ba Mon Sep 17 00:00:00 2001 From: Marian Ohligs Date: Thu, 19 May 2011 12:53:47 +0200 Subject: [PATCH] - add some open-flag defines - some design changes --- include/metalsvm/fs.h | 25 +++++++++++++++++++++++++ include/metalsvm/stdio.h | 10 ---------- kernel/syscall.c | 1 - 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/include/metalsvm/fs.h b/include/metalsvm/fs.h index 695bf107..4f4f5895 100644 --- a/include/metalsvm/fs.h +++ b/include/metalsvm/fs.h @@ -37,6 +37,31 @@ //#define FS_SYMLINK 0x06 //#define FS_MOUNTPOINT 0x08 // Is the file an active mountpoint? +/*open flags*/ +#define O_RDONLY 0 +#define O_WRONLY 1 +#define O_RDWR 2 + +#define O_CREAT 64 +#define O_EXCL 128 +#define O_NOCTTY 256 +#define O_TRUNC 512 +#define O_APPEND 1024 +#define O_NDELAY 2048 +#define O_SYNC 4096 +#define O_ASYNC 8192 + +/*lseek defines*/ +#ifndef SEEK_SET +#define SEEK_SET 0 /* set file offset to offset */ +#endif +#ifndef SEEK_CUR +#define SEEK_CUR 1 /* set file offset to current plus offset */ +#endif +#ifndef SEEK_END +#define SEEK_END 2 /* set file offset to EOF plus offset */ +#endif + struct vfs_node; /** @defgroup fsprototypes FS access function prototypes diff --git a/include/metalsvm/stdio.h b/include/metalsvm/stdio.h index 527fd2b4..6f9fc20e 100644 --- a/include/metalsvm/stdio.h +++ b/include/metalsvm/stdio.h @@ -23,16 +23,6 @@ * @brief Stringstream related functions. Mainly printf-stuff. */ -#ifndef SEEK_SET -#define SEEK_SET 0 /* set file offset to offset */ -#endif -#ifndef SEEK_CUR -#define SEEK_CUR 1 /* set file offset to current plus offset */ -#endif -#ifndef SEEK_END -#define SEEK_END 2 /* set file offset to EOF plus offset */ -#endif - #ifndef __STDIO_H__ #define __STDIO_H__ diff --git a/kernel/syscall.c b/kernel/syscall.c index 8cee87e6..408ab4f8 100644 --- a/kernel/syscall.c +++ b/kernel/syscall.c @@ -78,7 +78,6 @@ static int sys_lseek(int fd, off_t pos, int origin) if (BUILTIN_EXPECT(per_core(current_task)->fildes_table[fd].node->type != FS_FILE, 0)) return -EINVAL; - switch(origin) {