Applied the latest mainline PCem commits.

This commit is contained in:
OBattler
2017-06-17 00:50:51 +02:00
parent 20178cb1bb
commit 66ff71ca55
3 changed files with 197 additions and 51 deletions

View File

@@ -705,11 +705,12 @@ int dma_channel_write(int channel, uint16_t val)
dma16.cc[channel] = dma16.cb[channel] + 1;
dma16.ac[channel] = dma16.ab[channel];
}
else
dma16.m |= (1 << channel);
dma16.stat |= (1 << channel);
}
if (dma.m & (1 << channel))
if (dma16.m & (1 << channel))
return DMA_OVER;
}
return 0;