Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

settings: Use std::chrono::seconds instead of s64 for RTC

Browse source
This commit is contained in:
Zach Hilman 2018-12-28 20:24:24 -05:00
parent dbb1eb9c29
commit 05dbb47af5
6 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/core.cpp
View file

@ -96,8 +96,7 @@ struct System::Impl {
kernel.Initialize();
const auto current_time = std::chrono::duration_cast<std::chrono::seconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
std::chrono::system_clock::now().time_since_epoch());
Settings::values.custom_rtc_differential =
Settings::values.custom_rtc.value_or(current_time) - current_time;

10
src/core/hle/service/time/time.cpp
View file

@ -16,10 +16,9 @@
namespace Service::Time {
static s64 GetSecondsSinceEpoch() {
static std::chrono::seconds GetSecondsSinceEpoch() {
return std::chrono::duration_cast<std::chrono::seconds>(
std::chrono::system_clock::now().time_since_epoch())
.count() +
std::chrono::system_clock::now().time_since_epoch()) +
Settings::values.custom_rtc_differential;
}
@ -76,7 +75,7 @@ public:
private:
void GetCurrentTime(Kernel::HLERequestContext& ctx) {
const s64 time_since_epoch{GetSecondsSinceEpoch()};
const s64 time_since_epoch{GetSecondsSinceEpoch().count()};
LOG_DEBUG(Service_Time, "called");
IPC::ResponseBuilder rb{ctx, 4};
@ -272,8 +271,7 @@ void Module::Interface::GetClockSnapshot(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
const auto initial_type = rp.PopRaw<u8>();
const s64 time_since_epoch{GetSecondsSinceEpoch()};
const s64 time_since_epoch{GetSecondsSinceEpoch().count()};
const std::time_t time(time_since_epoch);
const std::tm* tm = std::localtime(&time);
if (tm == nullptr) {

8
src/core/settings.h
View file

@ -6,6 +6,7 @@
#include <array>
#include <atomic>
#include <chrono>
#include <map>
#include <optional>
#include <string>
@ -350,9 +351,10 @@ struct Values {
bool use_docked_mode;
bool enable_nfc;
std::optional<u32> rng_seed;
std::optional<s64> custom_rtc; // Measured in seconds since epoch
s64 custom_rtc_differential; // Set on game boot, reset on stop. Seconds difference between
// current time and `custom_rtc`
std::optional<std::chrono::seconds> custom_rtc; // Measured in seconds since epoch
std::chrono::seconds
custom_rtc_differential; // Set on game boot, reset on stop. Seconds difference between
// current time and `custom_rtc`
s32 current_user;
s32 language_index;