X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=vgasrc%2Fvgabios.c;h=e69c6c511a0138cc3c90e7c9a928333c7d4ad429;hb=2af8ba1ab23d01006b080e57900325e35f464481;hp=84b112cb1483a075262c3bd8a6307ab7c0144caf;hpb=3471fdbe63f9e982ae979094b6b3e7562dae1021;p=seabios.git diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 84b112c..e69c6c5 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -20,11 +20,28 @@ #include "stdvga.h" // stdvga_set_cursor_shape #include "clext.h" // clext_1012 #include "vgahw.h" // vgahw_set_mode +#include "vbe.h" // VBE_RETURN_STATUS_FAILED +#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 @@ -46,6 +63,22 @@ struct pci_data rom_pci_data VAR16VISIBLE = { * Helper functions ****************************************************************/ +// Return the bits per pixel in system memory for a given mode. +int +vga_bpp(struct vgamode_s *vmode_g) +{ + switch (GET_GLOBAL(vmode_g->memmodel)) { + case MM_TEXT: + return 16; + case MM_PLANAR: + return 1; + } + u8 depth = GET_GLOBAL(vmode_g->depth); + if (depth > 8) + return ALIGN(depth, 8); + return depth; +} + u16 calc_page_size(u8 memmodel, u16 width, u16 height) { @@ -105,11 +138,9 @@ set_cursor_pos(struct cursorpos cp) return; // Calculate the memory address - u16 nbcols = GET_BDA(video_cols); - u16 address = (GET_BDA(video_pagesize) * cp.page - + (cp.x + cp.y * nbcols) * 2); - - stdvga_set_cursor_pos(address / 2); + int address = (GET_BDA(video_pagesize) * cp.page + + (cp.x + cp.y * GET_BDA(video_cols)) * 2); + stdvga_set_cursor_pos(address); } static struct cursorpos @@ -135,7 +166,7 @@ set_active_page(u8 page) return; // Get the mode - struct vgamode_s *vmode_g = vgahw_find_mode(GET_BDA(video_mode)); + struct vgamode_s *vmode_g = get_current_mode(); if (!vmode_g) return; @@ -143,9 +174,8 @@ set_active_page(u8 page) struct cursorpos cp = get_cursor_pos(page); // 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); + int address = GET_BDA(video_pagesize) * page; + vgahw_set_displaystart(vmode_g, address); // And change the BIOS page SET_BDA(video_pagestart, address); @@ -300,7 +330,9 @@ save_bda_state(u16 seg, struct saveBDAstate *info) static void restore_bda_state(u16 seg, struct saveBDAstate *info) { - SET_BDA(video_mode, GET_FARVAR(seg, info->video_mode)); + u16 mode = GET_FARVAR(seg, info->video_mode); + SET_BDA(video_mode, mode); + SET_BDA(vbe_mode, mode); SET_BDA(video_cols, GET_FARVAR(seg, info->video_cols)); SET_BDA(video_pagesize, GET_FARVAR(seg, info->video_pagesize)); SET_BDA(crtc_address, GET_FARVAR(seg, info->crtc_address)); @@ -320,16 +352,40 @@ 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(vbe_mode) & ~MF_VBEFLAGS); +} + // Setup BDA after a mode switch. -void -modeswitch_set_bda(int mode, int flags, struct vgamode_s *vmode_g) +int +vga_set_mode(int mode, int flags) { + dprintf(1, "set VGA mode %x\n", mode); + struct vgamode_s *vmode_g = vgahw_find_mode(mode); + if (!vmode_g) + return VBE_RETURN_STATUS_FAILED; + + int ret = vgahw_set_mode(vmode_g, flags); + if (ret) + return ret; + // Set the BIOS mem 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); + if (mode < 0x100) + SET_BDA(video_mode, mode); + else + SET_BDA(video_mode, 0xff); + SET_BDA(vbe_mode, mode | (flags & MF_VBEFLAGS)); if (memmodel == MM_TEXT) { SET_BDA(video_cols, width); SET_BDA(video_rows, height-1); @@ -375,6 +431,8 @@ modeswitch_set_bda(int mode, int flags, struct vgamode_s *vmode_g) SET_IVT(0x43, SEGOFF(get_global_seg(), (u32)vgafont16)); break; } + + return 0; } @@ -399,7 +457,7 @@ handle_1000(struct bregs *regs) if (regs->al & 0x80) flags |= MF_NOCLEARMEM; - vgahw_set_mode(mode, flags); + vga_set_mode(mode, flags); } static void @@ -1010,6 +1068,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]; @@ -1196,14 +1270,21 @@ 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) + == GET_GLOBAL(rom_pci_data.vendor)) + && (pci_config_readw(bdf, PCI_DEVICE_ID) + == GET_GLOBAL(rom_pci_data.device))) + SET_VGA(VgaBDF, bdf); + } int ret = vgahw_init(); if (ret) { @@ -1213,7 +1294,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));