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

Fix pixel clocks on ATI-28800, ET4000 and Trident graphics cards.

Browse source
This commit is contained in:
SarahW 2019-04-26 17:28:01 +01:00
commit 5d9b14ac4a
5 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/vid_ati28800.c
View file

@ -272,20 +272,20 @@ void ati28800_recalctimings(svga_t *svga)
switch (((ati28800->regs[0xbe] & 0x10) >> 1) | ((ati28800->regs[0xb9] & 2) << 1) | ((svga->miscout & 0x0C) >> 2))
{
case 0x00: svga->clock = cpuclock / 42954000.0; break;
case 0x01: svga->clock = cpuclock / 48771000.0; break;
case 0x03: svga->clock = cpuclock / 36000000.0; break;
case 0x04: svga->clock = cpuclock / 50350000.0; break;
case 0x05: svga->clock = cpuclock / 56640000.0; break;
case 0x07: svga->clock = cpuclock / 44900000.0; break;
case 0x08: svga->clock = cpuclock / 30240000.0; break;
case 0x09: svga->clock = cpuclock / 32000000.0; break;
case 0x0A: svga->clock = cpuclock / 37500000.0; break;
case 0x0B: svga->clock = cpuclock / 39000000.0; break;
case 0x0C: svga->clock = cpuclock / 40000000.0; break;
case 0x0D: svga->clock = cpuclock / 56644000.0; break;
case 0x0E: svga->clock = cpuclock / 75000000.0; break;
case 0x0F: svga->clock = cpuclock / 65000000.0; break;
case 0x00: svga->clock = (cpuclock * (double)(1ull << 32)) / 42954000.0; break;
case 0x01: svga->clock = (cpuclock * (double)(1ull << 32)) / 48771000.0; break;
case 0x03: svga->clock = (cpuclock * (double)(1ull << 32)) / 36000000.0; break;
case 0x04: svga->clock = (cpuclock * (double)(1ull << 32)) / 50350000.0; break;
case 0x05: svga->clock = (cpuclock * (double)(1ull << 32)) / 56640000.0; break;
case 0x07: svga->clock = (cpuclock * (double)(1ull << 32)) / 44900000.0; break;
case 0x08: svga->clock = (cpuclock * (double)(1ull << 32)) / 30240000.0; break;
case 0x09: svga->clock = (cpuclock * (double)(1ull << 32)) / 32000000.0; break;
case 0x0A: svga->clock = (cpuclock * (double)(1ull << 32)) / 37500000.0; break;
case 0x0B: svga->clock = (cpuclock * (double)(1ull << 32)) / 39000000.0; break;
case 0x0C: svga->clock = (cpuclock * (double)(1ull << 32)) / 40000000.0; break;
case 0x0D: svga->clock = (cpuclock * (double)(1ull << 32)) / 56644000.0; break;
case 0x0E: svga->clock = (cpuclock * (double)(1ull << 32)) / 75000000.0; break;
case 0x0F: svga->clock = (cpuclock * (double)(1ull << 32)) / 65000000.0; break;
default: break;
}
if (ati28800->regs[0xb8] & 0x40)

6
src/vid_et4000.c
View file

@ -240,9 +240,9 @@ void et4000_recalctimings(svga_t *svga)
switch (((svga->miscout >> 2) & 3) | ((svga->crtc[0x34] << 1) & 4))
{
case 0: case 1: break;
case 3: svga->clock = cpuclock / 40000000.0; break;
case 5: svga->clock = cpuclock / 65000000.0; break;
default: svga->clock = cpuclock / 36000000.0; break;
case 3: svga->clock = (cpuclock * (double)(1ull << 32)) / 40000000.0; break;
case 5: svga->clock = (cpuclock * (double)(1ull << 32)) / 65000000.0; break;
default: svga->clock = (cpuclock * (double)(1ull << 32)) / 36000000.0; break;
}
switch (svga->bpp)

2
src/vid_et4000w32.c
View file

@ -293,7 +293,7 @@ void et4000w32p_recalctimings(svga_t *svga)
switch ((svga->miscout >> 2) & 3)
{
case 0: case 1: break;
case 2: case 3: svga->clock = cpuclock / icd2061_getfreq(&et4000->icd2061, 2); break;
case 2: case 3: svga->clock = (cpuclock * (double)(1ull << 32)) / icd2061_getfreq(&et4000->icd2061, 2); break;
}
switch (svga->bpp)

30
src/vid_tgui9440.c
View file

@ -482,7 +482,7 @@ void tgui_recalctimings(svga_t *svga)
if (tgui->type >= TGUI_9440)
{
if (svga->miscout & 8)
svga->clock = cpuclock / (((tgui->clock_n + 8) * 14318180.0) / ((tgui->clock_m + 2) * (1 << tgui->clock_k)));
svga->clock = (cpuclock * (double)(1ull << 32)) / (((tgui->clock_n + 8) * 14318180.0) / ((tgui->clock_m + 2) * (1 << tgui->clock_k)));
if (svga->gdcreg[0xf] & 0x08)
svga->clock *= 2;
@ -493,20 +493,20 @@ void tgui_recalctimings(svga_t *svga)
{
switch (((svga->miscout >> 2) & 3) | ((tgui->newctrl2 << 2) & 4) | ((tgui->newctrl2 >> 3) & 8))
{
case 0x02: svga->clock = cpuclock/ 44900000.0; break;
case 0x03: svga->clock = cpuclock/ 36000000.0; break;
case 0x04: svga->clock = cpuclock/ 57272000.0; break;
case 0x05: svga->clock = cpuclock/ 65000000.0; break;
case 0x06: svga->clock = cpuclock/ 50350000.0; break;
case 0x07: svga->clock = cpuclock/ 40000000.0; break;
case 0x08: svga->clock = cpuclock/ 88000000.0; break;
case 0x09: svga->clock = cpuclock/ 98000000.0; break;
case 0x0a: svga->clock = cpuclock/118800000.0; break;
case 0x0b: svga->clock = cpuclock/108000000.0; break;
case 0x0c: svga->clock = cpuclock/ 72000000.0; break;
case 0x0d: svga->clock = cpuclock/ 77000000.0; break;
case 0x0e: svga->clock = cpuclock/ 80000000.0; break;
case 0x0f: svga->clock = cpuclock/ 75000000.0; break;
case 0x02: svga->clock = (cpuclock * (double)(1ull << 32)) / 44900000.0; break;
case 0x03: svga->clock = (cpuclock * (double)(1ull << 32)) / 36000000.0; break;
case 0x04: svga->clock = (cpuclock * (double)(1ull << 32)) / 57272000.0; break;
case 0x05: svga->clock = (cpuclock * (double)(1ull << 32)) / 65000000.0; break;
case 0x06: svga->clock = (cpuclock * (double)(1ull << 32)) / 50350000.0; break;
case 0x07: svga->clock = (cpuclock * (double)(1ull << 32)) / 40000000.0; break;
case 0x08: svga->clock = (cpuclock * (double)(1ull << 32)) / 88000000.0; break;
case 0x09: svga->clock = (cpuclock * (double)(1ull << 32)) / 98000000.0; break;
case 0x0a: svga->clock = (cpuclock * (double)(1ull << 32)) /118800000.0; break;
case 0x0b: svga->clock = (cpuclock * (double)(1ull << 32)) /108000000.0; break;
case 0x0c: svga->clock = (cpuclock * (double)(1ull << 32)) / 72000000.0; break;
case 0x0d: svga->clock = (cpuclock * (double)(1ull << 32)) / 77000000.0; break;
case 0x0e: svga->clock = (cpuclock * (double)(1ull << 32)) / 80000000.0; break;
case 0x0f: svga->clock = (cpuclock * (double)(1ull << 32)) / 75000000.0; break;
}
if (svga->gdcreg[0xf] & 0x08)
{

12
src/vid_tvga.c
View file

@ -248,12 +248,12 @@ void tvga_recalctimings(svga_t *svga)
switch (((svga->miscout >> 2) & 3) | ((tvga->newctrl2 << 2) & 4))
{
case 2: svga->clock = cpuclock/44900000.0; break;
case 3: svga->clock = cpuclock/36000000.0; break;
case 4: svga->clock = cpuclock/57272000.0; break;
case 5: svga->clock = cpuclock/65000000.0; break;
case 6: svga->clock = cpuclock/50350000.0; break;
case 7: svga->clock = cpuclock/40000000.0; break;
case 2: svga->clock = (cpuclock * (double)(1ull << 32)) / 44900000.0; break;
case 3: svga->clock = (cpuclock * (double)(1ull << 32)) / 36000000.0; break;
case 4: svga->clock = (cpuclock * (double)(1ull << 32)) / 57272000.0; break;
case 5: svga->clock = (cpuclock * (double)(1ull << 32)) / 65000000.0; break;
case 6: svga->clock = (cpuclock * (double)(1ull << 32)) / 50350000.0; break;
case 7: svga->clock = (cpuclock * (double)(1ull << 32)) / 40000000.0; break;
}
if (tvga->oldctrl2 & 0x10)