diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2012-01-31 22:51:56 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2012-02-01 21:58:49 -0500 |
| commit | c8845029a7d0b67ac5f37423deb3495c4397a3f9 (patch) | |
| tree | ce099ef63e89d5586d898087e964653ae2f743e5 /vgasrc/bochsvga.c | |
| parent | 3524453b5d5eca4ec352f099e0cc8419a1ac778d (diff) | |
| download | seabios-c8845029a7d0b67ac5f37423deb3495c4397a3f9.tar.gz | |
vgabios: Rework bochsvga mode switching.
Make the bochsvga mode switch more similar to the original lgpl
vgabios code.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'vgasrc/bochsvga.c')
| -rw-r--r-- | vgasrc/bochsvga.c | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c index 36688324..71f2cd4b 100644 --- a/vgasrc/bochsvga.c +++ b/vgasrc/bochsvga.c @@ -205,17 +205,6 @@ bochsvga_list_modes(u16 seg, u16 *dest, u16 *last) stdvga_list_modes(seg, dest, last); } -static void -bochsvga_hires_enable(int enable) -{ - u16 flags = enable ? - VBE_DISPI_ENABLED | - VBE_DISPI_LFB_ENABLED | - VBE_DISPI_NOCLEARMEM : 0; - - dispi_write(VBE_DISPI_INDEX_ENABLE, flags); -} - int bochsvga_get_window(struct vgamode_s *vmode_g, int window) { @@ -271,25 +260,12 @@ bochsvga_set_displaystart(struct vgamode_s *vmode_g, int val) return 0; } -static void -bochsvga_clear_scr(void) -{ - u16 en; - - en = dispi_read(VBE_DISPI_INDEX_ENABLE); - en &= ~VBE_DISPI_NOCLEARMEM; - dispi_write(VBE_DISPI_INDEX_ENABLE, en); -} - int bochsvga_set_mode(struct vgamode_s *vmode_g, int flags) { - if (! is_bochsvga_mode(vmode_g)) { - bochsvga_hires_enable(0); + dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); + if (! is_bochsvga_mode(vmode_g)) return stdvga_set_mode(vmode_g, flags); - } - - bochsvga_hires_enable(1); u8 depth = GET_GLOBAL(vmode_g->depth); if (depth == 4) @@ -304,13 +280,15 @@ bochsvga_set_mode(struct vgamode_s *vmode_g, int flags) dispi_write(VBE_DISPI_INDEX_XRES, width); dispi_write(VBE_DISPI_INDEX_YRES, height); dispi_write(VBE_DISPI_INDEX_BANK, 0); + u16 bf = ((flags & MF_NOCLEARMEM ? VBE_DISPI_NOCLEARMEM : 0) + | (flags & MF_LINEARFB ? VBE_DISPI_LFB_ENABLED : 0)); + dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED | bf); /* VGA compat setup */ - //XXX: This probably needs some reverse engineering u16 crtc_addr = VGAREG_VGA_CRTC_ADDRESS; stdvga_crtc_write(crtc_addr, 0x11, 0x00); stdvga_crtc_write(crtc_addr, 0x01, width / 8 - 1); - dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, width); + stdvga_set_linelength(vmode_g, width); stdvga_crtc_write(crtc_addr, 0x12, height - 1); u8 v = 0; if ((height - 1) & 0x0100) @@ -331,13 +309,5 @@ bochsvga_set_mode(struct vgamode_s *vmode_g, int flags) stdvga_grdc_mask(0x05, 0x20, 0x40); } - if (flags & MF_LINEARFB) { - /* Linear frame buffer */ - /* XXX: ??? */ - } - if (!(flags & MF_NOCLEARMEM)) { - bochsvga_clear_scr(); - } - return 0; } |