X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.c;h=c971c09fe08fd3a10183ca9203f0776493fc3c10;hb=2e550c2c1429d917fd7188c3a92bc7eb87536d98;hp=b8431b50e1b277317716b3b9f7f9f20defdb673f;hpb=b7ad98378650e9ac53b1bf629c927ad7597a792f;p=bertos.git diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c index b8431b50..c971c09f 100644 --- a/bertos/kern/proc.c +++ b/bertos/kern/proc.c @@ -89,7 +89,7 @@ REGISTER Process *CurrentProcess; List StackFreeList; #define NPROC 8 -cpustack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpustack_t)]; +cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)]; #endif /** The main process (the one that executes main()). */ @@ -103,6 +103,7 @@ static void proc_init_struct(Process *proc) #if CONFIG_KERN_SIGNALS proc->sig_recv = 0; + proc->sig_wait = 0; #endif #if CONFIG_KERN_HEAP @@ -112,6 +113,7 @@ static void proc_init_struct(Process *proc) #if CONFIG_KERN_PRI proc->link.pri = 0; #endif + } MOD_DEFINE(proc); @@ -152,10 +154,10 @@ void proc_init(void) * \return Process structure of new created process * if successful, NULL otherwise. */ -struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpustack_t *stack_base) +struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpu_stack_t *stack_base) { Process *proc; - const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t); + const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpu_stack_t)) / sizeof(cpu_stack_t); #if CONFIG_KERN_HEAP bool free_stack = false; #endif @@ -163,7 +165,7 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry) #if (ARCH & ARCH_EMUL) /* Ignore stack provided by caller and use the large enough default instead. */ - PROC_ATOMIC(stack_base = (cpustack_t *)list_remHead(&StackFreeList)); + PROC_ATOMIC(stack_base = (cpu_stack_t *)list_remHead(&StackFreeList)); stack_size = CONFIG_KERN_MINSTACKSIZE; #elif CONFIG_KERN_HEAP @@ -209,8 +211,8 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry) } else { - proc = (Process *)(stack_base + stack_size / sizeof(cpustack_t) - PROC_SIZE_WORDS); - proc->stack = (cpustack_t *)proc; + proc = (Process *)(stack_base + stack_size / sizeof(cpu_stack_t) - PROC_SIZE_WORDS); + proc->stack = (cpu_stack_t *)proc; if (CPU_SP_ON_EMPTY_SLOT) proc->stack--; } @@ -368,14 +370,6 @@ void proc_exit(void) } -/** - * Get the pointer to the current process - */ -struct Process *proc_current(void) -{ - return CurrentProcess; -} - /** * Get the pointer to the user data of the current process */