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

YM2608-LLE, part 3

Browse source
This commit is contained in:
tildearrow 2024-04-26 17:08:43 -05:00
parent 7f354705e3
commit 08ac4fe0b1
1 changed files with 85 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/engine/platform/ym2608.cpp
View file

@ -492,22 +492,23 @@ void DivPlatformYM2608::acquire_ymfm(short** buf, size_t len) {
void DivPlatformYM2608::acquire_lle(short** buf, size_t len) { void DivPlatformYM2608::acquire_lle(short** buf, size_t len) {
for (size_t h=0; h<len; h++) { for (size_t h=0; h<len; h++) {
bool canWeWrite=true;
bool have0=false;
bool have1=false;
unsigned char howLong=0;
while (true) { while (true) {
lastS=fm_lle.o_s; lastS=fm_lle.o_s;
lastSH=fm_lle.o_sh1; lastSH=fm_lle.o_sh1;
lastSH2=fm_lle.o_sh2; lastSH2=fm_lle.o_sh2;
if (canWeWrite) {
if (delay>0) { if (delay>0) {
if (delay>1) {
delay--;
} else {
fm_lle.input.cs=0; fm_lle.input.cs=0;
fm_lle.input.rd=0; fm_lle.input.rd=0;
fm_lle.input.wr=1; fm_lle.input.wr=1;
fm_lle.input.a0=0; fm_lle.input.a0=0;
fm_lle.input.a1=0; fm_lle.input.a1=0;
delay=1; delay=1;
}
} else if (!writes.empty()) { } else if (!writes.empty()) {
QueuedWrite& w=writes.front(); QueuedWrite& w=writes.front();
if (w.addrOrVal) { if (w.addrOrVal) {
@ -518,7 +519,7 @@ void DivPlatformYM2608::acquire_lle(short** buf, size_t len) {
fm_lle.input.a0=1; fm_lle.input.a0=1;
fm_lle.input.data=w.val; fm_lle.input.data=w.val;
delay=32; delay=2;
//logV("%.3x = %.2x",w.addr,w.val); //logV("%.3x = %.2x",w.addr,w.val);
@ -532,38 +533,58 @@ void DivPlatformYM2608::acquire_lle(short** buf, size_t len) {
fm_lle.input.a0=0; fm_lle.input.a0=0;
fm_lle.input.data=w.addr&0xff; fm_lle.input.data=w.addr&0xff;
delay=32; delay=2;
w.addrOrVal=true; w.addrOrVal=true;
} }
} else {
fm_lle.input.cs=1;
fm_lle.input.rd=1;
fm_lle.input.wr=1;
fm_lle.input.a0=0;
fm_lle.input.a1=0;
}
} }
FMOPNA_Clock(&fm_lle,0); FMOPNA_Clock(&fm_lle,0);
FMOPNA_Clock(&fm_lle,1); FMOPNA_Clock(&fm_lle,1);
if (canWeWrite) {
if (delay==1) { if (delay==1) {
// check busy status here // check busy status here
if (!(fm_lle.o_data&0x80)) { //if (!(fm_lle.o_data&0x80)) {
if (!fm_lle.busy_cnt_en[1]) {
delay=0; delay=0;
} else { } else {
//logV("AM BUSY"); //logV("AM BUSY");
} }
} }
}
canWeWrite=false;
if (fm_lle.o_s && !lastS) { if (fm_lle.o_s && !lastS) {
dacVal>>=1; dacVal>>=1;
dacVal|=(fm_lle.o_opo&1)<<16; dacVal|=(fm_lle.o_opo&1)<<23;
howLong++;
} }
if (!fm_lle.o_sh1 && lastSH) { if (!fm_lle.o_sh1 && lastSH) {
/*int e=(dacVal>>10)&7; //int e=(dacVal>>10)&7;
int m=(dacVal>>0)&1023; //int m=(dacVal>>0)&1023;
dacOut[0]=dacVal-0x10000;//(m<<e)>>1; dacOut[0]=dacVal>>8;//(m<<e)>>1;
logV("%.8x (%d, %d)",dacVal,m,e); have0=true;
dacVal=0;*/
break;
} }
if (!fm_lle.o_sh2 && lastSH2) {
//int e=(dacVal>>10)&7;
//int m=(dacVal>>0)&1023;
dacOut[1]=dacVal>>8;//(m<<e)>>1;
have1=true;
}
if (have0 && have1) break;
// ADPCM data bus // ADPCM data bus
//if (fm_lle.input.!=0) { //if (fm_lle.input.!=0) {
//logV("%x",fm_lle.input.ad); //logV("%x",fm_lle.input.ad);
@ -571,10 +592,33 @@ void DivPlatformYM2608::acquire_lle(short** buf, size_t len) {
} }
// TODO: o_analog // TODO: o_analog
if (howLong!=48) logW("NOT 48! %d",howLong);
// DAC // DAC
buf[0][h]=fm_lle.ac_fm_accm1[0]>>1; int accm1=dacOut[0]-0x4000;
buf[1][h]=buf[0][h]; int accm2=dacOut[1]-0x4000;
if (accm1&0x20000) {
accm1|=0xfffc0000;
}
if (accm2&0x20000) {
accm2|=0xfffc0000;
}
//logV("%.8x %.8x",dacOut[0],dacOut[1]);
//logV("%.8x %d",accm1,howLong);
int outL=(accm1<<1)+fm_lle.o_analog*ssgVol*42;
int outR=(accm2<<1)+fm_lle.o_analog*ssgVol*42;
if (outL<-32768) outL=-32768;
if (outL>32767) outL=32767;
if (outR<-32768) outR=-32768;
if (outR>32767) outR=32767;
buf[0][h]=outL;
buf[1][h]=outR;
} }
} }