From: Kevin O'Connor Date: Sun, 15 Jan 2012 04:15:40 +0000 (-0500) Subject: vgabios: Move video_param_table definition to vgabios.c. X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=seabios.git;a=commitdiff_plain;h=aad3b695b782534908bfce0f0f60314cb4ea3694 vgabios: Move video_param_table definition to vgabios.c. Signed-off-by: Kevin O'Connor --- diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h index abda606..0beb345 100644 --- a/vgasrc/stdvga.h +++ b/vgasrc/stdvga.h @@ -84,6 +84,7 @@ struct saveDACcolors { // vgatables.c struct vgamode_s *stdvga_find_mode(int mode); +void stdvga_build_video_param(void); // stdvgaio.c u8 stdvga_pelmask_read(void); diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index cd39cf1..449f3c4 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -25,6 +25,20 @@ #define DEBUG_VGA_POST 1 #define DEBUG_VGA_10 3 +// Standard Video Save Pointer Table +struct VideoSavePointer_s { + struct segoff_s videoparam; + struct segoff_s paramdynamicsave; + struct segoff_s textcharset; + struct segoff_s graphcharset; + struct segoff_s secsavepointer; + u8 reserved[8]; +} PACKED; + +static struct VideoSavePointer_s video_save_pointer_table VAR16; + +struct VideoParam_s video_param_table[29] VAR16; + /**************************************************************** * PCI Data @@ -1229,7 +1243,9 @@ vga_post(struct bregs *regs) init_bios_area(); - build_video_param(); + SET_VGA(video_save_pointer_table.videoparam + , SEGOFF(get_global_seg(), (u32)video_param_table)); + stdvga_build_video_param(); extern void entry_10(void); SET_IVT(0x10, SEGOFF(get_global_seg(), (u32)entry_10)); diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h index 3f86146..a10198d 100644 --- a/vgasrc/vgabios.h +++ b/vgasrc/vgabios.h @@ -4,6 +4,21 @@ #include "types.h" // u8 #include "farptr.h" // struct segoff_s +// 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; + +extern struct VideoParam_s video_param_table[29]; + struct saveBDAstate { u8 video_mode; u16 video_cols; @@ -50,10 +65,6 @@ struct vgamode_s { u16 sstart; }; -// vgatables.c -void build_video_param(void); -extern struct VideoSavePointer_s video_save_pointer_table; - // vgafonts.c extern u8 vgafont8[]; extern u8 vgafont14[]; diff --git a/vgasrc/vgatables.c b/vgasrc/vgatables.c index 11e20e4..4a5350d 100644 --- a/vgasrc/vgatables.c +++ b/vgasrc/vgatables.c @@ -8,97 +8,11 @@ #include "vgabios.h" // struct VideoParamTableEntry_s #include "biosvar.h" // GET_GLOBAL #include "util.h" // memcpy_far -#include "stdvga.h" // struct vgamode_s +#include "stdvga.h" // stdvga_find_mode /**************************************************************** - * Video parameter table - ****************************************************************/ - -// Standard Video Save Pointer Table -struct VideoSavePointer_s { - struct segoff_s videoparam; - struct segoff_s paramdynamicsave; - struct segoff_s textcharset; - struct segoff_s graphcharset; - struct segoff_s secsavepointer; - u8 reserved[8]; -} PACKED; - -struct VideoSavePointer_s video_save_pointer_table VAR16; - -// 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; - -struct VideoParam_s video_param_table[29] VAR16; - -void -build_video_param(void) -{ - static u8 parammodes[ARRAY_SIZE(video_param_table)] VAR16 = { - 0, 0, 0, 0, 0x04, 0x05, 0x06, 0x07, - 0, 0, 0, 0, 0, 0x0d, 0x0e, 0, - 0, 0x0f, 0x10, 0, 0, 0, 0, 0x01, - 0x03, 0x07, 0x11, 0x12, 0x13 - }; - - int i; - for (i=0; iwidth); - int height = GET_GLOBAL(vmode_g->height); - u8 memmodel = GET_GLOBAL(vmode_g->memmodel); - int cheight = GET_GLOBAL(vmode_g->cheight); - if (memmodel == MM_TEXT) { - SET_VGA(vparam_g->twidth, width); - SET_VGA(vparam_g->theightm1, height-1); - } else { - int cwidth = GET_GLOBAL(vmode_g->cwidth); - SET_VGA(vparam_g->twidth, width / cwidth); - SET_VGA(vparam_g->theightm1, (height / cheight) - 1); - } - SET_VGA(vparam_g->cheight, cheight); - SET_VGA(vparam_g->slength, calc_page_size(memmodel, width, height)); - struct stdvga_mode_s *stdmode_g = container_of( - vmode_g, struct stdvga_mode_s, info); - memcpy_far(get_global_seg(), vparam_g->sequ_regs - , get_global_seg(), GET_GLOBAL(stdmode_g->sequ_regs) - , ARRAY_SIZE(vparam_g->sequ_regs)); - SET_VGA(vparam_g->miscreg, GET_GLOBAL(stdmode_g->miscreg)); - memcpy_far(get_global_seg(), vparam_g->crtc_regs - , get_global_seg(), GET_GLOBAL(stdmode_g->crtc_regs) - , ARRAY_SIZE(vparam_g->crtc_regs)); - memcpy_far(get_global_seg(), vparam_g->actl_regs - , get_global_seg(), GET_GLOBAL(stdmode_g->actl_regs) - , ARRAY_SIZE(vparam_g->actl_regs)); - memcpy_far(get_global_seg(), vparam_g->grdc_regs - , get_global_seg(), GET_GLOBAL(stdmode_g->grdc_regs) - , ARRAY_SIZE(vparam_g->grdc_regs)); - } - - SET_VGA(video_save_pointer_table.videoparam - , SEGOFF(get_global_seg(), (u32)video_param_table)); -} - - -/**************************************************************** - * Register definitions + * Video mode register definitions ****************************************************************/ /* Mono */ @@ -340,13 +254,7 @@ static u8 crtc_6A[] VAR16 = { 0x59, 0x8d, 0x57, 0x32, 0x00, 0x57, 0x73, 0xe3, 0xff }; - -/**************************************************************** - * Video mode list - ****************************************************************/ - #define PAL(x) x, sizeof(x) -#define VPARAM(x) &video_param_table[x] static struct stdvga_mode_s vga_modes[] VAR16 = { //mode { model tx ty bpp cw ch sstart } @@ -385,6 +293,11 @@ static struct stdvga_mode_s vga_modes[] VAR16 = { , 0xFF, PAL(palette2), sequ_0e, 0xe3, crtc_6A, actl_10, grdc_0d}, }; + +/**************************************************************** + * Mode functions + ****************************************************************/ + struct vgamode_s * stdvga_find_mode(int mode) { @@ -396,3 +309,54 @@ stdvga_find_mode(int mode) } return NULL; } + +void +stdvga_build_video_param(void) +{ + static u8 parammodes[] VAR16 = { + 0, 0, 0, 0, 0x04, 0x05, 0x06, 0x07, + 0, 0, 0, 0, 0, 0x0d, 0x0e, 0, + 0, 0x0f, 0x10, 0, 0, 0, 0, 0x01, + 0x03, 0x07, 0x11, 0x12, 0x13 + }; + + int i; + for (i=0; iwidth); + int height = GET_GLOBAL(vmode_g->height); + u8 memmodel = GET_GLOBAL(vmode_g->memmodel); + int cheight = GET_GLOBAL(vmode_g->cheight); + if (memmodel == MM_TEXT) { + SET_VGA(vparam_g->twidth, width); + SET_VGA(vparam_g->theightm1, height-1); + } else { + int cwidth = GET_GLOBAL(vmode_g->cwidth); + SET_VGA(vparam_g->twidth, width / cwidth); + SET_VGA(vparam_g->theightm1, (height / cheight) - 1); + } + SET_VGA(vparam_g->cheight, cheight); + SET_VGA(vparam_g->slength, calc_page_size(memmodel, width, height)); + struct stdvga_mode_s *stdmode_g = container_of( + vmode_g, struct stdvga_mode_s, info); + memcpy_far(get_global_seg(), vparam_g->sequ_regs + , get_global_seg(), GET_GLOBAL(stdmode_g->sequ_regs) + , ARRAY_SIZE(vparam_g->sequ_regs)); + SET_VGA(vparam_g->miscreg, GET_GLOBAL(stdmode_g->miscreg)); + memcpy_far(get_global_seg(), vparam_g->crtc_regs + , get_global_seg(), GET_GLOBAL(stdmode_g->crtc_regs) + , ARRAY_SIZE(vparam_g->crtc_regs)); + memcpy_far(get_global_seg(), vparam_g->actl_regs + , get_global_seg(), GET_GLOBAL(stdmode_g->actl_regs) + , ARRAY_SIZE(vparam_g->actl_regs)); + memcpy_far(get_global_seg(), vparam_g->grdc_regs + , get_global_seg(), GET_GLOBAL(stdmode_g->grdc_regs) + , ARRAY_SIZE(vparam_g->grdc_regs)); + } +}