ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Replace BOOT_MIOS with an explicit "is MIOS" flag 

I didn't know better back then, but the boot type is only supposed to
be used for the actual boot params. It shouldn't be used or changed
after booting.
This commit is contained in:
Léo Lam 2017-05-27 12:32:45 +02:00
parent 096399d371
commit 4d2fb9b9ba
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/ConfigManager.h
View File

@ -129,6 +129,7 @@ struct SConfig : NonCopyable
bool bOverrideGCLanguage = false; bool bOverrideGCLanguage = false;
bool bWii = false; bool bWii = false;
bool m_is_mios = false;
// Interface settings // Interface settings
bool bConfirmStop = false; bool bConfirmStop = false;
@ -195,7 +196,6 @@ struct SConfig : NonCopyable
BOOT_ELF, BOOT_ELF,
BOOT_DOL, BOOT_DOL,
BOOT_WII_NAND, BOOT_WII_NAND,
BOOT_MIOS,
BOOT_BS2, BOOT_BS2,
BOOT_DFF BOOT_DFF
}; };

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

@ -236,9 +236,7 @@ void CEXIIPL::SetCS(int _iCS)
void CEXIIPL::UpdateRTC() void CEXIIPL::UpdateRTC()
{ {
u32 epoch = u32 epoch =
(SConfig::GetInstance().bWii || SConfig::GetInstance().m_BootType == SConfig::BOOT_MIOS) ? (SConfig::GetInstance().bWii || SConfig::GetInstance().m_is_mios) ? WII_EPOCH : GC_EPOCH;
WII_EPOCH :
GC_EPOCH;
u32 rtc = Common::swap32(GetEmulatedTime(epoch)); u32 rtc = Common::swap32(GetEmulatedTime(epoch));
std::memcpy(m_RTC, &rtc, sizeof(u32)); std::memcpy(m_RTC, &rtc, sizeof(u32));
} }

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

@ -168,7 +168,7 @@ bool Load()
Memory::Write_U32(0x00000000, ADDRESS_INIT_SEMAPHORE); Memory::Write_U32(0x00000000, ADDRESS_INIT_SEMAPHORE);
NOTICE_LOG(IOS, "IPL ready."); NOTICE_LOG(IOS, "IPL ready.");
SConfig::GetInstance().m_BootType = SConfig::BOOT_MIOS; SConfig::GetInstance().m_is_mios = true;
DVDInterface::UpdateRunningGameMetadata(); DVDInterface::UpdateRunningGameMetadata();
return true; return true;
} }

3
Source/Core/Core/State.cpp
View File

@ -156,8 +156,7 @@ static std::string DoState(PointerWrap& p)
return version_created_by; return version_created_by;
} }
bool is_wii = bool is_wii = SConfig::GetInstance().bWii || SConfig::GetInstance().m_is_mios;
SConfig::GetInstance().bWii || SConfig::GetInstance().m_BootType == SConfig::BOOT_MIOS;
const bool is_wii_currently = is_wii; const bool is_wii_currently = is_wii;
p.Do(is_wii); p.Do(is_wii);
if (is_wii != is_wii_currently) if (is_wii != is_wii_currently)