valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

No irq generating when masking the IRQ channel. Fixes later sci games and bug #482.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4113
This commit is contained in:
Peter Veenstra 2018-06-11 14:51:22 +00:00
parent cb8bf9f8f6
commit fdc5a06200
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/hardware/sblaster.cpp
View file

@ -273,11 +273,27 @@ static INLINE void DSP_FlushData(void) {
sb.dsp.out.pos=0;
}
static double last_dma_callback = 0.0f;
static void DSP_DMA_CallBack(DmaChannel * chan, DMAEvent event) {
if (chan!=sb.dma.chan || event==DMA_REACHED_TC) return;
else if (event==DMA_MASKED) {
if (sb.mode==MODE_DMA) {
GenerateDMASound(sb.dma.min);
//Catch up to current time, but don't generate an IRQ!
//Fixes problems with later sci games.
double t = PIC_FullIndex() - last_dma_callback;
Bitu s = static_cast<Bitu>(sb.dma.rate * t / 1000.0f);
if (s > sb.dma.min) {
LOG(LOG_SB,LOG_NORMAL)("limiting amount masked to sb.dma.min");
s = sb.dma.min;
}
Bitu min_size = sb.dma.mul >> SB_SH;
if (!min_size) min_size = 1;
min_size *= 2;
if (sb.dma.left > min_size) {
if (s > (sb.dma.left-min_size)) s = sb.dma.left - min_size;
GenerateDMASound(s);
}
sb.mode=MODE_DMA_MASKED;
// DSP_ChangeMode(MODE_DMA_MASKED);
LOG(LOG_SB,LOG_NORMAL)("DMA masked,stopping output, left %d",chan->currcnt);
@ -394,12 +410,15 @@ INLINE Bit8u decode_ADPCM_3_sample(Bit8u sample,Bit8u & reference,Bits& scale) {
static void GenerateDMASound(Bitu size) {
Bitu read=0;Bitu done=0;Bitu i=0;
last_dma_callback = PIC_FullIndex();
if(sb.dma.autoinit) {
if (sb.dma.left <= size)
size = sb.dma.left;
} else if (sb.dma.left <= sb.dma.min)
size = sb.dma.left;
} else {
if (sb.dma.left <= sb.dma.min)
size = sb.dma.left;
}
switch (sb.dma.mode) {
case DSP_DMA_2: