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

Compile fix, now the ATI 68860 RAMDAC is using the proper 8514/A ON flag when needed.

Browse Source
This commit is contained in:
TC1995
2023-08-15 01:25:28 +02:00
parent 489492b9de
commit 9808f62921
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/video/vid_ati68860_ramdac.c
View File

@@ -68,19 +68,20 @@ void
ati68860_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga) ati68860_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga)
{ {
ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv; ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv;
ibm8514_t *dev = &svga->dev8514;
switch (addr) { switch (addr) {
case 0: case 0:
svga_out(ibm8514_on ? 0x2ec : 0x3c8, val, svga); svga_out(dev->on ? 0x2ec : 0x3c8, val, svga);
break; break;
case 1: case 1:
svga_out(ibm8514_on ? 0x2ed : 0x3c9, val, svga); svga_out(dev->on ? 0x2ed : 0x3c9, val, svga);
break; break;
case 2: case 2:
svga_out(ibm8514_on ? 0x2ea : 0x3c6, val, svga); svga_out(dev->on ? 0x2ea : 0x3c6, val, svga);
break; break;
case 3: case 3:
svga_out(ibm8514_on ? 0x2eb : 0x3c7, val, svga); svga_out(dev->on ? 0x2eb : 0x3c7, val, svga);
break; break;
default: default:
ramdac->regs[addr & 0xf] = val; ramdac->regs[addr & 0xf] = val;
@@ -171,20 +172,21 @@ uint8_t
ati68860_ramdac_in(uint16_t addr, void *priv, svga_t *svga) ati68860_ramdac_in(uint16_t addr, void *priv, svga_t *svga)
{ {
const ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv; const ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv;
ibm8514_t *dev = &svga->dev8514;
uint8_t temp = 0; uint8_t temp = 0;
switch (addr) { switch (addr) {
case 0: case 0:
temp = svga_in(ibm8514_on ? 0x2ec : 0x3c8, svga); temp = svga_in(dev->on ? 0x2ec : 0x3c8, svga);
break; break;
case 1: case 1:
temp = svga_in(ibm8514_on ? 0x2ed : 0x3c9, svga); temp = svga_in(dev->on ? 0x2ed : 0x3c9, svga);
break; break;
case 2: case 2:
temp = svga_in(ibm8514_on ? 0x2ea : 0x3c6, svga); temp = svga_in(dev->on ? 0x2ea : 0x3c6, svga);
break; break;
case 3: case 3:
temp = svga_in(ibm8514_on ? 0x2eb : 0x3c7, svga); temp = svga_in(dev->on ? 0x2eb : 0x3c7, svga);
break; break;
case 4: case 4:
case 8: case 8: