From: Gene Cumm <gene.cumm@gmail.com>
Date: Mon, 7 Feb 2011 03:59:53 +0000 (-0500)
Subject: memdisk/setup: Change int15maxres to parse memory range lines
X-Git-Tag: syslinux-4.04-pre10^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e10b3d5c70245484868d85a18c331e410d8b1a2d;p=platform%2Fupstream%2Fsyslinux.git

memdisk/setup: Change int15maxres to parse memory range lines

Only touch the ranges that are type 1 (available)
---

diff --git a/memdisk/setup.c b/memdisk/setup.c
index 623c9cd..75e8475 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -724,16 +724,21 @@ uint32_t getramtop(void)
 void int15maxres(uint32_t restop)
 {
     uint32_t ramtop;
+    struct e820range *ep;
 
     ramtop = getramtop();
-    /* printf("  TOP RAM-%08x  RES-%08x", ramtop, restop); */
-    if (restop < ramtop) {
-	/* printf("  (A)"); */
-	insertrange(restop, (ramtop - restop), 3);
-	parse_mem();
+    for (ep = ranges; ep->type != -1U; ep++) {
+	if (ep->type == 1) {	/* Only if available */
+	    if (ep->start >= restop) {
+		printf("  %08x -> 2\n", ep->start);
+		ep->type = 2;
+	    } else if (ep[1].start > restop) {
+		printf("  +%08x =2; cut %08x\n", restop, ep->start);
+		insertrange(restop, (ep[1].start - restop), 2);
+	    }
+	}
     }
-    ramtop = getramtop();
-    /* printf("    NOW RAM-%08x\n", ramtop); */
+    parse_mem();
 }
 
 struct real_mode_args rm_args;