Changeset 4037847 in mainline for arch/ppc32/src/mm

Timestamp:

2006-03-24T19:14:12Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c715e9b

Parents:

5201199

Message:

kernel boot API change

Location:

arch/ppc32/src/mm

Files:

• frame.c (modified) (3 diffs)
• memory_init.c (modified) (2 diffs)

arch/ppc32/src/mm/frame.c

@@ -27 +27 @@
  */
 
+#include <arch/boot/boot.h>
 #include <arch/mm/frame.h>
-#include <arch/boot/memmap.h>
 #include <arch/mm/memory_init.h>
 #include <mm/frame.h>
@@ -43 +43 @@
         size_t size;
         
-        for (i = 0; i < memmap.count; i++) {
-                start = ADDR2PFN(ALIGN_UP(memmap.zones[i].start, FRAME_SIZE));
-                size = SIZE2FRAMES(ALIGN_DOWN(memmap.zones[i].size, FRAME_SIZE));
+        for (i = 0; i < bootinfo.memmap.count; i++) {
+                start = ADDR2PFN(ALIGN_UP(bootinfo.memmap.zones[i].start, FRAME_SIZE));
+                size = SIZE2FRAMES(ALIGN_DOWN(bootinfo.memmap.zones[i].size, FRAME_SIZE));
                 
                 if ((minconf < start) || (minconf >= start + size))
@@ -53 +53 @@
                 
                 zone_create(start, size, conf, 0);
-                if (last_frame < ALIGN_UP(memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE))
-                        last_frame = ALIGN_UP(memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE);
+                if (last_frame < ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE))
+                        last_frame = ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE);
         }
 

arch/ppc32/src/mm/memory_init.c

@@ -27 +27 @@
  */
 
-#include <arch/boot/memmap.h>
+#include <arch/boot/boot.h>
 #include <arch/mm/memory_init.h>
 #include <typedefs.h>
 #include <print.h>
 
-memmap_t memmap;
-
 
 size_t get_memory_size(void) 
 {
-        return memmap.total;
+        return bootinfo.memmap.total;
 }
 
@@ -45 +43 @@
         count_t i;
         
-        for (i = 0; i < memmap.count; i++)
-                printf("base: %L size: %L\n", memmap.zones[i].start, memmap.zones[i].size);
+        for (i = 0; i < bootinfo.memmap.count; i++)
+                printf("base: %L size: %L\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
 }