From 30516ae9a217982ec4027cef4b7525b2a74fe3c7 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 9 Feb 2015 22:29:49 +0100 Subject: Add ioctl support in nullfs. --- src/kernel/include/nullfs.h | 7 ++++--- src/kernel/user/nullfs.c | 14 +++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/kernel/include/nullfs.h b/src/kernel/include/nullfs.h index 265d41b..43bad5e 100644 --- a/src/kernel/include/nullfs.h +++ b/src/kernel/include/nullfs.h @@ -9,10 +9,11 @@ typedef struct nullfs nullfs_t; typedef struct { void* (*open)(void* f, int mode, fs_handle_t *h); - size_t (*read)(void* f, size_t offset, size_t len, char* buf); - size_t (*write)(void* f, size_t offset, size_t len, const char* buf); + size_t (*read)(void* fd, size_t offset, size_t len, char* buf); + size_t (*write)(void* fd, size_t offset, size_t len, const char* buf); bool (*stat)(void* f, stat_t *st); - void (*close)(void* f); + int (*ioctl)(void* f, int command, void* data); + void (*close)(void* fd); void (*dispose)(void* f); } nullfs_node_ops_t; diff --git a/src/kernel/user/nullfs.c b/src/kernel/user/nullfs.c index 382e30b..a2975b4 100644 --- a/src/kernel/user/nullfs.c +++ b/src/kernel/user/nullfs.c @@ -10,6 +10,7 @@ static bool nullfs_i_open(void* fs, const char* file, int mode, fs_handle_t *s); static bool nullfs_i_delete(void* fs, const char* file); static void nullfs_i_shutdown(void* fs); static bool nullfs_i_fs_stat(void* fs, const char* file, stat_t *st); +static int nullfs_i_fs_ioctl(void* fs, const char* file, int command, void* data); static bool nullfs_i_f_stat(void* f, stat_t *st); static size_t nullfs_i_read(void* f, size_t offset, size_t len, char* buf); @@ -26,7 +27,7 @@ static fs_ops_t nullfs_ops = { .delete = nullfs_i_delete, .rename = 0, .stat = nullfs_i_fs_stat, - .ioctl = 0, + .ioctl = nullfs_i_fs_ioctl, .add_source = 0, .shutdown = nullfs_i_shutdown }; @@ -164,6 +165,16 @@ bool nullfs_i_fs_stat(void* fs, const char* file, stat_t *st) { return x->ops->stat && x->ops->stat(x->data, st); } +int nullfs_i_fs_ioctl(void* fs, const char* file, int command, void* data) { + nullfs_t *f = (nullfs_t*)fs; + + nullfs_item_t *x = (nullfs_item_t*)(hashtbl_find(f->items, file)); + if (x == 0) return 0; + if (x->ops->ioctl == 0) return 0; + + return x->ops->ioctl(x->data, command, data); +} + bool nullfs_i_delete(void* fs, const char* file) { nullfs_t *f = (nullfs_t*)fs; @@ -216,6 +227,7 @@ static nullfs_node_ops_t nullfs_ram_ops = { .write = nullfs_i_ram_write, .stat = nullfs_i_ram_stat, .close = 0, + .ioctl = 0, .dispose = nullfs_i_ram_dispose }; -- cgit v1.2.3