80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Tseng Labs fixes and bug-compatible fixes too.

Browse Source 
ET3000AX: the chip in question should not support 1MB of video memory.
ET4000AX: the early TC6058AF revision can support 1MB of video memory (e.g.: Diamond Speedstar BIOS D3.10, undumped anyway), and actually don't update the rowoffset to 256 when using such chip in 320x200x256 mode. Fixes the copper demo in said chip revision.
This commit is contained in:
TC1995
2024-04-02 15:09:18 +02:00
parent 737ef38021
commit 38e044ca34
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/vid_svga.h
View File

@@ -129,6 +129,7 @@ typedef struct svga_t {
int hblank_end_mask;
int hblank_sub;
int packed_4bpp;
int ps_bit_bug;
int ati_4color;
/*The three variables below allow us to implement memory maps like that seen on a 1MB Trio64 :

2
src/video/vid_et3000.c
View File

@@ -557,8 +557,6 @@ static const device_config_t et3000_config[] = {
.value = 256 },
{ .description = "512 KB",
.value = 512 },
{ .description = "1 MB",
.value = 1024 },
{ .description = "" } } },
{ .type = CONFIG_END }
};

19
src/video/vid_et4000.c
View File

@@ -652,7 +652,9 @@ et4000_recalctimings(svga_t *svga)
svga->ma_latch |= (svga->crtc[0x33] & 3) << 16;
svga->hblankstart = (((svga->crtc[0x3f] & 0x4) >> 2) << 8) + svga->crtc[2];
svga->hblankstart = (((svga->crtc[0x3f] & 0x4) >> 2) << 8) + svga->crtc[2];
svga->ps_bit_bug = (dev->type == ET4000_TYPE_TC6058AF) && svga->lowres && ((svga->gdcreg[5] & 0x60) >= 0x40);
if (svga->crtc[0x35] & 1)
svga->vblankstart |= 0x400;
@@ -664,7 +666,7 @@ et4000_recalctimings(svga_t *svga)
svga->vsyncstart |= 0x400;
if (svga->crtc[0x35] & 0x10)
svga->split |= 0x400;
if (!svga->rowoffset)
if (!svga->rowoffset && !svga->ps_bit_bug)
svga->rowoffset = 0x100;
if (svga->crtc[0x3f] & 1)
svga->htotal |= 0x100;
@@ -729,13 +731,6 @@ et4000_recalctimings(svga_t *svga)
svga->rowoffset <<= 1;
svga->render = svga_render_8bpp_highres;
}
if (dev->type == ET4000_TYPE_TC6058AF) {
if (svga->render == svga_render_8bpp_lowres)
svga->render = svga_render_8bpp_tseng_lowres;
else if (svga->render == svga_render_8bpp_highres)
svga->render = svga_render_8bpp_tseng_highres;
}
}
static void
@@ -962,6 +957,10 @@ static const device_config_t et4000_tc6058af_config[] = {
.description = "512 KB",
.value = 512
},
{
.description = "1 MB",
.value = 1024
},
{
.description = ""
}
@@ -1071,7 +1070,7 @@ const device_t et4000_tc6058af_isa_device = {
.name = "Tseng Labs ET4000AX (TC6058AF) (ISA)",
.internal_name = "et4000ax_tc6058af",
.flags = DEVICE_ISA,
.local = 0,
.local = ET4000_TYPE_TC6058AF,
.init = et4000_init,
.close = et4000_close,
.reset = NULL,