From: Kevin O'Connor <kevin@koconnor.net>
Date: Mon, 2 Jan 2012 15:51:26 +0000 (-0500)
Subject: vgabios: Remove dummy 0xfe mode from list of cirrus modes.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=seabios.git;a=commitdiff_plain;h=2c8ba89aab21dcd400a923887843696dc00a9645

vgabios: Remove dummy 0xfe mode from list of cirrus modes.

The 0xfe mode isn't a real mode, it's a place holder for settings
needed to switch back to non-cirrus modes.  Handle it that way.

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

diff --git a/vgasrc/clext.c b/vgasrc/clext.c
index 61bfe92..ec0380f 100644
--- a/vgasrc/clext.c
+++ b/vgasrc/clext.c
@@ -293,10 +293,11 @@ static struct cirrus_mode_s cirrus_modes[] VAR16 = {
     {0x7b,MM_PACKED,1600,1200,8,0x00,
      cseq_1600x1200x8,cgraph_svgacolor,ccrtc_1600x1200x8,8,
      0,0,0,0,0,0,0,0},
+};
 
+static struct cirrus_mode_s mode_switchback VAR16 =
     {0xfe,0xff,0,0,0,0,cseq_vga,cgraph_vga,ccrtc_vga,0,
-     0,0,0,0,0,0,0,0},
-};
+     0,0,0,0,0,0,0,0};
 
 
 /****************************************************************
@@ -405,8 +406,7 @@ clext_set_mode(int mode, int flags)
         SET_BDA(video_mode, mode);
         return 0;
     }
-    table_g = cirrus_get_modeentry(0xfe);
-    cirrus_switch_mode(table_g);
+    cirrus_switch_mode(&mode_switchback);
     dprintf(1, "cirrus mode switch regular\n");
     return stdvga_set_mode(mode, flags);
 }