Changeset 96e0748d in mainline for kernel/arch/arm32/src/arm32.c

Timestamp:

2009-02-17T22:47:27Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f89979b

Parents:

e662a5f

Message:

make arch_pre_main optional, don't force any specific prototype
simplify boot process
mips32: detect number of configured CPUs in msim

File:

• kernel/arch/arm32/src/arm32.c (modified) (2 diffs)

kernel/arch/arm32/src/arm32.c

@@ -35 +35 @@
 
 #include <arch.h>
-#include <arch/boot.h>
 #include <config.h>
 #include <arch/console.h>
@@ -49 +48 @@
 #include <arch/machine.h>
 #include <userspace.h>
-
-/** Information about loaded tasks. */
-bootinfo_t bootinfo;
+#include <macros.h>
 
 /** Performs arm32 specific initialization before main_bsp() is called. */
-void arch_pre_main(void)
+void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
 {
         unsigned int i;
-
-        init.cnt = bootinfo.cnt;
-
-        for (i = 0; i < bootinfo.cnt; ++i) {
-                init.tasks[i].addr = bootinfo.tasks[i].addr;
-                init.tasks[i].size = bootinfo.tasks[i].size;
+        
+        init.cnt = bootinfo->cnt;
+        
+        for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); ++i) {
+                init.tasks[i].addr = bootinfo->tasks[i].addr;
+                init.tasks[i].size = bootinfo->tasks[i].size;
         }
-        
 }