etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NES: implement DPCM loop

This commit is contained in:
tildearrow 2022-09-22 18:43:48 -05:00
parent 52cd4f15de
commit cbff5f190c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/engine/platform/nes.cpp
View File

@ -320,9 +320,10 @@ void DivPlatformNES::tick(bool sysTick) {
unsigned int dpcmAddr=parent->getSample(dacSample)->offDPCM; unsigned int dpcmAddr=parent->getSample(dacSample)->offDPCM;
unsigned int dpcmLen=(parent->getSample(dacSample)->lengthDPCM+15)>>4; unsigned int dpcmLen=(parent->getSample(dacSample)->lengthDPCM+15)>>4;
if (dpcmLen>255) dpcmLen=255; if (dpcmLen>255) dpcmLen=255;
goingToLoop=parent->getSample(dacSample)->isLoopable();
// write DPCM // write DPCM
rWrite(0x4015,15); rWrite(0x4015,15);
rWrite(0x4010,calcDPCMRate(dacRate)); rWrite(0x4010,calcDPCMRate(dacRate)|(goingToLoop?0x40:0));
rWrite(0x4012,(dpcmAddr>>6)&0xff); rWrite(0x4012,(dpcmAddr>>6)&0xff);
rWrite(0x4013,dpcmLen&0xff); rWrite(0x4013,dpcmLen&0xff);
rWrite(0x4015,31); rWrite(0x4015,31);
@ -330,7 +331,7 @@ void DivPlatformNES::tick(bool sysTick) {
} }
} else { } else {
if (dpcmMode) { if (dpcmMode) {
rWrite(0x4010,calcDPCMRate(dacRate)); rWrite(0x4010,calcDPCMRate(dacRate)|(goingToLoop?0x40:0));
} }
} }
if (dumpWrites && !dpcmMode) addWrite(0xffff0001,dacRate); if (dumpWrites && !dpcmMode) addWrite(0xffff0001,dacRate);
@ -385,9 +386,10 @@ int DivPlatformNES::dispatch(DivCommand c) {
unsigned int dpcmAddr=parent->getSample(dacSample)->offDPCM; unsigned int dpcmAddr=parent->getSample(dacSample)->offDPCM;
unsigned int dpcmLen=(parent->getSample(dacSample)->lengthDPCM+15)>>4; unsigned int dpcmLen=(parent->getSample(dacSample)->lengthDPCM+15)>>4;
if (dpcmLen>255) dpcmLen=255; if (dpcmLen>255) dpcmLen=255;
goingToLoop=parent->getSample(dacSample)->isLoopable();
// write DPCM // write DPCM
rWrite(0x4015,15); rWrite(0x4015,15);
rWrite(0x4010,calcDPCMRate(dacRate)); rWrite(0x4010,calcDPCMRate(dacRate)|(goingToLoop?0x40:0));
rWrite(0x4012,(dpcmAddr>>6)&0xff); rWrite(0x4012,(dpcmAddr>>6)&0xff);
rWrite(0x4013,dpcmLen&0xff); rWrite(0x4013,dpcmLen&0xff);
rWrite(0x4015,31); rWrite(0x4015,31);
@ -612,6 +614,7 @@ void DivPlatformNES::reset() {
sampleBank=0; sampleBank=0;
dpcmBank=0; dpcmBank=0;
dpcmMode=false; dpcmMode=false;
goingToLoop=false;
if (useNP) { if (useNP) {
nes1_NP->Reset(); nes1_NP->Reset();

1
src/engine/platform/nes.h
View File

@ -73,6 +73,7 @@ class DivPlatformNES: public DivDispatch {
bool dpcmMode; bool dpcmMode;
bool dacAntiClickOn; bool dacAntiClickOn;
bool useNP; bool useNP;
bool goingToLoop;
struct NESAPU* nes; struct NESAPU* nes;
xgm::NES_APU* nes1_NP; xgm::NES_APU* nes1_NP;
xgm::NES_DMC* nes2_NP; xgm::NES_DMC* nes2_NP;