vgabios: Use stored total memory in cirrus code instead of recalculating.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/vgasrc/clext.c b/vgasrc/clext.c
index 5468db35ef77d6e9e4099ed0669772527cb6abc0..39f3b2a99362941c223366378aa5058dfcc7163e 100644 (file)
--- a/vgasrc/clext.c
+++ b/vgasrc/clext.c
@@ -404,7 +404,7 @@ static void
 cirrus_clear_vram(u16 param)
 {
     cirrus_enable_16k_granularity();
 cirrus_clear_vram(u16 param)
 {
     cirrus_enable_16k_granularity();

-    u8 count = cirrus_get_memsize() * 4;
+    u8 count = GET_GLOBAL(VBE_total_memory) / (16 * 1024);

     u8 i;
     for (i=0; i<count; i++) {
         stdvga_grdc_write(0x09, i);
     u8 i;
     for (i=0; i<count; i++) {
         stdvga_grdc_write(0x09, i);


@@ -479,7 +479,7 @@ clext_101282(struct bregs *regs)
 static void
 clext_101285(struct bregs *regs)
 {
 static void
 clext_101285(struct bregs *regs)
 {

-    regs->al = cirrus_get_memsize();
+    regs->al = GET_GLOBAL(VBE_total_memory) / (64*1024);

 }
 
 static void
 }
 
 static void


@@ -655,7 +655,7 @@ cirrus_vesa_06h(struct bregs *regs)
     u32 v = cirrus_get_line_offset();
     regs->cx = v / cirrus_get_bpp_bytes();
     regs->bx = v;
     u32 v = cirrus_get_line_offset();
     regs->cx = v / cirrus_get_bpp_bytes();
     regs->bx = v;

-    regs->dx = (cirrus_get_memsize() * 64 * 1024) / v;
+    regs->dx = GET_GLOBAL(VBE_total_memory) / v;

     regs->ax = 0x004f;
 }
 
     regs->ax = 0x004f;
 }