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

Merge from trunk

Browse source
This commit is contained in:
SarahW 2019-04-18 20:46:38 +01:00
commit 50e7de5214
282 changed files with 51494 additions and 22451 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/vid_genius.c
View file

@ -97,8 +97,8 @@ typedef struct genius_t
int enabled; /* Display enabled, 0 or 1 */
int detach; /* Detach cursor, 0 or 1 */
int dispontime, dispofftime;
int vidtime;
uint64_t dispontime, dispofftime;
pc_timer_t timer;
int linepos, displine;
int vc;
@ -245,8 +245,8 @@ void genius_recalctimings(genius_t *genius)
_dispofftime = disptime - _dispontime;
_dispontime *= MDACONST;
_dispofftime *= MDACONST;
genius->dispontime = (int)(_dispontime * (1 << TIMER_SHIFT));
genius->dispofftime = (int)(_dispofftime * (1 << TIMER_SHIFT));
genius->dispontime = (uint64_t)_dispontime;
genius->dispofftime = (uint64_t)_dispofftime;
}
@ -461,7 +461,7 @@ void genius_poll(void *p)
if (!genius->linepos)
{
genius->vidtime += genius->dispofftime;
timer_advance_u64(&genius->timer, genius->dispofftime);
genius->cga_stat |= 1;
genius->mda_stat |= 1;
genius->linepos = 1;
@ -525,7 +525,7 @@ void genius_poll(void *p)
genius->cga_stat &= ~1;
genius->mda_stat &= ~1;
}
genius->vidtime += genius->dispontime;
timer_advance_u64(&genius->timer, genius->dispontime);
genius->linepos = 0;
if (genius->displine == 1008)
@ -560,7 +560,7 @@ void *genius_init()
/* 160k video RAM */
genius->vram = malloc(0x28000);
timer_add(genius_poll, &genius->vidtime, TIMER_ALWAYS_ENABLED, genius);
timer_add(&genius->timer, genius_poll, genius, 1);
/* Occupy memory between 0xB0000 and 0xBFFFF (moves to 0xA0000 in
* high-resolution modes) */