claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

CS423x: Fix ADPCM DMA counter

Browse Source
This commit is contained in:
RichardG867
2022-03-07 21:12:14 -03:00
parent 669a6a2e49
commit d0cf4bc157
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sound/snd_ad1848.c
View File

@@ -236,6 +236,7 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
case 9: case 9:
if (!ad1848->enable && (val & 0x41) == 0x01) { if (!ad1848->enable && (val & 0x41) == 0x01) {
ad1848->adpcm_pos = 0;
if (ad1848->timer_latch) if (ad1848->timer_latch)
timer_set_delay_u64(&ad1848->timer_count, ad1848->timer_latch); timer_set_delay_u64(&ad1848->timer_count, ad1848->timer_latch);
else else
@@ -257,8 +258,7 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
return; return;
case 14: case 14:
ad1848->count = ad1848->regs[15] | (val << 8); ad1848->count = ad1848->regs[15] | (val << 8);
ad1848->adpcm_pos = 0;
break; break;
case 17: case 17:
@@ -455,13 +455,12 @@ static int16_t
ad1848_process_adpcm(ad1848_t *ad1848) ad1848_process_adpcm(ad1848_t *ad1848)
{ {
int temp; int temp;
if (ad1848->adpcm_pos) { if (ad1848->adpcm_pos++ & 1) {
temp = (ad1848->adpcm_data & 0x0f) + ad1848->adpcm_step; temp = (ad1848->adpcm_data & 0x0f) + ad1848->adpcm_step;
} else { } else {
ad1848->adpcm_data = dma_channel_read(ad1848->dma); ad1848->adpcm_data = dma_channel_read(ad1848->dma);
temp = (ad1848->adpcm_data >> 4) + ad1848->adpcm_step; temp = (ad1848->adpcm_data >> 4) + ad1848->adpcm_step;
} }
ad1848->adpcm_pos ^= 1;
if (temp < 0) if (temp < 0)
temp = 0; temp = 0;
else if (temp > 63) else if (temp > 63)
@@ -580,7 +579,8 @@ ad1848_poll(void *priv)
} }
} }
ad1848->count--; if (!(ad1848->adpcm_pos & 7)) /* ADPCM counts down every 4 bytes */
ad1848->count--;
} else { } else {
ad1848->out_l = ad1848->out_r = 0; ad1848->out_l = ad1848->out_r = 0;
ad1848->cd_vol_l = ad1848->cd_vol_r = 0; ad1848->cd_vol_l = ad1848->cd_vol_r = 0;