yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #6053 from Morph1984/time-CalculateSpanBetween 

time: Fix CalculateSpanBetween implementation
This commit is contained in:
bunnei 2021-03-12 23:31:09 -08:00 committed by GitHub
parent 4735d18bb9 87cfe5b1da
commit 3b85ac2ac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/hle/service/time/time.cpp
View File

@ -341,12 +341,18 @@ void Module::Interface::CalculateStandardUserSystemClockDifferenceByUser(
void Module::Interface::CalculateSpanBetween(Kernel::HLERequestContext& ctx) { void Module::Interface::CalculateSpanBetween(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_Time, "called"); LOG_DEBUG(Service_Time, "called");
IPC::RequestParser rp{ctx}; Clock::ClockSnapshot snapshot_a;
const auto snapshot_a = rp.PopRaw<Clock::ClockSnapshot>(); Clock::ClockSnapshot snapshot_b;
const auto snapshot_b = rp.PopRaw<Clock::ClockSnapshot>();
const auto snapshot_a_data = ctx.ReadBuffer(0);
const auto snapshot_b_data = ctx.ReadBuffer(1);
std::memcpy(&snapshot_a, snapshot_a_data.data(), sizeof(Clock::ClockSnapshot));
std::memcpy(&snapshot_b, snapshot_b_data.data(), sizeof(Clock::ClockSnapshot));
Clock::TimeSpanType time_span_type{}; Clock::TimeSpanType time_span_type{};
s64 span{}; s64 span{};
if (const ResultCode result{snapshot_a.steady_clock_time_point.GetSpanBetween( if (const ResultCode result{snapshot_a.steady_clock_time_point.GetSpanBetween(
snapshot_b.steady_clock_time_point, span)}; snapshot_b.steady_clock_time_point, span)};
result != RESULT_SUCCESS) { result != RESULT_SUCCESS) {