more

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>
jezze · May 10, 2021 · af3eacb · af3eacb
1 parent 09b1cce
commit af3eacb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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);