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

Re-added the Cardex Tseng ET4000/W32p (which works better than the Diamond Stealth32), and moved the Diamond Stealth32 to the Dev branch;

Browse Source 
Re-added the ATi Mach64GX ISA, this time with a working BIOS;
Fixed some CGA/EGA/(S)VGA timing mess-ups.
This commit is contained in:
OBattler
2018-01-25 19:35:23 +01:00
parent 5b78369563
commit 6856a77e2d
9 changed files with 196 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/video/vid_cga.c
View File

@@ -8,13 +8,13 @@
*
* Emulation of the old and new IBM CGA graphics cards.
*
* Version: @(#)vid_cga.c 1.0.12 2017/12/31
* Version: @(#)vid_cga.c 1.0.13 2018/01/25
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
*
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016,2017 Miran Grca.
* Copyright 2008-2018 Sarah Walker.
* Copyright 2016-2018 Miran Grca.
*/
#include <stdio.h>
#include <stdint.h>
@@ -140,17 +140,17 @@ void cga_recalctimings(cga_t *cga)
/* pclog("Recalc - %i %i %i\n", cga->crtc[0], cga->crtc[1], cga->cgamode & 1); */
if (cga->cgamode & 1)
{
disptime = cga->crtc[0] + 1;
_dispontime = cga->crtc[1];
disptime = (double) (cga->crtc[0] + 1);
_dispontime = (double) cga->crtc[1];
}
else
{
disptime = (cga->crtc[0] + 1) << 1;
_dispontime = cga->crtc[1] << 1;
disptime = (double) ((cga->crtc[0] + 1) << 1);
_dispontime = (double) (cga->crtc[1] << 1);
}
_dispofftime = disptime - _dispontime;
_dispontime *= CGACONST;
_dispofftime *= CGACONST;
_dispontime = _dispontime * CGACONST;
_dispofftime = _dispofftime * CGACONST;
cga->dispontime = (int64_t)(_dispontime * (1LL << TIMER_SHIFT));
cga->dispofftime = (int64_t)(_dispofftime * (1LL << TIMER_SHIFT));
}