dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-23 06:57:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DSPEmulator: Remove redundant parameter and code

Browse Source 
PauseAndLock is only called with do_lock=true, so remove the parameter
and modify PauseAndLock accordingly.
This commit is contained in:
Dentomologist 2025-08-13 15:50:18 -07:00
parent d5f079d78b
commit c47db6dba7
6 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Core.cpp
View File

@ -780,7 +780,7 @@ static bool PauseAndLock(Core::System& system)
const bool was_unpaused = system.GetCPU().PauseAndLock(); const bool was_unpaused = system.GetCPU().PauseAndLock();
// audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle). // audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle).
system.GetDSP().GetDSPEmulator()->PauseAndLock(true); system.GetDSP().GetDSPEmulator()->PauseAndLock();
// video has to come after CPU, because CPU thread can wait for video thread // video has to come after CPU, because CPU thread can wait for video thread
// (s_efbAccessRequested). // (s_efbAccessRequested).

2
Source/Core/Core/DSPEmulator.h
View File

@ -22,7 +22,7 @@ public:
virtual void Shutdown() = 0; virtual void Shutdown() = 0;
virtual void DoState(PointerWrap& p) = 0; virtual void DoState(PointerWrap& p) = 0;
virtual void PauseAndLock(bool do_lock) = 0; virtual void PauseAndLock() = 0;
virtual void UnpauseAndUnlock() = 0; virtual void UnpauseAndUnlock() = 0;
virtual void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) = 0; virtual void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) = 0;

2
Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
View File

@ -242,7 +242,7 @@ u16 DSPHLE::DSP_ReadControlRegister()
return m_dsp_control.Hex; return m_dsp_control.Hex;
} }
void DSPHLE::PauseAndLock(bool do_lock) void DSPHLE::PauseAndLock()
{ {
} }

2
Source/Core/Core/HW/DSPHLE/DSPHLE.h
View File

@ -34,7 +34,7 @@ public:
void Shutdown() override; void Shutdown() override;
bool IsLLE() const override { return false; } bool IsLLE() const override { return false; }
void DoState(PointerWrap& p) override; void DoState(PointerWrap& p) override;
void PauseAndLock(bool do_lock) override; void PauseAndLock() override;
void UnpauseAndUnlock() override; void UnpauseAndUnlock() override;
void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override; void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override;

18
Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
View File

@ -287,23 +287,9 @@ u32 DSPLLE::DSP_UpdateRate()
return 12600; // TO BE TWEAKED return 12600; // TO BE TWEAKED
} }
void DSPLLE::PauseAndLock(bool do_lock) void DSPLLE::PauseAndLock()
{ {
if (do_lock) m_dsp_thread_mutex.lock();
{
m_dsp_thread_mutex.lock();
}
else
{
m_dsp_thread_mutex.unlock();
if (m_is_dsp_on_thread)
{
// Signal the DSP thread so it can perform any outstanding work now (if any)
m_ppc_event.Wait();
m_dsp_event.Set();
}
}
} }
void DSPLLE::UnpauseAndUnlock() void DSPLLE::UnpauseAndUnlock()

2
Source/Core/Core/HW/DSPLLE/DSPLLE.h
View File

@ -26,7 +26,7 @@ public:
void Shutdown() override; void Shutdown() override;
bool IsLLE() const override { return true; } bool IsLLE() const override { return true; }
void DoState(PointerWrap& p) override; void DoState(PointerWrap& p) override;
void PauseAndLock(bool do_lock) override; void PauseAndLock() override;
void UnpauseAndUnlock() override; void UnpauseAndUnlock() override;
void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override; void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override;