Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sound Blaster Write Buffer Status register now set to full on data write and cleared after a short wait - sound in Crystal Dream no longer cuts off after the first few seconds.

Browse source
This commit is contained in:
SarahW 2016-05-03 21:29:33 +01:00
commit 27545dbd62
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/sound_sb_dsp.c
View file

@ -531,6 +531,10 @@ void sb_write(uint16_t a, uint8_t v, void *priv)
dsp->sbreset = v; dsp->sbreset = v;
return; return;
case 0xC: /*Command/data write*/ case 0xC: /*Command/data write*/
timer_process();
dsp->wb_time = TIMER_USEC * 1;
dsp->wb_full = 1;
timer_update_outstanding();
if (dsp->asp_data_len) if (dsp->asp_data_len)
{ {
// pclog("ASP data %i\n", dsp->asp_data_len); // pclog("ASP data %i\n", dsp->asp_data_len);
@ -576,9 +580,11 @@ uint8_t sb_read(uint16_t a, void *priv)
// pclog("SB read %02X\n",sbreaddat); // pclog("SB read %02X\n",sbreaddat);
return dsp->sbreaddat; return dsp->sbreaddat;
case 0xC: /*Write data ready*/ case 0xC: /*Write data ready*/
cycles -= 100; if (dsp->wb_full)
dsp->writebusy++; {
if (dsp->writebusy & 8) return 0xff; dsp->wb_full = dsp->wb_time;
return 0xff;
}
return 0x7f; return 0x7f;
case 0xE: /*Read data ready*/ case 0xE: /*Read data ready*/
picintc(1 << dsp->sb_irqnum); picintc(1 << dsp->sb_irqnum);
@ -592,6 +598,13 @@ uint8_t sb_read(uint16_t a, void *priv)
return 0; return 0;
} }
static void sb_wb_clear(void *p)
{
sb_dsp_t *dsp = (sb_dsp_t *)p;
dsp->wb_time = 0;
}
void sb_dsp_init(sb_dsp_t *dsp, int type) void sb_dsp_init(sb_dsp_t *dsp, int type)
{ {
dsp->sb_type = type; dsp->sb_type = type;
@ -603,6 +616,7 @@ void sb_dsp_init(sb_dsp_t *dsp, int type)
timer_add(pollsb, &dsp->sbcount, &dsp->sbenable, dsp); timer_add(pollsb, &dsp->sbcount, &dsp->sbenable, dsp);
timer_add(sb_poll_i, &dsp->sb_count_i, &dsp->sb_enable_i, dsp); timer_add(sb_poll_i, &dsp->sb_count_i, &dsp->sb_enable_i, dsp);
timer_add(sb_wb_clear, &dsp->wb_time, &dsp->wb_time, dsp);
} }
void sb_dsp_setaddr(sb_dsp_t *dsp, uint16_t addr) void sb_dsp_setaddr(sb_dsp_t *dsp, uint16_t addr)

4
src/sound_sb_dsp.h
View file

@ -22,8 +22,6 @@ typedef struct sb_dsp_t
int sb_freq; int sb_freq;
int writebusy; /*Needed for Amnesia*/
int16_t sbdat; int16_t sbdat;
int sbdat2; int sbdat2;
int16_t sbdatl, sbdatr; int16_t sbdatl, sbdatr;
@ -57,6 +55,8 @@ typedef struct sb_dsp_t
int asp_data_len; int asp_data_len;
int wb_time, wb_full;
int16_t buffer[SOUNDBUFLEN * 2]; int16_t buffer[SOUNDBUFLEN * 2];
int pos; int pos;
} sb_dsp_t; } sb_dsp_t;