From 00714cac572a538965225d41ed96703df3c547b7 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Mon, 18 Aug 2025 02:41:50 +0000 Subject: kernel: disk: Remove redundant decl clutter Move the common disk I/O routines out side of the _KERNEL guard so that they are visible from both within the kernel as well as from the user side. Signed-off-by: Ian Moffett --- sys/include/sys/disk.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/include/sys/disk.h b/sys/include/sys/disk.h index 6b27156..749322f 100644 --- a/sys/include/sys/disk.h +++ b/sys/include/sys/disk.h @@ -158,10 +158,13 @@ disk_param_init(uint8_t *buf, blkoff_t blk, size_t size, struct disk_param *res) */ #if !defined(_KERNEL) ssize_t __disk_io(diskid_t id, diskop_t op, const struct disk_param *param); -ssize_t disk_write(diskid_t id, blkoff_t off, const void *buf, size_t len); -ssize_t disk_read(diskid_t id, blkoff_t off, void *buf, size_t len); #endif /* !_KERNEL */ +/* Common disk operations */ +int disk_query(diskid_t id, struct disk_info *res); +ssize_t disk_read(diskid_t id, blkoff_t blk, void *buf, size_t len); +ssize_t disk_write(diskid_t id, blkoff_t blk, const void *buf, size_t len); + #if defined(_KERNEL) /* * Represents a block storage device @@ -187,9 +190,6 @@ struct disk { void *disk_buf_alloc(diskid_t id, size_t len); void disk_buf_free(void *p); -ssize_t disk_read(diskid_t id, blkoff_t blk, void *buf, size_t len); -ssize_t disk_write(diskid_t id, blkoff_t blk, const void *buf, size_t len); - int disk_add(const char *name, dev_t dev, const struct bdevsw *bdev, int flags); int disk_get_id(diskid_t id, struct disk **res); -- cgit v1.2.3