Browse Source
Merge pull request #3659 from bunnei/time-calc-standard-user
service: time: Implement CalculateStandardUserSystemClockDifferenceByUser.
pull/15/merge
Rodrigo Locatti
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
25 additions and
1 deletions
-
src/core/hle/service/time/interface.cpp
-
src/core/hle/service/time/time.cpp
-
src/core/hle/service/time/time.h
|
|
|
@ -29,7 +29,7 @@ Time::Time(std::shared_ptr<Module> module, Core::System& system, const char* nam |
|
|
|
{300, &Time::CalculateMonotonicSystemClockBaseTimePoint, "CalculateMonotonicSystemClockBaseTimePoint"}, |
|
|
|
{400, &Time::GetClockSnapshot, "GetClockSnapshot"}, |
|
|
|
{401, &Time::GetClockSnapshotFromSystemClockContext, "GetClockSnapshotFromSystemClockContext"}, |
|
|
|
{500, nullptr, "CalculateStandardUserSystemClockDifferenceByUser"}, |
|
|
|
{500, &Time::CalculateStandardUserSystemClockDifferenceByUser, "CalculateStandardUserSystemClockDifferenceByUser"}, |
|
|
|
{501, &Time::CalculateSpanBetween, "CalculateSpanBetween"}, |
|
|
|
}; |
|
|
|
// clang-format on
|
|
|
|
|
|
|
|
@ -308,6 +308,29 @@ void Module::Interface::GetClockSnapshotFromSystemClockContext(Kernel::HLEReques |
|
|
|
ctx.WriteBuffer(&clock_snapshot, sizeof(Clock::ClockSnapshot)); |
|
|
|
} |
|
|
|
|
|
|
|
void Module::Interface::CalculateStandardUserSystemClockDifferenceByUser( |
|
|
|
Kernel::HLERequestContext& ctx) { |
|
|
|
LOG_DEBUG(Service_Time, "called"); |
|
|
|
|
|
|
|
IPC::RequestParser rp{ctx}; |
|
|
|
const auto snapshot_a = rp.PopRaw<Clock::ClockSnapshot>(); |
|
|
|
const auto snapshot_b = rp.PopRaw<Clock::ClockSnapshot>(); |
|
|
|
|
|
|
|
auto time_span_type{Clock::TimeSpanType::FromSeconds(snapshot_b.user_context.offset - |
|
|
|
snapshot_a.user_context.offset)}; |
|
|
|
|
|
|
|
if ((snapshot_b.user_context.steady_time_point.clock_source_id != |
|
|
|
snapshot_a.user_context.steady_time_point.clock_source_id) || |
|
|
|
(snapshot_b.is_automatic_correction_enabled && |
|
|
|
snapshot_a.is_automatic_correction_enabled)) { |
|
|
|
time_span_type.nanoseconds = 0; |
|
|
|
} |
|
|
|
|
|
|
|
IPC::ResponseBuilder rb{ctx, (sizeof(s64) / 4) + 2}; |
|
|
|
rb.Push(RESULT_SUCCESS); |
|
|
|
rb.PushRaw(time_span_type.nanoseconds); |
|
|
|
} |
|
|
|
|
|
|
|
void Module::Interface::CalculateSpanBetween(Kernel::HLERequestContext& ctx) { |
|
|
|
LOG_DEBUG(Service_Time, "called"); |
|
|
|
|
|
|
|
|
|
|
|
@ -32,6 +32,7 @@ public: |
|
|
|
void CalculateMonotonicSystemClockBaseTimePoint(Kernel::HLERequestContext& ctx); |
|
|
|
void GetClockSnapshot(Kernel::HLERequestContext& ctx); |
|
|
|
void GetClockSnapshotFromSystemClockContext(Kernel::HLERequestContext& ctx); |
|
|
|
void CalculateStandardUserSystemClockDifferenceByUser(Kernel::HLERequestContext& ctx); |
|
|
|
void CalculateSpanBetween(Kernel::HLERequestContext& ctx); |
|
|
|
void GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx); |
|
|
|
|
|
|
|
|