Changeset b07c332 in mainline for kernel/arch/ia32/src/mm/frame.c

Timestamp:

2008-02-05T14:02:09Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b5ed4f8

Parents:

a0f6a61

Message:

convert e820list to a generic physmem command

File:

• kernel/arch/ia32/src/mm/frame.c (modified) (8 diffs)

kernel/arch/ia32/src/mm/frame.c

@@ -46 +46 @@
 
 #include <print.h>
-#include <console/cmd.h>
-#include <console/kconsole.h>
 
 size_t hardcoded_unmapped_ktext_size = 0;
@@ -56 +54 @@
 static void init_e820_memory(pfn_t minconf)
 {
-        int i;
+        unsigned int i;
         pfn_t start, conf;
         size_t size;
@@ -64 +62 @@
                         start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE));
                         size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE));
+                        
                         if ((minconf < start) || (minconf >= start + size))
                                 conf = start;
                         else
                                 conf = minconf;
+                        
                         zone_create(start, size, conf, 0);
+                        
                         if (last_frame < ALIGN_UP(e820table[i].base_address +
                             e820table[i].size, FRAME_SIZE))
@@ -76 +77 @@
         }
 }
-
-static int cmd_e820mem(cmd_arg_t *argv);
-static cmd_info_t e820_info = {
-        .name = "e820list",
-        .description = "List e820 memory.",
-        .func = cmd_e820mem,
-        .argc = 0
-};
 
 static char *e820names[] = {
@@ -95 +88 @@
 
 
-static int cmd_e820mem(cmd_arg_t *argv)
+void physmem_print(void)
 {
         unsigned int i;
@@ -112 +105 @@
                         e820table[i].size, name);
         }                       
-        return 0;
 }
 
@@ -118 +110 @@
 void frame_arch_init(void)
 {
-        static pfn_t minconf;
+        pfn_t minconf;
         
         if (config.cpu_active == 1) {
-                cmd_initialize(&e820_info);
-                cmd_register(&e820_info);
-
                 minconf = 1;
 #ifdef CONFIG_SMP
                 minconf = max(minconf,
-                    ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
-                        hardcoded_unmapped_kdata_size));
+                        ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
+                        hardcoded_unmapped_kdata_size));
 #endif
 #ifdef CONFIG_SIMICS_FIX
@@ -141 +130 @@
                 /* Reserve AP real mode bootstrap memory */
                 frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH, 
-                    (hardcoded_unmapped_ktext_size +
-                    hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
+                        (hardcoded_unmapped_ktext_size +
+                        hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
                 
 #ifdef CONFIG_SIMICS_FIX