Changeset a55f97f in mainline

Timestamp:

2005-07-21T14:27:13Z (20 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

f5e3d1da

Parents:

f7a13b9

Message:

Memory size detection for ia32 completed.

Files:

• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/include/mm/memory_init.h (added)
• arch/ia32/src/mm/frame.c (modified) (1 diff)
• arch/ia32/src/mm/memory_init.c (added)
• src/main/main.c (modified) (2 diffs)

arch/ia32/Makefile.inc

@@ -39 +39 @@
         arch/cpu/cpu.c \
         arch/mm/frame.c \
+        arch/mm/memory_init.c \
         arch/mm/page.c \
         arch/mm/tlb.c \

arch/ia32/src/mm/frame.c

@@ -49 +49 @@
                 
                 for (i=e820counter;i>0;i--) {
-                        //printf("E820 base: %Q size: %Q type: %L \n",e820table[i-1].base_address,e820table[i-1].size,e820table[i-1].type);
+                        // printf("E820 base: %Q size: %Q type: %L \n",e820table[i-1].base_address,e820table[i-1].size,e820table[i-1].type);
                         if (e820table[i-1].type!=MEMMAP_MEMORY_AVAILABLE) {
                                 frame_region_not_free(e820table[i-1].base_address,e820table[i-1].size);

src/main/main.c

@@ -48 +48 @@
 #include <smp/smp.h>
 
+#include <arch/mm/memory_init.h>
 #include <mm/frame.h>
 #include <mm/page.h>
@@ -99 +100 @@
 
         config.base = hardcoded_load_address;
-        config.memory_size = CONFIG_MEMORY_SIZE;
+        config.memory_size = get_memory_size();
         config.kernel_size = hardcoded_ktext_size + hardcoded_kdata_size + CONFIG_HEAP_SIZE + CONFIG_STACK_SIZE;