Move stuff around, again

45 files changed, 99 insertions, 99 deletions

diff --git a/src/bin/bam.lua b/src/bin/bam.lua
index 1a2d3a7..4026bce 100644
--- a/src/bin/bam.lua
+++ b/src/bin/bam.lua
@@ -8,16 +8,16 @@ local function bin_settings(name)
 	return s
 end
 
-local function bin_exe(name, moredeps)
+local function bin_exe(name, deps)
 	local s = bin_settings(name)
 
 	local src = Collect('src/bin/' .. name .. '/*.c')
 	local obj = Compile(s, src)
 
-	return Link(s, 'bin/' .. name .. ".bin", {obj, libkogata, moredeps})
+	return Link(s, 'bin/' .. name .. ".bin", {obj, deps})
 end
 
 bin = {
-	bin_exe('lua', {liblua}),
+	-- bin_exe('lua', {liblua}),
 	-- bin_exe('luac', {liblua}),
 }
diff --git a/src/common/bam.lua b/src/common/bam.lua
index 8b302fa..6d4a29c 100644
--- a/src/common/bam.lua
+++ b/src/common/bam.lua
@@ -3,6 +3,5 @@ local function lib(name)
 	return Compile(common_settings, source) 
 end
 
-common_libalgo = lib('libalgo')
 common_libc = lib('libc')
 common_libkogata = lib('libkogata')
diff --git a/src/common/include/algo.h b/src/common/include/kogata/algo.h
index 80af052..80af052 100644
--- a/src/common/include/algo.h
+++ b/src/common/include/kogata/algo.h
diff --git a/src/common/include/btree.h b/src/common/include/kogata/btree.h
index a645d66..e796a2d 100644
--- a/src/common/include/btree.h
+++ b/src/common/include/kogata/btree.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <algo.h>
+#include <kogata/algo.h>
 
 // A btree may contain several bindings for the same key (in that case they are not ordered)
 //	- btree_find returns any item with matching key, or null if none exists
diff --git a/src/common/include/debug.h b/src/common/include/kogata/debug.h
index 2db5a80..2db5a80 100644
--- a/src/common/include/debug.h
+++ b/src/common/include/kogata/debug.h
diff --git a/src/common/include/hashtbl.h b/src/common/include/kogata/hashtbl.h
index b9c7178..e8f327c 100644
--- a/src/common/include/hashtbl.h
+++ b/src/common/include/kogata/hashtbl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <algo.h>
+#include <kogata/algo.h>
 
 // Simple hashtable structure (key -> void*)
 // Supports adding, seeking, removing, iterating
diff --git a/src/common/include/malloc.h b/src/common/include/kogata/malloc.h
index e55c25e..e55c25e 100644
--- a/src/common/include/malloc.h
+++ b/src/common/include/kogata/malloc.h
diff --git a/src/common/include/mutex.h b/src/common/include/kogata/mutex.h
index 88c077e..88c077e 100644
--- a/src/common/include/mutex.h
+++ b/src/common/include/kogata/mutex.h
diff --git a/src/common/include/printf.h b/src/common/include/kogata/printf.h
index b4e1c1b..b4e1c1b 100644
--- a/src/common/include/printf.h
+++ b/src/common/include/kogata/printf.h
diff --git a/src/common/include/region_alloc.h b/src/common/include/kogata/region_alloc.h
index d314bd5..d314bd5 100644
--- a/src/common/include/region_alloc.h
+++ b/src/common/include/kogata/region_alloc.h
diff --git a/src/common/include/slab_alloc.h b/src/common/include/kogata/slab_alloc.h
index c8d5d6c..1191057 100644
--- a/src/common/include/slab_alloc.h
+++ b/src/common/include/kogata/slab_alloc.h
@@ -16,7 +16,7 @@
 #include <stdio.h> 
 #define dbg_printf printf
 #else
-#include <debug.h>
+#include <kogata/debug.h>
 #endif
 
 #define PAGE_SIZE 0x1000
diff --git a/src/common/libc/printf.c b/src/common/libc/printf.c
index 8618741..d1671c3 100644
--- a/src/common/libc/printf.c
+++ b/src/common/libc/printf.c
@@ -1,6 +1,7 @@
-#include <printf.h>
 #include <stdarg.h>
 
+#include <kogata/printf.h>
+
 int snprintf(char * buff, size_t len, const char *format, ...) {
 	va_list ap;
 
diff --git a/src/common/libc/string.c b/src/common/libc/string.c
index 90cea34..e1ed21e 100644
--- a/src/common/libc/string.c
+++ b/src/common/libc/string.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include <malloc.h>
 
+#include <kogata/malloc.h>
 
 size_t strlen(const char* str) {
 	size_t ret = 0;
diff --git a/src/common/libalgo/btree.c b/src/common/libkogata/btree.c
index d1bfd18..dc5f11f 100644
--- a/src/common/libalgo/btree.c
+++ b/src/common/libkogata/btree.c
@@ -1,7 +1,7 @@
-#include <malloc.h>
-#include <debug.h>
+#include <kogata/malloc.h>
+#include <kogata/debug.h>
 
-#include <btree.h>
+#include <kogata/btree.h>
 
 typedef struct btree_item {
 	void *key, *val;
diff --git a/src/common/libalgo/hashtbl.c b/src/common/libkogata/hashtbl.c
index 0284d75..b0097cd 100644
--- a/src/common/libalgo/hashtbl.c
+++ b/src/common/libkogata/hashtbl.c
@@ -1,7 +1,7 @@
-#include <debug.h>
-#include <malloc.h>
+#include <kogata/debug.h>
+#include <kogata/malloc.h>
 
-#include <hashtbl.h>
+#include <kogata/hashtbl.h>
 
 #define DEFAULT_HT_INIT_SIZE 16
 #define SLOT_OF_HASH(k, nslots) (((size_t)(k)*21179)%(size_t)(nslots))
diff --git a/src/common/libalgo/keyval.c b/src/common/libkogata/keyval.c
index 528fa90..9541c72 100644
--- a/src/common/libalgo/keyval.c
+++ b/src/common/libkogata/keyval.c
@@ -1,7 +1,7 @@
-#include <malloc.h>
 #include <string.h>
 
-#include <algo.h>
+#include <kogata/malloc.h>
+#include <kogata/algo.h>
 
 // Hashing and comparing
 
diff --git a/src/common/libkogata/mutex.c b/src/common/libkogata/mutex.c
index b345ee5..e521330 100644
--- a/src/common/libkogata/mutex.c
+++ b/src/common/libkogata/mutex.c
@@ -1,4 +1,4 @@
-#include <mutex.h>
+#include <kogata/mutex.h>
 
 /*	Internal use only. This function is atomic, meaning it cannot be interrupted by a system task switch. */
 static uint32_t atomic_exchange(uint32_t* ptr, uint32_t newval) {
diff --git a/src/common/libkogata/region_alloc.c b/src/common/libkogata/region_alloc.c
index 1f2fe0f..85c437a 100644
--- a/src/common/libkogata/region_alloc.c
+++ b/src/common/libkogata/region_alloc.c
@@ -1,6 +1,6 @@
-#include <region_alloc.h>
-#include <debug.h>
-#include <mutex.h>
+#include <kogata/region_alloc.h>
+#include <kogata/debug.h>
+#include <kogata/mutex.h>
 
 // we cannot include sys...
 
diff --git a/src/common/libkogata/slab_alloc.c b/src/common/libkogata/slab_alloc.c
index 0736655..6362207 100644
--- a/src/common/libkogata/slab_alloc.c
+++ b/src/common/libkogata/slab_alloc.c
@@ -1,4 +1,4 @@
-#include <slab_alloc.h>
+#include <kogata/slab_alloc.h>
 
 typedef struct object {
 	struct object *next;
diff --git a/src/kernel/bam.lua b/src/kernel/bam.lua
index 1588315..4a82f49 100644
--- a/src/kernel/bam.lua
+++ b/src/kernel/bam.lua
@@ -1,6 +1,7 @@
 local kernel_settings = TableDeepCopy(common_settings)
 
-kernel_settings.cc.includes:Add("src/kernel/include")
+kernel_settings.cc.includes:Add("src/common/include/kogata",
+								"src/kernel/include")
 
 kernel_settings.link.flags:Add("-T src/kernel/linker.ld",
 							   "-Xlinker -Map=build/kernel.map")
@@ -15,6 +16,5 @@ kernel_source = {
 }
 kernel_obj = Compile(kernel_settings, kernel_source)
 
-kernel = Link(kernel_settings, "kernel", {kernel_obj, common_libkogata, 
-										  common_libc, common_libalgo})
+kernel = Link(kernel_settings, "kernel", {kernel_obj, common_libc, common_libkogata})
 
diff --git a/src/lib/bam.lua b/src/lib/bam.lua
index b8e51e4..cef678e 100644
--- a/src/lib/bam.lua
+++ b/src/lib/bam.lua
@@ -3,6 +3,8 @@ local function lib(name)
 	return Compile(user_settings, source)
 end
 
-libkogata = {lib('libkogata'), common_libc, common_libalgo, common_libkogata}
+libc = {lib('libc'), common_libc, common_libkogata}
 
-liblua = lib('lua')
+libkogata = {lib('libkogata'), libc}
+
+liblua = {lib('lua'), libc}
diff --git a/src/lib/include/draw.h b/src/lib/include/kogata/draw.h
index 5296b92..fb9fe05 100644
--- a/src/lib/include/draw.h
+++ b/src/lib/include/kogata/draw.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <syscall.h>
+#include <kogata/syscall.h>
 #include <proto/fb.h>
 
 //  ---- Generic drawing functions
diff --git a/src/lib/include/gip.h b/src/lib/include/kogata/gip.h
index 9c66091..1d1725a 100644
--- a/src/lib/include/gip.h
+++ b/src/lib/include/kogata/gip.h
@@ -2,10 +2,10 @@
 
 // Not thread safe
 
-#include <hashtbl.h>
+#include <kogata/hashtbl.h>
+#include <kogata/mainloop.h>
 
 #include <proto/gip.h>
-#include <mainloop.h>
 
 typedef struct gip_handler gip_handler_t;
 
diff --git a/src/lib/include/keyboard.h b/src/lib/include/kogata/keyboard.h
index 63c6c2c..63c6c2c 100644
--- a/src/lib/include/keyboard.h
+++ b/src/lib/include/kogata/keyboard.h
diff --git a/src/lib/include/mainloop.h b/src/lib/include/kogata/mainloop.h
index 1e71ffb..2b447ef 100644
--- a/src/lib/include/mainloop.h
+++ b/src/lib/include/kogata/mainloop.h
@@ -4,7 +4,7 @@
 // is to multiplex several IO operations on a
 // single thread.
 
-#include <syscall.h>
+#include <kogata/syscall.h>
 
 #define MAINLOOP_MAX_WR_BUFS 4
 
diff --git a/src/lib/include/syscall.h b/src/lib/include/kogata/syscall.h
index 07defdb..378dda2 100644
--- a/src/lib/include/syscall.h
+++ b/src/lib/include/kogata/syscall.h
@@ -9,7 +9,7 @@
 #include <proto/fs.h>
 #include <proto/token.h>
 
-#include <debug.h>
+#include <kogata/debug.h>
 
 typedef void (*entry_t)(void*);
 
diff --git a/src/lib/include/proto/gip.h b/src/lib/include/proto/gip.h
index ca8b868..5cf0166 100644
--- a/src/lib/include/proto/gip.h
+++ b/src/lib/include/proto/gip.h
@@ -2,7 +2,7 @@
 
 #include <proto/fb.h>
 
-#include <syscall.h>
+#include <kogata/syscall.h>
 
 /*
 	Definition of the GIP protocol (Graphics Initiation Protocol).
diff --git a/src/lib/include/stdio.h b/src/lib/include/stdio.h
index f46add4..1e75270 100644
--- a/src/lib/include/stdio.h
+++ b/src/lib/include/stdio.h
@@ -2,7 +2,7 @@
 
 #include <stdarg.h>
 
-#include <syscall.h>
+#include <kogata/syscall.h>
 
 extern fd_t stdio;
 
diff --git a/src/lib/include/stdlib.h b/src/lib/include/stdlib.h
index 29d8661..30da9a6 100644
--- a/src/lib/include/stdlib.h
+++ b/src/lib/include/stdlib.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "malloc.h"
+#include <kogata/malloc.h>
 
 #define EXIT_SUCCESS 0
 #define EXIT_FAILURE 255
diff --git a/src/lib/libkogata/debug.c b/src/lib/libc/debug.c
index 847ecca..dc04fd3 100644
--- a/src/lib/libkogata/debug.c
+++ b/src/lib/libc/debug.c
@@ -1,8 +1,7 @@
 #include <stdbool.h>
 
-#include <debug.h>
-
-#include <syscall.h>
+#include <kogata/debug.h>
+#include <kogata/syscall.h>
 
 void sys_panic(const char* msg, const char* file, int line) {
 	dbg_printf("PANIC in user process\n  %s\n  at %s:%d\n", msg, file, line);
diff --git a/src/lib/libkogata/malloc.c b/src/lib/libc/malloc.c
index 3777123..cb983fd 100644
--- a/src/lib/libkogata/malloc.c
+++ b/src/lib/libc/malloc.c
@@ -1,10 +1,10 @@
-#include <malloc.h>
-#include <slab_alloc.h>
+#include <kogata/malloc.h>
+#include <kogata/slab_alloc.h>
 
-#include <string.h>
+#include <kogata/syscall.h>
+#include <kogata/region_alloc.h>
 
-#include <syscall.h>
-#include <region_alloc.h>
+#include <string.h>
 
 static void* heap_alloc_pages(size_t s) {
 	void* addr = region_alloc(s, "Heap");
diff --git a/src/lib/libkogata/start.c b/src/lib/libc/start.c
index bd22d7a..49a6ca1 100644
--- a/src/lib/libkogata/start.c
+++ b/src/lib/libc/start.c
@@ -1,4 +1,4 @@
-#include <syscall.h>
+#include <kogata/syscall.h>
 
 void malloc_setup();
 
diff --git a/src/lib/libkogata/stdio.c b/src/lib/libc/stdio.c
index 94dec22..22be78e 100644
--- a/src/lib/libkogata/stdio.c
+++ b/src/lib/libc/stdio.c
@@ -1,9 +1,9 @@
-#include <syscall.h>
 #include <string.h>
-
-#include <printf.h>
 #include <stdio.h>
 
+#include <kogata/syscall.h>
+#include <kogata/printf.h>
+
 
 fd_t stdio = 1;
 
diff --git a/src/lib/libkogata/syscall.c b/src/lib/libc/syscall.c
index bf0b35e..61b3471 100644
--- a/src/lib/libkogata/syscall.c
+++ b/src/lib/libc/syscall.c
@@ -1,8 +1,9 @@
-#include <debug.h>
-#include <syscall.h>
+#include <kogata/debug.h>
+#include <kogata/syscall.h>
+
+#include <kogata/printf.h>
 
 #include <string.h>
-#include <printf.h>
 
 static inline uint32_t call(uint32_t a, uint32_t b, uint32_t c, uint32_t d, uint32_t ss, uint32_t dd) {
 	uint32_t ret;
diff --git a/src/lib/libkogata/unistd.c b/src/lib/libc/unistd.c
index 101e02e..5ae1735 100644
--- a/src/lib/libkogata/unistd.c
+++ b/src/lib/libc/unistd.c
@@ -1,9 +1,8 @@
 #include <string.h>
-
-#include <syscall.h>
-
 #include <unistd.h>
 
+#include <kogata/syscall.h>
+
 
 char cwd_buf[256];
 
diff --git a/src/lib/libkogata/draw.c b/src/lib/libkogata/draw.c
index 2806df4..d988cb9 100644
--- a/src/lib/libkogata/draw.c
+++ b/src/lib/libkogata/draw.c
@@ -1,13 +1,13 @@
-#include <syscall.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
-#include <printf.h>
 
 #include <proto/font_file.h>
 
-#include <region_alloc.h>
+#include <kogata/printf.h>
+#include <kogata/region_alloc.h>
 
-#include <draw.h>
+#include <kogata/syscall.h>
+#include <kogata/draw.h>
 
 fb_t *g_fb_from_file(fd_t file, fb_info_t *geom) {
 	fb_t *ret = (fb_t*)malloc(sizeof(fb_t));
diff --git a/src/lib/libkogata/gip.c b/src/lib/libkogata/gip.c
index cdfeb71..5b1e44d 100644
--- a/src/lib/libkogata/gip.c
+++ b/src/lib/libkogata/gip.c
@@ -1,7 +1,7 @@
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
-#include <gip.h>
+#include <kogata/gip.h>
 
 typedef struct {
 	gip_reply_callback_t cb;
diff --git a/src/lib/libkogata/keyboard.c b/src/lib/libkogata/keyboard.c
index 505c048..e7fb08b 100644
--- a/src/lib/libkogata/keyboard.c
+++ b/src/lib/libkogata/keyboard.c
@@ -1,11 +1,12 @@
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
-#include <printf.h>
-
-#include <syscall.h>
 
 #include <proto/keyboard.h>
-#include <keyboard.h>
+
+#include <kogata/printf.h>
+#include <kogata/syscall.h>
+
+#include <kogata/keyboard.h>
 
 //  ---- Control keys that are not KBD_CHAR-able
 
diff --git a/src/lib/libkogata/mainloop.c b/src/lib/libkogata/mainloop.c
index 58966dd..bce1174 100644
--- a/src/lib/libkogata/mainloop.c
+++ b/src/lib/libkogata/mainloop.c
@@ -1,7 +1,7 @@
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
-#include <mainloop.h>
+#include <kogata/mainloop.h>
 
 mainloop_fd_t *mainloop_fds = 0;
 bool mainloop_fds_change = false;
diff --git a/src/sysbin/bam.lua b/src/sysbin/bam.lua
index d223beb..d9d5846 100644
--- a/src/sysbin/bam.lua
+++ b/src/sysbin/bam.lua
@@ -5,20 +5,19 @@ local function sysbin_settings(name)
 	return s
 end
 
-local function sysbin_exe(name, moredeps)
+local function sysbin_exe(name, deps)
 	local s = sysbin_settings(name)
 
 	local src = Collect('src/sysbin/' .. name .. '/*.c')
 	local obj = Compile(s, src)
 
-	return Link(s, 'sysbin/' .. name .. ".bin", {obj, libkogata, moredeps})
+	return Link(s, 'sysbin/' .. name .. ".bin", {obj, deps})
 end
 
 sysbin = {
-	sysbin_exe('init'),
-	sysbin_exe('giosrv'),
-	sysbin_exe('login'),
-	sysbin_exe('terminal'),
-	--sysbin_exe('shell', {liblua, liblualib}),
-	sysbin_exe('shell'),
+	sysbin_exe('init', {libkogata}),
+	sysbin_exe('giosrv', {libkogata}),
+	sysbin_exe('login', {libkogata}),
+	sysbin_exe('terminal', {libkogata}),
+	sysbin_exe('shell', {libkogata}),
 }
diff --git a/src/sysbin/giosrv/main.c b/src/sysbin/giosrv/main.c
index e0b76f5..37f0f3c 100644
--- a/src/sysbin/giosrv/main.c
+++ b/src/sysbin/giosrv/main.c
@@ -1,14 +1,14 @@
 #include <string.h>
 
-#include <malloc.h>
+#include <stdlib.h>
 
-#include <syscall.h>
-#include <debug.h>
-#include <region_alloc.h>
+#include <kogata/syscall.h>
+#include <kogata/debug.h>
+#include <kogata/region_alloc.h>
 
 #include <proto/keyboard.h>
 
-#include <gip.h>
+#include <kogata/gip.h>
 
 //  ---- GIP server
 
diff --git a/src/sysbin/init/main.c b/src/sysbin/init/main.c
index 6be0a87..da51223 100644
--- a/src/sysbin/init/main.c
+++ b/src/sysbin/init/main.c
@@ -1,13 +1,11 @@
 #include <string.h>
-#include <printf.h>
+#include <stdlib.h>
 
-#include <malloc.h>
+#include <kogata/syscall.h>
+#include <kogata/debug.h>
+#include <kogata/printf.h>
 
-#include <syscall.h>
-#include <debug.h>
-#include <region_alloc.h>
-
-#include <btree.h>
+#include <kogata/btree.h>
 
 pid_t giosrv_pid = 0, login_pid = 0;
 fd_pair_t root_gip_chan;
diff --git a/src/sysbin/login/main.c b/src/sysbin/login/main.c
index dfc5dfa..c9d2455 100644
--- a/src/sysbin/login/main.c
+++ b/src/sysbin/login/main.c
@@ -1,8 +1,8 @@
 #include <string.h>
-#include <malloc.h>
-#include <debug.h>
+#include <stdlib.h>
 
-#include <syscall.h>
+#include <kogata/debug.h>
+#include <kogata/syscall.h>
 
 int main(int argc, char **argv) {
 	dbg_print("[login] Starting up.\n");
diff --git a/src/sysbin/shell/main.c b/src/sysbin/shell/main.c
index 3f37ff8..81ecdfa 100644
--- a/src/sysbin/shell/main.c
+++ b/src/sysbin/shell/main.c
@@ -1,11 +1,11 @@
 #include <string.h>
-#include <malloc.h>
-#include <debug.h>
+#include <stdlib.h>
 
 #include <stdio.h>
 #include <unistd.h>
 
-#include <syscall.h>
+#include <kogata/debug.h>
+#include <kogata/syscall.h>
 
 void ls(char* dir) {
 	fd_t f = open(dir, FM_READDIR);
diff --git a/src/sysbin/terminal/main.c b/src/sysbin/terminal/main.c
index a0d8855..fe2376f 100644
--- a/src/sysbin/terminal/main.c
+++ b/src/sysbin/terminal/main.c
@@ -1,11 +1,12 @@
 #include <string.h>
-#include <malloc.h>
-#include <region_alloc.h>
-#include <debug.h>
+#include <stdlib.h>
 
-#include <gip.h>
-#include <draw.h>
-#include <keyboard.h>
+#include <kogata/region_alloc.h>
+#include <kogata/debug.h>
+
+#include <kogata/gip.h>
+#include <kogata/draw.h>
+#include <kogata/keyboard.h>
 
 #define NCOLORS 16