vgabios: Make struct vgamode_s more similar to bochs/cirrus mode tables.

[seabios.git] / vgasrc / vgatables.c

diff --git a/vgasrc/vgatables.c b/vgasrc/vgatables.c
index fe860ebb23adbcc569461913fa82eddade95f27a..314222e3b2546fdfcd40f35cb1b327a179eab0b8 100644 (file)
--- a/vgasrc/vgatables.c
+++ b/vgasrc/vgatables.c
@@ -54,16 +54,25 @@ build_video_param(void)
 
     int i;
     for (i=0; i<ARRAY_SIZE(parammodes); i++) {
-        u8 mode = GET_GLOBAL(parammodes[i]);
+        int mode = GET_GLOBAL(parammodes[i]);
         if (! mode)
             continue;
         struct VideoParam_s *vparam_g = &video_param_table[i];
         struct vgamode_s *vmode_g = find_vga_entry(mode);
         if (!vmode_g)
             continue;
-        SET_VGA(vparam_g->twidth, GET_GLOBAL(vmode_g->twidth));
-        SET_VGA(vparam_g->theightm1, GET_GLOBAL(vmode_g->theight)-1);
-        SET_VGA(vparam_g->cheight, GET_GLOBAL(vmode_g->cheight));
+        int width = GET_GLOBAL(vmode_g->width);
+        int height = GET_GLOBAL(vmode_g->height);
+        int cheight = GET_GLOBAL(vmode_g->cheight);
+        if (GET_GLOBAL(vmode_g->memmodel) == MM_TEXT) {
+            SET_VGA(vparam_g->twidth, width);
+            SET_VGA(vparam_g->theightm1, height-1);
+        } else {
+            int cwidth = GET_GLOBAL(vmode_g->cwidth);
+            SET_VGA(vparam_g->twidth, width / cwidth);
+            SET_VGA(vparam_g->theightm1, (height / cheight) - 1);
+        }
+        SET_VGA(vparam_g->cheight, cheight);
         SET_VGA(vparam_g->slength, GET_GLOBAL(vmode_g->slength));
         memcpy_far(get_global_seg(), vparam_g->sequ_regs
                    , get_global_seg(), GET_GLOBAL(vmode_g->sequ_regs)
@@ -337,39 +346,39 @@ static u8 crtc_6A[] VAR16 = {
 #define VPARAM(x) &video_param_table[x]
 
 static struct vgamode_s vga_modes[] VAR16 = {
-    //mode model       tx  ty bpp cw ch  sstart     slength
+    //mode model       tx   ty bpp cw ch  sstart     slength
     // pelm  dac            sequ     misc  crtc     actl     grdc
-    {0x00, MM_TEXT,    40, 25, 4, 9, 16, SEG_CTEXT, 0x0800
+    {0x00, MM_TEXT,    40,  25, 4, 9, 16, SEG_CTEXT, 0x0800
      , 0xFF, PAL(palette2), sequ_01, 0x67, crtc_01, actl_01, grdc_01},
-    {0x01, MM_TEXT,    40, 25, 4, 9, 16, SEG_CTEXT, 0x0800
+    {0x01, MM_TEXT,    40,  25, 4, 9, 16, SEG_CTEXT, 0x0800
      , 0xFF, PAL(palette2), sequ_01, 0x67, crtc_01, actl_01, grdc_01},
-    {0x02, MM_TEXT,    80, 25, 4, 9, 16, SEG_CTEXT, 0x1000
+    {0x02, MM_TEXT,    80,  25, 4, 9, 16, SEG_CTEXT, 0x1000
      , 0xFF, PAL(palette2), sequ_03, 0x67, crtc_03, actl_01, grdc_01},
-    {0x03, MM_TEXT,    80, 25, 4, 9, 16, SEG_CTEXT, 0x1000
+    {0x03, MM_TEXT,    80,  25, 4, 9, 16, SEG_CTEXT, 0x1000
      , 0xFF, PAL(palette2), sequ_03, 0x67, crtc_03, actl_01, grdc_01},
-    {0x04, MM_CGA,     40, 25, 2, 8,  8, SEG_CTEXT, 0x0800
+    {0x04, MM_CGA,    320, 200, 2, 8,  8, SEG_CTEXT, 0x0800
      , 0xFF, PAL(palette1), sequ_04, 0x63, crtc_04, actl_04, grdc_04},
-    {0x05, MM_CGA,     40, 25, 2, 8,  8, SEG_CTEXT, 0x0800
+    {0x05, MM_CGA,    320, 200, 2, 8,  8, SEG_CTEXT, 0x0800
      , 0xFF, PAL(palette1), sequ_04, 0x63, crtc_04, actl_04, grdc_04},
-    {0x06, MM_CGA,     80, 25, 1, 8,  8, SEG_CTEXT, 0x1000
+    {0x06, MM_CGA,    640, 200, 1, 8,  8, SEG_CTEXT, 0x1000
      , 0xFF, PAL(palette1), sequ_06, 0x63, crtc_06, actl_06, grdc_06},
-    {0x07, MM_TEXT,    80, 25, 4, 9, 16, SEG_MTEXT, 0x1000
+    {0x07, MM_TEXT,    80,  25, 4, 9, 16, SEG_MTEXT, 0x1000
      , 0xFF, PAL(palette0), sequ_03, 0x66, crtc_07, actl_07, grdc_07},
-    {0x0D, MM_PLANAR,  40, 25, 4, 8,  8, SEG_GRAPH, 0x2000
+    {0x0D, MM_PLANAR, 320, 200, 4, 8,  8, SEG_GRAPH, 0x2000
      , 0xFF, PAL(palette1), sequ_0d, 0x63, crtc_0d, actl_0d, grdc_0d},
-    {0x0E, MM_PLANAR,  80, 25, 4, 8,  8, SEG_GRAPH, 0x4000
+    {0x0E, MM_PLANAR, 640, 200, 4, 8,  8, SEG_GRAPH, 0x4000
      , 0xFF, PAL(palette1), sequ_0e, 0x63, crtc_0e, actl_0d, grdc_0d},
-    {0x0F, MM_PLANAR,  80, 25, 1, 8, 14, SEG_GRAPH, 0x8000
+    {0x0F, MM_PLANAR, 640, 350, 1, 8, 14, SEG_GRAPH, 0x8000
      , 0xFF, PAL(palette0), sequ_0e, 0xa3, crtc_0f, actl_0f, grdc_0d},
-    {0x10, MM_PLANAR,  80, 25, 4, 8, 14, SEG_GRAPH, 0x8000
+    {0x10, MM_PLANAR, 640, 350, 4, 8, 14, SEG_GRAPH, 0x8000
      , 0xFF, PAL(palette2), sequ_0e, 0xa3, crtc_0f, actl_10, grdc_0d},
-    {0x11, MM_PLANAR,  80, 30, 1, 8, 16, SEG_GRAPH, 0x0000
+    {0x11, MM_PLANAR, 640, 480, 1, 8, 16, SEG_GRAPH, 0x0000
      , 0xFF, PAL(palette2), sequ_0e, 0xe3, crtc_11, actl_11, grdc_0d},
-    {0x12, MM_PLANAR,  80, 30, 4, 8, 16, SEG_GRAPH, 0x0000
+    {0x12, MM_PLANAR, 640, 480, 4, 8, 16, SEG_GRAPH, 0x0000
      , 0xFF, PAL(palette2), sequ_0e, 0xe3, crtc_11, actl_10, grdc_0d},
-    {0x13, MM_PACKED,  40, 25, 8, 8,  8, SEG_GRAPH, 0x0000
+    {0x13, MM_PACKED, 320, 200, 8, 8,  8, SEG_GRAPH, 0x0000
      , 0xFF, PAL(palette3), sequ_13, 0x63, crtc_13, actl_13, grdc_13},
-    {0x6A, MM_PLANAR, 100, 37, 4, 8, 16, SEG_GRAPH, 0x0000
+    {0x6A, MM_PLANAR, 800, 600, 4, 8, 16, SEG_GRAPH, 0x0000
      , 0xFF, PAL(palette2), sequ_0e, 0xe3, crtc_6A, actl_10, grdc_0d},
 };
 
@@ -379,7 +388,7 @@ find_vga_entry(u8 mode)
     int i;
     for (i = 0; i < ARRAY_SIZE(vga_modes); i++) {
         struct vgamode_s *vmode_g = &vga_modes[i];
-        if (GET_GLOBAL(vmode_g->svgamode) == mode)
+        if (GET_GLOBAL(vmode_g->mode) == mode)
             return vmode_g;
     }
     return NULL;