X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fmemmap.c;h=20ccae0d4909fe291e87634b32231d1e1d89d5a6;hb=8b9137d29561e958ba557ba31e73da71d3b03249;hp=5b7eba5f3514f7a7a918a891013678593b509cb9;hpb=5d8ec3ee06686179f157c609e3fd053fc1c5c6b1;p=seabios.git

diff --git a/src/memmap.c b/src/memmap.c
index 5b7eba5..20ccae0 100644
--- a/src/memmap.c
+++ b/src/memmap.c
@@ -1,6 +1,6 @@
 // Support for building memory maps suitable for int 15 e820 calls.
 //
-// Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2008,2009  Kevin O'Connor <kevin@koconnor.net>
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
@@ -8,6 +8,11 @@
 #include "util.h" // dprintf.h
 #include "biosvar.h" // SET_EBDA
 
+
+/****************************************************************
+ * e820 memory map
+ ****************************************************************/
+
 // Remove an entry from the e820_list.
 static void
 remove_e820(int i)
@@ -22,7 +27,7 @@ static void
 insert_e820(int i, u64 start, u64 size, u32 type)
 {
     if (e820_count >= CONFIG_MAX_E820) {
-        dprintf(1, "Overflowed e820 list!\n");
+        warn_noalloc();
         return;
     }
 
@@ -35,19 +40,33 @@ insert_e820(int i, u64 start, u64 size, u32 type)
     e->type = type;
 }
 
+static const char *
+e820_type_name(u32 type)
+{
+	switch (type) {
+	case E820_RAM:      return "RAM";
+	case E820_RESERVED: return "RESERVED";
+	case E820_ACPI:     return "ACPI";
+	case E820_NVS:      return "NVS";
+	case E820_UNUSABLE: return "UNUSABLE";
+	case E820_HOLE:     return "HOLE";
+	default:            return "UNKNOWN";
+	}
+}
+
 // Show the current e820_list.
 static void
-dump_map()
+dump_map(void)
 {
     dprintf(1, "e820 map has %d items:\n", e820_count);
     int i;
     for (i=0; i<e820_count; i++) {
         struct e820entry *e = &e820_list[i];
         u64 e_end = e->start + e->size;
-        dprintf(1, "  %d: %x%x - %x%x = %d\n", i
+        dprintf(1, "  %d: %08x%08x - %08x%08x = %d %s\n", i
                 , (u32)(e->start >> 32), (u32)e->start
                 , (u32)(e_end >> 32), (u32)e_end
-                , e->type);
+                , e->type, e820_type_name(e->type));
     }
 }
 
@@ -56,7 +75,7 @@ dump_map()
 void
 add_e820(u64 start, u64 size, u32 type)
 {
-    dprintf(8, "Add to e820 map: %x %x %d\n", (u32)start, (u32)size, type);
+    dprintf(8, "Add to e820 map: %08x %08x %d\n", (u32)start, (u32)size, type);
 
     if (! size)
         // Huh?  Nothing to do.
@@ -72,26 +91,20 @@ add_e820(u64 start, u64 size, u32 type)
             continue;
         // Found position - check if an existing item needs to be split.
         if (start > e->start) {
-            e->size = start - e->start;
-            i++;
-            if (end < e_end)
-                // Need to split existing item
-                insert_e820(i, end, e_end - end, e->type);
             if (type == e->type) {
                 // Same type - merge them.
                 size += start - e->start;
                 start = e->start;
-                i--;
-                remove_e820(i);
+            } else {
+                // Split existing item.
+                e->size = start - e->start;
+                i++;
+                if (e_end > end)
+                    insert_e820(i, end, e_end - end, e->type);
             }
         }
         break;
     }
-    // Insert new item.
-    if (type != E820_HOLE) {
-        insert_e820(i, start, size, type);
-        i++;
-    }
     // Remove/adjust existing items that are overlapping.
     while (i<e820_count) {
         struct e820entry *e = &e820_list[i];
@@ -106,40 +119,23 @@ add_e820(u64 start, u64 size, u32 type)
         }
         // Not completely overlapped - adjust its start.
         e->start = end;
-        e->size = e_end - e->start;
+        e->size = e_end - end;
         if (type == e->type) {
             // Same type - merge them.
-            (e-1)->size += e->size;
+            size += e->size;
             remove_e820(i);
         }
         break;
     }
+    // Insert new item.
+    if (type != E820_HOLE)
+        insert_e820(i, start, size, type);
     //dump_map();
 }
 
-// Prep for memmap stuff - init bios table locations.
-void
-memmap_setup()
-{
-    memset(BiosTableSpace, 0, CONFIG_MAX_BIOSTABLE);
-    bios_table_cur_addr = (u32)BiosTableSpace;
-    bios_table_end_addr = bios_table_cur_addr + CONFIG_MAX_BIOSTABLE;
-    dprintf(1, "bios_table_addr: 0x%08x end=0x%08x\n",
-            bios_table_cur_addr, bios_table_end_addr);
-
-    e820_count = 0;
-}
-
 // Report on final memory locations.
 void
-memmap_finalize()
+memmap_finalize(void)
 {
     dump_map();
-
-    dprintf(1, "final bios_table_addr: 0x%08x (used %d%%)\n"
-            , bios_table_cur_addr
-            , (100 * (bios_table_cur_addr - (u32)&BiosTableSpace)
-               / CONFIG_MAX_BIOSTABLE));
-    if (bios_table_cur_addr > bios_table_end_addr)
-        panic("bios_table_end_addr overflow!\n");
 }