From 934deb7984353c9ded0cf66b179fcb629abd58ee Mon Sep 17 00:00:00 2001
From: Rick Rongen <rickrongen@outlook.com>
Date: Sat, 27 Feb 2021 14:11:28 +0100
Subject: [PATCH] feat: moved libk stuff to libk folder

---
 kernel/command.c             | 4 ++--
 kernel/cpu/isr.c             | 2 +-
 kernel/cpu/syscall_handler.c | 2 +-
 kernel/cpu/timer.c           | 4 ++--
 kernel/drivers/ide.c         | 4 ++--
 kernel/drivers/keyboard.c    | 2 +-
 kernel/drivers/pci.c         | 2 +-
 kernel/fs/blockdev.c         | 2 +-
 kernel/kernel.c              | 6 +++---
 kernel/libc/kprintf.c        | 4 ++--
 kernel/libc/readline.c       | 2 +-
 kernel/{ => libk}/kprint.c   | 0
 kernel/{ => libk}/kprint.h   | 0
 kernel/{ => libk}/libk.c     | 0
 kernel/{ => libk}/libk.h     | 0
 kernel/{ => libk}/syscall.c  | 0
 kernel/{ => libk}/syscall.h  | 0
 kernel/mem/mem.c             | 2 +-
 kernel/mem/pmm.c             | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)
 rename kernel/{ => libk}/kprint.c (100%)
 rename kernel/{ => libk}/kprint.h (100%)
 rename kernel/{ => libk}/libk.c (100%)
 rename kernel/{ => libk}/libk.h (100%)
 rename kernel/{ => libk}/syscall.c (100%)
 rename kernel/{ => libk}/syscall.h (100%)

diff --git a/kernel/command.c b/kernel/command.c
index d994173..c2e435d 100644
--- a/kernel/command.c
+++ b/kernel/command.c
@@ -3,8 +3,8 @@
 //
 
 #include "command.h"
-#include "kprint.h"
-#include "libk.h"
+#include "libk/kprint.h"
+#include "libk/libk.h"
 #include <types.h>
 #include <libc/kprintf.h>
 #include <stdbool.h>
diff --git a/kernel/cpu/isr.c b/kernel/cpu/isr.c
index e3b4f07..b72e1e0 100644
--- a/kernel/cpu/isr.c
+++ b/kernel/cpu/isr.c
@@ -9,7 +9,7 @@
 #include <libc/libc.h>
 #include <drivers/ports.h>
 #include <libc/kprintf.h>
-#include <libk.h>
+#include <libk/libk.h>
 
 #define PIC_END_OF_INTERRUPT 0x20
 
diff --git a/kernel/cpu/syscall_handler.c b/kernel/cpu/syscall_handler.c
index 5033675..3e09acb 100644
--- a/kernel/cpu/syscall_handler.c
+++ b/kernel/cpu/syscall_handler.c
@@ -3,7 +3,7 @@
 //
 
 #include "syscall_handler.h"
-#include <syscall.h>
+#include <libk/syscall.h>
 #include <tasks/task.h>
 
 void syscall_handle(isr_registers_t *registers) {
diff --git a/kernel/cpu/timer.c b/kernel/cpu/timer.c
index 712f2eb..43471b3 100644
--- a/kernel/cpu/timer.c
+++ b/kernel/cpu/timer.c
@@ -7,8 +7,8 @@
 #include <drivers/ports.h>
 #include <cpu/isr.h>
 #include <libc/libc.h>
-#include <libk.h>
-#include <kprint.h>
+#include <libk/libk.h>
+#include <libk/kprint.h>
 #include <tasks/task.h>
 
 // https://wiki.osdev.org/PIT
diff --git a/kernel/drivers/ide.c b/kernel/drivers/ide.c
index 96f1253..5e9059a 100644
--- a/kernel/drivers/ide.c
+++ b/kernel/drivers/ide.c
@@ -6,10 +6,10 @@
 #include "ide.h"
 #include "ports.h"
 #include <types.h>
-#include <kprint.h>
+#include <libk/kprint.h>
 #include <drivers/pci.h>
 #include <stdbool.h>
-#include <libk.h>
+#include <libk/libk.h>
 #include <cpu/timer.h>
 #include <libc/kprintf.h>
 #include <fs/blockdev.h>
diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c
index c24fede..7ab3477 100644
--- a/kernel/drivers/keyboard.c
+++ b/kernel/drivers/keyboard.c
@@ -6,7 +6,7 @@
 #include <drivers/ports.h>
 #include <cpu/isr.h>
 #include <libc/ringqueue.h>
-#include <libk.h>
+#include <libk/libk.h>
 #include <mem/malloc.h>
 
 
diff --git a/kernel/drivers/pci.c b/kernel/drivers/pci.c
index 87cd8e1..068812c 100644
--- a/kernel/drivers/pci.c
+++ b/kernel/drivers/pci.c
@@ -7,7 +7,7 @@
 
 #include <types.h>
 #include <drivers/ports.h>
-#include <libk.h>
+#include <libk/libk.h>
 #include <libc/kprintf.h>
 
 #define PCI_CONFIG_ENABLE (1 << 31)
diff --git a/kernel/fs/blockdev.c b/kernel/fs/blockdev.c
index 2ee4b17..0a68403 100644
--- a/kernel/fs/blockdev.c
+++ b/kernel/fs/blockdev.c
@@ -3,7 +3,7 @@
 //
 
 #include <libc/libc.h>
-#include <libk.h>
+#include <libk/libk.h>
 #include <libc/kprintf.h>
 #include <mem/malloc.h>
 #include "blockdev.h"
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 586e407..0665a8b 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -5,8 +5,8 @@
 #include <mem/mem.h>
 #include <multiboot.h>
 #include <drivers/serial.h>
-#include <kprint.h>
-#include <libk.h>
+#include <libk/kprint.h>
+#include <libk/libk.h>
 #include <drivers/pci.h>
 #include <drivers/ide.h>
 #include <libc/kprintf.h>
@@ -17,7 +17,7 @@
 #include <cpu/cpuidx.h>
 #include <mem/malloc.h>
 #include <tasks/task.h>
-#include <syscall.h>
+#include <libk/syscall.h>
 #include <command.h>
 #include <attributes.h>
 
diff --git a/kernel/libc/kprintf.c b/kernel/libc/kprintf.c
index 9e73f6c..0ecde04 100644
--- a/kernel/libc/kprintf.c
+++ b/kernel/libc/kprintf.c
@@ -6,8 +6,8 @@
 #include "libc.h"
 #include <libc/string.h>
 #include <stdarg.h>
-#include <kprint.h>
-#include <libk.h>
+#include <libk/kprint.h>
+#include <libk/libk.h>
 #include <types.h>
 
 /*
diff --git a/kernel/libc/readline.c b/kernel/libc/readline.c
index 00a24cc..943ba31 100644
--- a/kernel/libc/readline.c
+++ b/kernel/libc/readline.c
@@ -5,7 +5,7 @@
 #include "readline.h"
 #include <libc/libc.h>
 #include <types.h>
-#include <kprint.h>
+#include <libk/kprint.h>
 #include <drivers/keyboard.h>
 #include <mem/malloc.h>
 
diff --git a/kernel/kprint.c b/kernel/libk/kprint.c
similarity index 100%
rename from kernel/kprint.c
rename to kernel/libk/kprint.c
diff --git a/kernel/kprint.h b/kernel/libk/kprint.h
similarity index 100%
rename from kernel/kprint.h
rename to kernel/libk/kprint.h
diff --git a/kernel/libk.c b/kernel/libk/libk.c
similarity index 100%
rename from kernel/libk.c
rename to kernel/libk/libk.c
diff --git a/kernel/libk.h b/kernel/libk/libk.h
similarity index 100%
rename from kernel/libk.h
rename to kernel/libk/libk.h
diff --git a/kernel/syscall.c b/kernel/libk/syscall.c
similarity index 100%
rename from kernel/syscall.c
rename to kernel/libk/syscall.c
diff --git a/kernel/syscall.h b/kernel/libk/syscall.h
similarity index 100%
rename from kernel/syscall.h
rename to kernel/libk/syscall.h
diff --git a/kernel/mem/mem.c b/kernel/mem/mem.c
index b23ce5c..6d4d606 100644
--- a/kernel/mem/mem.c
+++ b/kernel/mem/mem.c
@@ -6,7 +6,7 @@
 #include <types.h>
 #include <mem/mem.h>
 #include <libc/kprintf.h>
-#include <libk.h>
+#include <libk/libk.h>
 #include <attributes.h>
 
 #define MEMMAP_ENTRIES 16
diff --git a/kernel/mem/pmm.c b/kernel/mem/pmm.c
index b64347f..3b5cc34 100644
--- a/kernel/mem/pmm.c
+++ b/kernel/mem/pmm.c
@@ -4,7 +4,7 @@
 
 #include <stdbool.h>
 #include <libc/libc.h>
-#include <libk.h>
+#include <libk/libk.h>
 #include "pmm.h"
 
 #define NUM_PAGING_INFOS 16