X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=vgasrc%2Fvgabios.c;h=62b09b45caad464c3e9d8014a75d4f0f4b1d9e72;hb=4a73f933968e5cf6f2a6ce1ad87448dd6b136e48;hp=7bed069556cbaa61d1093f7fe9377aacb2cca51b;hpb=d4398adab635f10a55717e2472ecf651b1edab3c;p=seabios.git diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 7bed069..62b09b4 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -14,19 +14,33 @@ #include "bregs.h" // struct bregs #include "biosvar.h" // GET_BDA #include "util.h" // memset -#include "vgabios.h" // find_vga_entry +#include "vgabios.h" // calc_page_size #include "optionroms.h" // struct pci_data #include "config.h" // CONFIG_* -#include "stdvga.h" // stdvga_set_mode -#include "geodevga.h" // geodevga_init -#include "bochsvga.h" // bochsvga_init -#include "clext.h" // clext_init +#include "stdvga.h" // stdvga_set_cursor_shape +#include "clext.h" // clext_1012 #include "vgahw.h" // vgahw_set_mode +#include "pci.h" // pci_config_readw +#include "pci_regs.h" // PCI_VENDOR_ID // XXX #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 @@ -48,6 +62,19 @@ struct pci_data rom_pci_data VAR16VISIBLE = { * Helper functions ****************************************************************/ +u16 +calc_page_size(u8 memmodel, u16 width, u16 height) +{ + switch (memmodel) { + case MM_TEXT: + return ALIGN(width * height * 2, 2*1024); + case MM_CGA: + return 16*1024; + default: + return ALIGN(width * height / 8, 8*1024); + } +} + static void set_cursor_shape(u8 start, u8 end) { @@ -93,15 +120,12 @@ set_cursor_pos(struct cursorpos cp) if (cp.page != current) return; - // Get the dimensions + // Calculate the memory address u16 nbcols = GET_BDA(video_cols); - u16 nbrows = GET_BDA(video_rows) + 1; + u16 address = (GET_BDA(video_pagesize) * cp.page + + (cp.x + cp.y * nbcols) * 2); - // Calculate the address knowing nbcols nbrows and page num - u16 address = (SCREEN_IO_START(nbcols, nbrows, cp.page) - + cp.x + cp.y * nbcols); - - stdvga_set_cursor_pos(address); + stdvga_set_cursor_pos(address / 2); } static struct cursorpos @@ -127,32 +151,20 @@ set_active_page(u8 page) return; // Get the mode - struct vgamode_s *vmode_g = find_vga_entry(GET_BDA(video_mode)); + struct vgamode_s *vmode_g = get_current_mode(); if (!vmode_g) return; // Get pos curs pos for the right page struct cursorpos cp = get_cursor_pos(page); - u16 address; - if (GET_GLOBAL(vmode_g->memmodel) == MM_TEXT) { - // Get the dimensions - u16 nbcols = GET_BDA(video_cols); - u16 nbrows = GET_BDA(video_rows) + 1; - - // Calculate the address knowing nbcols nbrows and page num - address = SCREEN_MEM_START(nbcols, nbrows, page); - SET_BDA(video_pagestart, address); - - // Start address - address = SCREEN_IO_START(nbcols, nbrows, page); - } else { - address = page * GET_GLOBAL(vmode_g->slength); - } - - stdvga_set_active_page(address); + // Calculate memory address of start of page + u8 memmodel = GET_GLOBAL(vmode_g->memmodel); + u16 address = GET_BDA(video_pagesize) * page; + stdvga_set_active_page(memmodel == MM_TEXT ? address / 2 : address); // And change the BIOS page + SET_BDA(video_pagestart, address); SET_BDA(video_page, page); dprintf(1, "Set active page %02x address %04x\n", page, address); @@ -174,7 +186,7 @@ set_scan_lines(u8 lines) u8 rows = vde / lines; SET_BDA(video_rows, rows - 1); u16 cols = GET_BDA(video_cols); - SET_BDA(video_pagesize, rows * cols * 2); + SET_BDA(video_pagesize, calc_page_size(MM_TEXT, cols, rows)); } @@ -324,23 +336,43 @@ restore_bda_state(u16 seg, struct saveBDAstate *info) SET_IVT(0x43, GET_FARVAR(seg, info->font1)); } + +/**************************************************************** + * Mode setting + ****************************************************************/ + +struct vgamode_s * +get_current_mode(void) +{ + return vgahw_find_mode(GET_BDA(video_mode)); +} + // Setup BDA after a mode switch. void modeswitch_set_bda(int mode, int flags, struct vgamode_s *vmode_g) { // Set the BIOS mem - u16 cheight = GET_GLOBAL(vmode_g->cheight); + int width = GET_GLOBAL(vmode_g->width); + int height = GET_GLOBAL(vmode_g->height); + u8 memmodel = GET_GLOBAL(vmode_g->memmodel); + int cheight = GET_GLOBAL(vmode_g->cheight); SET_BDA(video_mode, mode); - SET_BDA(video_cols, GET_GLOBAL(vmode_g->twidth)); - SET_BDA(video_pagesize, GET_GLOBAL(vmode_g->slength)); + if (memmodel == MM_TEXT) { + SET_BDA(video_cols, width); + SET_BDA(video_rows, height-1); + SET_BDA(cursor_type, 0x0607); + } else { + int cwidth = GET_GLOBAL(vmode_g->cwidth); + SET_BDA(video_cols, width / cwidth); + SET_BDA(video_rows, (height / cheight) - 1); + SET_BDA(cursor_type, 0x0000); + } + SET_BDA(video_pagesize, calc_page_size(memmodel, width, height)); SET_BDA(crtc_address, stdvga_get_crtc()); - SET_BDA(video_rows, GET_GLOBAL(vmode_g->theight)-1); SET_BDA(char_height, cheight); SET_BDA(video_ctl, 0x60 | (flags & MF_NOCLEARMEM ? 0x80 : 0x00)); SET_BDA(video_switches, 0xF9); SET_BDA(modeset_ctl, GET_BDA(modeset_ctl) & 0x7f); - SET_BDA(cursor_type - , GET_GLOBAL(vmode_g->memmodel) == MM_TEXT ? 0x0607 : 0x0000); int i; for (i=0; i<8; i++) SET_BDA(cursor_pos[i], 0x0000); @@ -570,7 +602,7 @@ handle_101000(struct bregs *regs) { if (regs->bl > 0x14) return; - stdvga_set_single_palette_reg(regs->bl, regs->bh); + stdvga_attr_write(regs->bl, regs->bh); } static void @@ -596,7 +628,7 @@ handle_101007(struct bregs *regs) { if (regs->bl > 0x14) return; - regs->bh = stdvga_get_single_palette_reg(regs->bl); + regs->bh = stdvga_attr_read(regs->bl); } static void @@ -615,13 +647,13 @@ static void noinline handle_101010(struct bregs *regs) { u8 rgb[3] = {regs->dh, regs->ch, regs->cl}; - stdvga_set_dac_regs(GET_SEG(SS), rgb, regs->bx, 1); + stdvga_dac_write(GET_SEG(SS), rgb, regs->bx, 1); } static void handle_101012(struct bregs *regs) { - stdvga_set_dac_regs(regs->es, (u8*)(regs->dx + 0), regs->bx, regs->cx); + stdvga_dac_write(regs->es, (u8*)(regs->dx + 0), regs->bx, regs->cx); } static void @@ -634,7 +666,7 @@ static void noinline handle_101015(struct bregs *regs) { u8 rgb[3]; - stdvga_get_dac_regs(GET_SEG(SS), rgb, regs->bx, 1); + stdvga_dac_read(GET_SEG(SS), rgb, regs->bx, 1); regs->dh = rgb[0]; regs->ch = rgb[1]; regs->cl = rgb[2]; @@ -643,19 +675,19 @@ handle_101015(struct bregs *regs) static void handle_101017(struct bregs *regs) { - stdvga_get_dac_regs(regs->es, (u8*)(regs->dx + 0), regs->bx, regs->cx); + stdvga_dac_read(regs->es, (u8*)(regs->dx + 0), regs->bx, regs->cx); } static void handle_101018(struct bregs *regs) { - stdvga_set_pel_mask(regs->bl); + stdvga_pelmask_write(regs->bl); } static void handle_101019(struct bregs *regs) { - regs->bl = stdvga_get_pel_mask(); + regs->bl = stdvga_pelmask_read(); } static void @@ -935,6 +967,11 @@ handle_1012XX(struct bregs *regs) static void handle_1012(struct bregs *regs) { + if (CONFIG_VGA_CIRRUS && regs->bl >= 0x80) { + clext_1012(regs); + return; + } + switch (regs->bl) { case 0x10: handle_101210(regs); break; case 0x30: handle_101230(regs); break; @@ -946,8 +983,6 @@ handle_1012(struct bregs *regs) case 0x36: handle_101236(regs); break; default: handle_1012XX(regs); break; } - - // XXX - cirrus has 1280, 1281, 1282, 1285, 129a, 12a0, 12a1, 12a2, 12ae } @@ -1002,6 +1037,22 @@ handle_101a(struct bregs *regs) } +static u8 static_functionality[0x10] VAR16 = { + /* 0 */ 0xff, // All modes supported #1 + /* 1 */ 0xe0, // All modes supported #2 + /* 2 */ 0x0f, // All modes supported #3 + /* 3 */ 0x00, 0x00, 0x00, 0x00, // reserved + /* 7 */ 0x07, // 200, 350, 400 scan lines + /* 8 */ 0x02, // mamimum number of visible charsets in text mode + /* 9 */ 0x08, // total number of charset blocks in text mode + /* a */ 0xe7, // Change to add new functions + /* b */ 0x0c, // Change to add new functions + /* c */ 0x00, // reserved + /* d */ 0x00, // reserved + /* e */ 0x00, // Change to add new functions + /* f */ 0x00 // reserved +}; + struct funcInfo { struct segoff_s static_functionality; u8 bda_0x49[30]; @@ -1188,14 +1239,19 @@ init_bios_area(void) SET_BDA(video_msr, 0x09); } -u16 VgaBDF VAR16; +int VgaBDF VAR16 = -1; void VISIBLE16 vga_post(struct bregs *regs) { debug_enter(regs, DEBUG_VGA_POST); - SET_VGA(VgaBDF, regs->ax); + if (CONFIG_VGA_PCI) { + u16 bdf = regs->ax; + if (pci_config_readw(bdf, PCI_VENDOR_ID) == CONFIG_VGA_VID + && pci_config_readw(bdf, PCI_DEVICE_ID) == CONFIG_VGA_DID) + SET_VGA(VgaBDF, bdf); + } int ret = vgahw_init(); if (ret) { @@ -1205,7 +1261,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));