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

OPL: YM3812-LLE, part 4

Browse source 
Y8950
This commit is contained in:
tildearrow 2023-11-24 15:29:00 -05:00
parent 8500b1b435
commit 32030d6742
1 changed files with 61 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/engine/platform/opl.cpp
View file

@ -517,9 +517,12 @@ static const int cycleMapDrums[18]={
void DivPlatformOPL::acquire_nukedLLE2(short** buf, size_t len) { void DivPlatformOPL::acquire_nukedLLE2(short** buf, size_t len) {
int chOut[11]; int chOut[11];
thread_local ymfm::ymfm_output<2> aOut;
for (size_t h=0; h<len; h++) { for (size_t h=0; h<len; h++) {
int curCycle=0; int curCycle=0;
unsigned char subCycle=0; unsigned char subCycle=0;
for (int i=0; i<11; i++) { for (int i=0; i<11; i++) {
chOut[i]=0; chOut[i]=0;
} }
@ -548,6 +551,10 @@ void DivPlatformOPL::acquire_nukedLLE2(short** buf, size_t len) {
writes.pop(); writes.pop();
delay=84; delay=84;
} else { } else {
if (chipType==8950) {
switch (w.addr) {
case 8:
adpcmB->write(w.addr-7,(w.val&15)|0x80);
fm_lle2.input.cs=0; fm_lle2.input.cs=0;
fm_lle2.input.rd=1; fm_lle2.input.rd=1;
fm_lle2.input.wr=0; fm_lle2.input.wr=0;
@ -556,6 +563,34 @@ void DivPlatformOPL::acquire_nukedLLE2(short** buf, size_t len) {
w.addrOrVal=true; w.addrOrVal=true;
// weird. wasn't it 12? // weird. wasn't it 12?
delay=24; delay=24;
break;
case 7: case 9: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17: case 18: case 21: case 22: case 23:
adpcmB->write(w.addr-7,w.val);
regPool[w.addr&511]=w.val;
writes.pop();
delay=108;
break;
default:
fm_lle2.input.cs=0;
fm_lle2.input.rd=1;
fm_lle2.input.wr=0;
fm_lle2.input.address=0;
fm_lle2.input.data_i=w.addr;
w.addrOrVal=true;
// weird. wasn't it 12?
delay=24;
break;
}
} else {
fm_lle2.input.cs=0;
fm_lle2.input.rd=1;
fm_lle2.input.wr=0;
fm_lle2.input.address=0;
fm_lle2.input.data_i=w.addr;
w.addrOrVal=true;
// weird. wasn't it 12?
delay=24;
}
} }
waitingBusy=true; waitingBusy=true;
@ -594,8 +629,6 @@ void DivPlatformOPL::acquire_nukedLLE2(short** buf, size_t len) {
} }
} }
buf[0][h]=dacOut;
for (int i=0; i<11; i++) { for (int i=0; i<11; i++) {
if (i>=6 && properDrums) { if (i>=6 && properDrums) {
chOut[i]<<=1; chOut[i]<<=1;
@ -606,6 +639,24 @@ void DivPlatformOPL::acquire_nukedLLE2(short** buf, size_t len) {
if (chOut[i]>32767) chOut[i]=32767; if (chOut[i]>32767) chOut[i]=32767;
oscBuf[i]->data[oscBuf[i]->needle++]=chOut[i]; oscBuf[i]->data[oscBuf[i]->needle++]=chOut[i];
} }
if (chipType==8950) {
adpcmB->clock();
aOut.clear();
adpcmB->output<2>(aOut,0);
if (!isMuted[adpcmChan]) {
dacOut-=aOut.data[0]>>3;
oscBuf[adpcmChan]->data[oscBuf[adpcmChan]->needle++]=aOut.data[0]>>1;
} else {
oscBuf[adpcmChan]->data[oscBuf[adpcmChan]->needle++]=0;
}
}
if (dacOut<-32768) dacOut=-32768;
if (dacOut>32767) dacOut=32767;
buf[0][h]=dacOut;
} }
} }