otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixed global variables

Browse source
This commit is contained in:
AArt1256 2024-08-21 13:33:37 +03:00
parent f0b138ff48
commit 5599ee327b
4 changed files with 49 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/engine/platform/supervision.cpp
View file

@ -52,22 +52,10 @@ const char* regCheatSheetSupervision[]={
NULL NULL
}; };
unsigned char supervision_noiseReg[3];
unsigned char supervision_kon[4];
unsigned char supervision_initWrite[4];
unsigned char supervision_initWrite2[4];
const char** DivPlatformSupervision::getRegisterSheet() { const char** DivPlatformSupervision::getRegisterSheet() {
return regCheatSheetSupervision; return regCheatSheetSupervision;
} }
unsigned char* sampleMem=supervision_dma_mem;
unsigned char supervision_duty_swap=0;
unsigned char supervision_otherFlags=0;
unsigned int supervision_sampleOffset=0;
void DivPlatformSupervision::acquire(short** buf, size_t len) { void DivPlatformSupervision::acquire(short** buf, size_t len) {
for (size_t h=0; h<len; h++) { for (size_t h=0; h<len; h++) {
int mask_bits=0; int mask_bits=0;
@ -148,11 +136,11 @@ void DivPlatformSupervision::tick(bool sysTick) {
chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,true,0,chan[i].pitch2,chipClock<<1,CHIP_DIVIDER); chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,true,0,chan[i].pitch2,chipClock<<1,CHIP_DIVIDER);
if (chan[i].freq<1) chan[i].freq=1; if (chan[i].freq<1) chan[i].freq=1;
if (chan[i].freq>2047) chan[i].freq=2047; if (chan[i].freq>2047) chan[i].freq=2047;
if (chan[i].freqChanged || supervision_initWrite[i]) { if (chan[i].freqChanged || initWrite[i]) {
rWrite(0x10|(i<<2),chan[i].freq&0xff); rWrite(0x10|(i<<2),chan[i].freq&0xff);
rWrite(0x11|(i<<2),(chan[i].freq>>8)&0x7); rWrite(0x11|(i<<2),(chan[i].freq>>8)&0x7);
} }
supervision_initWrite[i]=0; initWrite[i]=0;
} else if (i == 3) { } else if (i == 3) {
int ntPos=chan[i].baseFreq; int ntPos=chan[i].baseFreq;
if (NEW_ARP_STRAT) { if (NEW_ARP_STRAT) {
@ -166,9 +154,9 @@ void DivPlatformSupervision::tick(bool sysTick) {
chan[i].freq=15-(ntPos&15); chan[i].freq=15-(ntPos&15);
unsigned char r=(chan[i].freq<<4)|(chan[i].outVol&0xf); unsigned char r=(chan[i].freq<<4)|(chan[i].outVol&0xf);
rWrite(0x28,r); rWrite(0x28,r);
supervision_noiseReg[0]=r; noiseReg[0]=r;
rWrite(0x29,0xc8); rWrite(0x29,0xc8);
r=((chan[i].duty&1)^supervision_duty_swap)|(0x02|0x10)|(chan[i].pan<<2); r=((chan[i].duty&1)^dutySwap)|(0x02|0x10)|(chan[i].pan<<2);
rWrite(0x2A,r); rWrite(0x2A,r);
} }
if (chan[i].keyOn && i==2) { if (chan[i].keyOn && i==2) {
@ -188,7 +176,7 @@ void DivPlatformSupervision::tick(bool sysTick) {
rWrite(0x1B,chan[i].freq|((chan[i].pan&3)<<2)|((off>>14&7)<<4)); rWrite(0x1B,chan[i].freq|((chan[i].pan&3)<<2)|((off>>14&7)<<4));
rWrite(0x1C,0x80); rWrite(0x1C,0x80);
} }
supervision_sampleOffset=chan[i].hasOffset; sampleOffset=chan[i].hasOffset;
chan[i].hasOffset=0; chan[i].hasOffset=0;
} }
} }
@ -205,14 +193,14 @@ void DivPlatformSupervision::tick(bool sysTick) {
} }
} }
} }
if (chan[i].keyOn) supervision_kon[i]=1; if (chan[i].keyOn) kon[i]=1;
if (chan[i].keyOff) supervision_kon[i]=0; if (chan[i].keyOff) kon[i]=0;
if (chan[i].keyOn) chan[i].keyOn=false; if (chan[i].keyOn) chan[i].keyOn=false;
if (chan[i].keyOff) chan[i].keyOff=false; if (chan[i].keyOff) chan[i].keyOff=false;
chan[i].freqChanged=false; chan[i].freqChanged=false;
} }
if (supervision_kon[i]) { if (kon[i]) {
if (i < 2) { if (i < 2) {
rWrite(0x12|(i<<2),(chan[i].outVol&0xf)|((chan[i].duty&3)<<4)); rWrite(0x12|(i<<2),(chan[i].outVol&0xf)|((chan[i].duty&3)<<4));
rWrite(0x13|(i<<2),0xc8); rWrite(0x13|(i<<2),0xc8);
@ -228,12 +216,12 @@ void DivPlatformSupervision::tick(bool sysTick) {
ntPos+=chan[i].pitch2; ntPos+=chan[i].pitch2;
chan[i].freq=15-(ntPos&15); chan[i].freq=15-(ntPos&15);
unsigned char r=(chan[i].freq<<4)|(chan[i].outVol&0xf); unsigned char r=(chan[i].freq<<4)|(chan[i].outVol&0xf);
if (supervision_noiseReg[0] != r) rWrite(0x28,r); if (noiseReg[0] != r) rWrite(0x28,r);
supervision_noiseReg[0]=r; noiseReg[0]=r;
rWrite(0x29,0xc8); rWrite(0x29,0xc8);
r=((chan[i].duty&1)^supervision_duty_swap)|(0x02|0x10)|(chan[i].pan<<2); r=((chan[i].duty&1)^dutySwap)|(0x02|0x10)|(chan[i].pan<<2);
if (supervision_noiseReg[2] != r) rWrite(0x2A,r); if (noiseReg[2] != r) rWrite(0x2A,r);
supervision_noiseReg[2]=r; noiseReg[2]=r;
} else if (i==2) { } else if (i==2) {
if (chan[i].pcm) { if (chan[i].pcm) {
int ntPos=chan[i].sampleNote; int ntPos=chan[i].sampleNote;
@ -242,8 +230,8 @@ void DivPlatformSupervision::tick(bool sysTick) {
int sNum=chan[i].sample; int sNum=chan[i].sample;
DivSample* sample=parent->getSample(sNum); DivSample* sample=parent->getSample(sNum);
if (sample!=NULL && sNum>=0 && sNum<parent->song.sampleLen) { if (sample!=NULL && sNum>=0 && sNum<parent->song.sampleLen) {
unsigned int off=MIN(sampleOff[sNum]+supervision_sampleOffset,sampleOff[sNum]+sampleLen[sNum]); unsigned int off=MIN(sampleOff[sNum]+sampleOffset,sampleOff[sNum]+sampleLen[sNum]);
unsigned int len=MAX((((int)sampleLen[sNum])-((int)supervision_sampleOffset)),0); unsigned int len=MAX((((int)sampleLen[sNum])-((int)sampleOffset)),0);
if (len) { if (len) {
rWrite(0x1A,MIN(MAX(len>>4,0),255)); rWrite(0x1A,MIN(MAX(len>>4,0),255));
if (chan[i].outVol==0) { if (chan[i].outVol==0) {
@ -262,8 +250,8 @@ void DivPlatformSupervision::tick(bool sysTick) {
} else if (i == 3) { } else if (i == 3) {
rWrite(0x29,0); rWrite(0x29,0);
unsigned char r=0; unsigned char r=0;
if (supervision_noiseReg[2] != r) rWrite(0x2A,r); if (noiseReg[2] != r) rWrite(0x2A,r);
supervision_noiseReg[2]=r; noiseReg[2]=r;
} }
} }
@ -456,12 +444,11 @@ void DivPlatformSupervision::reset() {
supervision_sound_reset(); supervision_sound_reset();
memset(tempL,0,32*sizeof(int)); memset(tempL,0,32*sizeof(int));
memset(tempR,0,32*sizeof(int)); memset(tempR,0,32*sizeof(int));
memset(supervision_noiseReg,0,3*sizeof(unsigned char)); memset(noiseReg,0,3*sizeof(unsigned char));
supervision_noiseReg[2]=0xff; noiseReg[2]=0xff;
memset(supervision_kon,0,4*sizeof(unsigned char)); memset(kon,0,4*sizeof(unsigned char));
memset(supervision_initWrite,1,4*sizeof(unsigned char)); memset(initWrite,1,4*sizeof(unsigned char));
memset(supervision_initWrite2,1,4*sizeof(unsigned char)); sampleOffset=0;
supervision_sampleOffset=0;
} }
int DivPlatformSupervision::getOutputCount() { int DivPlatformSupervision::getOutputCount() {
@ -480,13 +467,13 @@ void DivPlatformSupervision::notifyInsDeletion(void* ins) {
void DivPlatformSupervision::setFlags(const DivConfig& flags) { void DivPlatformSupervision::setFlags(const DivConfig& flags) {
if (flags.getInt("swapDuty",true)) { if (flags.getInt("swapDuty",true)) {
supervision_duty_swap=1; dutySwap=1;
} else { } else {
supervision_duty_swap=0; dutySwap=0;
} }
supervision_otherFlags=0; otherFlags=0;
if (flags.getInt("sqStereo",false)) { if (flags.getInt("sqStereo",false)) {
supervision_otherFlags |= 1; otherFlags |= 1;
} }
chipClock=4000000; chipClock=4000000;
CHECK_CUSTOM_CLOCK; CHECK_CUSTOM_CLOCK;
@ -495,7 +482,7 @@ void DivPlatformSupervision::setFlags(const DivConfig& flags) {
oscBuf[i]->rate=rate; oscBuf[i]->rate=rate;
} }
supervision_sound_set_clock((unsigned int)chipClock); supervision_sound_set_clock((unsigned int)chipClock);
supervision_sound_set_flags((unsigned int)supervision_otherFlags); supervision_sound_set_flags((unsigned int)otherFlags);
} }
void DivPlatformSupervision::poke(unsigned int addr, unsigned short val) { void DivPlatformSupervision::poke(unsigned int addr, unsigned short val) {
@ -587,6 +574,10 @@ int DivPlatformSupervision::init(DivEngine* p, int channels, int sugRate, const
isMuted[i]=false; isMuted[i]=false;
oscBuf[i]=new DivDispatchOscBuffer; oscBuf[i]=new DivDispatchOscBuffer;
} }
sampleMem=supervision_dma_mem;
dutySwap=0;
otherFlags=0;
sampleOffset=0;
sampleMemLen=0; sampleMemLen=0;
memset(sampleMem,0,65536); memset(sampleMem,0,65536);
setFlags(flags); setFlags(flags);

8
src/engine/platform/supervision.h
View file

@ -58,8 +58,14 @@ class DivPlatformSupervision: public DivDispatch {
unsigned int sampleLen[256]; unsigned int sampleLen[256];
bool sampleLoaded[256]; bool sampleLoaded[256];
DivMemoryComposition memCompo; DivMemoryComposition memCompo;
unsigned char* sampleMem;
size_t sampleMemLen; size_t sampleMemLen;
unsigned char dutySwap;
unsigned char otherFlags;
unsigned int sampleOffset;
unsigned char noiseReg[3];
unsigned char kon[4];
unsigned char initWrite[4];
friend void putDispatchChip(void*,int); friend void putDispatchChip(void*,int);
friend void putDispatchChan(void*,int,int); friend void putDispatchChan(void*,int,int);

19
src/engine/platform/upd1771c.cpp
View file

@ -32,10 +32,6 @@ const char* regCheatSheetUPD1771c[]={
NULL NULL
}; };
unsigned char upd1771c_kon[4];
unsigned char upd1771c_initWrite[4];
unsigned char upd1771c_initWrite2[4];
const char** DivPlatformUPD1771c::getRegisterSheet() { const char** DivPlatformUPD1771c::getRegisterSheet() {
return regCheatSheetUPD1771c; return regCheatSheetUPD1771c;
} }
@ -107,7 +103,7 @@ void DivPlatformUPD1771c::tick(bool sysTick) {
if (i==0) { if (i==0) {
chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,true,0,chan[i].pitch2,chipClock,CHIP_DIVIDER); chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,true,0,chan[i].pitch2,chipClock,CHIP_DIVIDER);
} }
if (chan[i].freqChanged || upd1771c_initWrite[i] || chan[i].keyOn) { if (chan[i].freqChanged || initWrite[i] || chan[i].keyOn) {
if (chan[i].duty == 0) { if (chan[i].duty == 0) {
rWrite(0,2); rWrite(0,2);
rWrite(1,(chan[i].wave<<5)|chan[i].pos); rWrite(1,(chan[i].wave<<5)|chan[i].pos);
@ -122,19 +118,19 @@ void DivPlatformUPD1771c::tick(bool sysTick) {
} else { } else {
rWrite(0,0); rWrite(0,0);
} }
upd1771c_initWrite[i]=0; initWrite[i]=0;
} }
if (chan[i].keyOff) { if (chan[i].keyOff) {
rWrite(0,0); rWrite(0,0);
} }
if (chan[i].keyOn) upd1771c_kon[i]=1; if (chan[i].keyOn) kon[i]=1;
if (chan[i].keyOff) upd1771c_kon[i]=0; if (chan[i].keyOff) kon[i]=0;
if (chan[i].keyOn) chan[i].keyOn=false; if (chan[i].keyOn) chan[i].keyOn=false;
if (chan[i].keyOff) chan[i].keyOff=false; if (chan[i].keyOff) chan[i].keyOff=false;
chan[i].freqChanged=false; chan[i].freqChanged=false;
} }
if (upd1771c_kon[i]) { if (kon[i]) {
if (i==0) { if (i==0) {
if (chan[i].duty == 0) { if (chan[i].duty == 0) {
rWrite(0,2); rWrite(0,2);
@ -321,9 +317,8 @@ void DivPlatformUPD1771c::reset() {
//upd1771c_sound_reset(); //upd1771c_sound_reset();
memset(tempL,0,32*sizeof(int)); memset(tempL,0,32*sizeof(int));
memset(tempR,0,32*sizeof(int)); memset(tempR,0,32*sizeof(int));
memset(upd1771c_kon,0,4*sizeof(unsigned char)); memset(kon,0,1*sizeof(unsigned char));
memset(upd1771c_initWrite,1,4*sizeof(unsigned char)); memset(initWrite,1,1*sizeof(unsigned char));
memset(upd1771c_initWrite2,1,4*sizeof(unsigned char));
} }
int DivPlatformUPD1771c::getOutputCount() { int DivPlatformUPD1771c::getOutputCount() {

4
src/engine/platform/upd1771c.h
View file

@ -50,6 +50,10 @@ class DivPlatformUPD1771c: public DivDispatch {
int tempR[32]; int tempR[32];
int coreQuality; int coreQuality;
unsigned char regPool[16]; unsigned char regPool[16];
// I may add the 3 square waves in noise mode later...
unsigned char kon[1];
unsigned char initWrite[1];
friend void putDispatchChip(void*,int); friend void putDispatchChip(void*,int);
friend void putDispatchChan(void*,int,int); friend void putDispatchChan(void*,int,int);