history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-05-09 07:45:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPU: Stub out transfer control register

Browse Source 
Fixes sound in Ridge Racer.
This commit is contained in:
Connor McLaughlin 2019-11-15 16:44:21 +10:00
parent d9c27c4ee3
commit 5b5d22fd27
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/spu.cpp
View File

@ -72,6 +72,7 @@ bool SPU::DoState(StateWrapper& sw)
{ {
sw.Do(&m_SPUCNT.bits); sw.Do(&m_SPUCNT.bits);
sw.Do(&m_SPUSTAT.bits); sw.Do(&m_SPUSTAT.bits);
sw.Do(&m_transfer_control.bits);
sw.Do(&m_transfer_address); sw.Do(&m_transfer_address);
sw.Do(&m_transfer_address_reg); sw.Do(&m_transfer_address_reg);
sw.Do(&m_irq_address); sw.Do(&m_irq_address);
@ -172,6 +173,10 @@ u16 SPU::ReadRegister(u32 offset)
Log_DebugPrintf("SPU control register -> 0x%04X", ZeroExtend32(m_SPUCNT.bits)); Log_DebugPrintf("SPU control register -> 0x%04X", ZeroExtend32(m_SPUCNT.bits));
return m_SPUCNT.bits; return m_SPUCNT.bits;
case 0x1F801DAC - SPU_BASE:
Log_DebugPrintf("SPU transfer control register -> 0x%04X", ZeroExtend32(m_transfer_control.bits));
return m_transfer_control.bits;
case 0x1F801DAE - SPU_BASE: case 0x1F801DAE - SPU_BASE:
// Log_DebugPrintf("SPU status register -> 0x%04X", ZeroExtend32(m_SPUCNT.bits)); // Log_DebugPrintf("SPU status register -> 0x%04X", ZeroExtend32(m_SPUCNT.bits));
return m_SPUSTAT.bits; return m_SPUSTAT.bits;
@ -350,7 +355,7 @@ void SPU::WriteRegister(u32 offset, u16 value)
{ {
Log_DebugPrintf("SPU transfer address register <- 0x%04X", ZeroExtend32(value)); Log_DebugPrintf("SPU transfer address register <- 0x%04X", ZeroExtend32(value));
m_transfer_address_reg = value; m_transfer_address_reg = value;
m_transfer_address = (ZeroExtend32(value) << VOICE_ADDRESS_SHIFT) & RAM_MASK; m_transfer_address = ZeroExtend32(value) * 8;
return; return;
} }
@ -376,6 +381,13 @@ void SPU::WriteRegister(u32 offset, u16 value)
return; return;
} }
case 0x1F801DAC - SPU_BASE:
{
Log_DebugPrintf("SPU transfer control register <- 0x%04X", ZeroExtend32(value));
m_transfer_control.bits = value;
return;
}
case 0x1F801DB0 - SPU_BASE: case 0x1F801DB0 - SPU_BASE:
{ {
Log_DebugPrintf("SPU left cd audio register <- 0x%04X", ZeroExtend32(value)); Log_DebugPrintf("SPU left cd audio register <- 0x%04X", ZeroExtend32(value));
@ -529,6 +541,7 @@ void SPU::DMAWrite(const u32* words, u32 word_count)
} }
else else
{ {
DebugAssert(m_transfer_control.mode == 2);
std::memcpy(&m_ram[m_transfer_address], words, sizeof(u32) * word_count); std::memcpy(&m_ram[m_transfer_address], words, sizeof(u32) * word_count);
m_transfer_address = (m_transfer_address + (sizeof(u32) * word_count)) & RAM_MASK; m_transfer_address = (m_transfer_address + (sizeof(u32) * word_count)) & RAM_MASK;
} }
@ -557,6 +570,7 @@ void SPU::RAMTransferWrite(u16 value)
{ {
Log_TracePrintf("SPU RAM @ 0x%08X (voice 0x%04X) <- 0x%04X", m_transfer_address, Log_TracePrintf("SPU RAM @ 0x%08X (voice 0x%04X) <- 0x%04X", m_transfer_address,
m_transfer_address >> VOICE_ADDRESS_SHIFT, ZeroExtend32(value)); m_transfer_address >> VOICE_ADDRESS_SHIFT, ZeroExtend32(value));
DebugAssert(m_transfer_control.mode == 2);
std::memcpy(&m_ram[m_transfer_address], &value, sizeof(value)); std::memcpy(&m_ram[m_transfer_address], &value, sizeof(value));
m_transfer_address = (m_transfer_address + sizeof(value)) & RAM_MASK; m_transfer_address = (m_transfer_address + sizeof(value)) & RAM_MASK;

8
src/core/spu.h
View File

@ -95,6 +95,13 @@ private:
BitField<u16, u8, 0, 6> mode; BitField<u16, u8, 0, 6> mode;
}; };
union TransferControl
{
u16 bits;
BitField<u8, u8, 1, 3> mode;
};
union ADSRRegister union ADSRRegister
{ {
u32 bits; u32 bits;
@ -285,6 +292,7 @@ private:
SPUCNT m_SPUCNT = {}; SPUCNT m_SPUCNT = {};
SPUSTAT m_SPUSTAT = {}; SPUSTAT m_SPUSTAT = {};
TransferControl m_transfer_control = {};
u16 m_transfer_address_reg = 0; u16 m_transfer_address_reg = 0;
u32 m_transfer_address = 0; u32 m_transfer_address = 0;