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 #11996 from Dentomologist/remove_pointless_pauseandlock_functions 

EXI: Remove pointless PauseAndLock functions
This commit is contained in:
Admiral H. Curtiss 2023-08-18 21:35:56 +02:00 committed by GitHub
parent bb4ed1c450 f151ae3c2a
commit b6bfa10ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 0 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

@ -818,8 +818,6 @@ static bool PauseAndLock(Core::System& system, bool do_lock, bool unpause_on_unl
was_unpaused = system.GetCPU().PauseAndLock(true); 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). // audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle).
system.GetDSP().GetDSPEmulator()->PauseAndLock(do_lock); system.GetDSP().GetDSPEmulator()->PauseAndLock(do_lock);

6
Source/Core/Core/HW/EXI/EXI.cpp
View File

@ -169,12 +169,6 @@ void ExpansionInterfaceManager::DoState(PointerWrap& p)
channel->DoState(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) void ExpansionInterfaceManager::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
{ {
for (int i = 0; i < MAX_EXI_CHANNELS; ++i) for (int i = 0; i < MAX_EXI_CHANNELS; ++i)

1
Source/Core/Core/HW/EXI/EXI.h
View File

@ -72,7 +72,6 @@ public:
void Init(const Sram* override_sram); void Init(const Sram* override_sram);
void Shutdown(); void Shutdown();
void DoState(PointerWrap& p); void DoState(PointerWrap& p);
void PauseAndLock(bool doLock, bool unpauseOnUnlock);
void RegisterMMIO(MMIO::Mapping* mmio, u32 base); void RegisterMMIO(MMIO::Mapping* mmio, u32 base);

6
Source/Core/Core/HW/EXI/EXI_Channel.cpp
View File

@ -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) void CEXIChannel::SetEXIINT(bool exiint)
{ {
m_status.EXIINT = !!exiint; m_status.EXIINT = !!exiint;

1
Source/Core/Core/HW/EXI/EXI_Channel.h
View File

@ -45,7 +45,6 @@ public:
bool IsCausingInterrupt(); bool IsCausingInterrupt();
void DoState(PointerWrap& p); 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 // This should only be used to transition interrupts from SP1 to Channel 2
void SetEXIINT(bool exiint); void SetEXIINT(bool exiint);

4
Source/Core/Core/HW/EXI/EXI_Device.cpp
View File

@ -89,10 +89,6 @@ void IEXIDevice::DoState(PointerWrap& p)
{ {
} }
void IEXIDevice::PauseAndLock(bool do_lock, bool resume_on_unlock)
{
}
bool IEXIDevice::IsInterruptSet() bool IEXIDevice::IsInterruptSet()
{ {
return false; return false;

1
Source/Core/Core/HW/EXI/EXI_Device.h
View File

@ -64,7 +64,6 @@ public:
virtual bool IsPresent() const; virtual bool IsPresent() const;
virtual void SetCS(int cs); virtual void SetCS(int cs);
virtual void DoState(PointerWrap& p); virtual void DoState(PointerWrap& p);
virtual void PauseAndLock(bool do_lock, bool resume_on_unlock = true);
// Is generating interrupt ? // Is generating interrupt ?
virtual bool IsInterruptSet(); virtual bool IsInterruptSet();