Changeset 46c20c8 in mainline for kernel/arch/ppc32/src/ppc32.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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 mainline changes.

File:

• kernel/arch/ppc32/src/ppc32.c (modified) (5 diffs)

kernel/arch/ppc32/src/ppc32.c

@@ -53 +53 @@
 #include <align.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 
@@ -65 +65 @@
 
 /** Performs ppc32-specific initialization before main_bsp() is called. */
-void arch_pre_main(void)
-{
-        init.cnt = bootinfo.taskmap.count;
-        
-        uint32_t i;
-        
-        for (i = 0; i < min3(bootinfo.taskmap.count, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
-                init.tasks[i].addr = bootinfo.taskmap.tasks[i].addr;
-                init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
+void arch_pre_main(bootinfo_t *bootinfo)
+{
+        /* Copy tasks map. */
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+        size_t i;
+        for (i = 0; i < init.cnt; i++) {
+                init.tasks[i].addr = (uintptr_t) bootinfo->taskmap.tasks[i].addr;
+                init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
-                    bootinfo.taskmap.tasks[i].name);
+                    bootinfo->taskmap.tasks[i].name);
+        }
+        
+        /* Copy physical memory map. */
+        memmap.total = bootinfo->memmap.total;
+        memmap.cnt = min(bootinfo->memmap.cnt, MEMMAP_MAX_RECORDS);
+        for (i = 0; i < memmap.cnt; i++) {
+                memmap.zones[i].start = bootinfo->memmap.zones[i].start;
+                memmap.zones[i].size = bootinfo->memmap.zones[i].size;
         }
         
         /* Copy boot allocations info. */
-        ballocs.base = bootinfo.ballocs.base;
-        ballocs.size = bootinfo.ballocs.size;
-        
-        ofw_tree_init(bootinfo.ofw_root);
+        ballocs.base = bootinfo->ballocs.base;
+        ballocs.size = bootinfo->ballocs.size;
+        
+        /* Copy OFW tree. */
+        ofw_tree_init(bootinfo->ofw_root);
 }
 
@@ -193 +201 @@
                 pic_init(assigned_address[0].addr, PAGE_SIZE, &pic_cir,
                     &pic_cir_arg);
-
+                
 #ifdef CONFIG_MAC_KBD
                 uintptr_t pa = assigned_address[0].addr + 0x16000;
@@ -215 +223 @@
                         }
                 }
-
+                
                 /*
                  * This is the necessary evil until the userspace driver is entirely
@@ -276 +284 @@
 {
         // TODO
-        while (1);
+        while (true);
 }