X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=vgasrc%2Fvgabios.c;h=854ed38d63247b70ec8a6457d4d344ae49e61df6;hb=83047be58ee787b2f3651f6b40e08d54371ecd3a;hp=203a3942a6f1cb6aac60f9fa669d6e5758c97cab;hpb=6f775088925a9b1ed3ded58e05d7ee276366166f;p=seabios.git diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 203a394..854ed38 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -18,9 +18,10 @@ #include "optionroms.h" // struct pci_data #include "config.h" // CONFIG_* #include "stdvga.h" // stdvga_set_mode -#include "geodelx.h" // geodelx_init +#include "geodevga.h" // geodevga_init #include "bochsvga.h" // bochsvga_init #include "clext.h" // clext_init +#include "vgahw.h" // vgahw_set_mode // XXX #define DEBUG_VGA_POST 1 @@ -47,6 +48,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) { @@ -92,15 +106,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 @@ -133,25 +144,13 @@ set_active_page(u8 page) // Get pos curs pos for the right page struct cursorpos cp = get_cursor_pos(page); - u16 address; - if (GET_GLOBAL(vmode_g->memmodel) & 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); @@ -173,7 +172,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)); } @@ -328,17 +327,27 @@ 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) & TEXT ? 0x0607 : 0x0000); int i; for (i=0; i<8; i++) SET_BDA(cursor_pos[i], 0x0000); @@ -378,8 +387,7 @@ modeswitch_set_bda(int mode, int flags, struct vgamode_s *vmode_g) static void handle_1000(struct bregs *regs) { - u8 noclearmem = regs->al & 0x80; - u8 mode = regs->al & 0x7f; + int mode = regs->al & 0x7f; // Set regs->al if (mode > 7) @@ -389,20 +397,11 @@ handle_1000(struct bregs *regs) else regs->al = 0x30; - if (CONFIG_VGA_CIRRUS) { - int ret = clext_set_video_mode(mode, noclearmem); - if (ret) - return; - } - - if (bochsvga_enabled()) - bochsvga_hires_enable(0); - int flags = GET_BDA(modeset_ctl) & (MF_NOPALETTE|MF_GRAYSUM); - if (noclearmem) + if (regs->al & 0x80) flags |= MF_NOCLEARMEM; - stdvga_set_mode(mode, flags); + vgahw_set_mode(mode, flags); } static void @@ -1196,30 +1195,30 @@ init_bios_area(void) SET_BDA(video_msr, 0x09); } +u16 VgaBDF VAR16; + void VISIBLE16 vga_post(struct bregs *regs) { debug_enter(regs, DEBUG_VGA_POST); - stdvga_init(); + SET_VGA(VgaBDF, regs->ax); - if (CONFIG_VGA_GEODELX) - geodelx_init(); + int ret = vgahw_init(); + if (ret) { + dprintf(1, "Failed to initialize VGA hardware. Exiting.\n"); + return; + } init_bios_area(); - bochsvga_init(regs->ah, regs->al); + build_video_param(); extern void entry_10(void); SET_IVT(0x10, SEGOFF(get_global_seg(), (u32)entry_10)); - if (CONFIG_VGA_CIRRUS) - clext_init(); - // XXX - clear screen and display info - build_video_param(); - // Fixup checksum extern u8 _rom_header_size, _rom_header_checksum; SET_VGA(_rom_header_checksum, 0);