80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #1735 from 86Box/tc1995

Browse Source 
OPL2 status now correctly cleared when timers are stopped. Fixes F15 …
This commit is contained in:
Miran Grča
2021-09-25 19:37:33 +02:00
committed by GitHub
parent 52e7b9b772 295d3ac937
commit 4dd5df59c8
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sound/snd_opl.c
View File

@@ -106,8 +106,15 @@ timer_control(opl_t *dev, int tmr, int start)
timer_tick(dev, tmr); /* Per the YMF 262 datasheet, OPL3 starts counting immediately, unlike OPL2. */ timer_tick(dev, tmr); /* Per the YMF 262 datasheet, OPL3 starts counting immediately, unlike OPL2. */
else else
timer_on_auto(&dev->timers[tmr], (tmr == 1) ? 320.0 : 80.0); timer_on_auto(&dev->timers[tmr], (tmr == 1) ? 320.0 : 80.0);
} else } else {
opl_log("Timer %i stopped\n", tmr); opl_log("Timer %i stopped\n", tmr);
if (!(dev->flags & FLAG_OPL3)) {
if (tmr == 1) {
dev->status &= ~STAT_TMR2_OVER;
} else
dev->status &= ~STAT_TMR1_OVER;
}
}
} }
@@ -140,6 +147,8 @@ opl_read(opl_t *dev, uint16_t port)
ret |= STAT_TMR_ANY; ret |= STAT_TMR_ANY;
} }
opl_log("OPL statret = %02x, status = %02x\n", ret, dev->status);
return ret; return ret;
} }
@@ -231,7 +240,8 @@ opl2_read(uint16_t port, void *priv)
cycles -= ((int) (isa_timing * 8)); cycles -= ((int) (isa_timing * 8));
opl2_update(dev); opl2_update(dev);
opl_log("OPL2 port read = %04x\n", port);
return(opl_read(dev, port)); return(opl_read(dev, port));
} }
@@ -243,6 +253,7 @@ opl2_write(uint16_t port, uint8_t val, void *priv)
opl2_update(dev); opl2_update(dev);
opl_log("OPL2 port write = %04x\n", port);
opl_write(dev, port, val); opl_write(dev, port, val);
} }
@@ -257,8 +268,9 @@ opl2_init(opl_t *dev)
void void
opl2_update(opl_t *dev) opl2_update(opl_t *dev)
{ {
if (dev->pos >= sound_pos_global) if (dev->pos >= sound_pos_global) {
return; return;
}
nuked_generate_stream(dev->opl, nuked_generate_stream(dev->opl,
&dev->buffer[dev->pos * 2], &dev->buffer[dev->pos * 2],