rename to kmi

27 files changed, 113 insertions, 113 deletions

diff --git a/common/bits.c b/common/bits.c
index d92fd29..cdb3224 100644
--- a/common/bits.c
+++ b/common/bits.c
@@ -6,10 +6,10 @@
  * Bit manipulation helper implementations, currently just byte swaps.
  */
 
-#include <apos/types.h>
-#include <apos/attrs.h>
-#include <apos/bits.h>
-#include <apos/builtin.h>
+#include <kmi/types.h>
+#include <kmi/attrs.h>
+#include <kmi/bits.h>
+#include <kmi/builtin.h>
 
 #undef __bswap16
 __weak uint16_t __bswap16(const uint16_t u)
diff --git a/common/canary.c b/common/canary.c
index 9fd89ff..e6210a4 100644
--- a/common/canary.c
+++ b/common/canary.c
@@ -1,5 +1,5 @@
-#include <apos/canary.h>
-#include <apos/mem.h>
+#include <kmi/canary.h>
+#include <kmi/mem.h>
 
 /**
  * @file canary.c
diff --git a/common/debug.c b/common/debug.c
index 36fed87..891e1c7 100644
--- a/common/debug.c
+++ b/common/debug.c
@@ -7,11 +7,11 @@
  * when running a debug build to save space in release mode.
  */
 
-#include <apos/types.h>
-#include <apos/debug.h>
-#include <apos/bits.h>
-#include <apos/vmem.h>
-#include <apos/pmem.h>
+#include <kmi/types.h>
+#include <kmi/debug.h>
+#include <kmi/bits.h>
+#include <kmi/vmem.h>
+#include <kmi/pmem.h>
 #include <arch/vmem.h>
 #include <libfdt.h>
 #include <stdarg.h>
diff --git a/common/dispatch.c b/common/dispatch.c
index 25ff0eb..f5d5d2e 100644
--- a/common/dispatch.c
+++ b/common/dispatch.c
@@ -1,11 +1,11 @@
-#include <apos/uapi.h>
-#include <apos/ipi.h>
+#include <kmi/uapi.h>
+#include <kmi/ipi.h>
 
 /**
  * @file dispatch.c
  *
  * Interface between assembly and C for dispatching syscalls/IPIs.
- * In apos, IPIs are a higher level concept and is not expected to be handled by
+ * In kmi, IPIs are a higher level concept and is not expected to be handled by
  * the underlying architecture. Instead, we only require that there is some way
  * to trigger an interrupt in some other core, and check if the interrupt was an
  * IPI or syscall in C.
diff --git a/common/dmem.c b/common/dmem.c
index 98b58fd..5a671fd 100644
--- a/common/dmem.c
+++ b/common/dmem.c
@@ -8,8 +8,8 @@
  * \todo Handle NUMA.
  */
 
-#include <apos/assert.h>
-#include <apos/dmem.h>
+#include <kmi/assert.h>
+#include <kmi/dmem.h>
 
 /** Region before RAM. */
 static struct mem_region_root pre_ram = { 0 };
diff --git a/common/elf.c b/common/elf.c
index f423fc5..eb9cb97 100644
--- a/common/elf.c
+++ b/common/elf.c
@@ -6,11 +6,11 @@
  * Handle elf executables, set up requested memory mappings etc.
  */
 
-#include <apos/elf.h>
-#include <apos/vmem.h>
-#include <apos/bits.h>
-#include <apos/string.h>
-#include <apos/assert.h>
+#include <kmi/elf.h>
+#include <kmi/vmem.h>
+#include <kmi/bits.h>
+#include <kmi/string.h>
+#include <kmi/assert.h>
 
 /**
  * Convert ELF flags to page flags.
diff --git a/common/initrd.c b/common/initrd.c
index 835ccf1..716231b 100644
--- a/common/initrd.c
+++ b/common/initrd.c
@@ -6,11 +6,11 @@
  * Handle initrd, implement cpio with newc format.
  */
 
-#include <apos/initrd.h>
-#include <apos/vmem.h>
-#include <apos/string.h>
-#include <apos/utils.h>
-#include <apos/attrs.h>
+#include <kmi/initrd.h>
+#include <kmi/vmem.h>
+#include <kmi/string.h>
+#include <kmi/utils.h>
+#include <kmi/attrs.h>
 #include <libfdt.h>
 
 /** GNU cpio, POSIX 'newc' format header. */
diff --git a/common/ipi.c b/common/ipi.c
index 32f1432..9629d8a 100644
--- a/common/ipi.c
+++ b/common/ipi.c
@@ -1,4 +1,4 @@
-#include <apos/ipi.h>
+#include <kmi/ipi.h>
 #include <arch/cpu.h>
 
 #include <arch/proc.h>
diff --git a/common/main.c b/common/main.c
index fb5d26e..6de5433 100644
--- a/common/main.c
+++ b/common/main.c
@@ -6,12 +6,12 @@
  * Entry point for actual kernel setup.
  */
 
-#include <apos/mem_nodes.h>
-#include <apos/timer.h>
-#include <apos/attrs.h>
-#include <apos/proc.h>
-#include <apos/debug.h>
-#include <apos/vmem.h>
+#include <kmi/mem_nodes.h>
+#include <kmi/timer.h>
+#include <kmi/attrs.h>
+#include <kmi/proc.h>
+#include <kmi/debug.h>
+#include <kmi/vmem.h>
 #include <arch/arch.h>
 #include <arch/proc.h>
 #include <arch/irq.h>
diff --git a/common/mem.c b/common/mem.c
index f4a0919..03c92fa 100644
--- a/common/mem.c
+++ b/common/mem.c
@@ -6,9 +6,9 @@
  * Generic memory handling, used both by physical and virtual memory.
  */
 
-#include <apos/types.h>
-#include <apos/mem.h>
-#include <apos/vmem.h>
+#include <kmi/types.h>
+#include <kmi/mem.h>
+#include <kmi/vmem.h>
 #include <libfdt.h>
 
 size_t __mm_shifts[10];
diff --git a/common/mem_nodes.c b/common/mem_nodes.c
index 918ee67..a991ebf 100644
--- a/common/mem_nodes.c
+++ b/common/mem_nodes.c
@@ -10,11 +10,11 @@
  * allocated through the node subsystem.
  */
 
-#include <apos/vmem.h>
-#include <apos/pmem.h>
-#include <apos/mem.h>
-#include <apos/string.h>
-#include <apos/mem_nodes.h>
+#include <kmi/vmem.h>
+#include <kmi/pmem.h>
+#include <kmi/mem.h>
+#include <kmi/string.h>
+#include <kmi/mem_nodes.h>
 
 /** Memory node subsystem instance. */
 static struct node_root root;
diff --git a/common/mem_regions.c b/common/mem_regions.c
index f49b390..b94036d 100644
--- a/common/mem_regions.c
+++ b/common/mem_regions.c
@@ -7,11 +7,11 @@
  * subsystems.
  */
 
-#include <apos/mem_regions.h>
-#include <apos/mem_nodes.h>
-#include <apos/pmem.h>
-#include <apos/bits.h>
-#include <apos/mem.h>
+#include <kmi/mem_regions.h>
+#include <kmi/mem_nodes.h>
+#include <kmi/pmem.h>
+#include <kmi/bits.h>
+#include <kmi/mem.h>
 
 /**
  * Readability wrapper for marking region used.
diff --git a/common/nodes.c b/common/nodes.c
index 60dec79..31819fe 100644
--- a/common/nodes.c
+++ b/common/nodes.c
@@ -26,11 +26,11 @@
  * \todo More in-depth documentation about the node algorithm.
  */
 
-#include <apos/mem.h>
-#include <apos/pmem.h>
-#include <apos/bits.h>
-#include <apos/nodes.h>
-#include <apos/string.h>
+#include <kmi/mem.h>
+#include <kmi/pmem.h>
+#include <kmi/bits.h>
+#include <kmi/nodes.h>
+#include <kmi/string.h>
 
 /* the structure of each node_region is approximately
  *
diff --git a/common/pmem.c b/common/pmem.c
index a245f43..b09f483 100644
--- a/common/pmem.c
+++ b/common/pmem.c
@@ -27,13 +27,13 @@
  * next pointer instead of storing it?
  */
 
-#include <apos/mem_nodes.h>
-#include <apos/pmem.h>
-#include <apos/dmem.h>
-#include <apos/debug.h>
-#include <apos/initrd.h>
-#include <apos/string.h> /* memset */
-#include <apos/bits.h> /* is_nset etc */
+#include <kmi/mem_nodes.h>
+#include <kmi/pmem.h>
+#include <kmi/dmem.h>
+#include <kmi/debug.h>
+#include <kmi/initrd.h>
+#include <kmi/string.h> /* memset */
+#include <kmi/bits.h> /* is_nset etc */
 #include <libfdt.h>
 
 /* \todo add memory page counting?
diff --git a/common/proc.c b/common/proc.c
index 1acd5b8..9bd07da 100644
--- a/common/proc.c
+++ b/common/proc.c
@@ -6,11 +6,11 @@
  * Process handling, might be merged into \ref common/tcb.c.
  */
 
-#include <apos/elf.h>
-#include <apos/proc.h>
-#include <apos/conf.h>
-#include <apos/string.h>
-#include <apos/initrd.h>
+#include <kmi/elf.h>
+#include <kmi/proc.h>
+#include <kmi/conf.h>
+#include <kmi/string.h>
+#include <kmi/initrd.h>
 #include <arch/arch.h>
 #include <arch/proc.h>
 #include <arch/cpu.h>
diff --git a/common/sp_tree.c b/common/sp_tree.c
index dbd0e8b..e2046ff 100644
--- a/common/sp_tree.c
+++ b/common/sp_tree.c
@@ -11,7 +11,7 @@
  * \todo Document sp_tree algorithm better.
  */
 
-#include <apos/sp_tree.h>
+#include <kmi/sp_tree.h>
 
 /**
  * Basic BST left turn.
diff --git a/common/string.c b/common/string.c
index c005c9f..d0bf877 100644
--- a/common/string.c
+++ b/common/string.c
@@ -6,9 +6,9 @@
  * Implementations of some string.h stdlib functions.
  */
 
-#include <apos/string.h>
-#include <apos/types.h>
-#include <apos/attrs.h>
+#include <kmi/string.h>
+#include <kmi/types.h>
+#include <kmi/attrs.h>
 
 /* we need to undef the macros in string.h, otherwise the names get mangled */
 #undef strcpy
diff --git a/common/tcb.c b/common/tcb.c
index 19ae8a3..85f5057 100644
--- a/common/tcb.c
+++ b/common/tcb.c
@@ -6,16 +6,16 @@
  * Thread control block handling implementation.
  */
 
-#include <apos/tcb.h>
-#include <apos/mem.h>
-#include <apos/conf.h>
-#include <apos/pmem.h>
-#include <apos/vmem.h>
-#include <apos/nodes.h>
-#include <apos/types.h>
-#include <apos/assert.h>
-#include <apos/string.h>
-#include <apos/canary.h>
+#include <kmi/tcb.h>
+#include <kmi/mem.h>
+#include <kmi/conf.h>
+#include <kmi/pmem.h>
+#include <kmi/vmem.h>
+#include <kmi/nodes.h>
+#include <kmi/types.h>
+#include <kmi/assert.h>
+#include <kmi/string.h>
+#include <kmi/canary.h>
 
 #include <arch/cpu.h>
 #include <arch/vmem.h>
diff --git a/common/timer.c b/common/timer.c
index 6dc1bce..9ab48a1 100644
--- a/common/timer.c
+++ b/common/timer.c
@@ -15,12 +15,12 @@
  * timers.
  */
 
-#include <apos/sp_tree.h>
-#include <apos/string.h>
-#include <apos/nodes.h>
-#include <apos/utils.h>
-#include <apos/timer.h>
-#include <apos/debug.h>
+#include <kmi/sp_tree.h>
+#include <kmi/string.h>
+#include <kmi/nodes.h>
+#include <kmi/utils.h>
+#include <kmi/timer.h>
+#include <kmi/debug.h>
 #include <arch/timer.h>
 #include <arch/cpu.h>
 
diff --git a/common/uapi/cap.c b/common/uapi/cap.c
index f681e8d..8fb0ff3 100644
--- a/common/uapi/cap.c
+++ b/common/uapi/cap.c
@@ -1,6 +1,6 @@
-#include <apos/uapi.h>
-#include <apos/caps.h>
-#include <apos/tcb.h>
+#include <kmi/uapi.h>
+#include <kmi/caps.h>
+#include <kmi/tcb.h>
 
 /**
  * @file cap.c
diff --git a/common/uapi/conf.c b/common/uapi/conf.c
index b3ac693..b5f0046 100644
--- a/common/uapi/conf.c
+++ b/common/uapi/conf.c
@@ -8,10 +8,10 @@
  * At the moment there are not runtime configuration parameters.
  */
 
-#include <apos/power.h>
-#include <apos/sizes.h>
-#include <apos/uapi.h>
-#include <apos/conf.h>
+#include <kmi/power.h>
+#include <kmi/sizes.h>
+#include <kmi/uapi.h>
+#include <kmi/conf.h>
 
 #include <arch/proc.h>
 
diff --git a/common/uapi/dispatch.c b/common/uapi/dispatch.c
index b5cd51e..70c2f4b 100644
--- a/common/uapi/dispatch.c
+++ b/common/uapi/dispatch.c
@@ -6,9 +6,9 @@
  * Syscall dispatch.
  */
 
-#include <apos/canary.h>
-#include <apos/debug.h>
-#include <apos/uapi.h>
+#include <kmi/canary.h>
+#include <kmi/debug.h>
+#include <kmi/uapi.h>
 
 /* not sure why doxygen requires these two definitions to state their return
  * values, when they don't actually return anything but eh */
diff --git a/common/uapi/ipc.c b/common/uapi/ipc.c
index 70f5fe7..f47b300 100644
--- a/common/uapi/ipc.c
+++ b/common/uapi/ipc.c
@@ -6,9 +6,9 @@
  * Interprocess communication syscall implementations.
  */
 
-#include <apos/uapi.h>
-#include <apos/tcb.h>
-#include <apos/ipi.h>
+#include <kmi/uapi.h>
+#include <kmi/tcb.h>
+#include <kmi/ipi.h>
 
 /**
  * IPC server notification syscall handler.
diff --git a/common/uapi/mem.c b/common/uapi/mem.c
index 41ebcca..d760cf8 100644
--- a/common/uapi/mem.c
+++ b/common/uapi/mem.c
@@ -7,10 +7,10 @@
  * \todo Should we return more error information?
  */
 
-#include <apos/uapi.h>
-#include <apos/utils.h>
-#include <apos/vmem.h>
-#include <apos/dmem.h>
+#include <kmi/uapi.h>
+#include <kmi/utils.h>
+#include <kmi/vmem.h>
+#include <kmi/dmem.h>
 
 /**
  * Memory request syscall handler.
diff --git a/common/uapi/proc.c b/common/uapi/proc.c
index 607f028..876c839 100644
--- a/common/uapi/proc.c
+++ b/common/uapi/proc.c
@@ -6,11 +6,11 @@
  * Process/thread handling syscall implementations.
  */
 
-#include <apos/elf.h>
-#include <apos/uapi.h>
-#include <apos/proc.h>
-#include <apos/bits.h>
-#include <apos/mem_regions.h>
+#include <kmi/elf.h>
+#include <kmi/uapi.h>
+#include <kmi/proc.h>
+#include <kmi/bits.h>
+#include <kmi/mem_regions.h>
 
 /**
  * Create syscall handler.
diff --git a/common/uapi/timers.c b/common/uapi/timers.c
index 929b630..ace106f 100644
--- a/common/uapi/timers.c
+++ b/common/uapi/timers.c
@@ -6,8 +6,8 @@
  * Timer syscall implementations.
  */
 
-#include <apos/timer.h>
-#include <apos/uapi.h>
+#include <kmi/timer.h>
+#include <kmi/uapi.h>
 
 #include <arch/timer.h>
 
diff --git a/common/vmem.c b/common/vmem.c
index b28a3d6..d9c0c2a 100644
--- a/common/vmem.c
+++ b/common/vmem.c
@@ -6,12 +6,12 @@
  * Virtual memory handling, mainly userspace virtual memory.
  */
 
-#include <apos/mem_regions.h>
-#include <apos/assert.h>
-#include <apos/string.h>
-#include <apos/debug.h>
-#include <apos/bits.h>
-#include <apos/vmem.h>
+#include <kmi/mem_regions.h>
+#include <kmi/assert.h>
+#include <kmi/string.h>
+#include <kmi/debug.h>
+#include <kmi/bits.h>
+#include <kmi/vmem.h>
 #include <arch/vmem.h>
 
 stat_t init_uvmem(struct tcb *t, vm_t base, vm_t top)