claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied all the mainline PCem commits, this also fixes the annoying buzzing on the AWE32.

Browse Source
This commit is contained in:
OBattler
2017-09-01 01:01:53 +02:00
parent 0d84add8a3
commit 5388c2205d
11 changed files with 538 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video/vid_ega.c
View File

@@ -961,18 +961,18 @@ uint8_t ega_read(uint32_t addr, void *p)
ega->ld = ega->vram[addr | 0x3];
if (ega->readmode)
{
temp = (ega->colournocare & 1) ? 0xff : 0;
temp &= ega->la;
temp = ega->la;
temp ^= (ega->colourcompare & 1) ? 0xff : 0;
temp2 = (ega->colournocare & 2) ? 0xff : 0;
temp2 &= ega->lb;
temp &= (ega->colournocare & 1) ? 0xff : 0;
temp2 = ega->lb;
temp2 ^= (ega->colourcompare & 2) ? 0xff : 0;
temp3 = (ega->colournocare & 4) ? 0xff : 0;
temp3 &= ega->lc;
temp2 &= (ega->colournocare & 2) ? 0xff : 0;
temp3 = ega->lc;
temp3 ^= (ega->colourcompare & 4) ? 0xff : 0;
temp4 = (ega->colournocare & 8) ? 0xff : 0;
temp4 &= ega->ld;
temp3 &= (ega->colournocare & 4) ? 0xff : 0;
temp4 = ega->ld;
temp4 ^= (ega->colourcompare & 8) ? 0xff : 0;
temp4 &= (ega->colournocare & 8) ? 0xff : 0;
return ~(temp | temp2 | temp3 | temp4);
}
return ega->vram[addr | readplane];

32
src/video/vid_svga.c
View File

@@ -1306,18 +1306,18 @@ uint8_t svga_read(uint32_t addr, void *p)
if (svga->readmode)
{
temp = (svga->colournocare & 1) ? 0xff : 0;
temp &= svga->la;
temp = svga->la;
temp ^= (svga->colourcompare & 1) ? 0xff : 0;
temp2 = (svga->colournocare & 2) ? 0xff : 0;
temp2 &= svga->lb;
temp &= (svga->colournocare & 1) ? 0xff : 0;
temp2 = svga->lb;
temp2 ^= (svga->colourcompare & 2) ? 0xff : 0;
temp3 = (svga->colournocare & 4) ? 0xff : 0;
temp3 &= svga->lc;
temp2 &= (svga->colournocare & 2) ? 0xff : 0;
temp3 = svga->lc;
temp3 ^= (svga->colourcompare & 4) ? 0xff : 0;
temp4 = (svga->colournocare & 8) ? 0xff : 0;
temp4 &= svga->ld;
temp3 &= (svga->colournocare & 4) ? 0xff : 0;
temp4 = svga->ld;
temp4 ^= (svga->colourcompare & 8) ? 0xff : 0;
temp4 &= (svga->colournocare & 8) ? 0xff : 0;
return ~(temp | temp2 | temp3 | temp4);
}
return svga->vram[addr | readplane];
@@ -1572,18 +1572,18 @@ uint8_t svga_read_linear(uint32_t addr, void *p)
svga->ld = svga->vram[addr | 0x3];
if (svga->readmode)
{
temp = (svga->colournocare & 1) ? 0xff : 0;
temp &= svga->la;
temp = svga->la;
temp ^= (svga->colourcompare & 1) ? 0xff : 0;
temp2 = (svga->colournocare & 2) ? 0xff : 0;
temp2 &= svga->lb;
temp &= (svga->colournocare & 1) ? 0xff : 0;
temp2 = svga->lb;
temp2 ^= (svga->colourcompare & 2) ? 0xff : 0;
temp3 = (svga->colournocare & 4) ? 0xff : 0;
temp3 &= svga->lc;
temp2 &= (svga->colournocare & 2) ? 0xff : 0;
temp3 = svga->lc;
temp3 ^= (svga->colourcompare & 4) ? 0xff : 0;
temp4 = (svga->colournocare & 8) ? 0xff : 0;
temp4 &= svga->ld;
temp3 &= (svga->colournocare & 4) ? 0xff : 0;
temp4 = svga->ld;
temp4 ^= (svga->colourcompare & 8) ? 0xff : 0;
temp4 &= (svga->colournocare & 8) ? 0xff : 0;
return ~(temp | temp2 | temp3 | temp4);
}
return svga->vram[addr | readplane];