diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-12-28 16:43:08 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-12-28 16:43:08 -0600 |
| commit | a09d8546364df7528d0d136db5067ede6bb089bc (patch) | |
| tree | 2ca61de4d6886f7d40b8656e0326ea2b46ac7eb2 /Source/Core | |
| parent | c5a0b6bf5086274df64308b62229d04870ef944c (diff) | |
| parent | fd0d19aa8299bcecd162414b1520f22cb3b943ff (diff) | |
Merge pull request #1760 from rohit-n/shadow
DSPLLE: Silence -Wshadow warning and conform more to style.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/DSPLLE/DSPLLE.cpp | 25 | ||||
| -rw-r--r-- | Source/Core/Core/HW/DSPLLE/DSPLLE.h | 2 |
2 files changed, 10 insertions, 17 deletions
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index f6bdfae290..43473d3330 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -48,9 +48,9 @@ static bool requestDisableThread; void DSPLLE::DoState(PointerWrap &p) { - bool isHLE = false; - p.Do(isHLE); - if (isHLE != false && p.GetMode() == PointerWrap::MODE_READ) + bool is_hle = false; + p.Do(is_hle); + if (is_hle && p.GetMode() == PointerWrap::MODE_READ) { Core::DisplayMessage("State is incompatible with current DSP engine. Aborting load state.", 3000); p.SetMode(PointerWrap::MODE_VERIFY); @@ -87,7 +87,7 @@ void DSPLLE::DoState(PointerWrap &p) } // Regular thread -void DSPLLE::dsp_thread(DSPLLE *dsp_lle) +void DSPLLE::DSPThread(DSPLLE* dsp_lle) { Common::SetCurrentThreadName("DSP thread"); @@ -101,7 +101,7 @@ void DSPLLE::dsp_thread(DSPLLE *dsp_lle) if (cycles > 0) { - std::lock_guard<std::mutex> lk(dsp_lle->m_csDSPThreadActive); + std::lock_guard<std::mutex> dsp_thread_lock(dsp_lle->m_csDSPThreadActive); if (dspjit) { DSPCore_RunCycles(cycles); @@ -111,7 +111,7 @@ void DSPLLE::dsp_thread(DSPLLE *dsp_lle) DSPInterpreter::RunCyclesThread(cycles); } { - std::lock_guard<std::mutex> lk(dsp_lle->m_csDSPCycleCountActive); + std::lock_guard<std::mutex> cycle_count_lock(dsp_lle->m_csDSPCycleCountActive); dsp_lle->m_cycle_count = 0; } } @@ -193,7 +193,7 @@ bool DSPLLE::Initialize(bool bWii, bool bDSPThread) if (m_bDSPThread) { m_bIsRunning.Set(true); - m_hDSPThread = std::thread(dsp_thread, this); + m_hDSPThread = std::thread(DSPThread, this); } Host_RefreshDSPDebuggerWindow(); @@ -250,18 +250,12 @@ u16 DSPLLE::DSP_ReadControlRegister() u16 DSPLLE::DSP_ReadMailBoxHigh(bool _CPUMailbox) { - if (_CPUMailbox) - return gdsp_mbox_read_h(GDSP_MBOX_CPU); - else - return gdsp_mbox_read_h(GDSP_MBOX_DSP); + return gdsp_mbox_read_h(_CPUMailbox ? GDSP_MBOX_CPU : GDSP_MBOX_DSP); } u16 DSPLLE::DSP_ReadMailBoxLow(bool _CPUMailbox) { - if (_CPUMailbox) - return gdsp_mbox_read_l(GDSP_MBOX_CPU); - else - return gdsp_mbox_read_l(GDSP_MBOX_DSP); + return gdsp_mbox_read_l(_CPUMailbox ? GDSP_MBOX_CPU : GDSP_MBOX_DSP); } void DSPLLE::DSP_WriteMailBoxHigh(bool _CPUMailbox, u16 _uHighMail) @@ -365,4 +359,3 @@ void DSPLLE::PauseAndLock(bool doLock, bool unpauseOnUnlock) else m_csDSPThreadActive.unlock(); } - diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h index 2e3a1bc4e5..a25d0850cf 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.h @@ -32,7 +32,7 @@ public: virtual u32 DSP_UpdateRate() override; private: - static void dsp_thread(DSPLLE* lpParameter); + static void DSPThread(DSPLLE* lpParameter); std::thread m_hDSPThread; std::mutex m_csDSPThreadActive; |