Changeset 150385b9 in mainline

Timestamp:

2009-03-03T23:00:58Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

63d1ebd

Parents:

ff685c9

Message:

Init task names for arm32.

Files:

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

boot/arch/arm32/loader/Makefile

@@ -68 +68 @@
         _components.c \
         ../../../generic/printf.c \
+        ../../../generic/string.c \
         ../../../genarch/division.c
 

boot/arch/arm32/loader/main.c

@@ -42 +42 @@
 #include <align.h>
 #include <macros.h>
+#include <string.h>
 
 #include "mm.h"
@@ -104 +105 @@
                         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/arm32/loader/main.h

@@ -43 +43 @@
 #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. */
@@ -50 +53 @@
         /** Size of the task's binary. */
         unsigned int size;
+        /** Task name. */
+        char name[BOOTINFO_TASK_NAME_BUFLEN];
 } task_t;
 

kernel/arch/arm32/include/arch.h

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

kernel/arch/arm32/src/arm32.c

@@ -49 +49 @@
 #include <userspace.h>
 #include <macros.h>
+#include <string.h>
 
 /** Performs arm32-specific initialization before main_bsp() is called. */
@@ -60 +61 @@
                 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);
         }
 }