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

C140 Part 2

Browse source
This commit is contained in:
cam900 2023-08-09 20:30:00 +09:00
parent 54cd69aabf
commit 14c5d94499
21 changed files with 210 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

99
src/engine/platform/c140.cpp
View file

@ -80,10 +80,9 @@ void DivPlatformC140::tick(bool sysTick) {
chan[i].std.next();
if (chan[i].std.vol.had) {
chan[i].outVol=(chan[i].vol*MIN(chan[i].macroVolMul,chan[i].std.vol.val))/chan[i].macroVolMul;
chan[i].chVolL=(chan[i].outVol*chan[i].chPanL)/255;
chan[i].chVolR=(chan[i].outVol*chan[i].chPanR)/255;
rWrite(1+(i<<4),chan[i].chVolL);
rWrite(0+(i<<4),chan[i].chVolR);
if (!isMuted[i]) {
chan[i].volumeChanged.changed=0xff;
}
}
if (NEW_ARP_STRAT) {
chan[i].handleArp();
@ -104,14 +103,16 @@ void DivPlatformC140::tick(bool sysTick) {
}
if (chan[i].std.panL.had) {
chan[i].chPanL=chan[i].std.panL.val&255;
chan[i].chVolL=(chan[i].outVol*chan[i].chPanL)/255;
rWrite(1+(i<<4),chan[i].chVolL);
if (!isMuted[i]) {
chan[i].volumeChanged.left=1;
}
}
if (chan[i].std.panR.had) {
chan[i].chPanR=chan[i].std.panR.val&255;
chan[i].chVolR=(chan[i].outVol*chan[i].chPanR)/255;
rWrite(0+(i<<4),chan[i].chVolR);
if (!isMuted[i]) {
chan[i].volumeChanged.right=1;
}
}
if (chan[i].std.phaseReset.had) {
@ -120,6 +121,25 @@ void DivPlatformC140::tick(bool sysTick) {
chan[i].setPos=true;
}
}
if (chan[i].volumeChanged.changed) {
if (chan[i].volumeChanged.left) {
if (isMuted[i]) {
chan[i].chVolL=0;
} else {
chan[i].chVolL=(chan[i].outVol*chan[i].chPanL)/255;
}
rWrite(1+(i<<4),chan[i].chVolL);
}
if (chan[i].volumeChanged.right) {
if (isMuted[i]) {
chan[i].chVolR=0;
} else {
chan[i].chVolR=(chan[i].outVol*chan[i].chPanR)/255;
}
rWrite(0+(i<<4),chan[i].chVolR);
}
chan[i].volumeChanged.changed=0;
}
if (chan[i].setPos) {
// force keyon
chan[i].keyOn=true;
@ -141,7 +161,7 @@ void DivPlatformC140::tick(bool sysTick) {
unsigned int end=0;
if (chan[i].sample>=0 && chan[i].sample<parent->song.sampleLen) {
start=sampleOff[chan[i].sample];
end=MIN(start+s->getCurBufLen(),getSampleMemCapacity()-1);
end=MIN(start+s->length8,getSampleMemCapacity()-1);
}
if (chan[i].audPos>0) {
start=start+MIN(chan[i].audPos,s->length8);
@ -149,19 +169,18 @@ void DivPlatformC140::tick(bool sysTick) {
if (s->isLoopable()) {
loop=start+s->loopStart;
}
rWrite(0x05+i*16,ctrl&~0x80); // force keyoff first
rWrite(0x06+i*16,(start>>8)&0xff);
rWrite(0x07+i*16,start&0xff);
rWrite(0x08+i*16,(end>>8)&0xff);
rWrite(0x09+i*16,end&0xff);
rWrite(0x0a+i*16,(loop>>8)&0xff);
rWrite(0x0b+i*16,loop&0xff);
rWrite(0x05+(i<<4),0); // force keyoff first
rWrite(0x06+(i<<4),(start>>8)&0xff);
rWrite(0x07+(i<<4),start&0xff);
rWrite(0x08+(i<<4),(end>>8)&0xff);
rWrite(0x09+(i<<4),end&0xff);
rWrite(0x0a+(i<<4),(loop>>8)&0xff);
rWrite(0x0b+(i<<4),loop&0xff);
if (!chan[i].std.vol.had) {
chan[i].outVol=chan[i].vol;
chan[i].chVolL=(chan[i].outVol*chan[i].chPanL)/255;
chan[i].chVolR=(chan[i].outVol*chan[i].chPanR)/255;
rWrite(1+(i<<4),chan[i].chVolL);
rWrite(0+(i<<4),chan[i].chVolR);
if (!isMuted[i]) {
chan[i].volumeChanged.changed=0xff;
}
}
chan[i].keyOn=false;
}
@ -169,11 +188,11 @@ void DivPlatformC140::tick(bool sysTick) {
chan[i].keyOff=false;
}
if (chan[i].freqChanged) {
rWrite(0x02+i*16,chan[i].freq&0xff);
rWrite(0x03+i*16,chan[i].freq>>8);
rWrite(0x02+(i<<4),chan[i].freq>>8);
rWrite(0x03+(i<<4),chan[i].freq&0xff);
chan[i].freqChanged=false;
}
rWrite(0x05+i*16,ctrl);
rWrite(0x05+(i<<4),ctrl);
}
}
}
@ -182,7 +201,6 @@ int DivPlatformC140::dispatch(DivCommand c) {
switch (c.cmd) {
case DIV_CMD_NOTE_ON: {
DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_AMIGA);
chan[c.chan].isNewYMZ=ins->type==DIV_INS_YMZ280B;
chan[c.chan].macroVolMul=ins->type==DIV_INS_AMIGA?64:255;
if (c.value!=DIV_NOTE_NULL) {
chan[c.chan].sample=ins->amiga.getSample(c.value);
@ -203,11 +221,9 @@ int DivPlatformC140::dispatch(DivCommand c) {
chan[c.chan].macroInit(ins);
if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) {
chan[c.chan].outVol=chan[c.chan].vol;
chan[c.chan].chVolL=(chan[c.chan].outVol*chan[c.chan].chPanL)/255;
chan[c.chan].chVolR=(chan[c.chan].outVol*chan[c.chan].chPanR)/255;
rWrite(1+(c.chan<<4),chan[c.chan].chVolL);
rWrite(0+(c.chan<<4),chan[c.chan].chVolR);
if (!isMuted[c.chan]) {
chan[c.chan].volumeChanged.changed=0xff;
}
}
break;
}
@ -231,10 +247,9 @@ int DivPlatformC140::dispatch(DivCommand c) {
if (!chan[c.chan].std.vol.has) {
chan[c.chan].outVol=c.value;
}
chan[c.chan].chVolL=(c.value*chan[c.chan].chPanL)/255;
chan[c.chan].chVolR=(c.value*chan[c.chan].chPanR)/255;
rWrite(1+(c.chan<<4),chan[c.chan].chVolL);
rWrite(0+(c.chan<<4),chan[c.chan].chVolR);
if (!isMuted[c.chan]) {
chan[c.chan].volumeChanged.changed=0xff;
}
break;
case DIV_CMD_GET_VOLUME:
if (chan[c.chan].std.vol.has) {
@ -245,10 +260,9 @@ int DivPlatformC140::dispatch(DivCommand c) {
case DIV_CMD_PANNING:
chan[c.chan].chPanL=c.value;
chan[c.chan].chPanR=c.value2;
chan[c.chan].chVolL=(chan[c.chan].outVol*chan[c.chan].chPanL)/255;
chan[c.chan].chVolR=(chan[c.chan].outVol*chan[c.chan].chPanR)/255;
rWrite(1+(c.chan<<4),chan[c.chan].chVolL);
rWrite(0+(c.chan<<4),chan[c.chan].chVolR);
if (!isMuted[c.chan]) {
chan[c.chan].volumeChanged.changed=0xff;
}
break;
case DIV_CMD_PITCH:
chan[c.chan].pitch=c.value;
@ -314,12 +328,14 @@ int DivPlatformC140::dispatch(DivCommand c) {
void DivPlatformC140::muteChannel(int ch, bool mute) {
isMuted[ch]=mute;
chan[ch].volumeChanged.changed=0xff;
}
void DivPlatformC140::forceIns() {
for (int i=0; i<24; i++) {
chan[i].insChanged=true;
chan[i].freqChanged=true;
chan[i].volumeChanged.changed=0xff;
chan[i].sample=-1;
}
}
@ -343,7 +359,7 @@ void DivPlatformC140::reset() {
for (int i=0; i<24; i++) {
chan[i]=DivPlatformC140::Channel();
chan[i].std.setEngine(parent);
rWrite(0x05+i*16,0);
rWrite(0x05+(i<<4),0);
}
}
@ -435,7 +451,7 @@ void DivPlatformC140::renderSamples(int sysID) {
} else {
memcpy(sampleMem+(memPos/sizeof(short)),s->data16,length);
}
sampleOff[i]=memPos;
sampleOff[i]=memPos>>1;
sampleLoaded[i]=true;
memPos+=length;
}
@ -447,7 +463,7 @@ void DivPlatformC140::setChipModel(int type) {
}
void DivPlatformC140::setFlags(const DivConfig& flags) {
chipClock = 8192000;
chipClock=32000*256; // 8.192MHz and 12.288MHz input, verified from Assault Schematics
CHECK_CUSTOM_CLOCK;
rate=chipClock/192;
for (int i=0; i<24; i++) {
@ -464,9 +480,10 @@ int DivPlatformC140::init(DivEngine* p, int channels, int sugRate, const DivConf
isMuted[i]=false;
oscBuf[i]=new DivDispatchOscBuffer;
}
sampleMem=new unsigned char[getSampleMemCapacity()];
sampleMem=new signed short[getSampleMemCapacity()/sizeof(short)];
sampleMemLen=0;
c140_init(&c140);
c140.sample_mem=sampleMem;
setFlags(flags);
reset();

23
src/engine/platform/c140.h
View file

@ -26,21 +26,33 @@
class DivPlatformC140: public DivDispatch {
struct Channel: public SharedChannel<int> {
struct VolumeUpdate {
union { // pack flag bits in single byte
struct { // flag bits
unsigned char left : 1; // left volume
unsigned char right : 1; // right volume
unsigned char reserved : 6;
};
unsigned char changed = 0; // Packed flags are stored here
};
VolumeUpdate():
changed(0) {}
} volumeChanged;
unsigned int audPos;
int sample, wave;
int panning;
bool setPos, isNewYMZ;
bool setPos;
int chPanL, chPanR;
int chVolL, chVolR;
int macroVolMul;
Channel():
SharedChannel<int>(255),
volumeChanged(VolumeUpdate()),
audPos(0),
sample(-1),
wave(-1),
panning(8),
setPos(false),
isNewYMZ(false),
chPanL(255),
chPanR(255),
chVolL(255),
@ -54,7 +66,7 @@ class DivPlatformC140: public DivDispatch {
unsigned int sampleOff[256];
bool sampleLoaded[256];
unsigned char* sampleMem;
signed short* sampleMem;
size_t sampleMemLen;
struct QueuedWrite {
unsigned short addr;
@ -97,6 +109,7 @@ class DivPlatformC140: public DivDispatch {
void setFlags(const DivConfig& flags);
int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
void quit();
private:
};
#endif

10
src/engine/platform/sound/c140.c
View file

@ -46,6 +46,8 @@ static int c140_bit(int val, int bit) { return (val >> bit) & 1; }
void c140_tick(struct c140_t *c140, const int cycle)
{
c140->lout = 0;
c140->rout = 0;
for (int i = 0; i < 24; i++)
{
c140_voice_tick(c140, i, cycle);
@ -53,8 +55,8 @@ void c140_tick(struct c140_t *c140, const int cycle)
c140->rout += c140->voice[i].rout;
}
// scale as 16bit
c140->lout >>= 5;
c140->rout >>= 5;
c140->lout >>= 8;
c140->rout >>= 8;
}
void c140_voice_tick(struct c140_t *c140, const unsigned char voice, const int cycle)
@ -82,8 +84,8 @@ void c140_voice_tick(struct c140_t *c140, const unsigned char voice, const int c
c140_voice->frac &= 0xffff;
}
// fetch 12 bit sample
signed short s1 = c140->read_sample(c140_voice->bank, c140_voice->addr) & ~0xf;
signed short s2 = c140->read_sample(c140_voice->bank, c140_voice->addr + 1) & ~0xf;
signed short s1 = c140->sample_mem[((unsigned int)(c140_voice->bank) << 16) | c140_voice->addr] & ~0xf;
signed short s2 = c140->sample_mem[((unsigned int)(c140_voice->bank) << 16) | ((c140_voice->addr + 1) & 0xffff)] & ~0xf;
if (c140_voice->compressed)
{
s1 = c140->mulaw[(s1 >> 8) & 0xff];

2
src/engine/platform/sound/c140.h
View file

@ -69,7 +69,7 @@ struct c140_t
struct c140_voice_t voice[24];
signed int lout, rout;
signed short mulaw[256];
unsigned short (*read_sample)(unsigned char bank, unsigned short addr);
signed short *sample_mem;
};
void c140_tick(struct c140_t *c140, const int cycle);