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

Correctly clear all extensions when extended write modes are disabled, fixes #2800.

Browse Source
This commit is contained in:
OBattler
2022-11-06 00:15:30 +01:00
parent 873d4dbbb8
commit 8b63f5995e
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/video/vid_cl54xx.c
View File

@@ -670,6 +670,7 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
if ((svga->seqaddr == 2) && !gd54xx->unlocked) { if ((svga->seqaddr == 2) && !gd54xx->unlocked) {
o = svga->seqregs[svga->seqaddr & 0x1f]; o = svga->seqregs[svga->seqaddr & 0x1f];
svga_out(addr, val, svga); svga_out(addr, val, svga);
if (svga->gdcreg[0xb] & 0x04)
svga->seqregs[svga->seqaddr & 0x1f] = (o & 0xf0) | (val & 0x0f); svga->seqregs[svga->seqaddr & 0x1f] = (o & 0xf0) | (val & 0x0f);
return; return;
} else if ((svga->seqaddr > 6) && !gd54xx->unlocked) } else if ((svga->seqaddr > 6) && !gd54xx->unlocked)
@@ -878,10 +879,6 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
case 0x09: case 0x09:
case 0x0a: case 0x0a:
case 0x0b: case 0x0b:
if (svga->gdcreg[0xb] & 0x04)
svga->writemode = svga->gdcreg[5] & 7;
else
svga->writemode = svga->gdcreg[5] & 3;
svga->adv_flags = 0; svga->adv_flags = 0;
if (svga->gdcreg[0xb] & 0x01) if (svga->gdcreg[0xb] & 0x01)
svga->adv_flags = FLAG_EXTRA_BANKS; svga->adv_flags = FLAG_EXTRA_BANKS;
@@ -893,6 +890,18 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
svga->adv_flags |= FLAG_LATCH8; svga->adv_flags |= FLAG_LATCH8;
if (svga->gdcreg[0xb] & 0x10) if (svga->gdcreg[0xb] & 0x10)
svga->adv_flags |= FLAG_ADDR_BY16; svga->adv_flags |= FLAG_ADDR_BY16;
if (svga->gdcreg[0xb] & 0x04)
svga->writemode = svga->gdcreg[5] & 7;
else {
svga->gdcreg[5] &= ~0x04;
svga->writemode = svga->gdcreg[5] & 3;
svga->adv_flags = 0;
svga->gdcreg[0] &= 0x0f;
gd543x_mmio_write(0xb8000, svga->gdcreg[0], gd54xx);
svga->gdcreg[1] &= 0x0f;
gd543x_mmio_write(0xb8004, svga->gdcreg[1], gd54xx);
svga->seqregs[2] &= 0x0f;
}
gd54xx_recalc_banking(gd54xx); gd54xx_recalc_banking(gd54xx);
break; break;