vgabios: Rename vgaio.c to stdvga.c.

Also, introduce stdvga.h.

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

9 files changed, 151 insertions, 142 deletions

diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 9dd142b..3b5c711 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -4,6 +4,7 @@
 #include "util.h"
 #include "config.h" // CONFIG_*
 #include "biosvar.h" // SET_BDA
+#include "stdvga.h" // VGAREG_SEQU_ADDRESS
 
 static struct mode
 {
diff --git a/vgasrc/clext.c b/vgasrc/clext.c
index 40447ff..764d05b 100644
--- a/vgasrc/clext.c
+++ b/vgasrc/clext.c
@@ -10,6 +10,7 @@
 #include "util.h" // dprintf
 #include "bregs.h" // struct bregs
 #include "vbe.h" // struct vbe_info
+#include "stdvga.h" // VGAREG_SEQU_ADDRESS
 
 
 /****************************************************************
diff --git a/vgasrc/geodelx.c b/vgasrc/geodelx.c
index 1d58be0..4a5f873 100644
--- a/vgasrc/geodelx.c
+++ b/vgasrc/geodelx.c
@@ -15,6 +15,7 @@
 #include "config.h"
 #include "types.h"
 #include "bregs.h"
+#include "stdvga.h" // VGAREG_VGA_CRTC_ADDRESS
 
 
 /****************************************************************
diff --git a/vgasrc/vgaio.c b/vgasrc/stdvga.c
index bc4c968..1727fca 100644
--- a/vgasrc/vgaio.c
+++ b/vgasrc/stdvga.c
@@ -5,6 +5,7 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
+#include "stdvga.h" // vgahw_init
 #include "ioport.h" // outb
 #include "farptr.h" // SET_FARVAR
 #include "biosvar.h" // GET_BDA
diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h
new file mode 100644
index 0000000..53fe3cf
--- /dev/null
+++ b/vgasrc/stdvga.h
@@ -0,0 +1,143 @@
+#ifndef __STDVGA_H
+#define __STDVGA_H
+
+#include "types.h" // u8
+
+// VGA registers
+#define VGAREG_ACTL_ADDRESS            0x3c0
+#define VGAREG_ACTL_WRITE_DATA         0x3c0
+#define VGAREG_ACTL_READ_DATA          0x3c1
+
+#define VGAREG_INPUT_STATUS            0x3c2
+#define VGAREG_WRITE_MISC_OUTPUT       0x3c2
+#define VGAREG_VIDEO_ENABLE            0x3c3
+#define VGAREG_SEQU_ADDRESS            0x3c4
+#define VGAREG_SEQU_DATA               0x3c5
+
+#define VGAREG_PEL_MASK                0x3c6
+#define VGAREG_DAC_STATE               0x3c7
+#define VGAREG_DAC_READ_ADDRESS        0x3c7
+#define VGAREG_DAC_WRITE_ADDRESS       0x3c8
+#define VGAREG_DAC_DATA                0x3c9
+
+#define VGAREG_READ_FEATURE_CTL        0x3ca
+#define VGAREG_READ_MISC_OUTPUT        0x3cc
+
+#define VGAREG_GRDC_ADDRESS            0x3ce
+#define VGAREG_GRDC_DATA               0x3cf
+
+#define VGAREG_MDA_CRTC_ADDRESS        0x3b4
+#define VGAREG_MDA_CRTC_DATA           0x3b5
+#define VGAREG_VGA_CRTC_ADDRESS        0x3d4
+#define VGAREG_VGA_CRTC_DATA           0x3d5
+
+#define VGAREG_MDA_WRITE_FEATURE_CTL   0x3ba
+#define VGAREG_VGA_WRITE_FEATURE_CTL   0x3da
+#define VGAREG_ACTL_RESET              0x3da
+
+#define VGAREG_MDA_MODECTL             0x3b8
+#define VGAREG_CGA_MODECTL             0x3d8
+#define VGAREG_CGA_PALETTE             0x3d9
+
+/* Video memory */
+#define SEG_GRAPH 0xA000
+#define SEG_CTEXT 0xB800
+#define SEG_MTEXT 0xB000
+
+/*
+ * Tables of default values for each mode
+ */
+#define TEXT       0x80
+
+#define CTEXT      (0x00 | TEXT)
+#define MTEXT      (0x01 | TEXT)
+#define CGA        0x02
+#define PLANAR1    0x03
+#define PLANAR4    0x04
+#define LINEAR8    0x05
+
+// for SVGA
+#define LINEAR15   0x10
+#define LINEAR16   0x11
+#define LINEAR24   0x12
+#define LINEAR32   0x13
+
+struct vgamode_s {
+    u8 svgamode;
+    u8 memmodel;    /* CTEXT,MTEXT,CGA,PL1,PL2,PL4,P8,P15,P16,P24,P32 */
+    u8 twidth;
+    u8 theight;
+    u8 cheight;
+    u8 pixbits;
+    u16 sstart;
+    u16 slength;
+
+    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;
+    u8 grdc_index;
+    u8 actl_index;
+    u8 feature;
+    u8 sequ_regs[4];
+    u8 sequ0;
+    u8 crtc_regs[25];
+    u8 actl_regs[20];
+    u8 grdc_regs[9];
+    u16 crtc_addr;
+    u8 plane_latch[4];
+};
+
+struct saveDACcolors {
+    u8 rwmode;
+    u8 peladdr;
+    u8 pelmask;
+    u8 dac[768];
+    u8 color_select;
+};
+
+void vgahw_screen_disable(void);
+void vgahw_screen_enable(void);
+void vgahw_set_border_color(u8 color);
+void vgahw_set_overscan_border_color(u8 color);
+u8 vgahw_get_overscan_border_color(void);
+void vgahw_set_palette(u8 palid);
+void vgahw_set_single_palette_reg(u8 reg, u8 val);
+u8 vgahw_get_single_palette_reg(u8 reg);
+void vgahw_set_all_palette_reg(u16 seg, u8 *data_far);
+void vgahw_get_all_palette_reg(u16 seg, u8 *data_far);
+void vgahw_toggle_intensity(u8 flag);
+void vgahw_select_video_dac_color_page(u8 flag, u8 data);
+void vgahw_read_video_dac_state(u8 *pmode, u8 *curpage);
+void vgahw_set_dac_regs(u16 seg, u8 *data_far, u8 start, int count);
+void vgahw_get_dac_regs(u16 seg, u8 *data_far, u8 start, int count);
+void vgahw_set_pel_mask(u8 val);
+u8 vgahw_get_pel_mask(void);
+void vgahw_save_dac_state(u16 seg, struct saveDACcolors *info);
+void vgahw_restore_dac_state(u16 seg, struct saveDACcolors *info);
+void vgahw_sequ_write(u8 index, u8 value);
+void vgahw_grdc_write(u8 index, u8 value);
+void vgahw_set_text_block_specifier(u8 spec);
+void get_font_access(void);
+void release_font_access(void);
+void vgahw_set_cursor_shape(u8 start, u8 end);
+void vgahw_set_active_page(u16 address);
+void vgahw_set_cursor_pos(u16 address);
+void vgahw_set_scan_lines(u8 lines);
+u16 vgahw_get_vde(void);
+void vgahw_save_state(u16 seg, struct saveVideoHardware *info);
+void vgahw_restore_state(u16 seg, struct saveVideoHardware *info);
+void vgahw_set_mode(struct vgamode_s *vmode_g);
+void vgahw_enable_video_addressing(u8 disable);
+void vgahw_init(void);
+
+#endif // stdvga.h
diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c
index f1b84f9..3caff5f 100644
--- a/vgasrc/vgabios.c
+++ b/vgasrc/vgabios.c
@@ -17,6 +17,7 @@
 #include "vgabios.h" // find_vga_entry
 #include "optionroms.h" // struct pci_data
 #include "config.h" // CONFIG_*
+#include "stdvga.h" // vgahw_screen_disable
 #include "geodelx.h" // geodelx_init
 #include "bochsvga.h" // bochsvga_init
 
diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h
index 568e276..5cf1f04 100644
--- a/vgasrc/vgabios.h
+++ b/vgasrc/vgabios.h
@@ -4,107 +4,9 @@
 #include "types.h" // u8
 #include "farptr.h" // struct segoff_s
 
-/*
- *
- * VGA registers
- *
- */
-#define VGAREG_ACTL_ADDRESS            0x3c0
-#define VGAREG_ACTL_WRITE_DATA         0x3c0
-#define VGAREG_ACTL_READ_DATA          0x3c1
-
-#define VGAREG_INPUT_STATUS            0x3c2
-#define VGAREG_WRITE_MISC_OUTPUT       0x3c2
-#define VGAREG_VIDEO_ENABLE            0x3c3
-#define VGAREG_SEQU_ADDRESS            0x3c4
-#define VGAREG_SEQU_DATA               0x3c5
-
-#define VGAREG_PEL_MASK                0x3c6
-#define VGAREG_DAC_STATE               0x3c7
-#define VGAREG_DAC_READ_ADDRESS        0x3c7
-#define VGAREG_DAC_WRITE_ADDRESS       0x3c8
-#define VGAREG_DAC_DATA                0x3c9
-
-#define VGAREG_READ_FEATURE_CTL        0x3ca
-#define VGAREG_READ_MISC_OUTPUT        0x3cc
-
-#define VGAREG_GRDC_ADDRESS            0x3ce
-#define VGAREG_GRDC_DATA               0x3cf
-
-#define VGAREG_MDA_CRTC_ADDRESS        0x3b4
-#define VGAREG_MDA_CRTC_DATA           0x3b5
-#define VGAREG_VGA_CRTC_ADDRESS        0x3d4
-#define VGAREG_VGA_CRTC_DATA           0x3d5
-
-#define VGAREG_MDA_WRITE_FEATURE_CTL   0x3ba
-#define VGAREG_VGA_WRITE_FEATURE_CTL   0x3da
-#define VGAREG_ACTL_RESET              0x3da
-
-#define VGAREG_MDA_MODECTL             0x3b8
-#define VGAREG_CGA_MODECTL             0x3d8
-#define VGAREG_CGA_PALETTE             0x3d9
-
-/* Video memory */
-#define SEG_GRAPH 0xA000
-#define SEG_CTEXT 0xB800
-#define SEG_MTEXT 0xB000
-
-/*
- * Tables of default values for each mode
- */
-#define TEXT       0x80
-
-#define CTEXT      (0x00 | TEXT)
-#define MTEXT      (0x01 | TEXT)
-#define CGA        0x02
-#define PLANAR1    0x03
-#define PLANAR4    0x04
-#define LINEAR8    0x05
-
-// for SVGA
-#define LINEAR15   0x10
-#define LINEAR16   0x11
-#define LINEAR24   0x12
-#define LINEAR32   0x13
-
 #define SCREEN_IO_START(x,y,p) (((((x)*(y)) | 0x00ff) + 1) * (p))
 #define SCREEN_MEM_START(x,y,p) SCREEN_IO_START(((x)*2),(y),(p))
 
-struct vgamode_s {
-    u8 svgamode;
-    u8 memmodel;    /* CTEXT,MTEXT,CGA,PL1,PL2,PL4,P8,P15,P16,P24,P32 */
-    u8 twidth;
-    u8 theight;
-    u8 cheight;
-    u8 pixbits;
-    u16 sstart;
-    u16 slength;
-
-    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;
-    u8 grdc_index;
-    u8 actl_index;
-    u8 feature;
-    u8 sequ_regs[4];
-    u8 sequ0;
-    u8 crtc_regs[25];
-    u8 actl_regs[20];
-    u8 grdc_regs[9];
-    u16 crtc_addr;
-    u8 plane_latch[4];
-};
-
 struct saveBDAstate {
     u8 video_mode;
     u16 video_cols;
@@ -124,15 +26,8 @@ struct saveBDAstate {
     struct segoff_s font1;
 };
 
-struct saveDACcolors {
-    u8 rwmode;
-    u8 peladdr;
-    u8 pelmask;
-    u8 dac[768];
-    u8 color_select;
-};
-
 // vgatables.c
+struct vgamode_s;
 struct vgamode_s *find_vga_entry(u8 mode);
 void build_video_param(void);
 extern struct VideoSavePointer_s video_save_pointer_table;
@@ -166,42 +61,6 @@ u8 vgafb_read_pixel(u16 x, u16 y);
 void vgafb_load_font(u16 seg, void *src_far, u16 count
                      , u16 start, u8 destflags, u8 fontsize);
 
-// vgaio.c
-void vgahw_screen_disable(void);
-void vgahw_screen_enable(void);
-void vgahw_set_border_color(u8 color);
-void vgahw_set_overscan_border_color(u8 color);
-u8 vgahw_get_overscan_border_color(void);
-void vgahw_set_palette(u8 palid);
-void vgahw_set_single_palette_reg(u8 reg, u8 val);
-u8 vgahw_get_single_palette_reg(u8 reg);
-void vgahw_set_all_palette_reg(u16 seg, u8 *data_far);
-void vgahw_get_all_palette_reg(u16 seg, u8 *data_far);
-void vgahw_toggle_intensity(u8 flag);
-void vgahw_select_video_dac_color_page(u8 flag, u8 data);
-void vgahw_read_video_dac_state(u8 *pmode, u8 *curpage);
-void vgahw_set_dac_regs(u16 seg, u8 *data_far, u8 start, int count);
-void vgahw_get_dac_regs(u16 seg, u8 *data_far, u8 start, int count);
-void vgahw_set_pel_mask(u8 val);
-u8 vgahw_get_pel_mask(void);
-void vgahw_save_dac_state(u16 seg, struct saveDACcolors *info);
-void vgahw_restore_dac_state(u16 seg, struct saveDACcolors *info);
-void vgahw_sequ_write(u8 index, u8 value);
-void vgahw_grdc_write(u8 index, u8 value);
-void vgahw_set_text_block_specifier(u8 spec);
-void get_font_access(void);
-void release_font_access(void);
-void vgahw_set_cursor_shape(u8 start, u8 end);
-void vgahw_set_active_page(u16 address);
-void vgahw_set_cursor_pos(u16 address);
-void vgahw_set_scan_lines(u8 lines);
-u16 vgahw_get_vde(void);
-void vgahw_save_state(u16 seg, struct saveVideoHardware *info);
-void vgahw_restore_state(u16 seg, struct saveVideoHardware *info);
-void vgahw_set_mode(struct vgamode_s *vmode_g);
-void vgahw_enable_video_addressing(u8 disable);
-void vgahw_init(void);
-
 // clext.c
 int cirrus_set_video_mode(u8 mode, u8 noclearmem);
 void cirrus_init(void);
diff --git a/vgasrc/vgafb.c b/vgasrc/vgafb.c
index f85cd28..3838303 100644
--- a/vgasrc/vgafb.c
+++ b/vgasrc/vgafb.c
@@ -8,6 +8,7 @@
 #include "biosvar.h" // GET_BDA
 #include "util.h" // memset_far
 #include "vgabios.h" // find_vga_entry
+#include "stdvga.h" // vgahw_grdc_write
 
 
 /****************************************************************
diff --git a/vgasrc/vgatables.c b/vgasrc/vgatables.c
index 90ffa89..0eda104 100644
--- a/vgasrc/vgatables.c
+++ b/vgasrc/vgatables.c
@@ -8,6 +8,7 @@
 #include "vgabios.h" // struct VideoParamTableEntry_s
 #include "biosvar.h" // GET_GLOBAL
 #include "util.h" // memcpy_far
+#include "stdvga.h" // struct vgamode_s
 
 
 /****************************************************************