X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=vgasrc%2Fvgatables.h;h=e0d61c906da29eb66d9803914de485fd246e52be;hb=f1e217dc1885228cdb79586f1d3bde694758cbc1;hp=60794350a5bc00a874c4750f90f3551277004127;hpb=d3b381514a57a3c77dd05753ea9852fa6e80996c;p=seabios.git

diff --git a/vgasrc/vgatables.h b/vgasrc/vgatables.h
index 6079435..e0d61c9 100644
--- 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
 
 /*
  *
@@ -66,35 +67,27 @@
 #define LINEAR24   0x12
 #define LINEAR32   0x13
 
-#define SCROLL_DOWN 0
-#define SCROLL_UP   1
-
-#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)
-
-/* standard BIOS Video Parameter Table */
-struct VideoParam_s {
-    u8 twidth;
-    u8 theightm1;
-    u8 cheight;
-    u16 slength;
-    u8 sequ_regs[4];
-    u8 miscreg;
-    u8 crtc_regs[25];
-    u8 actl_regs[20];
-    u8 grdc_regs[9];
-} PACKED;
+#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;
-    struct VideoParam_s *vparam;
     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 {
@@ -127,10 +120,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 {
@@ -143,8 +134,8 @@ struct saveDACcolors {
 
 // vgatables.c
 struct vgamode_s *find_vga_entry(u8 mode);
-extern u16 video_save_pointer_table[];
-extern struct VideoParam_s video_param_table[];
+void build_video_param(void);
+extern struct VideoSavePointer_s video_save_pointer_table;
 extern u8 static_functionality[];
 
 // vgafonts.c
@@ -155,32 +146,32 @@ extern u8 vgafont14alt[];
 extern u8 vgafont16alt[];
 
 // vga.c
+#define SET_VGA(var, val) SET_FARVAR(get_global_seg(), (var), (val))
 struct carattr {
-    u8 car, attr;
-    u16 use_attr;
+    u8 car, attr, use_attr;
 };
 struct cursorpos {
     u8 x, y, page;
 };
-struct cursorpos get_cursor_pos(u8 page);
+void vga_set_mode(u8 mode, u8 noclearmem);
 
 // 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 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);
@@ -192,31 +183,43 @@ 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_set_mode(struct vgamode_s *vmode_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();
-
-// vbe.c -- not implemented yet.
-#define VBE_DISPI_DISABLED              0x00
-void dispi_set_enable(int enable);
-void vbe_init();
-int vbe_has_vbe_display();
+int cirrus_set_video_mode(u8 mode, u8 noclearmem);
+void cirrus_init(void);
+
+// vbe.c
+#define VBE_OEM_STRING "SeaBIOS VBE(C) 2011"
+#define VBE_VENDOR_STRING "SeaBIOS Developers"
+#define VBE_PRODUCT_STRING "SeaBIOS VBE Adapter"
+#define VBE_REVISION_STRING "Rev. 1"
+
+struct vbe_modeinfo
+{
+    u16 width;
+    u16 height;
+    u8 depth;
+    u16 linesize;
+    u32 phys_base;
+    u32 vram_size;
+};
 
 #endif // vgatables.h