Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always decode CRTC index bit 5 on VGA compatibles. Fixes Joe Montana Football.

Browse source
This commit is contained in:
SarahW 2018-04-11 17:00:58 +01:00
commit 4ba11c5a13
4 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/vid_oti067.c
View file

@ -38,9 +38,11 @@ void oti067_out(uint16_t addr, uint8_t val, void *p)
switch (addr) switch (addr)
{ {
case 0x3D4: case 0x3D4:
svga->crtcreg = val & 31; svga->crtcreg = val & 0x3f;
return; return;
case 0x3D5: case 0x3D5:
if (svga->crtcreg & 0x20)
return;
if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80)) if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80))
return; return;
if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80)) if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
@ -99,7 +101,10 @@ uint8_t oti067_in(uint16_t addr, void *p)
temp = svga->crtcreg; temp = svga->crtcreg;
break; break;
case 0x3D5: case 0x3D5:
temp = svga->crtc[svga->crtcreg]; if (svga->crtcreg & 0x20)
temp = 0xff;
else
temp = svga->crtc[svga->crtcreg];
break; break;
case 0x3DE: case 0x3DE:

9
src/vid_paradise.c
View file

@ -110,12 +110,11 @@ void paradise_out(uint16_t addr, uint8_t val, void *p)
break; break;
case 0x3D4: case 0x3D4:
if (paradise->type == PVGA1A) svga->crtcreg = val & 0x3f;
svga->crtcreg = val & 0x1f;
else
svga->crtcreg = val & 0x3f;
return; return;
case 0x3D5: case 0x3D5:
if ((paradise->type == PVGA1A) && (svga->crtcreg & 0x20))
return;
if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80)) if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80))
return; return;
if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80)) if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
@ -191,6 +190,8 @@ uint8_t paradise_in(uint16_t addr, void *p)
case 0x3D4: case 0x3D4:
return svga->crtcreg; return svga->crtcreg;
case 0x3D5: case 0x3D5:
if ((paradise->type == PVGA1A) && (svga->crtcreg & 0x20))
return 0xff;
if (svga->crtcreg > 0x29 && svga->crtcreg < 0x30 && (svga->crtc[0x29] & 0x88) != 0x80) if (svga->crtcreg > 0x29 && svga->crtcreg < 0x30 && (svga->crtc[0x29] & 0x88) != 0x80)
return 0xff; return 0xff;
return svga->crtc[svga->crtcreg]; return svga->crtc[svga->crtcreg];

9
src/vid_ps1_svga.c
View file

@ -42,9 +42,11 @@ void ps1_m2121_svga_out(uint16_t addr, uint8_t val, void *p)
switch (addr) switch (addr)
{ {
case 0x3D4: case 0x3D4:
svga->crtcreg = val & 0x1f; svga->crtcreg = val & 0x3f;
return; return;
case 0x3D5: case 0x3D5:
if (svga->crtcreg & 0x20)
return;
if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80)) if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80))
return; return;
if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80)) if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
@ -104,7 +106,10 @@ uint8_t ps1_m2121_svga_in(uint16_t addr, void *p)
temp = svga->crtcreg; temp = svga->crtcreg;
break; break;
case 0x3D5: case 0x3D5:
temp = svga->crtc[svga->crtcreg]; if (svga->crtcreg & 0x20)
temp = 0xff;
else
temp = svga->crtc[svga->crtcreg];
break; break;
case 0x2108: case 0x2108:

9
src/vid_vga.c
View file

@ -30,9 +30,11 @@ void vga_out(uint16_t addr, uint8_t val, void *p)
switch (addr) switch (addr)
{ {
case 0x3D4: case 0x3D4:
svga->crtcreg = val & 0x1f; svga->crtcreg = val & 0x3f;
return; return;
case 0x3D5: case 0x3D5:
if (svga->crtcreg & 0x20)
return;
if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80)) if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80))
return; return;
if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80)) if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
@ -69,7 +71,10 @@ uint8_t vga_in(uint16_t addr, void *p)
temp = svga->crtcreg; temp = svga->crtcreg;
break; break;
case 0x3D5: case 0x3D5:
temp = svga->crtc[svga->crtcreg]; if (svga->crtcreg & 0x20)
temp = 0xff;
else
temp = svga->crtc[svga->crtcreg];
break; break;
default: default:
temp = svga_in(addr, svga); temp = svga_in(addr, svga);