Replace common segment/offset pairs with struct segoff_s.

[seabios.git] / vgasrc / vgatables.h

diff --git a/vgasrc/vgatables.h b/vgasrc/vgatables.h
index 03ea6133aff2b5d7af440d83a02b7fcdfb799936..e5f3309cc5e74d541c5937961de89bfd56a0259e 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
 
 /*
  *
@@ -49,15 +50,12 @@
 #define SEG_MTEXT 0xB000
 
 /*
- *
  * Tables of default values for each mode
- *
  */
-#define TEXT       0x00
-#define GRAPH      0x01
+#define TEXT       0x80
 
-#define CTEXT      0x00
-#define MTEXT      0x01
+#define CTEXT      (0x00 | TEXT)
+#define MTEXT      (0x01 | TEXT)
 #define CGA        0x02
 #define PLANAR1    0x03
 #define PLANAR4    0x04
@@ -69,14 +67,8 @@
 #define LINEAR24   0x12
 #define LINEAR32   0x13
 
-#define SCROLL_DOWN 0
-#define SCROLL_UP   1
-#define NO_ATTR     2
-#define WITH_ATTR   3
-
-#define SCREEN_SIZE(x,y) (((x*y*2)|0x00ff)+1)
-#define SCREEN_MEM_START(x,y,p) ((((x*y*2)|0x00ff)+1)*p)
-#define SCREEN_IO_START(x,y,p) ((((x*y)|0x00ff)+1)*p)
+#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))
 
 /* standard BIOS Video Parameter Table */
 struct VideoParam_s {
@@ -94,7 +86,6 @@ struct VideoParam_s {
 struct vgamode_s {
     u8 svgamode;
     struct VideoParam_s *vparam;
-    u8 class;       /* TEXT, GRAPH */
     u8 memmodel;    /* CTEXT,MTEXT,CGA,PL1,PL2,PL4,P8,P15,P16,P24,P32 */
     u8 pixbits;
     u16 sstart;
@@ -133,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 {
@@ -161,21 +150,23 @@ extern u8 vgafont14alt[];
 extern u8 vgafont16alt[];
 
 // vga.c
-u16 biosfn_get_cursor_pos(u8 page);
+struct carattr {
+    u8 car, attr, use_attr;
+};
+struct cursorpos {
+    u8 x, y, page;
+};
 
 // vgafb.c
 void clear_screen(struct vgamode_s *vmode_g);
-void biosfn_scroll(u8 nblines, u8 attr, u8 rul, u8 cul, u8 rlr, u8 clr
-                   , u8 page, u8 dir);
-void biosfn_write_char_attr(u8 car, u8 page, u8 attr, u16 count);
-void biosfn_write_char_only(u8 car, u8 page, u8 attr, u16 count);
-void biosfn_read_char_attr(u8 page, u16 *car);
-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 biosfn_load_text_user_pat(u16 ES, u16 BP, u16 CX, u16 DX, u8 BL, u8 BH);
-void biosfn_load_text_8_14_pat(u8 BL);
-void biosfn_load_text_8_8_pat(u8 BL);
-void biosfn_load_text_8_16_pat(u8 BL);
+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 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();
@@ -197,6 +188,8 @@ void vgahw_set_pel_mask(u8 val);
 u8 vgahw_get_pel_mask();
 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();