diff options
Diffstat (limited to 'src')
41 files changed, 53 insertions, 53 deletions
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> diff --git a/src/shared/errno.h b/src/shared/include/camellia/errno.h index a0b5731..a0b5731 100644 --- a/src/shared/errno.h +++ b/src/shared/include/camellia/errno.h diff --git a/src/shared/execbuf.h b/src/shared/include/camellia/execbuf.h index c9d444d..c9d444d 100644 --- a/src/shared/execbuf.h +++ b/src/shared/include/camellia/execbuf.h diff --git a/src/shared/flags.h b/src/shared/include/camellia/flags.h index dd20a3f..dd20a3f 100644 --- a/src/shared/flags.h +++ b/src/shared/include/camellia/flags.h diff --git a/src/shared/syscalls.h b/src/shared/include/camellia/syscalls.h index e3b879e..e835c91 100644 --- a/src/shared/syscalls.h +++ b/src/shared/include/camellia/syscalls.h @@ -1,5 +1,5 @@ #pragma once -#include <shared/types.h> +#include <camellia/types.h> #include <stddef.h> #define FORK_NOREAP 1 diff --git a/src/shared/types.h b/src/shared/include/camellia/types.h index f47e1bb..f47e1bb 100644 --- a/src/shared/types.h +++ b/src/shared/include/camellia/types.h diff --git a/src/user/app/init/driver/ansiterm.c b/src/user/app/init/driver/ansiterm.c index 8206e85..dde2183 100644 --- a/src/user/app/init/driver/ansiterm.c +++ b/src/user/app/init/driver/ansiterm.c @@ -1,4 +1,4 @@ -#include <shared/syscalls.h> +#include <camellia/syscalls.h> #include <stdbool.h> #include <user/app/init/driver/driver.h> diff --git a/src/user/app/init/driver/ps2.c b/src/user/app/init/driver/ps2.c index 9bbab8e..45458c8 100644 --- a/src/user/app/init/driver/ps2.c +++ b/src/user/app/init/driver/ps2.c @@ -1,5 +1,5 @@ +#include <camellia/syscalls.h> #include <shared/container/ring.h> -#include <shared/syscalls.h> #include <stdbool.h> #include <user/app/init/driver/driver.h> diff --git a/src/user/app/init/driver/termcook.c b/src/user/app/init/driver/termcook.c index 2ddd3f9..868d5d3 100644 --- a/src/user/app/init/driver/termcook.c +++ b/src/user/app/init/driver/termcook.c @@ -1,4 +1,4 @@ -#include <shared/syscalls.h> +#include <camellia/syscalls.h> #include <user/app/init/driver/driver.h> #include <user/lib/stdlib.h> diff --git a/src/user/app/init/driver/tmpfs.c b/src/user/app/init/driver/tmpfs.c index c6cc0f3..200e62d 100644 --- a/src/user/app/init/driver/tmpfs.c +++ b/src/user/app/init/driver/tmpfs.c @@ -1,5 +1,5 @@ +#include <camellia/syscalls.h> #include <shared/mem.h> -#include <shared/syscalls.h> #include <stddef.h> #include <user/lib/malloc.h> diff --git a/src/user/app/init/main.c b/src/user/app/init/main.c index 4c4bf4e..772a9e3 100644 --- a/src/user/app/init/main.c +++ b/src/user/app/init/main.c @@ -1,5 +1,5 @@ -#include <shared/flags.h> -#include <shared/syscalls.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <stdint.h> #include <user/app/init/driver/driver.h> #include <user/app/init/shell.h> diff --git a/src/user/app/init/shell.c b/src/user/app/init/shell.c index f420208..76a0dbc 100644 --- a/src/user/app/init/shell.c +++ b/src/user/app/init/shell.c @@ -1,4 +1,4 @@ -#include <shared/syscalls.h> +#include <camellia/syscalls.h> #include <stdbool.h> #include <user/app/init/shell.h> #include <user/app/init/tests/main.h> diff --git a/src/user/app/init/tests/main.c b/src/user/app/init/tests/main.c index 015a3be..4f8e858 100644 --- a/src/user/app/init/tests/main.c +++ b/src/user/app/init/tests/main.c @@ -1,8 +1,8 @@ #define TEST_MACROS -#include <shared/errno.h> -#include <shared/execbuf.h> -#include <shared/flags.h> -#include <shared/syscalls.h> +#include <camellia/errno.h> +#include <camellia/execbuf.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <user/app/init/tests/main.h> #include <user/lib/stdlib.h> diff --git a/src/user/app/init/tests/pipe.c b/src/user/app/init/tests/pipe.c index 54025d0..227007a 100644 --- a/src/user/app/init/tests/pipe.c +++ b/src/user/app/init/tests/pipe.c @@ -1,6 +1,6 @@ #define TEST_MACROS -#include <shared/flags.h> -#include <shared/syscalls.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <user/app/init/tests/main.h> #include <user/lib/stdlib.h> diff --git a/src/user/app/init/tests/semaphore.c b/src/user/app/init/tests/semaphore.c index 66ea4ba..b55db9e 100644 --- a/src/user/app/init/tests/semaphore.c +++ b/src/user/app/init/tests/semaphore.c @@ -1,6 +1,6 @@ #define TEST_MACROS -#include <shared/flags.h> -#include <shared/syscalls.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <user/app/init/tests/main.h> #include <user/lib/esemaphore.h> #include <user/lib/stdlib.h> diff --git a/src/user/app/init/tests/stress.c b/src/user/app/init/tests/stress.c index 9af1706..f797611 100644 --- a/src/user/app/init/tests/stress.c +++ b/src/user/app/init/tests/stress.c @@ -1,6 +1,6 @@ #define TEST_MACROS -#include <shared/flags.h> -#include <shared/syscalls.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <user/app/init/tests/main.h> #include <user/lib/stdlib.h> diff --git a/src/user/app/testelf/main.c b/src/user/app/testelf/main.c index a80d233..8c5b6a4 100644 --- a/src/user/app/testelf/main.c +++ b/src/user/app/testelf/main.c @@ -1,5 +1,5 @@ +#include <camellia/syscalls.h> #include <shared/printf.h> -#include <shared/syscalls.h> #include <user/lib/elf.h> #include <user/lib/elfload.h> #include <user/lib/stdlib.h> diff --git a/src/user/bootstrap/main.c b/src/user/bootstrap/main.c index 5f36aa1..fecd38f 100644 --- a/src/user/bootstrap/main.c +++ b/src/user/bootstrap/main.c @@ -1,6 +1,6 @@ -#include <shared/flags.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <shared/mem.h> -#include <shared/syscalls.h> #include <user/lib/elfload.h> #include <user/lib/fs/misc.h> diff --git a/src/user/bootstrap/tar.c b/src/user/bootstrap/tar.c index 40da437..a392f4c 100644 --- a/src/user/bootstrap/tar.c +++ b/src/user/bootstrap/tar.c @@ -1,6 +1,6 @@ -#include <shared/flags.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <shared/mem.h> -#include <shared/syscalls.h> #include <stdint.h> #include "tar.h" diff --git a/src/user/bootstrap/tar.h b/src/user/bootstrap/tar.h index 43aa9ed..fe4d6c5 100644 --- a/src/user/bootstrap/tar.h +++ b/src/user/bootstrap/tar.h @@ -1,5 +1,5 @@ #pragma once -#include <shared/types.h> +#include <camellia/types.h> _Noreturn void tar_driver(void *base); void *tar_find(const char *path, size_t path_len, void *base, size_t base_len); diff --git a/src/user/lib/elfload.c b/src/user/lib/elfload.c index ef14388..45ce2a0 100644 --- a/src/user/lib/elfload.c +++ b/src/user/lib/elfload.c @@ -1,6 +1,6 @@ -#include <shared/execbuf.h> -#include <shared/flags.h> -#include <shared/syscalls.h> +#include <camellia/execbuf.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <user/lib/elf.h> #include <user/lib/elfload.h> diff --git a/src/user/lib/esemaphore.c b/src/user/lib/esemaphore.c index 1230274..1da418e 100644 --- a/src/user/lib/esemaphore.c +++ b/src/user/lib/esemaphore.c @@ -1,5 +1,5 @@ -#include <shared/flags.h> -#include <shared/syscalls.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <user/lib/esemaphore.h> #include <user/lib/stdlib.h> diff --git a/src/user/lib/esemaphore.h b/src/user/lib/esemaphore.h index e746bd7..4a16c2e 100644 --- a/src/user/lib/esemaphore.h +++ b/src/user/lib/esemaphore.h @@ -1,5 +1,5 @@ #pragma once -#include <shared/types.h> +#include <camellia/types.h> struct evil_sem { handle_t wait, signal; diff --git a/src/user/lib/fs/misc.c b/src/user/lib/fs/misc.c index 3631e35..99993ed 100644 --- a/src/user/lib/fs/misc.c +++ b/src/user/lib/fs/misc.c @@ -1,6 +1,6 @@ -#include <shared/flags.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <shared/mem.h> -#include <shared/syscalls.h> #include <stdbool.h> #include <user/lib/fs/misc.h> #include <user/lib/stdlib.h> diff --git a/src/user/lib/malloc.c b/src/user/lib/malloc.c index 40ae917..bb6b653 100644 --- a/src/user/lib/malloc.c +++ b/src/user/lib/malloc.c @@ -1,5 +1,5 @@ -#include <shared/flags.h> -#include <shared/syscalls.h> +#include <camellia/flags.h> +#include <camellia/syscalls.h> #include <stdbool.h> #include <user/lib/malloc.h> diff --git a/src/user/lib/stdlib.c b/src/user/lib/stdlib.c index e947486..943af01 100644 --- a/src/user/lib/stdlib.c +++ b/src/user/lib/stdlib.c @@ -1,5 +1,5 @@ +#include <camellia/syscalls.h> #include <shared/printf.h> -#include <shared/syscalls.h> #include <user/lib/stdlib.h> // TODO oh god this garbage - malloc, actually open, [...] diff --git a/src/user/lib/stdlib.h b/src/user/lib/stdlib.h index 1982e85..64fbbe6 100644 --- a/src/user/lib/stdlib.h +++ b/src/user/lib/stdlib.h @@ -1,6 +1,6 @@ #pragma once +#include <camellia/types.h> #include <shared/mem.h> -#include <shared/types.h> #include <stdbool.h> #include <stddef.h> #include <user/lib/malloc.h> diff --git a/src/user/lib/syscall.c b/src/user/lib/syscall.c index e105638..7e0de88 100644 --- a/src/user/lib/syscall.c +++ b/src/user/lib/syscall.c @@ -2,7 +2,7 @@ * don't modify manually, instead run: * make src/user/lib/syscall.c */ -#include <shared/syscalls.h> +#include <camellia/syscalls.h> _Noreturn void _syscall_exit(long ret) { diff --git a/src/user/lib/syscall.c.awk b/src/user/lib/syscall.c.awk index 91e4665..58f9a4c 100644 --- a/src/user/lib/syscall.c.awk +++ b/src/user/lib/syscall.c.awk @@ -4,7 +4,7 @@ BEGIN { * don't modify manually, instead run:\n\ * make src/user/lib/syscall.c\n\ */\n\ -#include <shared/syscalls.h>\n\ +#include <camellia/syscalls.h>\n\ \n"; } |