diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-03-13 20:46:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 20:46:59 +0100 |
| commit | 2c308b723c0fd77e6507efb0cff886ddcfff432a (patch) | |
| tree | e27c9226628ce9263fec4f9883282754f234badf /Source/Core | |
| parent | 8035270aa8771ddbf1d57262f79735e4bff61c4a (diff) | |
| parent | f183d6759a23ae3c02136d2e1bb5b5a98bd8ad5d (diff) | |
Merge pull request #5074 from lioncash/prefix
HW/DSP: Remove prefixed underscores from parameter names
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/DSP.cpp | 16 | ||||
| -rw-r--r-- | Source/Core/Core/HW/DSP.h | 8 |
2 files changed, 11 insertions, 13 deletions
diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp index e97377f8bd..aae25d8298 100644 --- a/Source/Core/Core/HW/DSP.cpp +++ b/Source/Core/Core/HW/DSP.cpp @@ -582,27 +582,25 @@ static void Do_ARAM_DMA() // (shuffle2) I still don't believe that this hack is actually needed... :( // 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 -u8 ReadARAM(u32 _iAddress) +u8 ReadARAM(u32 address) { - // NOTICE_LOG(DSPINTERFACE, "ReadARAM 0x%08x", _iAddress); if (s_ARAM.wii_mode) { - if (_iAddress & 0x10000000) - return s_ARAM.ptr[_iAddress & s_ARAM.mask]; + if (address & 0x10000000) + return s_ARAM.ptr[address & s_ARAM.mask]; else - return Memory::Read_U8(_iAddress & Memory::RAM_MASK); + return Memory::Read_U8(address & Memory::RAM_MASK); } 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 - s_ARAM.ptr[_uAddress & s_ARAM.mask] = value; + s_ARAM.ptr[address & s_ARAM.mask] = value; } u8* GetARAMPtr() diff --git a/Source/Core/Core/HW/DSP.h b/Source/Core/Core/HW/DSP.h index f189b00b72..05bbffa86a 100644 --- a/Source/Core/Core/HW/DSP.h +++ b/Source/Core/Core/HW/DSP.h @@ -56,7 +56,7 @@ union UDSPControl u16 DSPInit : 1; // DSPInit() writes to this flag u16 pad : 4; }; - UDSPControl(u16 _Hex = 0) : Hex(_Hex) {} + UDSPControl(u16 hex = 0) : Hex(hex) {} }; void Init(bool hle); @@ -69,11 +69,11 @@ DSPEmulator* GetDSPEmulator(); void DoState(PointerWrap& p); -void GenerateDSPInterruptFromDSPEmu(DSPInterruptType _DSPInterruptType); +void GenerateDSPInterruptFromDSPEmu(DSPInterruptType type); // Audio/DSP Helper -u8 ReadARAM(const u32 _uAddress); -void WriteARAM(u8 value, u32 _uAddress); +u8 ReadARAM(u32 address); +void WriteARAM(u8 value, u32 address); // Debugger Helper u8* GetARAMPtr(); |