X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=seabios.git;a=blobdiff_plain;f=vgasrc%2Fstdvga.c;h=dcc51a86dd226a5f27bb3aed620d5b94eea0a6d8;hp=ed4dcd298a8ab15b6a3f64bc4296bff89b9c112e;hb=f98bbf09fc2f531b4ad220b987927addb1d4520f;hpb=1692007a5ff81cfd88d80d495c11fc8ad25aa35b

diff --git a/vgasrc/stdvga.c b/vgasrc/stdvga.c
index ed4dcd2..dcc51a8 100644
--- a/vgasrc/stdvga.c
+++ b/vgasrc/stdvga.c
@@ -5,6 +5,7 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
+#include "vgabios.h" // struct vgamode_s
 #include "stdvga.h" // stdvga_init
 #include "ioport.h" // outb
 #include "farptr.h" // SET_FARVAR
@@ -327,7 +328,7 @@ stdvga_set_displaystart(struct vgamode_s *vmode_g, int val)
 
 
 /****************************************************************
- * Save/Restore/Set state
+ * Save/Restore state
  ****************************************************************/
 
 void
@@ -396,113 +397,11 @@ stdvga_restore_state(u16 seg, struct saveVideoHardware *info)
     outb(GET_FARVAR(seg, info->feature), crtc_addr - 0x4 + 0xa);
 }
 
-static void
-clear_screen(struct vgamode_s *vmode_g)
-{
-    switch (GET_GLOBAL(vmode_g->memmodel)) {
-    case MM_TEXT:
-        memset16_far(GET_GLOBAL(vmode_g->sstart), 0, 0x0720, 32*1024);
-        break;
-    case MM_CGA:
-        memset16_far(GET_GLOBAL(vmode_g->sstart), 0, 0x0000, 32*1024);
-        break;
-    default:
-        // XXX - old code gets/sets/restores sequ register 2 to 0xf -
-        // but it should always be 0xf anyway.
-        memset16_far(GET_GLOBAL(vmode_g->sstart), 0, 0x0000, 64*1024);
-    }
-}
-
-int
-stdvga_set_mode(struct vgamode_s *vmode_g, int flags)
-{
-    if (! stdvga_is_mode(vmode_g)) {
-        warn_internalerror();
-        return -1;
-    }
-    struct stdvga_mode_s *stdmode_g = container_of(
-        vmode_g, struct stdvga_mode_s, info);
-
-    // if palette loading (bit 3 of modeset ctl = 0)
-    if (!(flags & MF_NOPALETTE)) {    // Set the PEL mask
-        stdvga_pelmask_write(GET_GLOBAL(stdmode_g->pelmask));
-
-        // From which palette
-        u8 *palette_g = GET_GLOBAL(stdmode_g->dac);
-        u16 palsize = GET_GLOBAL(stdmode_g->dacsize) / 3;
-
-        // Always 256*3 values
-        stdvga_dac_write(get_global_seg(), palette_g, 0, palsize);
-        int i;
-        for (i = palsize; i < 0x0100; i++) {
-            static u8 rgb[3] VAR16;
-            stdvga_dac_write(get_global_seg(), rgb, i, 1);
-        }
-
-        if (flags & MF_GRAYSUM)
-            stdvga_perform_gray_scale_summing(0x00, 0x100);
-    }
-
-    // Set Attribute Ctl
-    u8 *regs = GET_GLOBAL(stdmode_g->actl_regs);
-    int i;
-    for (i = 0; i <= 0x13; i++)
-        stdvga_attr_write(i, GET_GLOBAL(regs[i]));
-    stdvga_attr_write(0x14, 0x00);
-
-    // Set Sequencer Ctl
-    stdvga_sequ_write(0x00, 0x03);
-    regs = GET_GLOBAL(stdmode_g->sequ_regs);
-    for (i = 1; i <= 4; i++)
-        stdvga_sequ_write(i, GET_GLOBAL(regs[i - 1]));
-
-    // Set Grafx Ctl
-    regs = GET_GLOBAL(stdmode_g->grdc_regs);
-    for (i = 0; i <= 8; i++)
-        stdvga_grdc_write(i, GET_GLOBAL(regs[i]));
-
-    // Set CRTC address VGA or MDA
-    u8 miscreg = GET_GLOBAL(stdmode_g->miscreg);
-    u16 crtc_addr = VGAREG_VGA_CRTC_ADDRESS;
-    if (!(miscreg & 1))
-        crtc_addr = VGAREG_MDA_CRTC_ADDRESS;
-
-    // Disable CRTC write protection
-    stdvga_crtc_write(crtc_addr, 0x11, 0x00);
-    // Set CRTC regs
-    regs = GET_GLOBAL(stdmode_g->crtc_regs);
-    for (i = 0; i <= 0x18; i++)
-        stdvga_crtc_write(crtc_addr, i, GET_GLOBAL(regs[i]));
-
-    // Set the misc register
-    stdvga_misc_write(miscreg);
-
-    // Enable video
-    stdvga_attrindex_write(0x20);
-
-    // Clear screen
-    if (!(flags & MF_NOCLEARMEM))
-        clear_screen(vmode_g);
-
-    // Write the fonts in memory
-    u8 memmodel = GET_GLOBAL(vmode_g->memmodel);
-    if (memmodel == MM_TEXT)
-        stdvga_load_font(get_global_seg(), vgafont16, 0x100, 0, 0, 16);
-
-    return 0;
-}
-
 
 /****************************************************************
  * Misc
  ****************************************************************/
 
-void
-stdvga_list_modes(u16 seg, u16 *dest, u16 *last)
-{
-    SET_FARVAR(seg, *dest, 0xffff);
-}
-
 void
 stdvga_enable_video_addressing(u8 disable)
 {