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

Deal with edge cases where drivers use non-ESS playback route

Browse Source
This commit is contained in:
Cacodemon345
2024-03-05 14:06:20 +06:00
committed by Kagamiin~
parent 552f595bc5
commit 2e9e20c078
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/sound/snd_sb_dsp.c
View File

@@ -353,11 +353,27 @@ sb_add_data(sb_dsp_t *dsp, uint8_t v)
dsp->sb_read_wp &= 0xff; dsp->sb_read_wp &= 0xff;
} }
static unsigned int sb_ess_get_dma_len(sb_dsp_t *dsp)
{
unsigned int r;
r = (unsigned int)ESSreg(0xA5) << 8U;
r |= (unsigned int)ESSreg(0xA4);
/* the 16-bit counter is a "two's complement" of the DMA count because it counts UP to 0 and triggers IRQ on overflow */
return 0x10000U-r;
}
void void
sb_start_dma(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len) sb_start_dma(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
{ {
dsp->sb_pausetime = -1; dsp->sb_pausetime = -1;
if (dsp->ess_reload_len) {
len = sb_ess_get_dma_len(dsp);
dsp->ess_reload_len = 0;
}
if (dma8) { if (dma8) {
dsp->sb_8_length = dsp->sb_8_origlength = len; dsp->sb_8_length = dsp->sb_8_origlength = len;
dsp->sb_8_format = format; dsp->sb_8_format = format;
@@ -392,6 +408,11 @@ sb_start_dma(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
void void
sb_start_dma_i(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len) sb_start_dma_i(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
{ {
if (dsp->ess_reload_len) {
len = sb_ess_get_dma_len(dsp);
dsp->ess_reload_len = 0;
}
if (dma8) { if (dma8) {
dsp->sb_8_length = dsp->sb_8_origlength = len; dsp->sb_8_length = dsp->sb_8_origlength = len;
dsp->sb_8_format = format; dsp->sb_8_format = format;
@@ -419,18 +440,6 @@ sb_start_dma_i(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
memset(dsp->record_buffer, 0, sizeof(dsp->record_buffer)); memset(dsp->record_buffer, 0, sizeof(dsp->record_buffer));
} }
static unsigned int sb_ess_get_dma_len(sb_dsp_t *dsp)
{
unsigned int r;
r = (unsigned int)ESSreg(0xA5) << 8U;
r |= (unsigned int)ESSreg(0xA4);
/* the 16-bit counter is a "two's complement" of the DMA count because it counts UP to 0 and triggers IRQ on overflow */
return 0x10000U-r;
}
void void
sb_start_dma_ess(sb_dsp_t* dsp) sb_start_dma_ess(sb_dsp_t* dsp)
{ {