New elegant I/O blocking solution

This is done using an internal scheduler syscall (127).

Very nice!

6 files changed, 23 insertions, 16 deletions

diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h
index 93a8a5c..8dbf028 100644
--- a/kernel/inc/fs.h
+++ b/kernel/inc/fs.h
@@ -60,10 +60,10 @@ res vfs_mount(struct vfs_dev *dev, const char *path) NONNULL;
 struct vfs_dev *vfs_find_dev(const char *path) NONNULL;
 void vfs_add_dev(struct vfs_dev *dev) NONNULL;
 
-res vfs_read(const char *path, void *buf, u32 offset, u32 count) NONNULL;
-res vfs_write(const char *path, void *buf, u32 offset, u32 count) NONNULL;
-res vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3) ATTR((nonnull(1)));
-res vfs_stat(const char *path, struct stat *buf) NONNULL;
+// No NONNULL on syscalls
+res vfs_read(const char *path, void *buf, u32 offset, u32 count);
+res vfs_write(const char *path, void *buf, u32 offset, u32 count);
+res vfs_stat(const char *path, struct stat *buf);
 
 struct vfs_dev *device_get_by_name(const char *name) NONNULL;
 struct vfs_dev *device_get_by_id(u32 id) NONNULL;
diff --git a/kernel/inc/interrupts.h b/kernel/inc/interrupts.h
index a22bebb..7c0c1e7 100644
--- a/kernel/inc/interrupts.h
+++ b/kernel/inc/interrupts.h
@@ -70,6 +70,7 @@ extern void isr28(struct regs *r);
 extern void isr29(struct regs *r);
 extern void isr30(struct regs *r);
 extern void isr31(struct regs *r);
+extern void isr127(struct regs *r);
 extern void isr128(struct regs *r);
 
 extern void irq0(struct regs *r);
@@ -88,6 +89,7 @@ extern void irq12(struct regs *r);
 extern void irq13(struct regs *r);
 extern void irq14(struct regs *r);
 extern void irq15(struct regs *r);
+extern void irq127(struct regs *r);
 extern void irq128(struct regs *r);
 
 #endif
diff --git a/kernel/inc/io.h b/kernel/inc/io.h
index 3291bfc..e0b817b 100644
--- a/kernel/inc/io.h
+++ b/kernel/inc/io.h
@@ -19,12 +19,14 @@ struct io_dev {
 void io_install(struct boot_info *boot);
 void io_add(enum io_type io, struct io_dev *dev) NONNULL;
 
+// No NONNULL on syscalls
 res io_control(enum io_type io, u32 request, void *arg1, void *arg2, void *arg3);
 res io_write(enum io_type io, void *buf, u32 offset, u32 count);
 res io_read(enum io_type io, void *buf, u32 offset, u32 count);
-res io_poll(u32 *devs) NONNULL;
+res io_poll(u32 *devs);
+res io_ready(enum io_type io);
 
-void io_block(enum io_type io, struct proc *proc, struct regs *r) NONNULL;
+void io_block(enum io_type io, struct proc *proc) NONNULL;
 void io_unblock(enum io_type io);
 
 #endif
diff --git a/kernel/inc/load.h b/kernel/inc/load.h
index 9e62369..740e13a 100644
--- a/kernel/inc/load.h
+++ b/kernel/inc/load.h
@@ -161,6 +161,7 @@ struct PACKED elf_symbol {
 	u16 shndx;
 };
 
-res elf_load(const char *name, struct proc *proc) NONNULL;
+// No NONNULL on syscalls
+res elf_load(const char *name, struct proc *proc);
 
 #endif
diff --git a/kernel/inc/mm.h b/kernel/inc/mm.h
index 0f1b4ec..dc28a8d 100644
--- a/kernel/inc/mm.h
+++ b/kernel/inc/mm.h
@@ -132,14 +132,16 @@ void memory_backup_dir(struct page_dir **backup) NONNULL;
 // Bypass should almost never be used
 void memory_bypass_enable(void);
 void memory_bypass_disable(void);
-u8 memory_is_user(const void *addr) NONNULL;
-u8 memory_readable(const void *addr) NONNULL;
-u8 memory_writable(const void *addr) NONNULL;
-
-// User interface
-res memory_sys_alloc(struct page_dir *dir, u32 size, u32 *addr, u32 *id, u8 shared) NONNULL;
-res memory_sys_free(struct page_dir *dir, u32 addr) NONNULL;
-res memory_sys_shaccess(struct page_dir *dir, u32 id, u32 *addr, u32 *size) NONNULL;
+
+// No NONNULL on verification (for syscalls etc)
+u8 memory_is_user(const void *addr);
+u8 memory_readable(const void *addr);
+u8 memory_writable(const void *addr);
+
+// User interface - No NONNULL on syscalls
+res memory_sys_alloc(struct page_dir *dir, u32 size, u32 *addr, u32 *id, u8 shared);
+res memory_sys_free(struct page_dir *dir, u32 addr);
+res memory_sys_shaccess(struct page_dir *dir, u32 id, u32 *addr, u32 *size);
 
 void memory_user_hook(void);
 void memory_install(struct boot_info *boot) NONNULL;
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index 754693f..1d5d064 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -71,7 +71,7 @@ struct proc *proc_current(void);
 u8 proc_super(void);
 struct proc *proc_from_pid(u32 pid);
 void proc_exit(struct proc *proc, struct regs *r, s32 status) NONNULL;
-void proc_yield(struct regs *r) NONNULL;
+void proc_yield(void);
 void proc_set_quantum(struct proc *proc, u32 value);
 void proc_reset_quantum(struct proc *proc);
 void proc_state(struct proc *proc, enum proc_state state);