mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixing VBE support for whatvga (see [ 529309 ] meta feature for VBE app list)

Browse Source 
- added VBE checks for valid data/parameters
This commit is contained in:
Jeroen Janssen 2002-03-13 18:33:00 +00:00
parent c2df473661
commit fa04cb9d5b
3 changed files with 118 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/.conf.win32-cygwin
View File

@ -14,4 +14,4 @@ export CXX
export CFLAGS
export CXXFLAGS
./configure --enable-cdrom --enable-sb16=win
./configure --enable-cdrom --enable-sb16=win --enable-vbe

125
bochs/iodev/vga.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: vga.cc,v 1.25 2002-03-10 20:59:11 japj Exp $
// $Id: vga.cc,v 1.26 2002-03-13 18:33:00 japj Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -2097,8 +2097,22 @@ bx_vga_c::vbe_mem_write(Bit32u addr, Bit8u value)
x_tileno = (offset % BX_VGA_THIS s.vbe_xres) / X_TILESIZE;
BX_VGA_THIS s.vga_mem_updated = 1;
BX_VGA_THIS s.vga_tile_updated[x_tileno][y_tileno] = 1;
BX_VGA_THIS s.vbe_memory[offset]=value;
// check for out of memory write
if (offset < sizeof(BX_VGA_THIS s.vbe_memory))
{
BX_VGA_THIS s.vbe_memory[offset]=value;
}
else
{
// make sure we don't flood the logfile
static int count=0;
if (count<100)
{
count ++;
BX_INFO(("VBE_mem_write out of video memory write at %x",offset));
}
}
}
Bit32u
@ -2127,14 +2141,39 @@ bx_vga_c::vbe_read(Bit32u address, unsigned io_len)
}
else
{
// data register
// FIXME: read from the data registers
// data register read
switch (BX_VGA_THIS s.vbe_curindex)
{
case VBE_DISPI_INDEX_ID: // Display Interface ID check
{
return VBE_DISPI_ID0;
} break;
case VBE_DISPI_INDEX_XRES: // x resolution
{
return BX_VGA_THIS s.vbe_xres;
} break;
case VBE_DISPI_INDEX_YRES: // y resolution
{
return BX_VGA_THIS s.vbe_yres;
} break;
case VBE_DISPI_INDEX_BPP: // bpp
{
return BX_VGA_THIS s.vbe_bpp;
} break;
case VBE_DISPI_INDEX_ENABLE: // vbe enabled
{
return BX_VGA_THIS s.vbe_enabled;
} break;
case VBE_DISPI_INDEX_BANK: // current bank
{
return BX_VGA_THIS s.vbe_bank;
} break;
default:
{
@ -2184,36 +2223,98 @@ bx_vga_c::vbe_write(Bit32u address, Bit32u value, unsigned io_len)
}
else
{
BX_INFO(("VBE known Display Interface %x",value));
// make sure we don't flood the logfile
static int count=0;
if (count < 100)
{
count++;
BX_INFO(("VBE known Display Interface %x",value));
}
}
} break;
case VBE_DISPI_INDEX_XRES: // set xres
{
BX_VGA_THIS s.vbe_xres=(Bit16u) value;
// check that we don't set xres during vbe enabled
if (!BX_VGA_THIS s.vbe_enabled)
{
// check for within max xres range
if (value <= VBE_DISPI_MAX_XRES)
{
BX_VGA_THIS s.vbe_xres=(Bit16u) value;
}
else
{
BX_INFO(("VBE set xres more then max xres (%d)",value));
}
}
else
{
BX_INFO(("VBE set xres during vbe enabled!"));
}
} break;
case VBE_DISPI_INDEX_YRES: // set yres
{
BX_VGA_THIS s.vbe_yres=(Bit16u) value;
// check that we don't set yres during vbe enabled
if (!BX_VGA_THIS s.vbe_enabled)
{
// check for within max yres range
if (value <= VBE_DISPI_MAX_YRES)
{
BX_VGA_THIS s.vbe_yres=(Bit16u) value;
}
else
{
BX_INFO(("VBE set yres more then max yres (%d)",value));
}
}
else
{
BX_INFO(("VBE set yres during vbe enabled!"));
}
} break;
case VBE_DISPI_INDEX_BPP: // set bpp
{
BX_VGA_THIS s.vbe_bpp=(Bit16u) value;
// check that we don't set bpp during vbe enabled
if (!BX_VGA_THIS s.vbe_enabled)
{
// check for correct bpp range
if (value == VBE_DISPI_BPP_8)
{
BX_VGA_THIS s.vbe_bpp=(Bit16u) value;
}
else
{
BX_INFO(("VBE set bpp with unknown bpp (%d)",value));
}
}
else
{
BX_INFO(("VBE set bpp during vbe enabled!"));
}
} break;
case VBE_DISPI_INDEX_BANK: // set bank
{
BX_INFO(("VBE set bank to %d", BX_VGA_THIS s.vbe_bank));
BX_VGA_THIS s.vbe_bank=(Bit16u) value & 0xff; // FIXME lobyte = vbe bank A?
// check for max bank nr
if (value < (VBE_DISPI_TOTAL_VIDEO_MEMORY_MB * 1024 /64))
{
BX_INFO(("VBE set bank to %d", BX_VGA_THIS s.vbe_bank));
BX_VGA_THIS s.vbe_bank=(Bit16u) value & 0xff; // FIXME lobyte = vbe bank A?
}
else
{
BX_INFO(("VBE set invalid bank (%d)",value));
}
} break;
case VBE_DISPI_INDEX_ENABLE: // enable video
{
if (value)
{
BX_INFO(("VBE enabling x %d, y %d, bpp %d", BX_VGA_THIS s.vbe_xres, BX_VGA_THIS s.vbe_yres, BX_VGA_THIS s.vbe_bpp));
BX_INFO(("VBE enabling x %d, y %d, bpp %d (0=8bpp)", BX_VGA_THIS s.vbe_xres, BX_VGA_THIS s.vbe_yres, BX_VGA_THIS s.vbe_bpp));
bx_gui.dimension_update(BX_VGA_THIS s.vbe_xres, BX_VGA_THIS s.vbe_yres);
}
else

6
bochs/iodev/vga.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: vga.h,v 1.8 2002-03-10 04:51:24 bdenney Exp $
// $Id: vga.h,v 1.9 2002-03-13 18:33:00 japj Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -25,6 +25,8 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#if BX_SUPPORT_VBE
#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 4
#define VBE_DISPI_BANK_ADDRESS 0xA0000
#define VBE_DISPI_BANK_SIZE_KB 64
@ -216,7 +218,7 @@ private:
Bit8u tile[X_TILESIZE * Y_TILESIZE];
#if BX_SUPPORT_VBE
Bit8u vbe_memory[1024 * 1024];
Bit8u vbe_memory[VBE_DISPI_TOTAL_VIDEO_MEMORY_MB *1024 * 1024];
Bit16u vbe_xres;
Bit16u vbe_yres;
Bit16u vbe_bpp;