Changeset 89b1b64 in mainline

Timestamp:

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

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

5e9de3a

Parents:

63d1ebd

Message:

Init-task names for mips32.

Files:

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

boot/arch/mips32/loader/Makefile

@@ -73 +73 @@
         _components.c \
         ../../../generic/printf.c \
+        ../../../generic/string.c \
         asm.S \
         boot.S

boot/arch/mips32/loader/main.c

@@ -31 +31 @@
 #include <align.h>
 #include <macros.h>
+#include <string.h>
 #include "msim.h"
 #include "asm.h"
@@ -85 +86 @@
                         bootinfo.tasks[bootinfo.cnt].addr = ((void *) KERNEL_VIRTUAL_ADDRESS) + top;
                         bootinfo.tasks[bootinfo.cnt].size = components[i].size;
+                        strncpy(bootinfo.tasks[bootinfo.cnt].name,
+                            components[i].name, BOOTINFO_TASK_NAME_BUFLEN);
                         bootinfo.cnt++;
                 }

boot/arch/mips32/loader/main.h

@@ -39 +39 @@
 #ifndef __ASM__
 
+/** 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/mips32/include/arch.h

@@ -39 +39 @@
 #define CPUMAP_MAX_RECORDS   32
 
+#define BOOTINFO_TASK_NAME_BUFLEN 32
+
 #include <typedefs.h>
 
@@ -46 +48 @@
         uintptr_t addr;
         uint32_t size;
+        char name[BOOTINFO_TASK_NAME_BUFLEN];
 } utask_t;
 

kernel/arch/mips32/src/mips32.c

@@ -55 +55 @@
 #include <macros.h>
 #include <ddi/device.h>
+#include <config.h>
+#include <string.h>
 
 #include <arch/asm/regname.h>
@@ -87 +89 @@
                 init.tasks[i].addr = bootinfo->tasks[i].addr;
                 init.tasks[i].size = bootinfo->tasks[i].size;
+                strncpy(init.tasks[i].name, bootinfo->tasks[i].name,
+                        CONFIG_TASK_NAME_BUFLEN);
         }