Changeset 96e0748d in mainline for kernel/arch/ppc32/src/ppc32.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/ppc32/src/ppc32.c (modified) (2 diffs)

kernel/arch/ppc32/src/ppc32.c

@@ -46 +46 @@
 #include <ddi/irq.h>
 #include <arch/drivers/pic.h>
+#include <macros.h>
 
-#define IRQ_COUNT       64
+#define IRQ_COUNT  64
 
 bootinfo_t bootinfo;
@@ -53 +54 @@
 void arch_pre_main(void)
 {
-        /* Setup usermode */
         init.cnt = bootinfo.taskmap.count;
         
         uint32_t i;
         
-        for (i = 0; i < bootinfo.taskmap.count; i++) {
+        for (i = 0; i < min3(bootinfo.taskmap.count, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
                 init.tasks[i].addr = PA2KA(bootinfo.taskmap.tasks[i].addr);
                 init.tasks[i].size = bootinfo.taskmap.tasks[i].size;