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

More moving of SB IRQ's onto a rimer, fixes #1942.

Browse Source
This commit is contained in:
OBattler
2024-07-22 02:43:24 +02:00
parent e434b3f837
commit 3ccca3991f
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/snd_sb_dsp.h
View File

@@ -141,6 +141,7 @@ typedef struct sb_dsp_t {
int wb_full; int wb_full;
pc_timer_t irq_timer; pc_timer_t irq_timer;
pc_timer_t irq16_timer;
int busy_count; int busy_count;

33
src/sound/snd_sb_dsp.c
View File

@@ -1722,19 +1722,18 @@ sb_exec_command(sb_dsp_t *dsp)
sb_add_data(dsp, dsp->sb_test); sb_add_data(dsp, dsp->sb_test);
break; break;
case 0xF2: /* Trigger 8-bit IRQ */ case 0xF2: /* Trigger 8-bit IRQ */
sb_dsp_log("Trigger IRQ\n"); sb_dsp_log("Trigger 8-bit IRQ\n");
if (IS_ESS(dsp)) { if (!timer_is_enabled(&dsp->irq_timer)) {
if (!timer_is_enabled(&dsp->irq_timer)) { timer_set_delay_u64(&dsp->irq_timer, (100ULL * TIMER_USEC));
timer_set_delay_u64(&dsp->irq_timer, (100ULL * TIMER_USEC));
}
} else {
sb_irq(dsp, 1);
dsp->ess_irq_generic = true;
} }
break; break;
case 0xF3: /* Trigger 16-bit IRQ */ case 0xF3: /* Trigger 16-bit IRQ */
sb_dsp_log("Trigger IRQ\n"); sb_dsp_log("Trigger 16-bit IRQ\n");
dsp->ess_irq_generic = true; if (IS_ESS(dsp))
dsp->ess_irq_generic = true;
else if (!timer_is_enabled(&dsp->irq16_timer)) {
timer_set_delay_u64(&dsp->irq16_timer, (100ULL * TIMER_USEC));
}
break; break;
case 0xF8: case 0xF8:
if (dsp->sb_type < SB16) if (dsp->sb_type < SB16)
@@ -2061,6 +2060,15 @@ sb_dsp_irq_poll(void *priv)
dsp->ess_irq_generic = true; dsp->ess_irq_generic = true;
} }
void
sb_dsp_irq16_poll(void *priv)
{
sb_dsp_t *dsp = (sb_dsp_t *) priv;
sb_irq(dsp, 0);
dsp->ess_irq_generic = true;
}
void void
sb_dsp_init(sb_dsp_t *dsp, int type, int subtype, void *parent) sb_dsp_init(sb_dsp_t *dsp, int type, int subtype, void *parent)
{ {
@@ -2095,15 +2103,18 @@ sb_dsp_init(sb_dsp_t *dsp, int type, int subtype, void *parent)
timer_add(&dsp->input_timer, sb_poll_i, dsp, 0); timer_add(&dsp->input_timer, sb_poll_i, dsp, 0);
timer_add(&dsp->wb_timer, NULL, dsp, 0); timer_add(&dsp->wb_timer, NULL, dsp, 0);
timer_add(&dsp->irq_timer, sb_dsp_irq_poll, dsp, 0); timer_add(&dsp->irq_timer, sb_dsp_irq_poll, dsp, 0);
timer_add(&dsp->irq16_timer, sb_dsp_irq16_poll, dsp, 0);
if (IS_ESS(dsp)) if (IS_ESS(dsp))
/* Initialize ESS filter to 8 kHz. This will be recalculated when a set frequency command is /* Initialize ESS filter to 8 kHz. This will be recalculated when a set frequency command is
sent. */ sent. */
recalc_sb16_filter(0, 8000 * 2); recalc_sb16_filter(0, 8000 * 2);
else else {
timer_add(&dsp->irq16_timer, sb_dsp_irq16_poll, dsp, 0);
/* Initialise SB16 filter to same cutoff as 8-bit SBs (3.2 kHz). This will be recalculated when /* Initialise SB16 filter to same cutoff as 8-bit SBs (3.2 kHz). This will be recalculated when
a set frequency command is sent. */ a set frequency command is sent. */
recalc_sb16_filter(0, 3200 * 2); recalc_sb16_filter(0, 3200 * 2);
}
if (IS_ESS(dsp) || (dsp->sb_type >= SBPRO2)) { if (IS_ESS(dsp) || (dsp->sb_type >= SBPRO2)) {
/* OPL3 or dual OPL2 is stereo. */ /* OPL3 or dual OPL2 is stereo. */
if (dsp->sb_has_real_opl) if (dsp->sb_has_real_opl)