mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-28 00:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6791 from aldelaro5/wii-epoch-fix

Browse Source 
Wii: Fix the Wii epoch and make the IPL.CB 0 by default
This commit is contained in:
Léo Lam 2018-05-09 19:06:25 +02:00 committed by GitHub
commit 1016674242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

7
Source/Core/Core/HW/EXI/EXI_DeviceIPL.h
View File

@ -22,11 +22,8 @@ public:
bool IsPresent() const override; bool IsPresent() const override;
void DoState(PointerWrap& p) override; void DoState(PointerWrap& p) override;
static constexpr u32 UNIX_EPOCH = 0; // 1970-01-01 00:00:00 static constexpr u32 UNIX_EPOCH = 0; // 1970-01-01 00:00:00
static constexpr u32 GC_EPOCH = 0x386D4380; // 2000-01-01 00:00:00 static constexpr u32 GC_EPOCH = 0x386D4380; // 2000-01-01 00:00:00
static constexpr u32 WII_EPOCH = 0x477E5826; // 2008-01-04 16:00:38
// The Wii epoch is suspiciously random, and the Wii was even
// released before it, but apparently it works anyway?
static u32 GetEmulatedTime(u32 epoch); static u32 GetEmulatedTime(u32 epoch);
static u64 NetPlay_GetEmulatedTime(); static u64 NetPlay_GetEmulatedTime();

2
Source/Core/Core/SysConf.cpp
View File

@ -286,7 +286,7 @@ void SysConf::InsertDefaultEntries()
ipl_pc[2] = 0x14; ipl_pc[2] = 0x14;
AddEntry({Entry::Type::SmallArray, "IPL.PC", std::move(ipl_pc)}); AddEntry({Entry::Type::SmallArray, "IPL.PC", std::move(ipl_pc)});
AddEntry({Entry::Type::Long, "IPL.CB", {0x0f, 0x11, 0x14, 0xa6}}); AddEntry({Entry::Type::Long, "IPL.CB", {0x00, 0x00, 0x00, 0x00}});
AddEntry({Entry::Type::Byte, "IPL.AR", {1}}); AddEntry({Entry::Type::Byte, "IPL.AR", {1}});
AddEntry({Entry::Type::Byte, "IPL.SSV", {1}}); AddEntry({Entry::Type::Byte, "IPL.SSV", {1}});