From 79c1fda4198e29e23a3ca9f1c4a7c9c22de0a921 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Wed, 22 Apr 2020 16:54:30 +0200 Subject: [PATCH] Some defintion improvments --- core/alloc.c | 2 +- core/cpu_context.c | 4 ++-- core/cpu_context.h | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/alloc.c b/core/alloc.c index 1590d7a..b61ffc3 100644 --- a/core/alloc.c +++ b/core/alloc.c @@ -10,7 +10,7 @@ #define IS_SELF_CONTAINED(desc) ((vaddr_t)((desc)->page) == (vaddr_t)(desc)) // Slab will contains object from sizeof(void *) to PAGE_SIZE/2 by pow2 #define SLUB_SIZE (PAGE_SHIFT) -struct slabDesc *slub; +static struct slabDesc *slub; int allocSlab(struct slabDesc **desc, size_t size, int self_containing); int allocSlabEntry(struct slabEntry **desc, size_t size, int selfContained); diff --git a/core/cpu_context.c b/core/cpu_context.c index 1f7d14a..dcba68b 100644 --- a/core/cpu_context.c +++ b/core/cpu_context.c @@ -96,8 +96,8 @@ static void core_routine(cpu_kstate_function_arg1_t *start_func, void *start_arg } int cpu_kstate_init(struct cpu_state **ctxt, cpu_kstate_function_arg1_t *start_func, - uint32_t start_arg, vaddr_t stack_bottom, size_t stack_size, - cpu_kstate_function_arg1_t *exit_func, uint32_t exit_arg) + vaddr_t start_arg, vaddr_t stack_bottom, size_t stack_size, + cpu_kstate_function_arg1_t *exit_func, vaddr_t exit_arg) { /* We are initializing a Kernel thread's context */ struct cpu_kstate *kctxt; diff --git a/core/cpu_context.h b/core/cpu_context.h index 46dbc63..a5cb684 100644 --- a/core/cpu_context.h +++ b/core/cpu_context.h @@ -25,6 +25,7 @@ * be some kind of architecture-independent. */ +#include "stdarg.h" #include "types.h" #include "errno.h" @@ -84,11 +85,11 @@ typedef void (cpu_kstate_function_arg1_t(void * arg1)); */ int cpu_kstate_init(struct cpu_state **kctxt, cpu_kstate_function_arg1_t *start_func, - uint32_t start_arg, + vaddr_t start_arg, vaddr_t stack_bottom, size_t stack_size, cpu_kstate_function_arg1_t *exit_func, - uint32_t exit_arg); + vaddr_t exit_arg); /**