diff options
| author | Mai <mai.iam2048@gmail.com> | 2024-01-31 09:57:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-31 09:57:17 -0500 |
| commit | 30fdf25f8f3a2fd217c8c39eb3abb5b55f63b510 (patch) | |
| tree | bdf413f54fe46fc1c0a2ed168beac8b6fa84f51b /Source/Core/VideoCommon/CommandProcessor.cpp | |
| parent | e0828815e73faf8043da27f418f724d6b7fa9db3 (diff) | |
| parent | 9a3e770c23312f61848adefc7202cb1b800cadff (diff) | |
Merge pull request #12542 from AdmiralCurtiss/system-sconfig
Migrate m_is_mios and bWii from SConfig to System.
Diffstat (limited to 'Source/Core/VideoCommon/CommandProcessor.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/CommandProcessor.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index be9d3636ee..3f5179a726 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/CommandProcessor.cpp @@ -13,7 +13,6 @@ #include "Common/Flag.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Core/ConfigManager.h" #include "Core/CoreTiming.h" #include "Core/HW/GPFifo.h" #include "Core/HW/MMIO.h" @@ -137,19 +136,12 @@ void CommandProcessorManager::Init() m_system.GetCoreTiming().RegisterEvent("CPInterrupt", UpdateInterrupts_Wrapper); } -u32 GetPhysicalAddressMask() -{ - // Physical addresses in CP seem to ignore some of the upper bits (depending on platform) - // This can be observed in CP MMIO registers by setting to 0xffffffff and then reading back. - return SConfig::GetInstance().bWii ? 0x1fffffff : 0x03ffffff; -} - void CommandProcessorManager::RegisterMMIO(MMIO::Mapping* mmio, u32 base) { constexpr u16 WMASK_NONE = 0x0000; constexpr u16 WMASK_ALL = 0xffff; constexpr u16 WMASK_LO_ALIGN_32BIT = 0xffe0; - const u16 WMASK_HI_RESTRICT = GetPhysicalAddressMask() >> 16; + const u16 WMASK_HI_RESTRICT = GetPhysicalAddressMask(m_system.IsWii()) >> 16; struct { |