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

YM2612: new pitch slide formula

Browse source 
finally nailed it (almost)
This commit is contained in:
tildearrow 2022-04-22 16:46:24 -05:00
parent 8db53faf72
commit 943e013cb4
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/engine/platform/genesis.cpp
View file

@ -632,21 +632,26 @@ int DivPlatformGenesis::dispatch(DivCommand c) {
} }
} }
// check for octave boundary // check for octave boundary
// what the heck!
if (!chan[c.chan].portaPause) { if (!chan[c.chan].portaPause) {
chan[c.chan].freqChanged=true;
if ((newFreq&0x7ff)>1288) { if ((newFreq&0x7ff)>1288) {
newFreq=((newFreq&0x7ff)>>1)|((newFreq+0x800)&0xf800); newFreq=(644)|((newFreq+0x800)&0xf800);
/*chan[c.chan].portaPause=true; chan[c.chan].portaPause=true;
break;*/ chan[c.chan].freqChanged=false;
return2=false;
} }
if ((newFreq&0x7ff)<644) { if ((newFreq&0x7ff)<644) {
newFreq=(newFreq&0x7ff)<<1|((newFreq-0x800)&0xf800); newFreq=(1287)|((newFreq-0x800)&0xf800);
/*chan[c.chan].portaPause=true; chan[c.chan].portaPause=true;
break;*/ chan[c.chan].freqChanged=false;
return2=false;
} }
} } else {
chan[c.chan].baseFreq=newFreq;
chan[c.chan].portaPause=false; chan[c.chan].portaPause=false;
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
}
chan[c.chan].baseFreq=newFreq;
if (return2) { if (return2) {
chan[c.chan].inPorta=false; chan[c.chan].inPorta=false;
return 2; return 2;

10
src/engine/platform/genesisext.cpp
View file

@ -143,29 +143,25 @@ int DivPlatformGenesisExt::dispatch(DivCommand c) {
return2=true; return2=true;
} }
} }
// what the heck!
if (!opChan[ch].portaPause) { if (!opChan[ch].portaPause) {
opChan[ch].freqChanged=true; opChan[ch].freqChanged=true;
if ((newFreq&0x7ff)>1288) { if ((newFreq&0x7ff)>1288) {
newFreq=((newFreq&0x7ff)>>1)|((newFreq+0x800)&0xf800); newFreq=(644)|((newFreq+0x800)&0xf800);
opChan[ch].portaPause=true; opChan[ch].portaPause=true;
opChan[ch].freqChanged=false; opChan[ch].freqChanged=false;
return2=false; return2=false;
if (ch==3) printf("%d: upper bound\n",ch);
//break;
} }
if ((newFreq&0x7ff)<644) { if ((newFreq&0x7ff)<644) {
newFreq=(newFreq&0x7ff)<<1|((newFreq-0x800)&0xf800); newFreq=(1287)|((newFreq-0x800)&0xf800);
opChan[ch].portaPause=true; opChan[ch].portaPause=true;
opChan[ch].freqChanged=false; opChan[ch].freqChanged=false;
return2=false; return2=false;
if (ch==3) printf("%d: lower bound\n",ch);
//break;
} }
} else { } else {
opChan[ch].portaPause=false; opChan[ch].portaPause=false;
opChan[ch].freqChanged=true; opChan[ch].freqChanged=true;
} }
if (ch==3) printf("%d: writing %.4x to freq\n",ch,newFreq);
opChan[ch].baseFreq=newFreq; opChan[ch].baseFreq=newFreq;
if (return2) return 2; if (return2) return 2;
break; break;