Rename CONFIG_VBE in CONFIG_VGA_BOCHS and CONFIG_CIRRUS in CONFIG_VGA_CIRRUS

[seabios.git] / vgasrc / vgatables.h

diff --git a/vgasrc/vgatables.h b/vgasrc/vgatables.h
index 2eb0c71977138b90c88e1423dbdf91f06d5e610e..1f877c562630bd3fac580b2373790016491085f1 100644 (file)
--- a/vgasrc/vgatables.h
+++ b/vgasrc/vgatables.h
@@ -2,6 +2,7 @@
 #define __VGATABLES_H
 
 #include "types.h" // u8
+#include "farptr.h" // struct segoff_s
 
 /*
  *
@@ -123,10 +124,8 @@ struct saveBDAstate {
     u16 video_pagestart;
     u8 video_page;
     /* current font */
-    u16 font0_off;
-    u16 font0_seg;
-    u16 font1_off;
-    u16 font1_seg;
+    struct segoff_s font0;
+    struct segoff_s font1;
 };
 
 struct saveDACcolors {
@@ -164,17 +163,17 @@ void vgafb_scroll(int nblines, int attr
                   , struct cursorpos ul, struct cursorpos lr);
 void vgafb_write_char(struct cursorpos cp, struct carattr ca);
 struct carattr vgafb_read_char(struct cursorpos cp);
-void biosfn_write_pixel(u8 BH, u8 AL, u16 CX, u16 DX);
-void biosfn_read_pixel(u8 BH, u16 CX, u16 DX, u16 *AX);
+void vgafb_write_pixel(u8 color, u16 x, u16 y);
+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 vgahw_screen_enable();
+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();
+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);
@@ -186,31 +185,33 @@ 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();
+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 release_font_access();
+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();
+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 VideoParam_s *vparam_g);
 void vgahw_enable_video_addressing(u8 disable);
-void vgahw_init();
+void vgahw_init(void);
 
 // clext.c
 void cirrus_set_video_mode(u8 mode);
-void cirrus_init();
+void cirrus_init(void);
 
 // vbe.c -- not implemented yet.
 #define VBE_DISPI_DISABLED              0x00
 void dispi_set_enable(int enable);
-void vbe_init();
-int vbe_has_vbe_display();
+void bochs_init(void);
+int bochs_has_vbe_display(void);
 
 #endif // vgatables.h