ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

commodore64: connect sound

This commit is contained in:
saxxonpike 2012-12-03 04:19:45 +00:00
parent e24d1efbd4
commit 58db36e311
5 changed files with 140 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation/Computers/Commodore64/C64.Core.cs
View File

@ -160,7 +160,7 @@ namespace BizHawk.Emulation.Computers.Commodore64
colorRam = new Chip2114(); colorRam = new Chip2114();
cpu = new MOS6510(this); cpu = new MOS6510(this);
ram = new Chip4864(); ram = new Chip4864();
sid = new MOS6581(); sid = new MOS6581(44100, initRegion);
pla.UpdatePins(); pla.UpdatePins();
} }

2
BizHawk.Emulation/Computers/Commodore64/MOS/MOS6581.cs
View File

@ -4124,7 +4124,7 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
} }
}; };
public MOS6581() : base(waveTable) public MOS6581(uint newSampleRate, Region newRegion) : base(waveTable, newSampleRate, newRegion)
{ {
} }
} }

20
BizHawk.Emulation/Computers/Commodore64/MOS/Sid.SoundProvider.cs
View File

@ -7,16 +7,32 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
{ {
public abstract partial class Sid : ISoundProvider public abstract partial class Sid : ISoundProvider
{ {
private short[] buffer;
private uint bufferCounter;
private uint bufferFrequency;
private uint bufferIndex;
private uint bufferLength;
private uint bufferReadOffset;
private uint cyclesPerSec;
public void GetSamples(short[] samples) public void GetSamples(short[] samples)
{ {
// produce no samples for now uint count = (uint)samples.Length;
for (uint i = 0; i < count; i++)
{
samples[i] = buffer[bufferReadOffset];
if (bufferReadOffset != bufferIndex)
bufferReadOffset++;
if (bufferReadOffset == bufferLength)
bufferReadOffset = 0;
}
} }
public int MaxVolume public int MaxVolume
{ {
get get
{ {
return 255; return 15;
} }
set set
{ {

5
BizHawk.Emulation/Computers/Commodore64/MOS/Sid.SyncSoundProvider.cs
View File

@ -9,8 +9,9 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
{ {
public void GetSamples(out short[] samples, out int nsamp) public void GetSamples(out short[] samples, out int nsamp)
{ {
samples = new short[0]; samples = buffer;
nsamp = 0; nsamp = (int)bufferIndex;
bufferIndex = 0;
} }
public void DiscardSamples() public void DiscardSamples()

158
BizHawk.Emulation/Computers/Commodore64/MOS/Sid.cs
View File

@ -71,53 +71,54 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
delay = true; delay = true;
UpdateExpCounter(); UpdateExpCounter();
} }
if (lfsr != rate) if (lfsr != rate)
{ {
uint feedback = ((lfsr >> 14) ^ (lfsr >> 13)) & 0x1; uint feedback = ((lfsr >> 14) ^ (lfsr >> 13)) & 0x1;
lfsr = ((lfsr << 1) & 0x7FFF) | feedback; lfsr = ((lfsr << 1) & 0x7FFF) | feedback;
return;
} }
else lfsr = 0x7FFF;
if (state == stateAttack || ++expCounter == expPeriod)
{ {
lfsr = 0x7FFF; expCounter = 0;
if (state == stateAttack || ++expCounter == expPeriod) if (freeze)
return;
switch (state)
{ {
expCounter = 0; case stateAttack:
if (!freeze) envCounter++;
{ if (envCounter == 0xFF)
switch (state)
{ {
case stateAttack: state = stateDecay;
envCounter++; rate = adsrTable[decay];
if (envCounter == 0xFF)
{
state = stateDecay;
rate = adsrTable[decay];
}
break;
case stateDecay:
if (envCounter == sustainTable[sustain])
{
return;
}
if (expPeriod != 1)
{
delay = false;
return;
}
envCounter--;
break;
case stateRelease:
if (expPeriod != 1)
{
delay = false;
return;
}
envCounter--;
break;
} }
UpdateExpCounter(); break;
} case stateDecay:
if (envCounter == sustainTable[sustain])
{
return;
}
if (expPeriod != 1)
{
delay = false;
return;
}
envCounter--;
break;
case stateRelease:
if (expPeriod != 1)
{
delay = false;
return;
}
envCounter--;
break;
} }
envCounter &= 0xFF;
UpdateExpCounter();
} }
} }
@ -464,7 +465,7 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
output = 0x000; output = 0x000;
} }
pulse = ((accumulator >> 12) >= pulseWidth) ? (uint)0xFFF : (uint)0x000; pulse = ((accumulator >> 12) >= pulseWidth) ? (uint)0xFFF : (uint)0x000;
return 0; return output;
} }
public uint PulseWidth public uint PulseWidth
@ -566,8 +567,17 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
private uint volume; private uint volume;
private uint[][] waveformTable; private uint[][] waveformTable;
public Sid(uint[][] newWaveformTable) public Sid(uint[][] newWaveformTable, uint newSampleRate, Region newRegion)
{ {
switch (newRegion)
{
case Region.NTSC: cyclesPerSec = 14318181 / 14; break;
case Region.PAL: cyclesPerSec = 17734472 / 18; break;
}
bufferFrequency = cyclesPerSec / newSampleRate;
bufferLength = newSampleRate * 2;
buffer = new short[bufferLength];
waveformTable = newWaveformTable; waveformTable = newWaveformTable;
envelopes = new Envelope[3]; envelopes = new Envelope[3];
@ -635,6 +645,27 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
envelopeOutput[0] = envelopes[0].Level; envelopeOutput[0] = envelopes[0].Level;
envelopeOutput[1] = envelopes[1].Level; envelopeOutput[1] = envelopes[1].Level;
envelopeOutput[2] = envelopes[2].Level; envelopeOutput[2] = envelopes[2].Level;
// process output
if (bufferCounter == 0)
{
uint mixer;
short sample;
bufferCounter = bufferFrequency;
// mix each channel (20 bits)
mixer = ((voiceOutput[0] * envelopeOutput[0]) >> 7);
mixer += ((voiceOutput[1] * envelopeOutput[1]) >> 7);
mixer += ((voiceOutput[2] * envelopeOutput[2]) >> 7);
mixer = (mixer * volume) >> 4;
sample = (short)mixer;
buffer[bufferIndex++] = sample;
buffer[bufferIndex++] = sample;
if (bufferIndex == bufferLength)
bufferIndex = 0;
}
bufferCounter--;
} }
// ------------------------------------ // ------------------------------------
@ -767,8 +798,8 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
break; break;
case 0x19: result = (byte)potX; break; case 0x19: result = (byte)potX; break;
case 0x1A: result = (byte)potY; break; case 0x1A: result = (byte)potY; break;
case 0x1B: result = (byte)(voices[2].Oscillator >> 4); break; case 0x1B: result = (byte)(voiceOutput[2] >> 4); break;
case 0x1C: result = (byte)(envelopes[2].Level); break; case 0x1C: result = (byte)(envelopeOutput[2]); break;
} }
return result; return result;
@ -796,6 +827,51 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
private void WriteRegister(ushort addr, byte val) private void WriteRegister(ushort addr, byte val)
{ {
switch (addr)
{
case 0x00: voices[0].FrequencyLo = val; break;
case 0x01: voices[0].FrequencyHi = val; break;
case 0x02: voices[0].PulseWidthLo = val; break;
case 0x03: voices[0].PulseWidthHi = val; break;
case 0x04: voices[0].Control = val; envelopes[0].Gate = ((val & 0x01) != 0); break;
case 0x05: envelopes[0].Attack = (uint)(val >> 4); envelopes[0].Decay = (uint)(val & 0xF); break;
case 0x06: envelopes[0].Sustain = (uint)(val >> 4); envelopes[0].Release = (uint)(val & 0xF); break;
case 0x07: voices[1].FrequencyLo = val; break;
case 0x08: voices[1].FrequencyHi = val; break;
case 0x09: voices[1].PulseWidthLo = val; break;
case 0x0A: voices[1].PulseWidthHi = val; break;
case 0x0B: voices[1].Control = val; envelopes[1].Gate = ((val & 0x01) != 0); break;
case 0x0C: envelopes[1].Attack = (uint)(val >> 4); envelopes[1].Decay = (uint)(val & 0xF); break;
case 0x0D: envelopes[1].Sustain = (uint)(val >> 4); envelopes[1].Release = (uint)(val & 0xF); break;
case 0x0E: voices[2].FrequencyLo = val; break;
case 0x0F: voices[2].FrequencyHi = val; break;
case 0x10: voices[2].PulseWidthLo = val; break;
case 0x11: voices[2].PulseWidthHi = val; break;
case 0x12: voices[2].Control = val; envelopes[2].Gate = ((val & 0x01) != 0); break;
case 0x13: envelopes[2].Attack = (uint)(val >> 4); envelopes[2].Decay = (uint)(val & 0xF); break;
case 0x14: envelopes[2].Sustain = (uint)(val >> 4); envelopes[2].Release = (uint)(val & 0xF); break;
case 0x15: filterFrequency &= 0x3FF; filterFrequency |= (uint)(val & 0x7); break;
case 0x16: filterFrequency &= 0x7; filterFrequency |= (uint)val << 3; break;
case 0x17:
filterEnable[0] = ((val & 0x1) != 0);
filterEnable[1] = ((val & 0x2) != 0);
filterEnable[2] = ((val & 0x4) != 0);
filterResonance = (uint)val >> 4;
break;
case 0x18:
volume = (uint)(val & 0xF);
filterSelectLoPass = ((val & 0x10) != 0);
filterSelectBandPass = ((val & 0x20) != 0);
filterSelectHiPass = ((val & 0x40) != 0);
disableVoice3 = ((val & 0x40) != 0);
break;
case 0x19:
potX = val;
break;
case 0x1A:
potY = val;
break;
}
} }
} }
} }