Major restructuring

19 files changed, 7 insertions, 19 deletions

diff --git a/kernel/inc/acpi.h b/kernel/inc/drivers/acpi.h
index 29dcd32..29dcd32 100644
--- a/kernel/inc/acpi.h
+++ b/kernel/inc/drivers/acpi.h
diff --git a/kernel/inc/cpu.h b/kernel/inc/drivers/cpu.h
index 7ac6074..7ac6074 100644
--- a/kernel/inc/cpu.h
+++ b/kernel/inc/drivers/cpu.h
diff --git a/kernel/inc/gdt.h b/kernel/inc/drivers/gdt.h
index 7b9c65a..7b9c65a 100644
--- a/kernel/inc/gdt.h
+++ b/kernel/inc/drivers/gdt.h
diff --git a/kernel/inc/ide.h b/kernel/inc/drivers/ide.h
index dbe0652..dbe0652 100644
--- a/kernel/inc/ide.h
+++ b/kernel/inc/drivers/ide.h
diff --git a/kernel/inc/interrupts.h b/kernel/inc/drivers/interrupts.h
index 7c0c1e7..7c0c1e7 100644
--- a/kernel/inc/interrupts.h
+++ b/kernel/inc/drivers/interrupts.h
diff --git a/kernel/inc/mbr.h b/kernel/inc/drivers/mbr.h
index 07f6da0..07f6da0 100644
--- a/kernel/inc/mbr.h
+++ b/kernel/inc/drivers/mbr.h
diff --git a/kernel/inc/pci.h b/kernel/inc/drivers/pci.h
index 9429f29..9429f29 100644
--- a/kernel/inc/pci.h
+++ b/kernel/inc/drivers/pci.h
diff --git a/kernel/inc/ps2.h b/kernel/inc/drivers/ps2.h
index 5db8b57..5db8b57 100644
--- a/kernel/inc/ps2.h
+++ b/kernel/inc/drivers/ps2.h
diff --git a/kernel/inc/rtc.h b/kernel/inc/drivers/rtc.h
index 44a9c9e..44a9c9e 100644
--- a/kernel/inc/rtc.h
+++ b/kernel/inc/drivers/rtc.h
diff --git a/kernel/inc/rtl8139.h b/kernel/inc/drivers/rtl8139.h
index 0d748af..0d748af 100644
--- a/kernel/inc/rtl8139.h
+++ b/kernel/inc/drivers/rtl8139.h
diff --git a/kernel/inc/serial.h b/kernel/inc/drivers/serial.h
index 72c9dc1..72c9dc1 100644
--- a/kernel/inc/serial.h
+++ b/kernel/inc/drivers/serial.h
diff --git a/kernel/inc/timer.h b/kernel/inc/drivers/timer.h
index 0712e37..9ff23f8 100644
--- a/kernel/inc/timer.h
+++ b/kernel/inc/drivers/timer.h
@@ -4,7 +4,7 @@
 #define TIMER_H
 
 #include <def.h>
-#include <interrupts.h>
+#include <drivers/interrupts.h>
 
 u32 timer_get(void);
 void timer_wait(u32 ticks);
diff --git a/kernel/inc/fb.h b/kernel/inc/drivers/vbe.h
index b3486e0..5b2275a 100644
--- a/kernel/inc/fb.h
+++ b/kernel/inc/drivers/vbe.h
@@ -1,10 +1,10 @@
 // MIT License, Copyright (c) 2021 Marvin Borner
 
-#ifndef FB_H
-#define FB_H
+#ifndef VBE_H
+#define VBE_H
 
 #include <mm.h>
 
-void fb_install(void) NONNULL;
+void vbe_install(u32 data) NONNULL;
 
 #endif
diff --git a/kernel/inc/vmware.h b/kernel/inc/drivers/vmware.h
index 243c624..243c624 100644
--- a/kernel/inc/vmware.h
+++ b/kernel/inc/drivers/vmware.h
diff --git a/kernel/inc/fpu.h b/kernel/inc/fpu.h
deleted file mode 100644
index d3ec8d9..0000000
--- a/kernel/inc/fpu.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#ifndef FPU_H
-#define FPU_H
-
-void fpu_install(void);
-
-#endif
diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h
index a1cb696..1ea4b21 100644
--- a/kernel/inc/fs.h
+++ b/kernel/inc/fs.h
@@ -21,8 +21,6 @@ struct vfs_dev {
 	void *data;
 	res (*read)(void *buf, u32 offset, u32 count, struct vfs_dev *dev) NONNULL;
 	res (*write)(const void *buf, u32 offset, u32 count, struct vfs_dev *dev) NONNULL;
-	res (*ioctl)(u32 request, void *arg1, void *arg2, void *arg3, struct vfs_dev *dev)
-		ATTR((nonnull(5)));
 };
 
 /**
@@ -40,8 +38,6 @@ struct vfs {
 		    struct vfs_dev *dev) NONNULL;
 	res (*write)(const char *path, const void *buf, u32 offset, u32 count,
 		     struct vfs_dev *dev) NONNULL;
-	res (*ioctl)(const char *path, u32 request, void *arg1, void *arg2, void *arg3,
-		     struct vfs_dev *dev) ATTR((nonnull(1, 6)));
 	res (*stat)(const char *path, struct stat *buf, struct vfs_dev *dev) NONNULL;
 	res (*block)(const char *path, u32 func_ptr, struct vfs_dev *dev) NONNULL;
 	res (*perm)(const char *path, enum vfs_perm perm, struct vfs_dev *dev) NONNULL;
diff --git a/kernel/inc/io.h b/kernel/inc/io.h
index b3e8b9b..275fcae 100644
--- a/kernel/inc/io.h
+++ b/kernel/inc/io.h
@@ -4,7 +4,7 @@
 #define IO_H
 
 #include <def.h>
-#include <interrupts.h>
+#include <drivers/interrupts.h>
 #include <proc.h>
 #include <sys.h>
 
diff --git a/kernel/inc/mm.h b/kernel/inc/mm.h
index a8116e6..8f6f06a 100644
--- a/kernel/inc/mm.h
+++ b/kernel/inc/mm.h
@@ -5,7 +5,7 @@
 
 #include <def.h>
 #include <errno.h>
-#include <interrupts.h>
+#include <drivers/interrupts.h>
 
 struct memory_range {
 	u32 base;
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index 582ca22..1144782 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -4,7 +4,7 @@
 #define PROC_H
 
 #include <def.h>
-#include <interrupts.h>
+#include <drivers/interrupts.h>
 #include <list.h>
 #include <stack.h>
 #include <sys.h>