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

Merge pull request #5074 from lioncash/prefix 

HW/DSP: Remove prefixed underscores from parameter names
This commit is contained in:
Markus Wick 2017-03-13 20:46:59 +01:00 committed by GitHub
parent 8035270aa8 f183d6759a
commit 2c308b723c
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/HW/DSP.cpp
View File

@ -582,27 +582,25 @@ static void Do_ARAM_DMA()
// (shuffle2) I still don't believe that this hack is actually needed... :( // (shuffle2) I still don't believe that this hack is actually needed... :(
// Maybe the Wii Sports ucode is processed incorrectly? // Maybe the Wii Sports ucode is processed incorrectly?
// (LM) It just means that DSP reads via '0xffdd' on Wii can end up in EXRAM or main RAM // (LM) It just means that DSP reads via '0xffdd' on Wii can end up in EXRAM or main RAM
u8 ReadARAM(u32 _iAddress) u8 ReadARAM(u32 address)
{ {
// NOTICE_LOG(DSPINTERFACE, "ReadARAM 0x%08x", _iAddress);
if (s_ARAM.wii_mode) if (s_ARAM.wii_mode)
{ {
if (_iAddress & 0x10000000) if (address & 0x10000000)
return s_ARAM.ptr[_iAddress & s_ARAM.mask]; return s_ARAM.ptr[address & s_ARAM.mask];
else else
return Memory::Read_U8(_iAddress & Memory::RAM_MASK); return Memory::Read_U8(address & Memory::RAM_MASK);
} }
else else
{ {
return s_ARAM.ptr[_iAddress & s_ARAM.mask]; return s_ARAM.ptr[address & s_ARAM.mask];
} }
} }
void WriteARAM(u8 value, u32 _uAddress) void WriteARAM(u8 value, u32 address)
{ {
// NOTICE_LOG(DSPINTERFACE, "WriteARAM 0x%08x", _uAddress);
// TODO: verify this on Wii // TODO: verify this on Wii
s_ARAM.ptr[_uAddress & s_ARAM.mask] = value; s_ARAM.ptr[address & s_ARAM.mask] = value;
} }
u8* GetARAMPtr() u8* GetARAMPtr()

8
Source/Core/Core/HW/DSP.h
View File

@ -56,7 +56,7 @@ union UDSPControl
u16 DSPInit : 1; // DSPInit() writes to this flag u16 DSPInit : 1; // DSPInit() writes to this flag
u16 pad : 4; u16 pad : 4;
}; };
UDSPControl(u16 _Hex = 0) : Hex(_Hex) {} UDSPControl(u16 hex = 0) : Hex(hex) {}
}; };
void Init(bool hle); void Init(bool hle);
@ -69,11 +69,11 @@ DSPEmulator* GetDSPEmulator();
void DoState(PointerWrap& p); void DoState(PointerWrap& p);
void GenerateDSPInterruptFromDSPEmu(DSPInterruptType _DSPInterruptType); void GenerateDSPInterruptFromDSPEmu(DSPInterruptType type);
// Audio/DSP Helper // Audio/DSP Helper
u8 ReadARAM(const u32 _uAddress); u8 ReadARAM(u32 address);
void WriteARAM(u8 value, u32 _uAddress); void WriteARAM(u8 value, u32 address);
// Debugger Helper // Debugger Helper
u8* GetARAMPtr(); u8* GetARAMPtr();