From b43127e023eb14758f1ce5ad407849429154c6de Mon Sep 17 00:00:00 2001
From: kamkow1 <kamkow256@gmail.com>
Date: Sat, 21 Feb 2026 11:52:33 +0100
Subject: [PATCH] Reorganize libmsl

---
 liballoc/liballoc.c      | 2 +-
 libkb/kb.c               | 2 +-
 libmsl/.gitignore        | 1 +
 libmsl/init/__premain.c  | 2 +-
 libmsl/m/.gitignore      | 1 -
 libmsl/m/src.mk          | 3 ---
 libmsl/src.mk            | 5 ++++-
 libmsl/{m => }/syscall.h | 0
 libmsl/{m => }/system.c  | 4 ++--
 libmsl/{m => }/system.h  | 0
 libprocess/process.c     | 2 +-
 libprocess/process.h     | 2 +-
 libterminal/terminal.c   | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 libmsl/m/.gitignore
 delete mode 100644 libmsl/m/src.mk
 rename libmsl/{m => }/syscall.h (100%)
 rename libmsl/{m => }/system.c (98%)
 rename libmsl/{m => }/system.h (100%)

diff --git a/liballoc/liballoc.c b/liballoc/liballoc.c
index 9ed3ba4..cbbe8d6 100644
--- a/liballoc/liballoc.c
+++ b/liballoc/liballoc.c
@@ -2,7 +2,7 @@
 #pragma clang optimize off
 
 #include <liballoc.h>
-#include <m/system.h>
+#include <system.h>
 
 #define LIBALLOC_MUTEX 500
 
diff --git a/libkb/kb.c b/libkb/kb.c
index fdecf5f..bab62e5 100644
--- a/libkb/kb.c
+++ b/libkb/kb.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <kb.h>
-#include <m/system.h>
+#include <system.h>
 #include <m/kb_device.h>
 #include <m/status.h>
 
diff --git a/libmsl/.gitignore b/libmsl/.gitignore
index aa2c101..de276e3 100644
--- a/libmsl/.gitignore
+++ b/libmsl/.gitignore
@@ -1,3 +1,4 @@
+*.o
 *.json
 docs/
 .cache/
diff --git a/libmsl/init/__premain.c b/libmsl/init/__premain.c
index f0d89c2..8081d7a 100644
--- a/libmsl/init/__premain.c
+++ b/libmsl/init/__premain.c
@@ -1,6 +1,6 @@
 #include <liballoc.h>
-#include <m/system.h>
 #include <stdint.h>
+#include <system.h>
 
 extern volatile uint8_t __bss_start[];
 extern volatile uint8_t __bss_end[];
diff --git a/libmsl/m/.gitignore b/libmsl/m/.gitignore
deleted file mode 100644
index 5761abc..0000000
--- a/libmsl/m/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.o
diff --git a/libmsl/m/src.mk b/libmsl/m/src.mk
deleted file mode 100644
index efd926e..0000000
--- a/libmsl/m/src.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-c += m/system.c
-
-o += m/system.o
diff --git a/libmsl/src.mk b/libmsl/src.mk
index b61f45d..5208875 100644
--- a/libmsl/src.mk
+++ b/libmsl/src.mk
@@ -1,3 +1,6 @@
 include $(platform)/src.mk
 include init/src.mk
-include m/src.mk
+
+c += system.c
+
+o += system.o
diff --git a/libmsl/m/syscall.h b/libmsl/syscall.h
similarity index 100%
rename from libmsl/m/syscall.h
rename to libmsl/syscall.h
diff --git a/libmsl/m/system.c b/libmsl/system.c
similarity index 98%
rename from libmsl/m/system.c
rename to libmsl/system.c
index 2c009b5..91bbea5 100644
--- a/libmsl/m/system.c
+++ b/libmsl/system.c
@@ -1,7 +1,7 @@
-#include <m/syscall.h>
-#include <m/system.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <syscall.h>
+#include <system.h>
 
 #define do_syscall1(id, a1, a2, a3, a4, a5, a6, ...)                                               \
   syscall (id, (uintptr_t)a1, (uintptr_t)a2, (uintptr_t)a3, (uintptr_t)a4, (uintptr_t)a5,          \
diff --git a/libmsl/m/system.h b/libmsl/system.h
similarity index 100%
rename from libmsl/m/system.h
rename to libmsl/system.h
diff --git a/libprocess/process.c b/libprocess/process.c
index 591a151..d846049 100644
--- a/libprocess/process.c
+++ b/libprocess/process.c
@@ -1,9 +1,9 @@
 #include <liballoc.h>
 #include <m/status.h>
-#include <m/system.h>
 #include <process.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <system.h>
 
 int process_spawn (process_func_t func, void* argument_ptr) {
   void* stack = malloc (STACK_SIZE);
diff --git a/libprocess/process.h b/libprocess/process.h
index 647c208..be0d938 100644
--- a/libprocess/process.h
+++ b/libprocess/process.h
@@ -1,7 +1,7 @@
 #ifndef _LIBPROCESS_PROCESS_PROCESS_H
 #define _LIBPROCESS_PROCESS_PROCESS_H
 
-#include <m/system.h>
+#include <system.h>
 
 /* Size of process' stack */
 #define STACK_SIZE (256 * PAGE_SIZE)
diff --git a/libterminal/terminal.c b/libterminal/terminal.c
index 7f457b8..33eec40 100644
--- a/libterminal/terminal.c
+++ b/libterminal/terminal.c
@@ -1,5 +1,5 @@
-#include <m/system.h>
 #include <stddef.h>
+#include <system.h>
 #include <terminal.h>
 
 void terminal_print (const char* string, size_t len) {