Changeset 5e9de3a in mainline

Timestamp:

2009-03-04T22:45:25Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

46db10e9

Parents:

89b1b64

Message:

Init-task names for ppc32.

Files:

• boot/arch/ppc32/loader/Makefile (modified) (1 diff)
• boot/arch/ppc32/loader/main.c (modified) (2 diffs)
• boot/arch/ppc32/loader/main.h (modified) (1 diff)
• kernel/arch/ppc32/include/boot/boot.h (modified) (2 diffs)
• kernel/arch/ppc32/src/ppc32.c (modified) (2 diffs)

boot/arch/ppc32/loader/Makefile

@@ -66 +66 @@
         ../../../genarch/ofw.c \
         ../../../generic/printf.c \
+        ../../../generic/string.c \
         asm.S \
         boot.S

boot/arch/ppc32/loader/main.c

@@ -34 +34 @@
 #include <align.h>
 #include <macros.h>
+#include <string.h>
 
 #define HEAP_GAP 1024000
@@ -167 +168 @@
                                 bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr = (void *) (pages << PAGE_WIDTH);
                                 bootinfo.taskmap.tasks[bootinfo.taskmap.count].size = components[i].size;
+                                strncpy(bootinfo.taskmap.tasks[bootinfo.taskmap.count].name,
+                                    components[i].name, BOOTINFO_TASK_NAME_BUFLEN);
+
                                 bootinfo.taskmap.count++;
                         }

boot/arch/ppc32/loader/main.h

@@ -34 +34 @@
 #define TASKMAP_MAX_RECORDS 32
 
+/** Size of buffer for storing task name in task_t. */
+#define BOOTINFO_TASK_NAME_BUFLEN 32
+
+/** Struct holding information about single loaded task. */
 typedef struct {
+        /** Address where the task was placed. */
         void *addr;
+        /** Size of the task's binary. */
         unsigned int size;
+        /** Task name. */
+        char name[BOOTINFO_TASK_NAME_BUFLEN];
 } task_t;
 

kernel/arch/ppc32/include/boot/boot.h

@@ -46 +46 @@
 #ifndef __ASM__
 
+#define BOOTINFO_TASK_NAME_BUFLEN 32
+
 #include <arch/types.h>
 
@@ -51 +53 @@
         uintptr_t addr;
         uint32_t size;
+        char name[BOOTINFO_TASK_NAME_BUFLEN];
 } utask_t;
 

kernel/arch/ppc32/src/ppc32.c

@@ -47 +47 @@
 #include <arch/drivers/pic.h>
 #include <macros.h>
+#include <string.h>
 
 #define IRQ_COUNT  64
@@ -62 +63 @@
                 init.tasks[i].addr = PA2KA(bootinfo.taskmap.tasks[i].addr);
                 init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
+                strncpy(init.tasks[i].name, bootinfo.taskmap.tasks[i].name,
+                        CONFIG_TASK_NAME_BUFLEN);
         }
 }