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 #11997 from Dentomologist/dspemulator_remove_pauseandlock_parameter 

DSPEmulator: Remove unused PauseAndLock parameter
This commit is contained in:
Admiral H. Curtiss 2023-07-01 00:56:45 +02:00 committed by GitHub
parent 94f34260a6 ee684b0798
commit e71f42f819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,7 +812,7 @@ static bool PauseAndLock(Core::System& system, bool do_lock, bool unpause_on_unl
system.GetExpansionInterface().PauseAndLock(do_lock, false); system.GetExpansionInterface().PauseAndLock(do_lock, false);
// 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(do_lock, false); system.GetDSP().GetDSPEmulator()->PauseAndLock(do_lock);
// 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

@ -18,7 +18,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, bool unpause_on_unlock = true) = 0; virtual void PauseAndLock(bool do_lock) = 0;
virtual void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) = 0; virtual void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) = 0;
virtual void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) = 0; virtual void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) = 0;

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

@ -240,7 +240,7 @@ u16 DSPHLE::DSP_ReadControlRegister()
return m_dsp_control.Hex; return m_dsp_control.Hex;
} }
void DSPHLE::PauseAndLock(bool do_lock, bool unpause_on_unlock) void DSPHLE::PauseAndLock(bool do_lock)
{ {
} }
} // namespace DSP::HLE } // namespace DSP::HLE

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

@ -26,7 +26,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, bool unpause_on_unlock = true) override; void PauseAndLock(bool do_lock) override;
void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override; void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override;
void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) override; void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) override;

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

@ -288,7 +288,7 @@ u32 DSPLLE::DSP_UpdateRate()
return 12600; // TO BE TWEAKED return 12600; // TO BE TWEAKED
} }
void DSPLLE::PauseAndLock(bool do_lock, bool unpause_on_unlock) void DSPLLE::PauseAndLock(bool do_lock)
{ {
if (do_lock) if (do_lock)
{ {

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, bool unpause_on_unlock = true) override; void PauseAndLock(bool do_lock) override;
void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override; void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override;
void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) override; void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) override;