add AY8930 platform
This commit is contained in:
tildearrow
parent
b26208f2c1
commit
dce06d8ec4
12 changed files with 530 additions and 17 deletions
|
|
@ -10,6 +10,7 @@
|
|||
#include "platform/ym2610.h"
|
||||
#include "platform/ym2610ext.h"
|
||||
#include "platform/ay.h"
|
||||
#include "platform/ay8930.h"
|
||||
#include "platform/dummy.h"
|
||||
#include "../ta-log.h"
|
||||
|
||||
|
|
@ -116,6 +117,9 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do
|
|||
case DIV_SYSTEM_AY8910:
|
||||
dispatch=new DivPlatformAY8910;
|
||||
break;
|
||||
case DIV_SYSTEM_AY8930:
|
||||
dispatch=new DivPlatformAY8930;
|
||||
break;
|
||||
default:
|
||||
logW("this system is not supported yet! using dummy platform.\n");
|
||||
dispatch=new DivPlatformDummy;
|
||||
|
|
|
|||
|
|
@ -80,6 +80,8 @@ DivSystem systemFromFile(unsigned char val) {
|
|||
return DIV_SYSTEM_TIA;
|
||||
case 0x97:
|
||||
return DIV_SYSTEM_SAA1099;
|
||||
case 0x9a:
|
||||
return DIV_SYSTEM_AY8930;
|
||||
}
|
||||
return DIV_SYSTEM_NULL;
|
||||
}
|
||||
|
|
@ -123,6 +125,8 @@ unsigned char systemToFile(DivSystem val) {
|
|||
return 0x84;
|
||||
case DIV_SYSTEM_SAA1099:
|
||||
return 0x97;
|
||||
case DIV_SYSTEM_AY8930:
|
||||
return 0x9a;
|
||||
|
||||
case DIV_SYSTEM_NULL:
|
||||
return 0;
|
||||
|
|
@ -156,6 +160,7 @@ int DivEngine::getChannelCount(DivSystem sys) {
|
|||
return 16;
|
||||
// Furnace-specific systems
|
||||
case DIV_SYSTEM_AY8910:
|
||||
case DIV_SYSTEM_AY8930:
|
||||
return 3;
|
||||
case DIV_SYSTEM_AMIGA:
|
||||
return 4;
|
||||
|
|
@ -216,6 +221,8 @@ const char* DivEngine::getSystemName(DivSystem sys) {
|
|||
return "Atari 2600";
|
||||
case DIV_SYSTEM_SAA1099:
|
||||
return "Philips SAA1099";
|
||||
case DIV_SYSTEM_AY8930:
|
||||
return "Microchip AY8930";
|
||||
}
|
||||
return "Unknown";
|
||||
}
|
||||
|
|
@ -250,7 +257,7 @@ const char* chanNames[17][17]={
|
|||
{"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "FM 7", "FM 8", "Sample 1", "Sample 2", "Sample 3", "Sample 4", "Sample 5"}, // Arcade
|
||||
{"FM 1", "FM 2", "FM 3", "FM 4", "Square 1", "Square 2", "Square 3", "Sample 1", "Sample 2", "Sample 3", "Sample 4", "Sample 5", "Sample 6"}, // YM2610
|
||||
{"FM 1", "FM 2 OP1", "FM 2 OP2", "FM 2 OP3", "FM 2 OP4", "FM 3", "FM 4", "Square 1", "Square 2", "Square 3", "Sample 1", "Sample 2", "Sample 3", "Sample 4", "Sample 5", "Sample 6"}, // YM2610 (extended channel 2)
|
||||
{"Square 1", "Square 2", "Square 3"}, // AY-3-8910
|
||||
{"Square 1", "Square 2", "Square 3"}, // AY-3-8910/AY8930
|
||||
{"Channel 1", "Channel 2", "Channel 3", "Channel 4"}, // Amiga
|
||||
{"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "FM 7", "FM 8"}, // YM2151
|
||||
{"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6"}, // YM2612
|
||||
|
|
@ -270,7 +277,7 @@ const char* chanShortNames[17][17]={
|
|||
{"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "P1", "P2", "P3", "P4", "P5"}, // Arcade
|
||||
{"F1", "F2", "F3", "F4", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6"}, // YM2610
|
||||
{"F1", "O1", "O2", "O3", "O4", "F3", "F4", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6"}, // YM2610 (extended channel 2)
|
||||
{"S1", "S2", "S3"}, // AY-3-8910
|
||||
{"S1", "S2", "S3"}, // AY-3-8910/AY8930
|
||||
{"CH1", "CH2", "CH3", "CH4"}, // Amiga
|
||||
{"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8"}, // YM2151
|
||||
{"F1", "F2", "F3", "F4", "F5", "F6"}, // YM2612
|
||||
|
|
@ -290,7 +297,7 @@ const int chanTypes[17][17]={
|
|||
{0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4}, // Arcade
|
||||
{0, 0, 0, 0, 1, 1, 1, 4, 4, 4, 4, 4, 4}, // YM2610
|
||||
{0, 5, 5, 5, 5, 0, 0, 1, 1, 1, 4, 4, 4, 4, 4, 4}, // YM2610 (extended channel 2)
|
||||
{1, 1, 1}, // AY-3-8910
|
||||
{1, 1, 1}, // AY-3-8910/AY8930
|
||||
{4, 4, 4, 4}, // Amiga
|
||||
{0, 0, 0, 0, 0, 0, 0, 0}, // YM2151
|
||||
{0, 0, 0, 0, 0, 0}, // YM2612
|
||||
|
|
@ -335,6 +342,7 @@ const char* DivEngine::getChannelName(int chan) {
|
|||
return chanNames[10][dispatchChanOfChan[chan]];
|
||||
break;
|
||||
case DIV_SYSTEM_AY8910:
|
||||
case DIV_SYSTEM_AY8930:
|
||||
return chanNames[11][dispatchChanOfChan[chan]];
|
||||
break;
|
||||
case DIV_SYSTEM_AMIGA:
|
||||
|
|
@ -393,6 +401,7 @@ const char* DivEngine::getChannelShortName(int chan) {
|
|||
return chanShortNames[10][dispatchChanOfChan[chan]];
|
||||
break;
|
||||
case DIV_SYSTEM_AY8910:
|
||||
case DIV_SYSTEM_AY8930:
|
||||
return chanShortNames[11][dispatchChanOfChan[chan]];
|
||||
break;
|
||||
case DIV_SYSTEM_AMIGA:
|
||||
|
|
@ -450,6 +459,7 @@ int DivEngine::getChannelType(int chan) {
|
|||
return chanTypes[10][dispatchChanOfChan[chan]];
|
||||
break;
|
||||
case DIV_SYSTEM_AY8910:
|
||||
case DIV_SYSTEM_AY8930:
|
||||
return chanTypes[11][dispatchChanOfChan[chan]];
|
||||
break;
|
||||
case DIV_SYSTEM_AMIGA:
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
#include <map>
|
||||
#include <queue>
|
||||
|
||||
#define DIV_VERSION "0.4pre1"
|
||||
#define DIV_ENGINE_VERSION 17
|
||||
#define DIV_VERSION "0.4pre2"
|
||||
#define DIV_ENGINE_VERSION 18
|
||||
|
||||
enum DivStatusView {
|
||||
DIV_STATUS_NOTHING=0,
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@ enum DivInstrumentType {
|
|||
DIV_INS_C64=3,
|
||||
DIV_INS_AMIGA=4,
|
||||
DIV_INS_PCE=5,
|
||||
DIV_INS_AY=6
|
||||
DIV_INS_AY=6,
|
||||
DIV_INS_AY8930=7
|
||||
};
|
||||
|
||||
struct DivInstrumentFM {
|
||||
|
|
|
|||
372
src/engine/platform/ay8930.cpp
Normal file
372
src/engine/platform/ay8930.cpp
Normal file
|
|
@ -0,0 +1,372 @@
|
|||
#include "ay8930.h"
|
||||
#include "../engine.h"
|
||||
#include "sound/ay8910.h"
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
|
||||
#define rWrite(a,v) if (!skipRegisterWrites) {pendingWrites[a]=v;}
|
||||
#define immWrite(a,v) if (!skipRegisterWrites) {writes.emplace(a,v);}
|
||||
|
||||
#define PSG_FREQ_BASE 7640.0f
|
||||
|
||||
void DivPlatformAY8930::acquire(short* bufL, short* bufR, size_t start, size_t len) {
|
||||
if (ayBufLen<len) {
|
||||
ayBufLen=len;
|
||||
for (int i=0; i<3; i++) {
|
||||
delete[] ayBuf[i];
|
||||
ayBuf[i]=new short[ayBufLen];
|
||||
}
|
||||
}
|
||||
while (!writes.empty()) {
|
||||
QueuedWrite w=writes.front();
|
||||
if (bank!=(w.addr>>4)) {
|
||||
bank=w.addr>>4;
|
||||
ay->address_w(0x0d);
|
||||
ay->data_w(0xa0|(bank<<4));
|
||||
}
|
||||
ay->address_w(w.addr&15);
|
||||
if (w.addr==0x0d) {
|
||||
ay->data_w(0xa0|(bank<<4)|(w.val&15));
|
||||
} else {
|
||||
ay->data_w(w.val);
|
||||
}
|
||||
writes.pop();
|
||||
}
|
||||
ay->sound_stream_update(ayBuf,len);
|
||||
for (size_t i=0; i<len; i++) {
|
||||
bufL[i+start]=ayBuf[0][i]+ayBuf[1][i]+ayBuf[2][i];
|
||||
bufR[i+start]=ayBuf[0][i]+ayBuf[1][i]+ayBuf[2][i];
|
||||
}
|
||||
}
|
||||
|
||||
const unsigned char regPeriodL[3]={
|
||||
0x0b, 0x10, 0x12
|
||||
};
|
||||
|
||||
const unsigned char regPeriodH[3]={
|
||||
0x0c, 0x11, 0x13
|
||||
};
|
||||
|
||||
const unsigned char regMode[3]={
|
||||
0x0d, 0x14, 0x15
|
||||
};
|
||||
|
||||
void DivPlatformAY8930::tick() {
|
||||
// PSG
|
||||
for (int i=0; i<3; i++) {
|
||||
chan[i].std.next();
|
||||
if (chan[i].std.hadVol) {
|
||||
chan[i].outVol=chan[i].std.vol-(31-chan[i].vol);
|
||||
if (chan[i].outVol<0) chan[i].outVol=0;
|
||||
if (isMuted[i]) {
|
||||
rWrite(0x08+i,0);
|
||||
} else {
|
||||
rWrite(0x08+i,(chan[i].outVol&31)|((chan[i].psgMode&4)<<3));
|
||||
}
|
||||
}
|
||||
if (chan[i].std.hadArp) {
|
||||
if (!chan[i].inPorta) {
|
||||
if (chan[i].std.arpMode) {
|
||||
chan[i].baseFreq=round(PSG_FREQ_BASE/pow(2.0f,((float)(chan[i].std.arp)/12.0f)));
|
||||
} else {
|
||||
chan[i].baseFreq=round(PSG_FREQ_BASE/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f)));
|
||||
}
|
||||
}
|
||||
chan[i].freqChanged=true;
|
||||
} else {
|
||||
if (chan[i].std.arpMode && chan[i].std.finishedArp) {
|
||||
chan[i].baseFreq=round(PSG_FREQ_BASE/pow(2.0f,((float)(chan[i].note)/12.0f)));
|
||||
chan[i].freqChanged=true;
|
||||
}
|
||||
}
|
||||
if (chan[i].std.hadDuty) {
|
||||
rWrite(0x06,chan[i].std.duty);
|
||||
}
|
||||
if (chan[i].std.hadWave) {
|
||||
chan[i].psgMode&=4;
|
||||
chan[i].psgMode|=(chan[i].std.wave+1)&3;
|
||||
}
|
||||
if (chan[i].std.hadEx1) { // duty
|
||||
rWrite(0x16+i,chan[i].std.ex1);
|
||||
}
|
||||
if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
|
||||
chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true);
|
||||
if (chan[i].freq>4095) chan[i].freq=4095;
|
||||
if (chan[i].keyOn) {
|
||||
if (chan[i].insChanged) {
|
||||
if (!chan[i].std.willEx1) immWrite(0x16+i,chan[i].duty);
|
||||
chan[i].insChanged=false;
|
||||
}
|
||||
}
|
||||
if (chan[i].keyOff) {
|
||||
rWrite(0x08+i,0);
|
||||
}
|
||||
rWrite((i)<<1,chan[i].freq&0xff);
|
||||
rWrite(1+((i)<<1),chan[i].freq>>8);
|
||||
if (chan[i].keyOn) chan[i].keyOn=false;
|
||||
if (chan[i].keyOff) chan[i].keyOff=false;
|
||||
chan[i].freqChanged=false;
|
||||
}
|
||||
|
||||
if (ayEnvSlide[i]!=0) {
|
||||
ayEnvSlideLow[i]+=ayEnvSlide[i];
|
||||
while (ayEnvSlideLow[i]>7) {
|
||||
ayEnvSlideLow[i]-=8;
|
||||
if (ayEnvPeriod[i]<0xffff) {
|
||||
ayEnvPeriod[i]++;
|
||||
immWrite(regPeriodL[i],ayEnvPeriod[i]);
|
||||
immWrite(regPeriodH[i],ayEnvPeriod[i]>>8);
|
||||
}
|
||||
}
|
||||
while (ayEnvSlideLow[i]<-7) {
|
||||
ayEnvSlideLow[i]+=8;
|
||||
if (ayEnvPeriod[i]>0) {
|
||||
ayEnvPeriod[i]--;
|
||||
immWrite(regPeriodL[i],ayEnvPeriod[i]);
|
||||
immWrite(regPeriodH[i],ayEnvPeriod[i]>>8);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rWrite(0x07,
|
||||
~((chan[0].psgMode&1)|
|
||||
((chan[1].psgMode&1)<<1)|
|
||||
((chan[2].psgMode&1)<<2)|
|
||||
((chan[0].psgMode&2)<<2)|
|
||||
((chan[1].psgMode&2)<<3)|
|
||||
((chan[2].psgMode&2)<<4)));
|
||||
|
||||
for (int i=0; i<32; i++) {
|
||||
if (pendingWrites[i]!=oldWrites[i]) {
|
||||
immWrite(i,pendingWrites[i]&0xff);
|
||||
oldWrites[i]=pendingWrites[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int DivPlatformAY8930::dispatch(DivCommand c) {
|
||||
switch (c.cmd) {
|
||||
case DIV_CMD_NOTE_ON: {
|
||||
DivInstrument* ins=parent->getIns(chan[c.chan].ins);
|
||||
chan[c.chan].baseFreq=round(PSG_FREQ_BASE/pow(2.0f,((float)c.value/12.0f)));
|
||||
chan[c.chan].freqChanged=true;
|
||||
chan[c.chan].note=c.value;
|
||||
chan[c.chan].active=true;
|
||||
chan[c.chan].keyOn=true;
|
||||
chan[c.chan].std.init(ins);
|
||||
if (isMuted[c.chan]) {
|
||||
rWrite(0x08+c.chan,0);
|
||||
} else {
|
||||
rWrite(0x08+c.chan,(chan[c.chan].vol&31)|((chan[c.chan].psgMode&4)<<3));
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DIV_CMD_NOTE_OFF:
|
||||
chan[c.chan].keyOff=true;
|
||||
chan[c.chan].active=false;
|
||||
chan[c.chan].std.init(NULL);
|
||||
break;
|
||||
case DIV_CMD_VOLUME: {
|
||||
chan[c.chan].vol=c.value;
|
||||
if (!chan[c.chan].std.hasVol) {
|
||||
chan[c.chan].outVol=c.value;
|
||||
}
|
||||
if (isMuted[c.chan]) {
|
||||
rWrite(0x08+c.chan,0);
|
||||
} else {
|
||||
if (chan[c.chan].active) rWrite(0x08+c.chan,(chan[c.chan].vol&31)|((chan[c.chan].psgMode&4)<<3));
|
||||
}
|
||||
break;
|
||||
break;
|
||||
}
|
||||
case DIV_CMD_GET_VOLUME: {
|
||||
return chan[c.chan].vol;
|
||||
break;
|
||||
}
|
||||
case DIV_CMD_INSTRUMENT:
|
||||
if (chan[c.chan].ins!=c.value) {
|
||||
chan[c.chan].insChanged=true;
|
||||
}
|
||||
chan[c.chan].ins=c.value;
|
||||
break;
|
||||
case DIV_CMD_PITCH: {
|
||||
chan[c.chan].pitch=c.value;
|
||||
chan[c.chan].freqChanged=true;
|
||||
break;
|
||||
}
|
||||
case DIV_CMD_NOTE_PORTA: {
|
||||
int destFreq=round(PSG_FREQ_BASE/pow(2.0f,((float)c.value2/12.0f)));
|
||||
bool return2=false;
|
||||
if (destFreq>chan[c.chan].baseFreq) {
|
||||
chan[c.chan].baseFreq+=c.value;
|
||||
if (chan[c.chan].baseFreq>=destFreq) {
|
||||
chan[c.chan].baseFreq=destFreq;
|
||||
return2=true;
|
||||
}
|
||||
} else {
|
||||
chan[c.chan].baseFreq-=c.value;
|
||||
if (chan[c.chan].baseFreq<=destFreq) {
|
||||
chan[c.chan].baseFreq=destFreq;
|
||||
return2=true;
|
||||
}
|
||||
}
|
||||
chan[c.chan].freqChanged=true;
|
||||
if (return2) {
|
||||
chan[c.chan].inPorta=false;
|
||||
return 2;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DIV_CMD_LEGATO: {
|
||||
chan[c.chan].baseFreq=round(PSG_FREQ_BASE/pow(2.0f,((float)c.value/12.0f)));
|
||||
chan[c.chan].freqChanged=true;
|
||||
break;
|
||||
}
|
||||
case DIV_CMD_STD_NOISE_MODE:
|
||||
if (c.value<0x10) {
|
||||
// TODO: channel mode
|
||||
} else {
|
||||
chan[c.chan].duty=c.value&15;
|
||||
immWrite(0x16,chan[c.chan].duty);
|
||||
}
|
||||
break;
|
||||
case DIV_CMD_STD_NOISE_FREQ:
|
||||
rWrite(0x06,c.value);
|
||||
break;
|
||||
case DIV_CMD_AY_ENVELOPE_SET:
|
||||
ayEnvMode[c.chan]=c.value>>4;
|
||||
rWrite(regMode[c.chan],ayEnvMode[c.chan]);
|
||||
if (c.value&15) {
|
||||
chan[c.chan].psgMode|=4;
|
||||
} else {
|
||||
chan[c.chan].psgMode&=~4;
|
||||
}
|
||||
if (isMuted[c.chan]) {
|
||||
rWrite(0x08+c.chan,0);
|
||||
} else {
|
||||
rWrite(0x08+c.chan,(chan[c.chan].vol&31)|((chan[c.chan].psgMode&4)<<3));
|
||||
}
|
||||
break;
|
||||
case DIV_CMD_AY_ENVELOPE_LOW:
|
||||
ayEnvPeriod[c.chan]&=0xff00;
|
||||
ayEnvPeriod[c.chan]|=c.value;
|
||||
immWrite(regPeriodL[c.chan],ayEnvPeriod[c.chan]);
|
||||
immWrite(regPeriodH[c.chan],ayEnvPeriod[c.chan]>>8);
|
||||
break;
|
||||
case DIV_CMD_AY_ENVELOPE_HIGH:
|
||||
ayEnvPeriod[c.chan]&=0xff;
|
||||
ayEnvPeriod[c.chan]|=c.value<<8;
|
||||
immWrite(regPeriodL[c.chan],ayEnvPeriod[c.chan]);
|
||||
immWrite(regPeriodH[c.chan],ayEnvPeriod[c.chan]>>8);
|
||||
break;
|
||||
case DIV_CMD_AY_ENVELOPE_SLIDE:
|
||||
ayEnvSlide[c.chan]=c.value;
|
||||
break;
|
||||
case DIV_ALWAYS_SET_VOLUME:
|
||||
return 0;
|
||||
break;
|
||||
case DIV_CMD_GET_VOLMAX:
|
||||
return 31;
|
||||
break;
|
||||
case DIV_CMD_PRE_PORTA:
|
||||
chan[c.chan].std.init(parent->getIns(chan[c.chan].ins));
|
||||
chan[c.chan].inPorta=c.value;
|
||||
break;
|
||||
case DIV_CMD_PRE_NOTE:
|
||||
break;
|
||||
default:
|
||||
//printf("WARNING: unimplemented command %d\n",c.cmd);
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
void DivPlatformAY8930::muteChannel(int ch, bool mute) {
|
||||
isMuted[ch]=mute;
|
||||
if (isMuted[ch]) {
|
||||
rWrite(0x08+ch,0);
|
||||
} else {
|
||||
rWrite(0x08+ch,(chan[ch].outVol&31)|((chan[ch].psgMode&4)<<3));
|
||||
}
|
||||
}
|
||||
|
||||
void DivPlatformAY8930::forceIns() {
|
||||
for (int i=0; i<3; i++) {
|
||||
chan[i].insChanged=true;
|
||||
immWrite(regPeriodL[i],ayEnvPeriod[i]);
|
||||
immWrite(regPeriodH[i],ayEnvPeriod[i]>>8);
|
||||
immWrite(regMode[i],ayEnvMode[i]);
|
||||
}
|
||||
}
|
||||
|
||||
void DivPlatformAY8930::reset() {
|
||||
while (!writes.empty()) writes.pop();
|
||||
ay->device_reset();
|
||||
for (int i=0; i<3; i++) {
|
||||
chan[i]=DivPlatformAY8930::Channel();
|
||||
chan[i].vol=31;
|
||||
ayEnvPeriod[i]=0;
|
||||
ayEnvMode[i]=0;
|
||||
ayEnvSlide[i]=0;
|
||||
ayEnvSlideLow[i]=0;
|
||||
}
|
||||
|
||||
for (int i=0; i<32; i++) {
|
||||
oldWrites[i]=-1;
|
||||
pendingWrites[i]=-1;
|
||||
}
|
||||
|
||||
lastBusy=60;
|
||||
dacMode=0;
|
||||
dacPeriod=0;
|
||||
dacPos=0;
|
||||
dacRate=0;
|
||||
dacSample=-1;
|
||||
sampleBank=0;
|
||||
|
||||
delay=0;
|
||||
|
||||
extMode=false;
|
||||
bank=false;
|
||||
|
||||
immWrite(0x0d,0xa0);
|
||||
}
|
||||
|
||||
bool DivPlatformAY8930::isStereo() {
|
||||
return false;
|
||||
}
|
||||
|
||||
bool DivPlatformAY8930::keyOffAffectsArp(int ch) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void DivPlatformAY8930::notifyInsDeletion(void* ins) {
|
||||
for (int i=0; i<3; i++) {
|
||||
chan[i].std.notifyInsDeletion((DivInstrument*)ins);
|
||||
}
|
||||
}
|
||||
|
||||
int DivPlatformAY8930::init(DivEngine* p, int channels, int sugRate, bool pal) {
|
||||
parent=p;
|
||||
skipRegisterWrites=false;
|
||||
for (int i=0; i<3; i++) {
|
||||
isMuted[i]=false;
|
||||
}
|
||||
if (pal) {
|
||||
rate=250000;
|
||||
} else {
|
||||
rate=250000;
|
||||
}
|
||||
ay=new ay8930_device(rate);
|
||||
ay->device_start();
|
||||
ayBufLen=65536;
|
||||
for (int i=0; i<3; i++) ayBuf[i]=new short[ayBufLen];
|
||||
reset();
|
||||
return 3;
|
||||
}
|
||||
|
||||
void DivPlatformAY8930::quit() {
|
||||
for (int i=0; i<3; i++) delete[] ayBuf[i];
|
||||
delete ay;
|
||||
}
|
||||
67
src/engine/platform/ay8930.h
Normal file
67
src/engine/platform/ay8930.h
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
#ifndef _AY8930_H
|
||||
#define _AY8930_H
|
||||
#include "../dispatch.h"
|
||||
#include "../macroInt.h"
|
||||
#include <queue>
|
||||
#include "sound/ay8910.h"
|
||||
|
||||
class DivPlatformAY8930: public DivDispatch {
|
||||
protected:
|
||||
struct Channel {
|
||||
unsigned char freqH, freqL;
|
||||
int freq, baseFreq, pitch;
|
||||
unsigned char ins, note, psgMode, duty;
|
||||
signed char konCycles;
|
||||
bool active, insChanged, freqChanged, keyOn, keyOff, portaPause, inPorta;
|
||||
int vol, outVol;
|
||||
unsigned char pan;
|
||||
DivMacroInt std;
|
||||
Channel(): freqH(0), freqL(0), freq(0), baseFreq(0), pitch(0), ins(-1), note(0), psgMode(1), duty(4), active(false), insChanged(true), freqChanged(false), keyOn(false), keyOff(false), portaPause(false), inPorta(false), vol(0), outVol(31), pan(3) {}
|
||||
};
|
||||
Channel chan[3];
|
||||
bool isMuted[3];
|
||||
struct QueuedWrite {
|
||||
unsigned short addr;
|
||||
unsigned char val;
|
||||
bool addrOrVal;
|
||||
QueuedWrite(unsigned short a, unsigned char v): addr(a), val(v), addrOrVal(false) {}
|
||||
};
|
||||
std::queue<QueuedWrite> writes;
|
||||
ay8930_device* ay;
|
||||
unsigned char lastBusy;
|
||||
|
||||
bool dacMode;
|
||||
int dacPeriod;
|
||||
int dacRate;
|
||||
int dacPos;
|
||||
int dacSample;
|
||||
unsigned char sampleBank;
|
||||
bool bank;
|
||||
|
||||
int delay;
|
||||
|
||||
bool extMode;
|
||||
|
||||
short oldWrites[32];
|
||||
short pendingWrites[32];
|
||||
unsigned char ayEnvMode[3];
|
||||
unsigned short ayEnvPeriod[3];
|
||||
short ayEnvSlideLow[3];
|
||||
short ayEnvSlide[3];
|
||||
short* ayBuf[3];
|
||||
size_t ayBufLen;
|
||||
|
||||
public:
|
||||
void acquire(short* bufL, short* bufR, size_t start, size_t len);
|
||||
int dispatch(DivCommand c);
|
||||
void reset();
|
||||
void forceIns();
|
||||
void tick();
|
||||
void muteChannel(int ch, bool mute);
|
||||
bool isStereo();
|
||||
bool keyOffAffectsArp(int ch);
|
||||
void notifyInsDeletion(void* ins);
|
||||
int init(DivEngine* parent, int channels, int sugRate, bool pal);
|
||||
void quit();
|
||||
};
|
||||
#endif
|
||||
|
|
@ -328,9 +328,13 @@ bool DivEngine::perSystemPostEffect(int ch, unsigned char effect, unsigned char
|
|||
}
|
||||
break;
|
||||
case DIV_SYSTEM_AY8910:
|
||||
case DIV_SYSTEM_AY8930:
|
||||
switch (effect) {
|
||||
case 0x12: // duty on 8930
|
||||
dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,0x10+effectVal));
|
||||
break;
|
||||
case 0x20: // mode
|
||||
dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
|
||||
dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal&15));
|
||||
break;
|
||||
case 0x21: // noise freq
|
||||
dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_FREQ,ch,effectVal));
|
||||
|
|
|
|||
|
|
@ -30,7 +30,8 @@ enum DivSystem {
|
|||
DIV_SYSTEM_YM2151,
|
||||
DIV_SYSTEM_YM2612,
|
||||
DIV_SYSTEM_TIA,
|
||||
DIV_SYSTEM_SAA1099
|
||||
DIV_SYSTEM_SAA1099,
|
||||
DIV_SYSTEM_AY8930
|
||||
};
|
||||
|
||||
struct DivSong {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue