Reorganize libmsl

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
 

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>
 

libmsl/.gitignore

@@ -1,3 +1,4 @@
+*.o
 *.json
 docs/
 .cache/

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[];

libmsl/m/.gitignore

@@ -1 +0,0 @@
-*.o

libmsl/m/src.mk

@@ -1,3 +0,0 @@
-c += m/system.c
-
-o += m/system.o

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

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,          \

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);

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)

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) {