diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2018-05-12 21:59:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-12 21:59:13 +0200 |
| commit | e1169ef9ee2be1d3aee8d4d9972869f2c6967ca9 (patch) | |
| tree | a6e0c9839104d28eadedf61e17028ba28fab4b8a /Source/Core | |
| parent | 36adf76f4acef0b56150c6b377fe5b74589187fe (diff) | |
| parent | 4b2906c5697e43b78c02a79931132be33e82bbe3 (diff) | |
Merge pull request #6824 from aldelaro5/custom-rtc-no-bias
RTC: Write 0 to the counter bias if we are on custom RTC
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp index f317bc8324..5cfd42e7bc 100644 --- a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp @@ -20,6 +20,7 @@ #include "Core/Config/SYSCONFSettings.h" #include "Core/ConfigLoaders/IsSettingSaveable.h" +#include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/IOS/IOS.h" #include "Core/IOS/USB/Bluetooth/BTBase.h" @@ -49,6 +50,9 @@ void SaveToSYSCONF(Config::LayerType layer) setting.config_info); } + if (SConfig::GetInstance().bEnableCustomRTC) + sysconf.SetData<u32>("IPL.CB", SysConf::Entry::Type::Long, 0); + // Disable WiiConnect24's standby mode. If it is enabled, it prevents us from receiving // shutdown commands in the State Transition Manager (STM). // TODO: remove this if and once Dolphin supports WC24 standby mode. @@ -177,4 +181,4 @@ std::unique_ptr<Config::ConfigLayerLoader> GenerateBaseConfigLoader() { return std::make_unique<BaseConfigLayerLoader>(); } -} +} // namespace ConfigLoaders diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp index cda6a3eccb..08af03a6da 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp @@ -129,6 +129,8 @@ CEXIIPL::CEXIIPL() : m_uPosition(0), m_uAddress(0), m_uRWOffset(0), m_FontsLoade // We Overwrite language selection here since it's possible on the GC to change the language as // you please g_SRAM.lang = SConfig::GetInstance().SelectedLanguage; + if (SConfig::GetInstance().bEnableCustomRTC) + g_SRAM.counter_bias = 0; FixSRAMChecksums(); Common::WriteProtectMemory(m_pIPL, ROM_SIZE); |
