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

Removed the incorrect usage of CRTC register 3 bits 5 and 6.

Browse Source
This commit is contained in:
OBattler
2024-02-23 17:02:42 +01:00
parent b55c7b91dd
commit 9124e8165b
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/vid_et4000.c
View File

@@ -745,7 +745,7 @@ et4000_kasan_recalctimings(svga_t *svga)
if (svga->render == svga_render_text_80 && (et4000->kasan_cfg_regs[0] & 8)) { if (svga->render == svga_render_text_80 && (et4000->kasan_cfg_regs[0] & 8)) {
svga->hdisp += svga->dots_per_clock; svga->hdisp += svga->dots_per_clock;
svga->ma_latch -= 5; svga->ma_latch -= 4;
svga->ca_adj = (et4000->kasan_cfg_regs[0] >> 6) - 3; svga->ca_adj = (et4000->kasan_cfg_regs[0] >> 6) - 3;
svga->ksc5601_sbyte_mask = (et4000->kasan_cfg_regs[0] & 4) << 5; svga->ksc5601_sbyte_mask = (et4000->kasan_cfg_regs[0] & 4) << 5;
if ((et4000->kasan_cfg_regs[0] & 0x23) == 0x20 && (et4000->kasan_cfg_regs[4] & 0x80) && ((svga->crtc[0x37] & 0x0B) == 0x0A)) if ((et4000->kasan_cfg_regs[0] & 0x23) == 0x20 && (et4000->kasan_cfg_regs[4] & 0x80) && ((svga->crtc[0x37] & 0x0B) == 0x0A))

9
src/video/vid_svga.c
View File

@@ -1158,9 +1158,9 @@ svga_poll(void *priv)
if (ret) { if (ret) {
if (svga->interlace && svga->oddeven) if (svga->interlace && svga->oddeven)
svga->ma = svga->maback = (svga->rowoffset << 1) + ((svga->crtc[3] & 0x60) >> 5) + svga->hblank_sub; svga->ma = svga->maback = (svga->rowoffset << 1) + svga->hblank_sub;
else else
svga->ma = svga->maback = ((svga->crtc[3] & 0x60) >> 5) + svga->hblank_sub; svga->ma = svga->maback = svga->hblank_sub;
svga->ma = (svga->ma << 2); svga->ma = (svga->ma << 2);
svga->maback = (svga->maback << 2); svga->maback = (svga->maback << 2);
@@ -1230,10 +1230,9 @@ svga_poll(void *priv)
svga->vslines = 0; svga->vslines = 0;
if (svga->interlace && svga->oddeven) if (svga->interlace && svga->oddeven)
svga->ma = svga->maback = svga->ma_latch + (svga->rowoffset << 1) + svga->ma = svga->maback = svga->ma_latch + (svga->rowoffset << 1) + svga->hblank_sub;
((svga->crtc[3] & 0x60) >> 5) + svga->hblank_sub;
else else
svga->ma = svga->maback = svga->ma_latch + ((svga->crtc[3] & 0x60) >> 5) + svga->hblank_sub; svga->ma = svga->maback = svga->ma_latch + svga->hblank_sub;
svga->ca = ((svga->crtc[0xe] << 8) | svga->crtc[0xf]) + ((svga->crtc[0xb] & 0x60) >> 5) + svga->ca_adj; svga->ca = ((svga->crtc[0xe] << 8) | svga->crtc[0xf]) + ((svga->crtc[0xb] & 0x60) >> 5) + svga->ca_adj;
svga->ma = (svga->ma << 2); svga->ma = (svga->ma << 2);