From 18667c48b0cf6497b50c00f00f474d79a68f59ce Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Tue, 26 Jul 2022 18:16:10 +0200
Subject: shared: move some headers from shared/ to camellia/

---
 src/kernel/arch/amd64/driver/fsroot.c | 2 +-
 src/kernel/arch/amd64/paging.h        | 2 +-
 src/kernel/arch/amd64/registers.h     | 2 +-
 src/kernel/arch/amd64/sysenter.c      | 2 +-
 src/kernel/arch/generic.h             | 2 +-
 src/kernel/execbuf.c                  | 2 +-
 src/kernel/handle.h                   | 2 +-
 src/kernel/mem/virt.h                 | 2 +-
 src/kernel/proc.c                     | 2 +-
 src/kernel/proc.h                     | 2 +-
 src/kernel/syscalls.c                 | 4 ++--
 src/kernel/vfs/request.c              | 2 +-
 src/kernel/vfs/request.h              | 4 ++--
 13 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/kernel')

diff --git a/src/kernel/arch/amd64/driver/fsroot.c b/src/kernel/arch/amd64/driver/fsroot.c
index d6e943f..1e3dc1f 100644
--- a/src/kernel/arch/amd64/driver/fsroot.c
+++ b/src/kernel/arch/amd64/driver/fsroot.c
@@ -1,10 +1,10 @@
+#include <camellia/errno.h>
 #include <kernel/arch/amd64/ata.h>
 #include <kernel/arch/amd64/driver/fsroot.h>
 #include <kernel/mem/virt.h>
 #include <kernel/panic.h>
 #include <kernel/proc.h>
 #include <kernel/util.h>
-#include <shared/errno.h>
 #include <shared/mem.h>
 #include <stdbool.h>
 
diff --git a/src/kernel/arch/amd64/paging.h b/src/kernel/arch/amd64/paging.h
index a676bb8..f8de339 100644
--- a/src/kernel/arch/amd64/paging.h
+++ b/src/kernel/arch/amd64/paging.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <shared/types.h>
+#include <camellia/types.h>
 
 /* <heat> nitpick: I highly recommend you dont use bitfields for paging
  *        structures
diff --git a/src/kernel/arch/amd64/registers.h b/src/kernel/arch/amd64/registers.h
index c98c647..5d88595 100644
--- a/src/kernel/arch/amd64/registers.h
+++ b/src/kernel/arch/amd64/registers.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <shared/types.h>
+#include <camellia/types.h>
 #include <stdint.h>
 
 struct registers {
diff --git a/src/kernel/arch/amd64/sysenter.c b/src/kernel/arch/amd64/sysenter.c
index 536ada9..b5cec73 100644
--- a/src/kernel/arch/amd64/sysenter.c
+++ b/src/kernel/arch/amd64/sysenter.c
@@ -1,7 +1,7 @@
+#include <camellia/syscalls.h>
 #include <kernel/arch/amd64/sysenter.h>
 #include <kernel/arch/generic.h>
 #include <kernel/proc.h>
-#include <shared/syscalls.h>
 
 struct registers _sysexit_regs;
 
diff --git a/src/kernel/arch/generic.h b/src/kernel/arch/generic.h
index 941bfa4..4a4f632 100644
--- a/src/kernel/arch/generic.h
+++ b/src/kernel/arch/generic.h
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <camellia/types.h>
 #include <kernel/arch/amd64/registers.h>
-#include <shared/types.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/kernel/execbuf.c b/src/kernel/execbuf.c
index 1e4d8ed..682566e 100644
--- a/src/kernel/execbuf.c
+++ b/src/kernel/execbuf.c
@@ -1,7 +1,7 @@
+#include <camellia/execbuf.h>
 #include <kernel/execbuf.h>
 #include <kernel/mem/alloc.h>
 #include <kernel/panic.h>
-#include <shared/execbuf.h>
 #include <shared/mem.h>
 
 _Noreturn static void halt(struct process *proc) {
diff --git a/src/kernel/handle.h b/src/kernel/handle.h
index be8250b..233c2fa 100644
--- a/src/kernel/handle.h
+++ b/src/kernel/handle.h
@@ -2,8 +2,8 @@
 
 enum handle_type; // forward declaration for proc.h
 
+#include <camellia/types.h>
 #include <kernel/vfs/mount.h>
-#include <shared/types.h>
 #include <stddef.h>
 
 enum handle_type {
diff --git a/src/kernel/mem/virt.h b/src/kernel/mem/virt.h
index cf22a75..1f9ef14 100644
--- a/src/kernel/mem/virt.h
+++ b/src/kernel/mem/virt.h
@@ -1,7 +1,7 @@
 /* contains utilities for interacting with virtual memory */
 #pragma once
+#include <camellia/types.h>
 #include <kernel/mem/alloc.h>
-#include <shared/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 
diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index 9f6f6b7..a8cf303 100644
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -1,3 +1,4 @@
+#include <camellia/syscalls.h>
 #include <kernel/arch/generic.h>
 #include <kernel/execbuf.h>
 #include <kernel/main.h>
@@ -7,7 +8,6 @@
 #include <kernel/proc.h>
 #include <kernel/vfs/mount.h>
 #include <shared/mem.h>
-#include <shared/syscalls.h>
 #include <stdint.h>
 
 struct process *process_first;
diff --git a/src/kernel/proc.h b/src/kernel/proc.h
index c642a42..c7e885a 100644
--- a/src/kernel/proc.h
+++ b/src/kernel/proc.h
@@ -1,9 +1,9 @@
 #pragma once
+#include <camellia/syscalls.h>
 #include <kernel/arch/generic.h>
 #include <kernel/handle.h>
 #include <kernel/main.h>
 #include <kernel/vfs/mount.h>
-#include <shared/syscalls.h>
 #include <stdbool.h>
 
 #define HANDLE_MAX 16
diff --git a/src/kernel/syscalls.c b/src/kernel/syscalls.c
index f884fd3..9c4e2fa 100644
--- a/src/kernel/syscalls.c
+++ b/src/kernel/syscalls.c
@@ -1,3 +1,5 @@
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
 #include <kernel/arch/generic.h>
 #include <kernel/mem/alloc.h>
 #include <kernel/mem/virt.h>
@@ -5,9 +7,7 @@
 #include <kernel/pipe.h>
 #include <kernel/proc.h>
 #include <kernel/vfs/path.h>
-#include <shared/flags.h>
 #include <shared/mem.h>
-#include <shared/syscalls.h>
 #include <stdint.h>
 
 #define SYSCALL_RETURN(val) do { \
diff --git a/src/kernel/vfs/request.c b/src/kernel/vfs/request.c
index 102a7e8..377cb2c 100644
--- a/src/kernel/vfs/request.c
+++ b/src/kernel/vfs/request.c
@@ -1,10 +1,10 @@
+#include <camellia/errno.h>
 #include <kernel/arch/amd64/driver/fsroot.h>
 #include <kernel/mem/alloc.h>
 #include <kernel/mem/virt.h>
 #include <kernel/panic.h>
 #include <kernel/proc.h>
 #include <kernel/vfs/request.h>
-#include <shared/errno.h>
 #include <shared/mem.h>
 
 void vfsreq_create(struct vfs_request req_) {
diff --git a/src/kernel/vfs/request.h b/src/kernel/vfs/request.h
index 4201d44..cb560c9 100644
--- a/src/kernel/vfs/request.h
+++ b/src/kernel/vfs/request.h
@@ -1,7 +1,7 @@
 #pragma once
+#include <camellia/flags.h>
+#include <camellia/types.h>
 #include <kernel/proc.h>
-#include <shared/flags.h>
-#include <shared/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 
-- 
cgit v1.2.3