vgabios: Move stdvga_set_mode() to stdvgamodes.c.

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

diff --git a/vgasrc/stdvga.c b/vgasrc/stdvga.c
index ed4dcd298a8ab15b6a3f64bc4296bff89b9c112e..dcc51a86dd226a5f27bb3aed620d5b94eea0a6d8 100644 (file)
--- a/vgasrc/stdvga.c
+++ b/vgasrc/stdvga.c
@@ -5,6 +5,7 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
+#include "vgabios.h" // struct vgamode_s
 #include "stdvga.h" // stdvga_init
 #include "ioport.h" // outb
 #include "farptr.h" // SET_FARVAR
@@ -327,7 +328,7 @@ stdvga_set_displaystart(struct vgamode_s *vmode_g, int val)
 
 
 /****************************************************************
- * Save/Restore/Set state
+ * Save/Restore state
  ****************************************************************/
 
 void
@@ -396,113 +397,11 @@ stdvga_restore_state(u16 seg, struct saveVideoHardware *info)
     outb(GET_FARVAR(seg, info->feature), crtc_addr - 0x4 + 0xa);
 }
 
-static void
-clear_screen(struct vgamode_s *vmode_g)
-{
-    switch (GET_GLOBAL(vmode_g->memmodel)) {
-    case MM_TEXT:
-        memset16_far(GET_GLOBAL(vmode_g->sstart), 0, 0x0720, 32*1024);
-        break;
-    case MM_CGA:
-        memset16_far(GET_GLOBAL(vmode_g->sstart), 0, 0x0000, 32*1024);
-        break;
-    default:
-        // XXX - old code gets/sets/restores sequ register 2 to 0xf -
-        // but it should always be 0xf anyway.
-        memset16_far(GET_GLOBAL(vmode_g->sstart), 0, 0x0000, 64*1024);
-    }
-}
-
-int
-stdvga_set_mode(struct vgamode_s *vmode_g, int flags)
-{
-    if (! stdvga_is_mode(vmode_g)) {
-        warn_internalerror();
-        return -1;
-    }
-    struct stdvga_mode_s *stdmode_g = container_of(
-        vmode_g, struct stdvga_mode_s, info);
-
-    // if palette loading (bit 3 of modeset ctl = 0)
-    if (!(flags & MF_NOPALETTE)) {    // Set the PEL mask
-        stdvga_pelmask_write(GET_GLOBAL(stdmode_g->pelmask));
-
-        // From which palette
-        u8 *palette_g = GET_GLOBAL(stdmode_g->dac);
-        u16 palsize = GET_GLOBAL(stdmode_g->dacsize) / 3;
-
-        // Always 256*3 values
-        stdvga_dac_write(get_global_seg(), palette_g, 0, palsize);
-        int i;
-        for (i = palsize; i < 0x0100; i++) {
-            static u8 rgb[3] VAR16;
-            stdvga_dac_write(get_global_seg(), rgb, i, 1);
-        }
-
-        if (flags & MF_GRAYSUM)
-            stdvga_perform_gray_scale_summing(0x00, 0x100);
-    }
-
-    // Set Attribute Ctl
-    u8 *regs = GET_GLOBAL(stdmode_g->actl_regs);
-    int i;
-    for (i = 0; i <= 0x13; i++)
-        stdvga_attr_write(i, GET_GLOBAL(regs[i]));
-    stdvga_attr_write(0x14, 0x00);
-
-    // Set Sequencer Ctl
-    stdvga_sequ_write(0x00, 0x03);
-    regs = GET_GLOBAL(stdmode_g->sequ_regs);
-    for (i = 1; i <= 4; i++)
-        stdvga_sequ_write(i, GET_GLOBAL(regs[i - 1]));
-
-    // Set Grafx Ctl
-    regs = GET_GLOBAL(stdmode_g->grdc_regs);
-    for (i = 0; i <= 8; i++)
-        stdvga_grdc_write(i, GET_GLOBAL(regs[i]));
-
-    // Set CRTC address VGA or MDA
-    u8 miscreg = GET_GLOBAL(stdmode_g->miscreg);
-    u16 crtc_addr = VGAREG_VGA_CRTC_ADDRESS;
-    if (!(miscreg & 1))
-        crtc_addr = VGAREG_MDA_CRTC_ADDRESS;
-
-    // Disable CRTC write protection
-    stdvga_crtc_write(crtc_addr, 0x11, 0x00);
-    // Set CRTC regs
-    regs = GET_GLOBAL(stdmode_g->crtc_regs);
-    for (i = 0; i <= 0x18; i++)
-        stdvga_crtc_write(crtc_addr, i, GET_GLOBAL(regs[i]));
-
-    // Set the misc register
-    stdvga_misc_write(miscreg);
-
-    // Enable video
-    stdvga_attrindex_write(0x20);
-
-    // Clear screen
-    if (!(flags & MF_NOCLEARMEM))
-        clear_screen(vmode_g);
-
-    // Write the fonts in memory
-    u8 memmodel = GET_GLOBAL(vmode_g->memmodel);
-    if (memmodel == MM_TEXT)
-        stdvga_load_font(get_global_seg(), vgafont16, 0x100, 0, 0, 16);
-
-    return 0;
-}
-
 
 /****************************************************************
  * Misc
  ****************************************************************/
 
-void
-stdvga_list_modes(u16 seg, u16 *dest, u16 *last)
-{
-    SET_FARVAR(seg, *dest, 0xffff);
-}
-
 void
 stdvga_enable_video_addressing(u8 disable)
 {

diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h
index 94b22ff4566e755ffe2c1e530fa3d5727fff1fdc..4933723b6f062089c867f9147a862ee782f5d0cf 100644 (file)
--- a/vgasrc/stdvga.h
+++ b/vgasrc/stdvga.h
@@ -2,7 +2,6 @@
 #define __STDVGA_H
 
 #include "types.h" // u8
-#include "vgabios.h" // struct vgamode_s
 
 // VGA registers
 #define VGAREG_ACTL_ADDRESS            0x3c0
@@ -45,20 +44,6 @@
 #define SEG_CTEXT 0xB800
 #define SEG_MTEXT 0xB000
 
-struct stdvga_mode_s {
-    u16 mode;
-    struct vgamode_s info;
-
-    u8 pelmask;
-    u8 *dac;
-    u16 dacsize;
-    u8 *sequ_regs;
-    u8 miscreg;
-    u8 *crtc_regs;
-    u8 *actl_regs;
-    u8 *grdc_regs;
-};
-
 struct saveVideoHardware {
     u8 sequ_index;
     u8 crtc_index;
@@ -84,9 +69,10 @@ struct saveDACcolors {
 
 // stdvgamodes.c
 struct vgamode_s *stdvga_find_mode(int mode);
-int stdvga_is_mode(struct vgamode_s *vmode_g);
+void stdvga_list_modes(u16 seg, u16 *dest, u16 *last);
 void stdvga_build_video_param(void);
 void stdvga_override_crtc(int mode, u8 *crtc);
+int stdvga_set_mode(struct vgamode_s *vmode_g, int flags);
 
 // stdvgaio.c
 u8 stdvga_pelmask_read(void);
@@ -142,9 +128,7 @@ int stdvga_get_displaystart(struct vgamode_s *vmode_g);
 int stdvga_set_displaystart(struct vgamode_s *vmode_g, int val);
 void stdvga_save_state(u16 seg, struct saveVideoHardware *info);
 void stdvga_restore_state(u16 seg, struct saveVideoHardware *info);
-int stdvga_set_mode(struct vgamode_s *vmode_g, int flags);
 void stdvga_enable_video_addressing(u8 disable);
-void stdvga_list_modes(u16 seg, u16 *dest, u16 *last);
 int stdvga_init(void);
 
 #endif // stdvga.h

diff --git a/vgasrc/stdvgaio.c b/vgasrc/stdvgaio.c
index 5591ad2097763f5655a6be0fb8edff8cac2b91b6..b370d1afb88d8cc0b3dde75eb9cdd13c5298e5b7 100644 (file)
--- a/vgasrc/stdvgaio.c
+++ b/vgasrc/stdvgaio.c
@@ -5,6 +5,7 @@
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
 #include "stdvga.h" // stdvga_pelmask_read
+#include "farptr.h" // GET_FARVAR
 #include "ioport.h" // inb
 
 u8

diff --git a/vgasrc/stdvgamodes.c b/vgasrc/stdvgamodes.c
index 1b47e98d103fe326be5e66bae6501620b5081ee4..5497da8f6b39adef86c5141ab7b8ea1434f9d243 100644 (file)
--- a/vgasrc/stdvgamodes.c
+++ b/vgasrc/stdvgamodes.c
@@ -256,6 +256,20 @@ static u8 crtc_6A[] VAR16 = {
 
 #define PAL(x) x, sizeof(x)
 
+struct stdvga_mode_s {
+    u16 mode;
+    struct vgamode_s info;
+
+    u8 pelmask;
+    u8 *dac;
+    u16 dacsize;
+    u8 *sequ_regs;
+    u8 miscreg;
+    u8 *crtc_regs;
+    u8 *actl_regs;
+    u8 *grdc_regs;
+};
+
 static struct stdvga_mode_s vga_modes[] VAR16 = {
     //mode { model       tx   ty bpp cw ch  sstart    }
     // pelm  dac            sequ     misc  crtc     actl     grdc
@@ -298,8 +312,8 @@ static struct stdvga_mode_s vga_modes[] VAR16 = {
  * Mode functions
  ****************************************************************/
 
-int
-stdvga_is_mode(struct vgamode_s *vmode_g)
+static int
+is_stdvga_mode(struct vgamode_s *vmode_g)
 {
     return (vmode_g >= &vga_modes[0].info
             && vmode_g <= &vga_modes[ARRAY_SIZE(vga_modes)-1].info);
@@ -317,6 +331,12 @@ stdvga_find_mode(int mode)
     return NULL;
 }
 
+void
+stdvga_list_modes(u16 seg, u16 *dest, u16 *last)
+{
+    SET_FARVAR(seg, *dest, 0xffff);
+}
+
 void
 stdvga_build_video_param(void)
 {
@@ -378,3 +398,99 @@ stdvga_override_crtc(int mode, u8 *crtc)
         vmode_g, struct stdvga_mode_s, info);
     SET_VGA(stdmode_g->crtc_regs, crtc);
 }
+
+static void
+clear_screen(struct vgamode_s *vmode_g)
+{
+    switch (GET_GLOBAL(vmode_g->memmodel)) {
+    case MM_TEXT:
+        memset16_far(GET_GLOBAL(vmode_g->sstart), 0, 0x0720, 32*1024);
+        break;
+    case MM_CGA:
+        memset16_far(GET_GLOBAL(vmode_g->sstart), 0, 0x0000, 32*1024);
+        break;
+    default:
+        // XXX - old code gets/sets/restores sequ register 2 to 0xf -
+        // but it should always be 0xf anyway.
+        memset16_far(GET_GLOBAL(vmode_g->sstart), 0, 0x0000, 64*1024);
+    }
+}
+
+int
+stdvga_set_mode(struct vgamode_s *vmode_g, int flags)
+{
+    if (! is_stdvga_mode(vmode_g)) {
+        warn_internalerror();
+        return -1;
+    }
+    struct stdvga_mode_s *stdmode_g = container_of(
+        vmode_g, struct stdvga_mode_s, info);
+
+    // if palette loading (bit 3 of modeset ctl = 0)
+    if (!(flags & MF_NOPALETTE)) {    // Set the PEL mask
+        stdvga_pelmask_write(GET_GLOBAL(stdmode_g->pelmask));
+
+        // From which palette
+        u8 *palette_g = GET_GLOBAL(stdmode_g->dac);
+        u16 palsize = GET_GLOBAL(stdmode_g->dacsize) / 3;
+
+        // Always 256*3 values
+        stdvga_dac_write(get_global_seg(), palette_g, 0, palsize);
+        int i;
+        for (i = palsize; i < 0x0100; i++) {
+            static u8 rgb[3] VAR16;
+            stdvga_dac_write(get_global_seg(), rgb, i, 1);
+        }
+
+        if (flags & MF_GRAYSUM)
+            stdvga_perform_gray_scale_summing(0x00, 0x100);
+    }
+
+    // Set Attribute Ctl
+    u8 *regs = GET_GLOBAL(stdmode_g->actl_regs);
+    int i;
+    for (i = 0; i <= 0x13; i++)
+        stdvga_attr_write(i, GET_GLOBAL(regs[i]));
+    stdvga_attr_write(0x14, 0x00);
+
+    // Set Sequencer Ctl
+    stdvga_sequ_write(0x00, 0x03);
+    regs = GET_GLOBAL(stdmode_g->sequ_regs);
+    for (i = 1; i <= 4; i++)
+        stdvga_sequ_write(i, GET_GLOBAL(regs[i - 1]));
+
+    // Set Grafx Ctl
+    regs = GET_GLOBAL(stdmode_g->grdc_regs);
+    for (i = 0; i <= 8; i++)
+        stdvga_grdc_write(i, GET_GLOBAL(regs[i]));
+
+    // Set CRTC address VGA or MDA
+    u8 miscreg = GET_GLOBAL(stdmode_g->miscreg);
+    u16 crtc_addr = VGAREG_VGA_CRTC_ADDRESS;
+    if (!(miscreg & 1))
+        crtc_addr = VGAREG_MDA_CRTC_ADDRESS;
+
+    // Disable CRTC write protection
+    stdvga_crtc_write(crtc_addr, 0x11, 0x00);
+    // Set CRTC regs
+    regs = GET_GLOBAL(stdmode_g->crtc_regs);
+    for (i = 0; i <= 0x18; i++)
+        stdvga_crtc_write(crtc_addr, i, GET_GLOBAL(regs[i]));
+
+    // Set the misc register
+    stdvga_misc_write(miscreg);
+
+    // Enable video
+    stdvga_attrindex_write(0x20);
+
+    // Clear screen
+    if (!(flags & MF_NOCLEARMEM))
+        clear_screen(vmode_g);
+
+    // Write the fonts in memory
+    u8 memmodel = GET_GLOBAL(vmode_g->memmodel);
+    if (memmodel == MM_TEXT)
+        stdvga_load_font(get_global_seg(), vgafont16, 0x100, 0, 0, 16);
+
+    return 0;
+}

diff --git a/vgasrc/vgafb.c b/vgasrc/vgafb.c
index f0bd71ef563dfadfee6db5bf3644eefbb8c31981..79e389f32172fa316c296f697124e41ffbe1112d 100644 (file)
--- a/vgasrc/vgafb.c
+++ b/vgasrc/vgafb.c
@@ -5,6 +5,7 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
+#include "vgabios.h" // vgafb_scroll
 #include "biosvar.h" // GET_BDA
 #include "util.h" // memset_far
 #include "stdvga.h" // stdvga_planar4_plane