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

Merge pull request #3816 from 86Box/tc1995

Browse Source 
Forgot to apply the correction to the ATI 68860 ramdac, should clear the compile warnings
This commit is contained in:
Miran Grča
2023-11-10 00:03:06 +01:00
committed by GitHub
parent 849c3f27f8 45f0ecc87e
commit aee584bf2a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video/vid_ati68860_ramdac.c
View File

@@ -73,16 +73,16 @@ ati68860_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga)
switch (addr) { switch (addr) {
case 0: case 0:
svga_out((dev && dev->on) ? 0x2ec : 0x3c8, val, svga); svga_out((dev && (dev->on[0] || dev->on[1])) ? 0x2ec : 0x3c8, val, svga);
break; break;
case 1: case 1:
svga_out((dev && dev->on) ? 0x2ed : 0x3c9, val, svga); svga_out((dev && (dev->on[0] || dev->on[1])) ? 0x2ed : 0x3c9, val, svga);
break; break;
case 2: case 2:
svga_out((dev && dev->on) ? 0x2ea : 0x3c6, val, svga); svga_out((dev && (dev->on[0] || dev->on[1])) ? 0x2ea : 0x3c6, val, svga);
break; break;
case 3: case 3:
svga_out((dev && dev->on) ? 0x2eb : 0x3c7, val, svga); svga_out((dev && (dev->on[0] || dev->on[1])) ? 0x2eb : 0x3c7, val, svga);
break; break;
default: default:
ramdac->regs[addr & 0xf] = val; ramdac->regs[addr & 0xf] = val;
@@ -178,16 +178,16 @@ ati68860_ramdac_in(uint16_t addr, void *priv, svga_t *svga)
switch (addr) { switch (addr) {
case 0: case 0:
temp = svga_in((dev && dev->on) ? 0x2ec : 0x3c8, svga); temp = svga_in((dev && (dev->on[0] || dev->on[1])) ? 0x2ec : 0x3c8, svga);
break; break;
case 1: case 1:
temp = svga_in((dev && dev->on) ? 0x2ed : 0x3c9, svga); temp = svga_in((dev && (dev->on[0] || dev->on[1])) ? 0x2ed : 0x3c9, svga);
break; break;
case 2: case 2:
temp = svga_in((dev && dev->on) ? 0x2ea : 0x3c6, svga); temp = svga_in((dev && (dev->on[0] || dev->on[1])) ? 0x2ea : 0x3c6, svga);
break; break;
case 3: case 3:
temp = svga_in((dev && dev->on) ? 0x2eb : 0x3c7, svga); temp = svga_in((dev && (dev->on[0] || dev->on[1])) ? 0x2eb : 0x3c7, svga);
break; break;
case 4: case 4:
case 8: case 8: