vgabios: Unify page size calculations; remove page size from vgamode_s.

[seabios.git] / vgasrc / stdvga.h

diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h
index 0d5f59b5d41158e79704fc2d9effb3ed1445a9ca..2aabf1bb0294481fe4592689c033c675b0c7e7c5 100644 (file)
--- a/vgasrc/stdvga.h
+++ b/vgasrc/stdvga.h
@@ -44,33 +44,15 @@
 #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;
+    u16 mode;
+    u8 memmodel;
+    u16 width;
+    u16 height;
+    u8 depth;
+    u8 cwidth;
     u8 cheight;
-    u8 pixbits;
     u16 sstart;
-    u16 slength;
 
     u8 pelmask;
     u8 *dac;
@@ -105,8 +87,6 @@ struct saveDACcolors {
     u8 color_select;
 };
 
-void stdvga_screen_disable(void);
-void stdvga_screen_enable(void);
 void stdvga_set_border_color(u8 color);
 void stdvga_set_overscan_border_color(u8 color);
 u8 stdvga_get_overscan_border_color(void);
@@ -124,11 +104,13 @@ void stdvga_set_pel_mask(u8 val);
 u8 stdvga_get_pel_mask(void);
 void stdvga_save_dac_state(u16 seg, struct saveDACcolors *info);
 void stdvga_restore_dac_state(u16 seg, struct saveDACcolors *info);
+void stdvga_perform_gray_scale_summing(u16 start, u16 count);
 void stdvga_sequ_write(u8 index, u8 value);
 void stdvga_grdc_write(u8 index, u8 value);
 void stdvga_set_text_block_specifier(u8 spec);
 void stdvga_load_font(u16 seg, void *src_far, u16 count
                       , u16 start, u8 destflags, u8 fontsize);
+u16 stdvga_get_crtc(void);
 void stdvga_set_cursor_shape(u8 start, u8 end);
 void stdvga_set_active_page(u16 address);
 void stdvga_set_cursor_pos(u16 address);
@@ -136,8 +118,8 @@ void stdvga_set_scan_lines(u8 lines);
 u16 stdvga_get_vde(void);
 void stdvga_save_state(u16 seg, struct saveVideoHardware *info);
 void stdvga_restore_state(u16 seg, struct saveVideoHardware *info);
-void stdvga_set_mode(struct vgamode_s *vmode_g);
+int stdvga_set_mode(int mode, int flags);
 void stdvga_enable_video_addressing(u8 disable);
-void stdvga_init(void);
+int stdvga_init(void);
 
 #endif // stdvga.h