diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 3d3166f4ea..4e8df5af30 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -809,8 +809,6 @@ static bool PauseAndLock(Core::System& system, bool do_lock, bool unpause_on_unl was_unpaused = system.GetCPU().PauseAndLock(true); } - system.GetExpansionInterface().PauseAndLock(do_lock, false); - // audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle). system.GetDSP().GetDSPEmulator()->PauseAndLock(do_lock, false); diff --git a/Source/Core/Core/HW/EXI/EXI.cpp b/Source/Core/Core/HW/EXI/EXI.cpp index 57d6ff4b7f..d6a235ed98 100644 --- a/Source/Core/Core/HW/EXI/EXI.cpp +++ b/Source/Core/Core/HW/EXI/EXI.cpp @@ -169,12 +169,6 @@ void ExpansionInterfaceManager::DoState(PointerWrap& p) channel->DoState(p); } -void ExpansionInterfaceManager::PauseAndLock(bool doLock, bool unpauseOnUnlock) -{ - for (auto& channel : m_channels) - channel->PauseAndLock(doLock, unpauseOnUnlock); -} - void ExpansionInterfaceManager::RegisterMMIO(MMIO::Mapping* mmio, u32 base) { for (int i = 0; i < MAX_EXI_CHANNELS; ++i) diff --git a/Source/Core/Core/HW/EXI/EXI.h b/Source/Core/Core/HW/EXI/EXI.h index a82f8f994d..a4f2b899d0 100644 --- a/Source/Core/Core/HW/EXI/EXI.h +++ b/Source/Core/Core/HW/EXI/EXI.h @@ -72,7 +72,6 @@ public: void Init(const Sram* override_sram); void Shutdown(); void DoState(PointerWrap& p); - void PauseAndLock(bool doLock, bool unpauseOnUnlock); void RegisterMMIO(MMIO::Mapping* mmio, u32 base); diff --git a/Source/Core/Core/HW/EXI/EXI_Channel.cpp b/Source/Core/Core/HW/EXI/EXI_Channel.cpp index 1eb1bbae54..11f4814fd2 100644 --- a/Source/Core/Core/HW/EXI/EXI_Channel.cpp +++ b/Source/Core/Core/HW/EXI/EXI_Channel.cpp @@ -286,12 +286,6 @@ void CEXIChannel::DoState(PointerWrap& p) } } -void CEXIChannel::PauseAndLock(bool do_lock, bool resume_on_unlock) -{ - for (auto& device : m_devices) - device->PauseAndLock(do_lock, resume_on_unlock); -} - void CEXIChannel::SetEXIINT(bool exiint) { m_status.EXIINT = !!exiint; diff --git a/Source/Core/Core/HW/EXI/EXI_Channel.h b/Source/Core/Core/HW/EXI/EXI_Channel.h index 5bed226490..62f3aafcac 100644 --- a/Source/Core/Core/HW/EXI/EXI_Channel.h +++ b/Source/Core/Core/HW/EXI/EXI_Channel.h @@ -45,7 +45,6 @@ public: bool IsCausingInterrupt(); void DoState(PointerWrap& p); - void PauseAndLock(bool do_lock, bool resume_on_unlock); // This should only be used to transition interrupts from SP1 to Channel 2 void SetEXIINT(bool exiint); diff --git a/Source/Core/Core/HW/EXI/EXI_Device.cpp b/Source/Core/Core/HW/EXI/EXI_Device.cpp index cc6ac63e2e..425ce9dbb2 100644 --- a/Source/Core/Core/HW/EXI/EXI_Device.cpp +++ b/Source/Core/Core/HW/EXI/EXI_Device.cpp @@ -89,10 +89,6 @@ void IEXIDevice::DoState(PointerWrap& p) { } -void IEXIDevice::PauseAndLock(bool do_lock, bool resume_on_unlock) -{ -} - bool IEXIDevice::IsInterruptSet() { return false; diff --git a/Source/Core/Core/HW/EXI/EXI_Device.h b/Source/Core/Core/HW/EXI/EXI_Device.h index cbe8076e44..2c90d772f9 100644 --- a/Source/Core/Core/HW/EXI/EXI_Device.h +++ b/Source/Core/Core/HW/EXI/EXI_Device.h @@ -64,7 +64,6 @@ public: virtual bool IsPresent() const; virtual void SetCS(int cs); virtual void DoState(PointerWrap& p); - virtual void PauseAndLock(bool do_lock, bool resume_on_unlock = true); // Is generating interrupt ? virtual bool IsInterruptSet();