From af3eacb910e71851017f7b3606f4b777dccb4e2d Mon Sep 17 00:00:00 2001 From: Jens Nyberg Date: Tue, 11 May 2021 00:11:56 +0200 Subject: [PATCH] more Signed-off-by: Jens Nyberg --- src/kernel/kernel.c | 20 ++++++++++---------- src/kernel/kernel.h | 2 +- src/kernel/x86/arch.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index c03b2e1b8..78b921060 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -213,23 +213,23 @@ struct service_descriptor *kernel_getdescriptor(struct task *task, unsigned int } -static void copydescriptor(struct service_descriptor *tdescriptor, struct service_descriptor *sdescriptor) +static void copydescriptor(struct service_descriptor *descriptor, struct service_descriptor *pdescriptor) { - tdescriptor->protocol = sdescriptor->protocol; - tdescriptor->id = sdescriptor->id; + descriptor->protocol = pdescriptor->protocol; + descriptor->id = pdescriptor->id; } -void kernel_copydescriptors(struct task *source, struct task *target) +void kernel_copydescriptors(struct task *task, struct task *parent) { - copydescriptor(kernel_getdescriptor(target, FILE_PP + 0), kernel_getdescriptor(source, FILE_CP + 0)); - copydescriptor(kernel_getdescriptor(target, FILE_CP + 0), kernel_getdescriptor(source, FILE_CP + 0)); - copydescriptor(kernel_getdescriptor(target, FILE_PP + 1), kernel_getdescriptor(source, FILE_CP + 1)); - copydescriptor(kernel_getdescriptor(target, FILE_CP + 1), kernel_getdescriptor(source, FILE_CP + 1)); - copydescriptor(kernel_getdescriptor(target, FILE_PP + 2), kernel_getdescriptor(source, FILE_CP + 2)); - copydescriptor(kernel_getdescriptor(target, FILE_CP + 2), kernel_getdescriptor(source, FILE_CP + 2)); + copydescriptor(kernel_getdescriptor(task, FILE_PP + 0), kernel_getdescriptor(parent, FILE_CP + 0)); + copydescriptor(kernel_getdescriptor(task, FILE_CP + 0), kernel_getdescriptor(parent, FILE_CP + 0)); + copydescriptor(kernel_getdescriptor(task, FILE_PP + 1), kernel_getdescriptor(parent, FILE_CP + 1)); + copydescriptor(kernel_getdescriptor(task, FILE_CP + 1), kernel_getdescriptor(parent, FILE_CP + 1)); + copydescriptor(kernel_getdescriptor(task, FILE_PP + 2), kernel_getdescriptor(parent, FILE_CP + 2)); + copydescriptor(kernel_getdescriptor(task, FILE_CP + 2), kernel_getdescriptor(parent, FILE_CP + 2)); } diff --git a/src/kernel/kernel.h b/src/kernel/kernel.h index 80b73fbd5..1e07b78c0 100644 --- a/src/kernel/kernel.h +++ b/src/kernel/kernel.h @@ -12,7 +12,7 @@ struct task *kernel_picktask(void); void kernel_readytask(unsigned int id); void kernel_schedule(struct core *core); struct service_descriptor *kernel_getdescriptor(struct task *task, unsigned int descriptor); -void kernel_copydescriptors(struct task *source, struct task *target); +void kernel_copydescriptors(struct task *task, struct task *parent); void kernel_reset(unsigned int id); unsigned int kernel_pick(unsigned int source, struct message_header *header, void *data); unsigned int kernel_place(unsigned int source, unsigned int target, struct message_header *header, void *data); diff --git a/src/kernel/x86/arch.c b/src/kernel/x86/arch.c index 9daa8e79c..6cf9eca75 100644 --- a/src/kernel/x86/arch.c +++ b/src/kernel/x86/arch.c @@ -90,7 +90,7 @@ static unsigned int spawn(struct task *task, void *stack) if (!next) return 0; - kernel_copydescriptors(task, next); + kernel_copydescriptors(next, task); return loadtask(next);