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

wire up early GB support

Browse source 
TODO: check why are envelopes not working
This commit is contained in:
tildearrow 2021-05-26 17:43:14 -05:00
parent c2b3d85f77
commit a2e64606c0
3 changed files with 55 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/engine.cpp
View file

@ -483,6 +483,8 @@ bool DivEngine::load(void* f, size_t slen) {
ins->gb.envDir=reader.readC(); ins->gb.envDir=reader.readC();
ins->gb.envLen=reader.readC(); ins->gb.envLen=reader.readC();
ins->gb.soundLen=reader.readC(); ins->gb.soundLen=reader.readC();
logD("GB data: vol %d dir %d len %d sl %d\n",ins->gb.envVol,ins->gb.envDir,ins->gb.envLen,ins->gb.soundLen);
} }
} }

112
src/engine/platform/gb.cpp
View file

@ -2,79 +2,59 @@
#include "../engine.h" #include "../engine.h"
#include <math.h> #include <math.h>
//#define rWrite(a,v) pendingWrites[a]=v;
#define rWrite(a,v) GB_apu_write(gb,a,v);
#define FREQ_BASE 7943.75f
void DivPlatformGB::acquire(int& l, int& r) { void DivPlatformGB::acquire(int& l, int& r) {
gb->apu.apu_cycles=4;
GB_apu_run(gb); GB_apu_run(gb);
l=gb->apu_output.summed_samples[0].left+ l=(gb->apu_output.current_sample[0].left+
gb->apu_output.summed_samples[1].left+ gb->apu_output.current_sample[1].left+
gb->apu_output.summed_samples[2].left+ gb->apu_output.current_sample[2].left+
gb->apu_output.summed_samples[3].left; gb->apu_output.current_sample[3].left)<<6;
r=gb->apu_output.summed_samples[0].right+ r=(gb->apu_output.current_sample[0].right+
gb->apu_output.summed_samples[1].right+ gb->apu_output.current_sample[1].right+
gb->apu_output.summed_samples[2].right+ gb->apu_output.current_sample[2].right+
gb->apu_output.summed_samples[3].right; gb->apu_output.current_sample[3].right)<<6;
} }
void DivPlatformGB::tick() { void DivPlatformGB::tick() {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
chan[i].std.next(); chan[i].std.next();
if (chan[i].std.hadVol) {
chan[i].outVol=(chan[i].vol*chan[i].std.vol)>>4;
//sn->write(0x90|(i<<5)|(15-(chan[i].outVol&15)));
}
if (chan[i].std.hadArp) { if (chan[i].std.hadArp) {
if (chan[i].std.arpMode) { if (chan[i].std.arpMode) {
chan[i].baseFreq=round(1712.0f/pow(2.0f,((float)(chan[i].std.arp)/12.0f))); chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].std.arp)/12.0f)));
} else { } else {
chan[i].baseFreq=round(1712.0f/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f))); chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f)));
} }
chan[i].freqChanged=true; chan[i].freqChanged=true;
} }
if (chan[i].std.hadDuty) { if (chan[i].std.hadDuty) {
snNoiseMode=(snNoiseMode&2)|(chan[i].std.duty&1); chan[i].duty=chan[i].std.duty;
if (chan[i].std.duty<2) { rWrite(16+i*5+1,(chan[i].duty&3)<<6);
chan[3].freqChanged=false;
} }
updateSNMode=true;
}
}
for (int i=0; i<3; i++) {
if (chan[i].freqChanged) { if (chan[i].freqChanged) {
chan[i].freq=(chan[i].baseFreq*(ONE_SEMITONE-chan[i].pitch))/ONE_SEMITONE; chan[i].freq=(chan[i].baseFreq*(ONE_SEMITONE-chan[i].pitch))/ONE_SEMITONE;
if (chan[i].note>0x5d) chan[i].freq=0x01; if (chan[i].note>0x5d) chan[i].freq=0x01;
//sn->write(0x80|i<<5|(chan[i].freq&15)); if (i==0 || i==1) {
//sn->write(chan[i].freq>>4); if (chan[i].keyOn) {
DivInstrument* ins=parent->getIns(chan[i].ins);
rWrite(16+i*5+2,((chan[i].vol*ins->gb.envVol)&0xf0)|(ins->gb.envLen&7)|((ins->gb.envDir&1)<<3));
}
rWrite(16+i*5+3,(2048-chan[i].freq)&0xff);
rWrite(16+i*5+4,(((2048-chan[i].freq)>>8)&7)|(chan[i].keyOn?0x80:0x00));
if (chan[i].keyOn) chan[i].keyOn=false;
}
chan[i].freqChanged=false; chan[i].freqChanged=false;
} }
} }
if (chan[3].freqChanged || updateSNMode) {
updateSNMode=false; for (int i=0; i<64; i++) {
chan[3].freq=(chan[3].baseFreq*(ONE_SEMITONE-chan[3].pitch))/ONE_SEMITONE; if (pendingWrites[i]!=oldWrites[i]) {
if (chan[3].note>0x5d) chan[3].freq=0x01; GB_apu_write(gb,i,pendingWrites[i]&0xff);
chan[3].freqChanged=false; oldWrites[i]=pendingWrites[i];
if (snNoiseMode&2) { // take period from channel 3
if (snNoiseMode&1) {
//sn->write(0xe7);
} else {
//sn->write(0xe3);
}
//sn->write(0xdf);
//sn->write(0xc0|(chan[3].freq&15));
//sn->write(chan[3].freq>>4);
} else { // 3 fixed values
unsigned char value;
if (chan[3].std.hadArp) {
if (chan[3].std.arpMode) {
value=chan[3].std.arp%12;
} else {
value=(chan[3].note+chan[3].std.arp)%12;
}
} else {
value=chan[3].note%12;
}
if (value<3) {
value=2-value;
//sn->write(0xe0|value|((snNoiseMode&1)<<2));
}
} }
} }
} }
@ -82,43 +62,35 @@ void DivPlatformGB::tick() {
int DivPlatformGB::dispatch(DivCommand c) { int DivPlatformGB::dispatch(DivCommand c) {
switch (c.cmd) { switch (c.cmd) {
case DIV_CMD_NOTE_ON: case DIV_CMD_NOTE_ON:
chan[c.chan].baseFreq=round(1712.0f/pow(2.0f,((float)c.value/12.0f))); chan[c.chan].baseFreq=round(FREQ_BASE/pow(2.0f,((float)c.value/12.0f)));
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
chan[c.chan].note=c.value; chan[c.chan].note=c.value;
chan[c.chan].active=true; chan[c.chan].active=true;
//sn->write(0x90|c.chan<<5|(15-(chan[c.chan].vol&15))); chan[c.chan].keyOn=true;
chan[c.chan].std.init(parent->getIns(chan[c.chan].ins)); chan[c.chan].std.init(parent->getIns(chan[c.chan].ins));
break; break;
case DIV_CMD_NOTE_OFF: case DIV_CMD_NOTE_OFF:
chan[c.chan].active=false; chan[c.chan].active=false;
//sn->write(0x9f|c.chan<<5); chan[c.chan].keyOff=true;
chan[c.chan].std.init(NULL); chan[c.chan].std.init(NULL);
break; break;
case DIV_CMD_INSTRUMENT: case DIV_CMD_INSTRUMENT:
chan[c.chan].ins=c.value; chan[c.chan].ins=c.value;
//chan[c.chan].std.init(parent->getIns(chan[c.chan].ins));
break; break;
case DIV_CMD_VOLUME: case DIV_CMD_VOLUME:
if (chan[c.chan].vol!=c.value) { if (chan[c.chan].vol!=c.value) {
chan[c.chan].vol=c.value; chan[c.chan].vol=c.value;
if (!chan[c.chan].std.hasVol) {
chan[c.chan].outVol=c.value;
}
//sn->write(0x90|c.chan<<5|(15-(chan[c.chan].vol&15)));
} }
break; break;
case DIV_CMD_GET_VOLUME: case DIV_CMD_GET_VOLUME:
if (chan[c.chan].std.hasVol) {
return chan[c.chan].vol; return chan[c.chan].vol;
}
return chan[c.chan].outVol;
break; break;
case DIV_CMD_PITCH: case DIV_CMD_PITCH:
chan[c.chan].pitch=c.value; chan[c.chan].pitch=c.value;
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
break; break;
case DIV_CMD_NOTE_PORTA: { case DIV_CMD_NOTE_PORTA: {
int destFreq=round(1712.0f/pow(2.0f,((float)c.value2/12.0f))); int destFreq=round(FREQ_BASE/pow(2.0f,((float)c.value2/12.0f)));
bool return2=false; bool return2=false;
if (destFreq>chan[c.chan].baseFreq) { if (destFreq>chan[c.chan].baseFreq) {
chan[c.chan].baseFreq+=c.value; chan[c.chan].baseFreq+=c.value;
@ -142,7 +114,7 @@ int DivPlatformGB::dispatch(DivCommand c) {
updateSNMode=true; updateSNMode=true;
break; break;
case DIV_CMD_LEGATO: case DIV_CMD_LEGATO:
chan[c.chan].baseFreq=round(1712.0f/pow(2.0f,((float)c.value/12.0f))); chan[c.chan].baseFreq=round(FREQ_BASE/pow(2.0f,((float)c.value/12.0f)));
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
chan[c.chan].note=c.value; chan[c.chan].note=c.value;
break; break;
@ -160,11 +132,19 @@ int DivPlatformGB::dispatch(DivCommand c) {
int DivPlatformGB::init(DivEngine* p, int channels, int sugRate) { int DivPlatformGB::init(DivEngine* p, int channels, int sugRate) {
parent=p; parent=p;
rate=sugRate; // TODO: use blip_buf rate=2097152;
gb=new GB_gameboy_t; gb=new GB_gameboy_t;
memset(gb,0,sizeof(GB_gameboy_t)); memset(gb,0,sizeof(GB_gameboy_t));
gb->model=GB_MODEL_DMG_B;
GB_apu_init(gb); GB_apu_init(gb);
GB_set_sample_rate(gb,rate); GB_set_sample_rate(gb,rate);
for (int i=0; i<64; i++) {
oldWrites[i]=-1;
pendingWrites[i]=-1;
}
// enable all channels
GB_apu_write(gb,0x26,0x80);
GB_apu_write(gb,0x25,0xff);
snNoiseMode=3; snNoiseMode=3;
updateSNMode=false; updateSNMode=false;
return 4; return 4;

7
src/engine/platform/gb.h
View file

@ -8,7 +8,7 @@
class DivPlatformGB: public DivDispatch { class DivPlatformGB: public DivDispatch {
struct Channel { struct Channel {
int freq, baseFreq, pitch; int freq, baseFreq, pitch;
unsigned char ins, note; unsigned char ins, note, duty, wave;
bool active, insChanged, freqChanged, keyOn, keyOff; bool active, insChanged, freqChanged, keyOn, keyOff;
signed char vol, outVol; signed char vol, outVol;
DivMacroInt std; DivMacroInt std;
@ -18,6 +18,8 @@ class DivPlatformGB: public DivDispatch {
pitch(0), pitch(0),
ins(-1), ins(-1),
note(0), note(0),
duty(0),
wave(0),
active(false), active(false),
insChanged(true), insChanged(true),
freqChanged(false), freqChanged(false),
@ -28,6 +30,9 @@ class DivPlatformGB: public DivDispatch {
Channel chan[4]; Channel chan[4];
unsigned char snNoiseMode; unsigned char snNoiseMode;
bool updateSNMode; bool updateSNMode;
short oldWrites[64];
short pendingWrites[64];
GB_gameboy_t* gb; GB_gameboy_t* gb;
public: public:
void acquire(int& l, int& r); void acquire(int& l, int& r);