From 7d1b867c36add2cab496e8c799b5103f18e0c07a Mon Sep 17 00:00:00 2001 From: Marvin Friedrich Date: Thu, 5 Feb 2026 00:58:38 +0100 Subject: [PATCH] fixes --- .gitignore | 3 -- README.md | 2 -- kernel/boot/main.c | 2 +- kernel/include/kernel/sched.h | 8 +++--- kernel/include/kernel/syscalls.h | 2 +- kernel/syscalls/dispatch.c | 2 +- meson.options | 6 ---- zinnia.svg | 49 -------------------------------- 8 files changed, 7 insertions(+), 67 deletions(-) delete mode 100644 meson.options delete mode 100644 zinnia.svg diff --git a/.gitignore b/.gitignore index ce864bd..c93decb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,3 @@ compile_commands.json # Default build dir build/ - -# Generated files -.config* diff --git a/README.md b/README.md index a19d2e9..14b4e32 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,6 @@ zinnia is a lightweight Unix-like microkernel targeting 64-bit devices. > Please note that this project is a work in progress. > Some parts may not work at all and/or will drastically change over time. - - ## Building > [!NOTE] diff --git a/kernel/boot/main.c b/kernel/boot/main.c index c5fe9d1..ed63c36 100644 --- a/kernel/boot/main.c +++ b/kernel/boot/main.c @@ -9,7 +9,7 @@ #include #include -const char zinnia_banner[] = +static const char zinnia_banner[] = "zinnia " ZINNIA_VERSION " (" ZINNIA_ARCH ", " ZINNIA_COMPILER_ID ", " ZINNIA_LINKER_ID ")"; [[__init]] diff --git a/kernel/include/kernel/sched.h b/kernel/include/kernel/sched.h index 1810845..db0650d 100644 --- a/kernel/include/kernel/sched.h +++ b/kernel/include/kernel/sched.h @@ -1,16 +1,14 @@ #pragma once -#include #include #include +#include #include #include ASSERT_TYPE(struct arch_context); ASSERT_TYPE(struct arch_task_context); -typedef size_t tid_t; - enum task_state { TASK_STATE_RUNNING, // Task is active and running. TASK_STATE_READY, // Task is active, but not currently scheduled. @@ -19,7 +17,7 @@ enum task_state { // A task is the smallest unit of the scheduler. struct task { - tid_t id; + size_t id; struct process* process; enum task_state state; struct arch_context context; @@ -29,6 +27,8 @@ struct task { int8_t priority; }; +struct process {}; + // Per-CPU data for scheduling. struct sched_percpu { struct task* current; diff --git a/kernel/include/kernel/syscalls.h b/kernel/include/kernel/syscalls.h index 116f55a..8c14fbf 100644 --- a/kernel/include/kernel/syscalls.h +++ b/kernel/include/kernel/syscalls.h @@ -6,7 +6,7 @@ #include #include -zn_status_t syscall_dispatch(reg_t num, reg_t a0, reg_t a1, reg_t a2, reg_t a3, reg_t a4, reg_t a5, reg_t a6); +zn_status_t syscall_dispatch(reg_t num, reg_t a0, reg_t a1, reg_t a2, reg_t a3, reg_t a4, reg_t a5); [[noreturn]] void syscall_panic(zn_status_t err); diff --git a/kernel/syscalls/dispatch.c b/kernel/syscalls/dispatch.c index f549812..9cfa85f 100644 --- a/kernel/syscalls/dispatch.c +++ b/kernel/syscalls/dispatch.c @@ -4,7 +4,7 @@ #include #include -zn_status_t syscall_dispatch(reg_t num, reg_t a0, reg_t a1, reg_t a2, reg_t a3, reg_t a4, reg_t a5, reg_t a6) { +zn_status_t syscall_dispatch(reg_t num, reg_t a0, reg_t a1, reg_t a2, reg_t a3, reg_t a4, reg_t a5) { switch (num) { case ZN_SYSCALL_PANIC: syscall_panic((zn_status_t)a0); diff --git a/meson.options b/meson.options deleted file mode 100644 index 9c63029..0000000 --- a/meson.options +++ /dev/null @@ -1,6 +0,0 @@ -option( - 'kernel_only', - type: 'boolean', - value: true, - description: 'Build only the kernel', -) diff --git a/zinnia.svg b/zinnia.svg deleted file mode 100644 index 45fc0ad..0000000 --- a/zinnia.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -