From 4c4c10c61e0c60d9becc222d7fb8768fc1cb4f31 Mon Sep 17 00:00:00 2001
From: kamkow1 <kamkow256@gmail.com>
Date: Tue, 31 Mar 2026 15:56:30 +0200
Subject: [PATCH] organize device drivers into subdirectories

---
 kernel/amd64/bootmain.c                  |  2 +-
 kernel/device/device.c                   | 14 ++++-----
 kernel/device/pci/.gitignore             |  1 +
 kernel/device/{ => pci}/pci.c            |  8 ++---
 kernel/device/{ => pci}/pci.h            |  2 +-
 kernel/device/{ => pci}/pci_defs.c       |  2 +-
 kernel/device/{ => pci}/pci_ide.c        |  8 ++---
 kernel/device/{ => pci}/pci_ide.h        |  2 +-
 kernel/device/{ => pci}/pci_info.h       |  0
 kernel/device/{ => pci}/pci_xhci.c       |  8 ++---
 kernel/device/{ => pci}/pci_xhci.h       |  2 +-
 kernel/device/pci/src.mk                 |  9 ++++++
 kernel/device/ps2/.gitignore             |  1 +
 kernel/device/{ => ps2}/ps2_kb.c         |  2 +-
 kernel/device/{ => ps2}/ps2_kb.h         |  0
 kernel/device/ps2/src.mk                 |  3 ++
 kernel/device/src.mk                     | 37 ++++++------------------
 kernel/device/storage/.gitignore         |  1 +
 kernel/device/{ => storage}/idedrv.c     |  4 +--
 kernel/device/{ => storage}/idedrv.h     |  0
 kernel/device/{ => storage}/partdrv.c    |  2 +-
 kernel/device/{ => storage}/partdrv.h    |  0
 kernel/device/{ => storage}/partitions.c |  4 +--
 kernel/device/{ => storage}/partitions.h |  0
 kernel/device/{ => storage}/ramdrv.c     |  4 +--
 kernel/device/{ => storage}/ramdrv.h     |  0
 kernel/device/storage/src.mk             |  9 ++++++
 kernel/device/sys/.gitignore             |  1 +
 kernel/device/{ => sys}/debugconsole.c   |  2 +-
 kernel/device/{ => sys}/debugconsole.h   |  0
 kernel/device/sys/src.mk                 |  5 ++++
 kernel/device/{ => sys}/terminal.c       |  2 +-
 kernel/device/{ => sys}/terminal.h       |  0
 kernel/device/usb/.gitignore             |  1 +
 kernel/device/usb/src.mk                 |  3 ++
 kernel/device/{ => usb}/usb.h            |  0
 kernel/device/{ => usb}/xhci.c           |  4 +--
 kernel/device/{ => usb}/xhci.h           |  0
 38 files changed, 79 insertions(+), 64 deletions(-)
 create mode 100644 kernel/device/pci/.gitignore
 rename kernel/device/{ => pci}/pci.c (98%)
 rename kernel/device/{ => pci}/pci.h (98%)
 rename kernel/device/{ => pci}/pci_defs.c (99%)
 rename kernel/device/{ => pci}/pci_ide.c (97%)
 rename kernel/device/{ => pci}/pci_ide.h (89%)
 rename kernel/device/{ => pci}/pci_info.h (100%)
 rename kernel/device/{ => pci}/pci_xhci.c (96%)
 rename kernel/device/{ => pci}/pci_xhci.h (89%)
 create mode 100644 kernel/device/pci/src.mk
 create mode 100644 kernel/device/ps2/.gitignore
 rename kernel/device/{ => ps2}/ps2_kb.c (99%)
 rename kernel/device/{ => ps2}/ps2_kb.h (100%)
 create mode 100644 kernel/device/ps2/src.mk
 create mode 100644 kernel/device/storage/.gitignore
 rename kernel/device/{ => storage}/idedrv.c (99%)
 rename kernel/device/{ => storage}/idedrv.h (100%)
 rename kernel/device/{ => storage}/partdrv.c (98%)
 rename kernel/device/{ => storage}/partdrv.h (100%)
 rename kernel/device/{ => storage}/partitions.c (96%)
 rename kernel/device/{ => storage}/partitions.h (100%)
 rename kernel/device/{ => storage}/ramdrv.c (97%)
 rename kernel/device/{ => storage}/ramdrv.h (100%)
 create mode 100644 kernel/device/storage/src.mk
 create mode 100644 kernel/device/sys/.gitignore
 rename kernel/device/{ => sys}/debugconsole.c (94%)
 rename kernel/device/{ => sys}/debugconsole.h (100%)
 create mode 100644 kernel/device/sys/src.mk
 rename kernel/device/{ => sys}/terminal.c (97%)
 rename kernel/device/{ => sys}/terminal.h (100%)
 create mode 100644 kernel/device/usb/.gitignore
 create mode 100644 kernel/device/usb/src.mk
 rename kernel/device/{ => usb}/usb.h (100%)
 rename kernel/device/{ => usb}/xhci.c (99%)
 rename kernel/device/{ => usb}/xhci.h (100%)

diff --git a/kernel/amd64/bootmain.c b/kernel/amd64/bootmain.c
index 5e2c816..9683bee 100644
--- a/kernel/amd64/bootmain.c
+++ b/kernel/amd64/bootmain.c
@@ -9,7 +9,7 @@
 #include <amd64/sse.h>
 #include <aux/compiler.h>
 #include <device/device.h>
-#include <device/partitions.h>
+#include <device/storage/partitions.h>
 #include <devices.h>
 #include <fs/vfs.h>
 #include <fs_types.h>
diff --git a/kernel/device/device.c b/kernel/device/device.c
index 8f40542..4270582 100644
--- a/kernel/device/device.c
+++ b/kernel/device/device.c
@@ -1,9 +1,9 @@
-#include <device/debugconsole.h>
 #include <device/device.h>
-#include <device/partdrv.h>
-#include <device/partitions.h>
-#include <device/ramdrv.h>
-#include <device/terminal.h>
+#include <device/storage/partdrv.h>
+#include <device/storage/partitions.h>
+#include <device/storage/ramdrv.h>
+#include <device/sys/debugconsole.h>
+#include <device/sys/terminal.h>
 #include <device_info.h>
 #include <devices.h>
 #include <id/id_alloc.h>
@@ -22,8 +22,8 @@
 #include <sys/debug.h>
 
 #if defined(__x86_64__)
-#include <device/pci.h>
-#include <device/ps2_kb.h>
+#include <device/pci/pci.h>
+#include <device/ps2/ps2_kb.h>
 #endif
 
 struct device_table {
diff --git a/kernel/device/pci/.gitignore b/kernel/device/pci/.gitignore
new file mode 100644
index 0000000..5761abc
--- /dev/null
+++ b/kernel/device/pci/.gitignore
@@ -0,0 +1 @@
+*.o
diff --git a/kernel/device/pci.c b/kernel/device/pci/pci.c
similarity index 98%
rename from kernel/device/pci.c
rename to kernel/device/pci/pci.c
index 12503bc..6b01852 100644
--- a/kernel/device/pci.c
+++ b/kernel/device/pci/pci.c
@@ -1,8 +1,8 @@
 #include <amd64/io.h>
-#include <device/pci.h>
-#include <device/pci_ide.h>
-#include <device/pci_info.h>
-#include <device/pci_xhci.h>
+#include <device/pci/pci.h>
+#include <device/pci/pci_ide.h>
+#include <device/pci/pci_info.h>
+#include <device/pci/pci_xhci.h>
 #include <libk/lengthof.h>
 #include <libk/std.h>
 #include <libk/string.h>
diff --git a/kernel/device/pci.h b/kernel/device/pci/pci.h
similarity index 98%
rename from kernel/device/pci.h
rename to kernel/device/pci/pci.h
index f43f3dd..613cf25 100644
--- a/kernel/device/pci.h
+++ b/kernel/device/pci/pci.h
@@ -1,7 +1,7 @@
 #ifndef _KERNEL_DEVICE_PCI_H
 #define _KERNEL_DEVICE_PCI_H
 
-#include <device/pci_info.h>
+#include <device/pci/pci_info.h>
 #include <libk/std.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
diff --git a/kernel/device/pci_defs.c b/kernel/device/pci/pci_defs.c
similarity index 99%
rename from kernel/device/pci_defs.c
rename to kernel/device/pci/pci_defs.c
index 49fd452..b889211 100644
--- a/kernel/device/pci_defs.c
+++ b/kernel/device/pci/pci_defs.c
@@ -1,6 +1,6 @@
 #include <libk/std.h>
 
-#include <device/pci.h>
+#include <device/pci/pci.h>
 
 const struct pci_vendor pci_vendors[] = {
     {0x0001, "SafeNet (wrong ID)"},
diff --git a/kernel/device/pci_ide.c b/kernel/device/pci/pci_ide.c
similarity index 97%
rename from kernel/device/pci_ide.c
rename to kernel/device/pci/pci_ide.c
index 6cec005..ad5d9e7 100644
--- a/kernel/device/pci_ide.c
+++ b/kernel/device/pci/pci_ide.c
@@ -2,10 +2,10 @@
 #include <amd64/intr_defs.h>
 #include <amd64/io.h>
 #include <device/device.h>
-#include <device/idedrv.h>
-#include <device/partitions.h>
-#include <device/pci.h>
-#include <device/pci_info.h>
+#include <device/pci/pci.h>
+#include <device/pci/pci_info.h>
+#include <device/storage/idedrv.h>
+#include <device/storage/partitions.h>
 #include <devices.h>
 #include <libk/fieldsizeof.h>
 #include <libk/lengthof.h>
diff --git a/kernel/device/pci_ide.h b/kernel/device/pci/pci_ide.h
similarity index 89%
rename from kernel/device/pci_ide.h
rename to kernel/device/pci/pci_ide.h
index 855ecd0..85b23ee 100644
--- a/kernel/device/pci_ide.h
+++ b/kernel/device/pci/pci_ide.h
@@ -1,7 +1,7 @@
 #ifndef _KERNEL_DEVICE_PCI_IDE_H
 #define _KERNEL_DEVICE_PCI_IDE_H
 
-#include <device/pci_info.h>
+#include <device/pci/pci_info.h>
 #include <libk/std.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
diff --git a/kernel/device/pci_info.h b/kernel/device/pci/pci_info.h
similarity index 100%
rename from kernel/device/pci_info.h
rename to kernel/device/pci/pci_info.h
diff --git a/kernel/device/pci_xhci.c b/kernel/device/pci/pci_xhci.c
similarity index 96%
rename from kernel/device/pci_xhci.c
rename to kernel/device/pci/pci_xhci.c
index 18e9b0d..02e5307 100644
--- a/kernel/device/pci_xhci.c
+++ b/kernel/device/pci/pci_xhci.c
@@ -2,10 +2,10 @@
 #include <amd64/intr_defs.h>
 #include <device/def_device_op.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_info.h>
-#include <device/pci_xhci.h>
-#include <device/xhci.h>
+#include <device/pci/pci.h>
+#include <device/pci/pci_info.h>
+#include <device/pci/pci_xhci.h>
+#include <device/usb/xhci.h>
 #include <devices.h>
 #include <libk/align.h>
 #include <libk/lengthof.h>
diff --git a/kernel/device/pci_xhci.h b/kernel/device/pci/pci_xhci.h
similarity index 89%
rename from kernel/device/pci_xhci.h
rename to kernel/device/pci/pci_xhci.h
index 06fd91e..a9dd863 100644
--- a/kernel/device/pci_xhci.h
+++ b/kernel/device/pci/pci_xhci.h
@@ -1,7 +1,7 @@
 #ifndef _KERNEL_DEVICE_PCI_XHCI_H
 #define _KERNEL_DEVICE_PCI_XHCI_H
 
-#include <device/pci_info.h>
+#include <device/pci/pci_info.h>
 #include <libk/std.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
diff --git a/kernel/device/pci/src.mk b/kernel/device/pci/src.mk
new file mode 100644
index 0000000..3117ce6
--- /dev/null
+++ b/kernel/device/pci/src.mk
@@ -0,0 +1,9 @@
+c += device/pci/pci.c \
+		 device/pci/pci_defs.c \
+		 device/pci/pci_ide.c \
+		 device/pci/pci_xhci.c
+
+o += device/pci/pci.o \
+		 device/pci/pci_defs.o \
+		 device/pci/pci_ide.o \
+		 device/pci/pci_xhci.o
diff --git a/kernel/device/ps2/.gitignore b/kernel/device/ps2/.gitignore
new file mode 100644
index 0000000..5761abc
--- /dev/null
+++ b/kernel/device/ps2/.gitignore
@@ -0,0 +1 @@
+*.o
diff --git a/kernel/device/ps2_kb.c b/kernel/device/ps2/ps2_kb.c
similarity index 99%
rename from kernel/device/ps2_kb.c
rename to kernel/device/ps2/ps2_kb.c
index e1eeeca..16fb4eb 100644
--- a/kernel/device/ps2_kb.c
+++ b/kernel/device/ps2/ps2_kb.c
@@ -2,7 +2,7 @@
 #include <amd64/intr_defs.h>
 #include <amd64/io.h>
 #include <device/device.h>
-#include <device/ps2_kb.h>
+#include <device/ps2/ps2_kb.h>
 #include <devices.h>
 #include <irq/irq.h>
 #include <kb_defs.h>
diff --git a/kernel/device/ps2_kb.h b/kernel/device/ps2/ps2_kb.h
similarity index 100%
rename from kernel/device/ps2_kb.h
rename to kernel/device/ps2/ps2_kb.h
diff --git a/kernel/device/ps2/src.mk b/kernel/device/ps2/src.mk
new file mode 100644
index 0000000..ec92def
--- /dev/null
+++ b/kernel/device/ps2/src.mk
@@ -0,0 +1,3 @@
+c += device/ps2/ps2_kb.c
+
+o += device/ps2/ps2_kb.o
diff --git a/kernel/device/src.mk b/kernel/device/src.mk
index fd6d565..eecbcdd 100644
--- a/kernel/device/src.mk
+++ b/kernel/device/src.mk
@@ -1,31 +1,12 @@
-c += device/device.c \
-		 device/terminal.c \
-		 device/ramdrv.c \
-		 device/partdrv.c \
-		 device/partitions.c \
-		 device/debugconsole.c
-
-o += device/device.o \
-		 device/terminal.o \
-		 device/ramdrv.o \
-		 device/partdrv.o \
-		 device/partitions.o \
-		 device/debugconsole.o
+include device/storage/src.mk
+include device/sys/src.mk
 
 ifeq ($(platform),amd64)
-	c += device/ps2_kb.c \
-			 device/idedrv.c \
-			 device/pci.c \
-			 device/pci_defs.c \
-			 device/pci_ide.c \
-			 device/pci_xhci.c \
-			 device/xhci.c
-
-	o += device/ps2_kb.o \
-			 device/idedrv.o \
-			 device/pci.o \
-			 device/pci_defs.o \
-			 device/pci_ide.o \
-			 device/pci_xhci.o \
-			 device/xhci.o
+	include device/pci/src.mk
+	include device/ps2/src.mk
+	include device/usb/src.mk
 endif
+
+c += device/device.c
+
+o += device/device.o
diff --git a/kernel/device/storage/.gitignore b/kernel/device/storage/.gitignore
new file mode 100644
index 0000000..5761abc
--- /dev/null
+++ b/kernel/device/storage/.gitignore
@@ -0,0 +1 @@
+*.o
diff --git a/kernel/device/idedrv.c b/kernel/device/storage/idedrv.c
similarity index 99%
rename from kernel/device/idedrv.c
rename to kernel/device/storage/idedrv.c
index 55948a2..a38b315 100644
--- a/kernel/device/idedrv.c
+++ b/kernel/device/storage/idedrv.c
@@ -2,8 +2,8 @@
 #include <amd64/intr_defs.h>
 #include <amd64/io.h>
 #include <device/device.h>
-#include <device/idedrv.h>
-#include <device/partitions.h>
+#include <device/storage/idedrv.h>
+#include <device/storage/partitions.h>
 #include <devices.h>
 #include <irq/irq.h>
 #include <libk/list.h>
diff --git a/kernel/device/idedrv.h b/kernel/device/storage/idedrv.h
similarity index 100%
rename from kernel/device/idedrv.h
rename to kernel/device/storage/idedrv.h
diff --git a/kernel/device/partdrv.c b/kernel/device/storage/partdrv.c
similarity index 98%
rename from kernel/device/partdrv.c
rename to kernel/device/storage/partdrv.c
index bffba26..f001317 100644
--- a/kernel/device/partdrv.c
+++ b/kernel/device/storage/partdrv.c
@@ -1,5 +1,5 @@
 #include <device/device.h>
-#include <device/partdrv.h>
+#include <device/storage/partdrv.h>
 #include <devices.h>
 #include <libk/std.h>
 #include <mm/malloc.h>
diff --git a/kernel/device/partdrv.h b/kernel/device/storage/partdrv.h
similarity index 100%
rename from kernel/device/partdrv.h
rename to kernel/device/storage/partdrv.h
diff --git a/kernel/device/partitions.c b/kernel/device/storage/partitions.c
similarity index 96%
rename from kernel/device/partitions.c
rename to kernel/device/storage/partitions.c
index bd1b2c5..4170c71 100644
--- a/kernel/device/partitions.c
+++ b/kernel/device/storage/partitions.c
@@ -1,6 +1,6 @@
 #include <device/device.h>
-#include <device/partdrv.h>
-#include <device/partitions.h>
+#include <device/storage/partdrv.h>
+#include <device/storage/partitions.h>
 #include <devices.h>
 #include <libk/fieldsizeof.h>
 #include <libk/lengthof.h>
diff --git a/kernel/device/partitions.h b/kernel/device/storage/partitions.h
similarity index 100%
rename from kernel/device/partitions.h
rename to kernel/device/storage/partitions.h
diff --git a/kernel/device/ramdrv.c b/kernel/device/storage/ramdrv.c
similarity index 97%
rename from kernel/device/ramdrv.c
rename to kernel/device/storage/ramdrv.c
index 28304e8..087750c 100644
--- a/kernel/device/ramdrv.c
+++ b/kernel/device/storage/ramdrv.c
@@ -1,6 +1,6 @@
 #include <device/device.h>
-#include <device/partitions.h>
-#include <device/ramdrv.h>
+#include <device/storage/partitions.h>
+#include <device/storage/ramdrv.h>
 #include <devices.h>
 #include <libk/align.h>
 #include <libk/std.h>
diff --git a/kernel/device/ramdrv.h b/kernel/device/storage/ramdrv.h
similarity index 100%
rename from kernel/device/ramdrv.h
rename to kernel/device/storage/ramdrv.h
diff --git a/kernel/device/storage/src.mk b/kernel/device/storage/src.mk
new file mode 100644
index 0000000..9051a15
--- /dev/null
+++ b/kernel/device/storage/src.mk
@@ -0,0 +1,9 @@
+c += device/storage/partdrv.c \
+		 device/storage/ramdrv.c \
+		 device/storage/partitions.c \
+		 device/storage/idedrv.c
+
+o += device/storage/partdrv.o \
+		 device/storage/ramdrv.o \
+		 device/storage/partitions.o \
+		 device/storage/idedrv.o
diff --git a/kernel/device/sys/.gitignore b/kernel/device/sys/.gitignore
new file mode 100644
index 0000000..5761abc
--- /dev/null
+++ b/kernel/device/sys/.gitignore
@@ -0,0 +1 @@
+*.o
diff --git a/kernel/device/debugconsole.c b/kernel/device/sys/debugconsole.c
similarity index 94%
rename from kernel/device/debugconsole.c
rename to kernel/device/sys/debugconsole.c
index 82fa7e6..ffe457b 100644
--- a/kernel/device/debugconsole.c
+++ b/kernel/device/sys/debugconsole.c
@@ -1,5 +1,5 @@
-#include <device/debugconsole.h>
 #include <device/device.h>
+#include <device/sys/debugconsole.h>
 #include <libk/std.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
diff --git a/kernel/device/debugconsole.h b/kernel/device/sys/debugconsole.h
similarity index 100%
rename from kernel/device/debugconsole.h
rename to kernel/device/sys/debugconsole.h
diff --git a/kernel/device/sys/src.mk b/kernel/device/sys/src.mk
new file mode 100644
index 0000000..96eee18
--- /dev/null
+++ b/kernel/device/sys/src.mk
@@ -0,0 +1,5 @@
+c += device/sys/debugconsole.c \
+		 device/sys/terminal.c
+
+o += device/sys/debugconsole.o \
+		 device/sys/terminal.o
diff --git a/kernel/device/terminal.c b/kernel/device/sys/terminal.c
similarity index 97%
rename from kernel/device/terminal.c
rename to kernel/device/sys/terminal.c
index 14e56fa..3c1d2b5 100644
--- a/kernel/device/terminal.c
+++ b/kernel/device/sys/terminal.c
@@ -2,7 +2,7 @@
 #include <Flanterm/src/flanterm_backends/fb.h>
 #include <device/def_device_op.h>
 #include <device/device.h>
-#include <device/terminal.h>
+#include <device/sys/terminal.h>
 #include <libk/std.h>
 #include <limine/requests.h>
 #include <mm/malloc.h>
diff --git a/kernel/device/terminal.h b/kernel/device/sys/terminal.h
similarity index 100%
rename from kernel/device/terminal.h
rename to kernel/device/sys/terminal.h
diff --git a/kernel/device/usb/.gitignore b/kernel/device/usb/.gitignore
new file mode 100644
index 0000000..5761abc
--- /dev/null
+++ b/kernel/device/usb/.gitignore
@@ -0,0 +1 @@
+*.o
diff --git a/kernel/device/usb/src.mk b/kernel/device/usb/src.mk
new file mode 100644
index 0000000..2da6813
--- /dev/null
+++ b/kernel/device/usb/src.mk
@@ -0,0 +1,3 @@
+c += device/usb/xhci.c
+
+o += device/usb/xhci.o
diff --git a/kernel/device/usb.h b/kernel/device/usb/usb.h
similarity index 100%
rename from kernel/device/usb.h
rename to kernel/device/usb/usb.h
diff --git a/kernel/device/xhci.c b/kernel/device/usb/xhci.c
similarity index 99%
rename from kernel/device/xhci.c
rename to kernel/device/usb/xhci.c
index aafa50b..9d374ec 100644
--- a/kernel/device/xhci.c
+++ b/kernel/device/usb/xhci.c
@@ -1,7 +1,7 @@
 #include <device/def_device_op.h>
 #include <device/device.h>
-#include <device/usb.h>
-#include <device/xhci.h>
+#include <device/usb/usb.h>
+#include <device/usb/xhci.h>
 #include <irq/irq.h>
 #include <libk/list.h>
 #include <libk/std.h>
diff --git a/kernel/device/xhci.h b/kernel/device/usb/xhci.h
similarity index 100%
rename from kernel/device/xhci.h
rename to kernel/device/usb/xhci.h