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

[seabios.git] / vgasrc / vgafb.c

diff --git a/vgasrc/vgafb.c b/vgasrc/vgafb.c
index 38ed07040d8c03b820f1452694082c254ecef5d0..eb4ced8f7734328a88088ea67bc70043a1c3e1f3 100644 (file)
--- a/vgasrc/vgafb.c
+++ b/vgasrc/vgafb.c
@@ -41,16 +41,17 @@ static void
 scroll_pl4(struct vgamode_s *vmode_g, int nblines, int attr
            , struct cursorpos ul, struct cursorpos lr)
 {
-    u8 cheight = GET_GLOBAL(vmode_g->cheight);
-    int stride = GET_BDA(video_cols);
+    int cheight = GET_GLOBAL(vmode_g->cheight);
+    int cwidth = 1;
+    int stride = GET_BDA(video_cols) * cwidth;
     void *src_far, *dest_far;
     if (nblines >= 0) {
-        dest_far = (void*)(ul.y * cheight * stride + ul.x);
+        dest_far = (void*)(ul.y * cheight * stride + ul.x * cwidth);
         src_far = dest_far + nblines * cheight * stride;
     } else {
         // Scroll down
         nblines = -nblines;
-        dest_far = (void*)(lr.y * cheight * stride + ul.x);
+        dest_far = (void*)(lr.y * cheight * stride + ul.x * cwidth);
         src_far = dest_far - nblines * cheight * stride;
         stride = -stride;
     }
@@ -58,13 +59,14 @@ scroll_pl4(struct vgamode_s *vmode_g, int nblines, int attr
     int rows = lr.y - ul.y + 1;
     if (nblines < rows) {
         stdvga_grdc_write(0x05, 0x01);
-        dest_far = memcpy_stride(SEG_GRAPH, dest_far, src_far, cols, stride
-                                 , (rows - nblines) * cheight);
+        dest_far = memcpy_stride(SEG_GRAPH, dest_far, src_far, cols * cwidth
+                                 , stride, (rows - nblines) * cheight);
     }
     if (attr < 0)
         attr = 0;
     stdvga_grdc_write(0x05, 0x02);
-    memset_stride(SEG_GRAPH, dest_far, attr, cols, stride, nblines * cheight);
+    memset_stride(SEG_GRAPH, dest_far, attr, cols * cwidth
+                  , stride, nblines * cheight);
     stdvga_grdc_write(0x05, 0x00);
 }
 
@@ -72,64 +74,96 @@ static void
 scroll_cga(struct vgamode_s *vmode_g, int nblines, int attr
             , struct cursorpos ul, struct cursorpos lr)
 {
-    u8 cheight = GET_GLOBAL(vmode_g->cheight);
-    u8 bpp = GET_GLOBAL(vmode_g->pixbits);
-    int stride = GET_BDA(video_cols) * bpp;
+    int cheight = GET_GLOBAL(vmode_g->cheight) / 2;
+    int cwidth = GET_GLOBAL(vmode_g->depth);
+    int stride = GET_BDA(video_cols) * cwidth;
     void *src_far, *dest_far;
     if (nblines >= 0) {
-        dest_far = (void*)(ul.y * cheight * stride + ul.x * bpp);
+        dest_far = (void*)(ul.y * cheight * stride + ul.x * cwidth);
         src_far = dest_far + nblines * cheight * stride;
     } else {
         // Scroll down
         nblines = -nblines;
-        dest_far = (void*)(lr.y * cheight * stride + ul.x * bpp);
+        dest_far = (void*)(lr.y * cheight * stride + ul.x * cwidth);
         src_far = dest_far - nblines * cheight * stride;
         stride = -stride;
     }
-    int cols = (lr.x - ul.x + 1) * bpp;
+    int cols = lr.x - ul.x + 1;
     int rows = lr.y - ul.y + 1;
     if (nblines < rows) {
-        memcpy_stride(SEG_CTEXT, dest_far + 0x2000, src_far + 0x2000, cols
-                      , stride, (rows - nblines) * cheight / 2);
-        dest_far = memcpy_stride(SEG_CTEXT, dest_far, src_far, cols
-                                 , stride, (rows - nblines) * cheight / 2);
+        memcpy_stride(SEG_CTEXT, dest_far+0x2000, src_far+0x2000, cols * cwidth
+                      , stride, (rows - nblines) * cheight);
+        dest_far = memcpy_stride(SEG_CTEXT, dest_far, src_far, cols * cwidth
+                                 , stride, (rows - nblines) * cheight);
     }
     if (attr < 0)
         attr = 0;
-    memset_stride(SEG_CTEXT, dest_far + 0x2000, attr, cols
-                  , stride, nblines * cheight / 2);
-    memset_stride(SEG_CTEXT, dest_far, attr, cols
-                  , stride, nblines * cheight / 2);
+    memset_stride(SEG_CTEXT, dest_far + 0x2000, attr, cols * cwidth
+                  , stride, nblines * cheight);
+    memset_stride(SEG_CTEXT, dest_far, attr, cols * cwidth
+                  , stride, nblines * cheight);
+}
+
+static void
+scroll_lin(struct vgamode_s *vmode_g, int nblines, int attr
+           , struct cursorpos ul, struct cursorpos lr)
+{
+    int cheight = 8;
+    int cwidth = 8;
+    int stride = GET_BDA(video_cols) * cwidth;
+    void *src_far, *dest_far;
+    if (nblines >= 0) {
+        dest_far = (void*)(ul.y * cheight * stride + ul.x * cwidth);
+        src_far = dest_far + nblines * cheight * stride;
+    } else {
+        // Scroll down
+        nblines = -nblines;
+        dest_far = (void*)(lr.y * cheight * stride + ul.x * cwidth);
+        src_far = dest_far - nblines * cheight * stride;
+        stride = -stride;
+    }
+    int cols = lr.x - ul.x + 1;
+    int rows = lr.y - ul.y + 1;
+    if (nblines < rows)
+        dest_far = memcpy_stride(SEG_GRAPH, dest_far, src_far, cols * cwidth
+                                 , stride, (rows - nblines) * cheight);
+    if (attr < 0)
+        attr = 0;
+    memset_stride(SEG_GRAPH, dest_far, attr, cols * cwidth
+                  , stride, nblines * cheight);
 }
 
 static void
 scroll_text(struct vgamode_s *vmode_g, int nblines, int attr
             , struct cursorpos ul, struct cursorpos lr)
 {
+    int cheight = 1;
+    int cwidth = 2;
     u16 nbrows = GET_BDA(video_rows) + 1;
     u16 nbcols = GET_BDA(video_cols);
+    int stride = nbcols * cwidth;
     void *src_far, *dest_far = (void*)SCREEN_MEM_START(nbcols, nbrows, ul.page);
-    int stride = nbcols * 2;
     if (nblines >= 0) {
-        dest_far += ul.y * stride + ul.x * 2;
-        src_far = dest_far + nblines * stride;
+        dest_far += ul.y * cheight * stride + ul.x * cwidth;
+        src_far = dest_far + nblines * cheight * stride;
     } else {
         // Scroll down
         nblines = -nblines;
-        dest_far += lr.y * stride + ul.x * 2;
-        src_far = dest_far - nblines * stride;
+        dest_far += lr.y * cheight * stride + ul.x * cwidth;
+        src_far = dest_far - nblines * cheight * stride;
         stride = -stride;
     }
-    int cols = (lr.x - ul.x + 1) * 2;
+    int cols = lr.x - ul.x + 1;
     int rows = lr.y - ul.y + 1;
     u16 seg = GET_GLOBAL(vmode_g->sstart);
     if (nblines < rows)
-        dest_far = memcpy_stride(seg, dest_far, src_far, cols, stride
-                                 , (rows - nblines));
+        dest_far = memcpy_stride(seg, dest_far, src_far, cols * cwidth
+                                 , stride, (rows - nblines) * cheight);
     if (attr < 0)
         attr = 0x07;
     attr = (attr << 8) | ' ';
-    memset16_stride(seg, dest_far, attr, cols, stride, nblines);
+    memset16_stride(seg, dest_far, attr, cols * cwidth
+                    , stride, nblines * cheight);
 }
 
 void
@@ -142,19 +176,19 @@ vgafb_scroll(int nblines, int attr, struct cursorpos ul, struct cursorpos lr)
 
     // FIXME gfx mode not complete
     switch (GET_GLOBAL(vmode_g->memmodel)) {
-    case CTEXT:
-    case MTEXT:
+    case MM_TEXT:
         scroll_text(vmode_g, nblines, attr, ul, lr);
         break;
-    case PLANAR4:
-    case PLANAR1:
+    case MM_PLANAR:
         scroll_pl4(vmode_g, nblines, attr, ul, lr);
         break;
-    case CGA:
+    case MM_CGA:
         scroll_cga(vmode_g, nblines, attr, ul, lr);
         break;
-    default:
-        dprintf(1, "Scroll in graphics mode\n");
+    case MM_DIRECT:
+    case MM_PACKED:
+        scroll_lin(vmode_g, nblines, attr, ul, lr);
+        break;
     }
 }
 
@@ -198,7 +232,7 @@ write_gfx_char_pl4(struct vgamode_s *vmode_g
         for (j = 0; j < 8; j++) {
             u8 mask = 0x80 >> j;
             stdvga_grdc_write(0x08, mask);
-            GET_FARVAR(SEG_GRAPH, *dest_far);
+            GET_FARVAR(SEG_GRAPH, *(volatile u8*)dest_far);
             if (GET_GLOBAL(fdata_g[src + i]) & mask)
                 SET_FARVAR(SEG_GRAPH, *dest_far, ca.attr & 0x0f);
             else
@@ -219,7 +253,7 @@ write_gfx_char_cga(struct vgamode_s *vmode_g
         return;
 
     u8 *fdata_g = vgafont8;
-    u8 bpp = GET_GLOBAL(vmode_g->pixbits);
+    u8 bpp = GET_GLOBAL(vmode_g->depth);
     u16 addr = (cp.x * bpp) + cp.y * 320;
     u16 src = ca.car * 8;
     u8 i;
@@ -322,18 +356,17 @@ vgafb_write_char(struct cursorpos cp, struct carattr ca)
 
     // FIXME gfx mode not complete
     switch (GET_GLOBAL(vmode_g->memmodel)) {
-    case CTEXT:
-    case MTEXT:
+    case MM_TEXT:
         write_text_char(vmode_g, cp, ca);
         break;
-    case PLANAR4:
-    case PLANAR1:
+    case MM_PLANAR:
         write_gfx_char_pl4(vmode_g, cp, ca);
         break;
-    case CGA:
+    case MM_CGA:
         write_gfx_char_cga(vmode_g, cp, ca);
         break;
-    case LINEAR8:
+    case MM_DIRECT:
+    case MM_PACKED:
         write_gfx_char_lin(vmode_g, cp, ca);
         break;
     }
@@ -347,7 +380,7 @@ vgafb_read_char(struct cursorpos cp)
     if (!vmode_g)
         goto fail;
 
-    if (!(GET_GLOBAL(vmode_g->memmodel) & TEXT)) {
+    if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) {
         // FIXME gfx mode
         dprintf(1, "Read char in graphics mode\n");
         goto fail;
@@ -381,18 +414,15 @@ vgafb_write_pixel(u8 color, u16 x, u16 y)
     struct vgamode_s *vmode_g = find_vga_entry(GET_BDA(video_mode));
     if (!vmode_g)
         return;
-    if (GET_GLOBAL(vmode_g->memmodel) & TEXT)
-        return;
 
     u8 *addr_far, mask, attr, data;
     switch (GET_GLOBAL(vmode_g->memmodel)) {
-    case PLANAR4:
-    case PLANAR1:
+    case MM_PLANAR:
         addr_far = (void*)(x / 8 + y * GET_BDA(video_cols));
         mask = 0x80 >> (x & 0x07);
         stdvga_grdc_write(0x08, mask);
         stdvga_grdc_write(0x05, 0x02);
-        data = GET_FARVAR(SEG_GRAPH, *addr_far);
+        GET_FARVAR(SEG_GRAPH, *(volatile u8*)addr_far);
         if (color & 0x80)
             stdvga_grdc_write(0x03, 0x18);
         SET_FARVAR(SEG_GRAPH, *addr_far, color);
@@ -400,15 +430,15 @@ vgafb_write_pixel(u8 color, u16 x, u16 y)
         stdvga_grdc_write(0x05, 0x00);
         stdvga_grdc_write(0x03, 0x00);
         break;
-    case CGA:
-        if (GET_GLOBAL(vmode_g->pixbits) == 2)
+    case MM_CGA:
+        if (GET_GLOBAL(vmode_g->depth) == 2)
             addr_far = (void*)((x >> 2) + (y >> 1) * 80);
         else
             addr_far = (void*)((x >> 3) + (y >> 1) * 80);
         if (y & 1)
             addr_far += 0x2000;
         data = GET_FARVAR(SEG_CTEXT, *addr_far);
-        if (GET_GLOBAL(vmode_g->pixbits) == 2) {
+        if (GET_GLOBAL(vmode_g->depth) == 2) {
             attr = (color & 0x03) << ((3 - (x & 0x03)) * 2);
             mask = 0x03 << ((3 - (x & 0x03)) * 2);
         } else {
@@ -423,10 +453,13 @@ vgafb_write_pixel(u8 color, u16 x, u16 y)
         }
         SET_FARVAR(SEG_CTEXT, *addr_far, data);
         break;
-    case LINEAR8:
+    case MM_DIRECT:
+    case MM_PACKED:
         addr_far = (void*)(x + y * (GET_BDA(video_cols) * 8));
         SET_FARVAR(SEG_GRAPH, *addr_far, color);
         break;
+    case MM_TEXT:
+        return;
     }
 }
 
@@ -437,13 +470,10 @@ vgafb_read_pixel(u16 x, u16 y)
     struct vgamode_s *vmode_g = find_vga_entry(GET_BDA(video_mode));
     if (!vmode_g)
         return 0;
-    if (GET_GLOBAL(vmode_g->memmodel) & TEXT)
-        return 0;
 
     u8 *addr_far, mask, attr=0, data, i;
     switch (GET_GLOBAL(vmode_g->memmodel)) {
-    case PLANAR4:
-    case PLANAR1:
+    case MM_PLANAR:
         addr_far = (void*)(x / 8 + y * GET_BDA(video_cols));
         mask = 0x80 >> (x & 0x07);
         attr = 0x00;
@@ -454,20 +484,23 @@ vgafb_read_pixel(u16 x, u16 y)
                 attr |= (0x01 << i);
         }
         break;
-    case CGA:
+    case MM_CGA:
         addr_far = (void*)((x >> 2) + (y >> 1) * 80);
         if (y & 1)
             addr_far += 0x2000;
         data = GET_FARVAR(SEG_CTEXT, *addr_far);
-        if (GET_GLOBAL(vmode_g->pixbits) == 2)
+        if (GET_GLOBAL(vmode_g->depth) == 2)
             attr = (data >> ((3 - (x & 0x03)) * 2)) & 0x03;
         else
             attr = (data >> (7 - (x & 0x07))) & 0x01;
         break;
-    case LINEAR8:
+    case MM_DIRECT:
+    case MM_PACKED:
         addr_far = (void*)(x + y * (GET_BDA(video_cols) * 8));
         attr = GET_FARVAR(SEG_GRAPH, *addr_far);
         break;
+    case MM_TEXT:
+        return 0;
     }
     return attr;
 }