6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-07-28 00:29:09 +00:00
Code Issues Projects Releases Wiki Activity

More Noise Register to Audo structure conversions.

Browse Source 
Signed-off-by: Adrian.Conlon <adrian.conlon@arup.com>
This commit is contained in:
Adrian.Conlon 2017-09-20 00:38:35 +01:00
parent e06a092b2a
commit ca0b768ac5
2 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
LR35902/inc/Audio.h
View File

@ -24,6 +24,17 @@ namespace EightBit {
return (default() == 0) && (stepLength() == 0) && (direction() == Attenuate);
}
uint8_t toNR() const {
return (default() << 4) | (direction() << 3) | stepLength();
}
void fromNR(uint8_t value) {
setDefault((value >> 4) & Processor::Mask4); // Bits 4-7
setDirection((value >> 3) & Processor::Mask1); // Bit 3
setStepLength(value & Processor::Mask3); // Bits 0-2
}
int default() const { return m_defaultValue; }
void setDefault(int value) { m_defaultValue = value; }
@ -54,6 +65,16 @@ namespace EightBit {
m_time = m_direction = m_shift = 0;
}
uint8_t toNR() const {
return Processor::Bit7 | (time() << 4) | (direction() << 3) | shift();
}
void fromNR(uint8_t value) {
setTime((value >> 4) & Processor::Mask3); // Bits 4-6
setDirection((value >> 3) & Processor::Mask1); // Bit 3
setShift(value & Processor::Mask3); // Bits 0-2
}
bool zeroed() const {
return (time() == 0) && (shift() == 0) && (direction() == Addition);
}
@ -175,6 +196,15 @@ namespace EightBit {
return WaveVoice::zeroed() && (waveFormDutyCycle() == 0) && (length() == 0);
}
uint8_t toNR() const {
return Processor::Bit7 | (waveFormDutyCycle() << 6) | length();
}
void fromNR(uint8_t value) {
setWaveFormDutyCycle((value >> 6) & Processor::Mask2); // Bits 6-7
setLength(value & Processor::Mask6); // Bits 0-5
}
int waveFormDutyCycle() const { return m_waveFormDutyCycle; }
void setWaveFormDutyCycle(int value) { m_waveFormDutyCycle = value; }

33
LR35902/src/GameBoyBus.cpp
View File

@ -113,14 +113,21 @@ void EightBit::GameBoy::Bus::Bus_ReadingByte(const uint16_t address) {
// Sound Registers
case NR10:
mask(Processor::Mask7);
poke(address, audio().voice1()->sweep().toNR());
break;
case NR11:
poke(address, audio().voice1()->toNR());
break;
case NR12:
poke(address, audio().voice1()->envelope().toNR());
break;
case NR13:
case NR14:
case NR21:
break;
case NR22:
poke(address, audio().voice2()->envelope().toNR());
break;
case NR23:
case NR24:
break;
@ -139,6 +146,8 @@ void EightBit::GameBoy::Bus::Bus_ReadingByte(const uint16_t address) {
mask(Processor::Mask6);
break;
case NR42:
poke(address, audio().voice4()->envelope().toNR());
break;
case NR43:
break;
case NR44:
@ -250,22 +259,17 @@ void EightBit::GameBoy::Bus::Bus_WrittenByte(const uint16_t address) {
break;
case BASE + NR10: // Sound mode 1 register: Sweep
audio().voice1()->sweep().setTime((value >> 4) & Processor::Mask3); // Bits 4-6
audio().voice1()->sweep().setDirection((value >> 3) & Processor::Mask1); // Bit 3
audio().voice1()->sweep().setShift(value & Processor::Mask3); // Bits 0-2
audio().voice1()->sweep().fromNR(value);
audio().dumpVoice(0);
break;
case BASE + NR11: // Sound mode 1 register: Sound length / Wave pattern duty
audio().voice1()->setWaveFormDutyCycle((value >> 6) & Processor::Mask2); // Bits 6-7
audio().voice1()->setLength(value & Processor::Mask6); // Bits 0-5
audio().voice1()->fromNR(value);
audio().dumpVoice(0);
break;
case BASE + NR12: // Sound mode 1 register: Envelope
audio().voice1()->envelope().setDefault((value >> 4) & Processor::Mask4); // Bits 4-7
audio().voice1()->envelope().setDirection((value >> 3) & Processor::Mask1); // Bit 3
audio().voice1()->envelope().setStepLength(value & Processor::Mask3); // Bits 0-2
audio().voice1()->envelope().fromNR(value);
audio().dumpVoice(0);
break;
@ -282,15 +286,12 @@ void EightBit::GameBoy::Bus::Bus_WrittenByte(const uint16_t address) {
break;
case BASE + NR21: // Sound mode 2 register: Sound length / Wave pattern duty
audio().voice2()->setWaveFormDutyCycle((value >> 6) & Processor::Mask2); // Bits 6-7
audio().voice2()->setLength(value & Processor::Mask6); // Bits 0-5
audio().voice2()->fromNR(value);
audio().dumpVoice(1);
break;
case BASE + NR22: // Sound mode 2 register: Envelope
audio().voice2()->envelope().setDefault((value >> 4) & Processor::Mask4); // Bits 4-7
audio().voice2()->envelope().setDirection((value >> 3) & Processor::Mask1); // Bit 3
audio().voice2()->envelope().setStepLength(value & Processor::Mask3); // Bits 0-2
audio().voice2()->envelope().fromNR(value);
audio().dumpVoice(1);
break;
@ -339,9 +340,7 @@ void EightBit::GameBoy::Bus::Bus_WrittenByte(const uint16_t address) {
break;
case BASE + NR42: // Sound mode 4 register: Envelope
audio().voice4()->envelope().setDefault((value >> 4) & Processor::Mask4); // Bits 4-7
audio().voice4()->envelope().setDirection((value >> 3) & Processor::Mask1); // Bit 3
audio().voice4()->envelope().setStepLength(value & Processor::Mask3); // Bits 0-2
audio().voice4()->envelope().fromNR(value);
audio().dumpVoice(3);
break;