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

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
This commit is contained in:
Shawn Hoffman 2009-12-14 01:20:56 +00:00
parent fffc4e7fe3
commit 2d10a47c2b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Src/HW/DSP.cpp
View File

@ -240,6 +240,10 @@ void Init()
} }
else 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); g_ARAM.ptr = (u8 *)AllocateMemoryPages(g_ARAM.size);
} }
@ -642,8 +646,8 @@ void Update_ARAM_DMA()
u8 ReadARAM(u32 _iAddress) u8 ReadARAM(u32 _iAddress)
{ {
//NOTICE_LOG(DSPINTERFACE, "ReadARAM 0x%08x (0x%08x)", _iAddress, _iAddress & g_ARAM.mask); //NOTICE_LOG(DSPINTERFACE, "ReadARAM 0x%08x (0x%08x)", _iAddress, _iAddress & g_ARAM.mask);
if (g_ARAM.wii_mode && _iAddress < Memory::RAM_SIZE) if (g_ARAM.wii_mode && _iAddress < Memory::REALRAM_SIZE)
return Memory::Read_U8(_iAddress & Memory::RAM_MASK); return Memory::Read_U8(_iAddress);
else else
return g_ARAM.ptr[_iAddress & g_ARAM.mask]; return g_ARAM.ptr[_iAddress & g_ARAM.mask];
} }