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

Non-ESS SB clones fix:

Browse Source 
Add sanity checks to prevent segfaults on non-ESS SB clones using the setirq and setdma8 functions.
This commit is contained in:
TC1995
2024-05-21 22:44:52 +02:00
parent 94c30b06f0
commit 5c222f3f6d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sound/snd_sb_dsp.c
View File

@@ -875,9 +875,11 @@ sb_dsp_setirq(sb_dsp_t *dsp, int irq)
sb_dsp_log("IRQ now: %i\n", irq);
dsp->sb_irqnum = irq;
sb_ess_update_irq_drq_readback_regs(dsp, true);
if (IS_ESS(dsp)) {
sb_ess_update_irq_drq_readback_regs(dsp, true);
ESSreg(0xB1) = (ESSreg(0xB1) & 0xEF) | 0x10;
ESSreg(0xB1) = (ESSreg(0xB1) & 0xEF) | 0x10;
}
}
void
@@ -886,7 +888,8 @@ sb_dsp_setdma8(sb_dsp_t *dsp, int dma)
sb_dsp_log("8-bit DMA now: %i\n", dma);
dsp->sb_8_dmanum = dma;
sb_ess_update_irq_drq_readback_regs(dsp, true);
if (IS_ESS(dsp))
sb_ess_update_irq_drq_readback_regs(dsp, true);
}
void
@@ -1683,7 +1686,7 @@ sb_exec_command(sb_dsp_t *dsp)
switch (dsp->sb_subtype) {
default:
break;
case SB_SUBTYPE_ESS_ES688:
case SB_SUBTYPE_ESS_ES688:
sb_add_data(dsp, 0x68);
sb_add_data(dsp, 0x80 | 0x04);
break;