Changeset c621f4aa in mainline for kernel/arch/arm32/src/arm32.c

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

• kernel/arch/arm32/src/arm32.c (modified) (1 diff)

kernel/arch/arm32/src/arm32.c

@@ -45 +45 @@
 #include <interrupt.h>
 #include <arch/regutils.h>
+#include <arch/machine_func.h>
 #include <userspace.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <arch/ras.h>
-
-#ifdef MACHINE_testarm
-        #include <arch/mach/testarm/testarm.h>
-#endif
-
-#ifdef MACHINE_integratorcp
-        #include <arch/mach/integratorcp/integratorcp.h>
-#endif
-
 
 /** Performs arm32-specific initialization before main_bsp() is called. */
 void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
 {
-        unsigned int i;
+        init.cnt = min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
         
-        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;
+        size_t i;
+        for (i = 0; i < init.cnt; i++) {
+                init.tasks[i].addr = (uintptr_t) bootinfo->tasks[i].addr;
                 init.tasks[i].size = bootinfo->tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
                     bootinfo->tasks[i].name);
         }
+
+        /* Initialize machine_ops pointer. */
+        machine_ops_init();
 }