diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-12-14 01:20:56 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-12-14 01:20:56 +0000 |
| commit | 2d10a47c2bbeeab11fd2a904e9d9847f604ea7a2 (patch) | |
| tree | 5b2722fef4f1d8929384a75e78259ad8e4e4baec /Source/Core | |
| parent | fffc4e7fe3f7f9d3ac8a09e1ee326b699b0e9534 (diff) | |
fix issue where loading wii game then loading gc game would cause garbage audio
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4690 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/HW/DSP.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp index e287a1c517..d94f26ac97 100644 --- a/Source/Core/Core/Src/HW/DSP.cpp +++ b/Source/Core/Core/Src/HW/DSP.cpp @@ -240,6 +240,10 @@ void Init() } else { + // On the GC, ARAM is accessible only through this interface (unless you're doing mmu tricks?...) + g_ARAM.wii_mode = false; + g_ARAM.size = ARAM_SIZE; + g_ARAM.mask = ARAM_MASK; g_ARAM.ptr = (u8 *)AllocateMemoryPages(g_ARAM.size); } @@ -642,8 +646,8 @@ void Update_ARAM_DMA() u8 ReadARAM(u32 _iAddress) { //NOTICE_LOG(DSPINTERFACE, "ReadARAM 0x%08x (0x%08x)", _iAddress, _iAddress & g_ARAM.mask); - if (g_ARAM.wii_mode && _iAddress < Memory::RAM_SIZE) - return Memory::Read_U8(_iAddress & Memory::RAM_MASK); + if (g_ARAM.wii_mode && _iAddress < Memory::REALRAM_SIZE) + return Memory::Read_U8(_iAddress); else return g_ARAM.ptr[_iAddress & g_ARAM.mask]; } |