From a61124a9e7f2a6eab7f51c2b4dd30574e62ba25a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 24 Jul 2018 02:45:23 -0400 Subject: time: Simplify interface creation We can use one instance of the interface instead of duplicating code. --- src/core/hle/service/time/interface.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/core/hle/service/time/interface.h (limited to 'src/core/hle/service/time/interface.h') diff --git a/src/core/hle/service/time/interface.h b/src/core/hle/service/time/interface.h new file mode 100644 index 000000000..0f97cec35 --- /dev/null +++ b/src/core/hle/service/time/interface.h @@ -0,0 +1,16 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include "core/hle/service/time/time.h" + +namespace Service::Time { + +class TIME final : public Module::Interface { +public: + explicit TIME(std::shared_ptr time, const char* name); +}; + +} // namespace Service::Time -- cgit v1.2.3 From 3c1cb3b11e84aae62b4a16a139fab62c3b697e4c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 24 Jul 2018 02:47:41 -0400 Subject: time: Add the time:a service Given we already have time:s and time:u, we should also have time:a --- src/core/hle/service/time/interface.cpp | 12 ++++++------ src/core/hle/service/time/interface.h | 4 ++-- src/core/hle/service/time/time.cpp | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/core/hle/service/time/interface.h') diff --git a/src/core/hle/service/time/interface.cpp b/src/core/hle/service/time/interface.cpp index e61788db8..048d5b077 100644 --- a/src/core/hle/service/time/interface.cpp +++ b/src/core/hle/service/time/interface.cpp @@ -6,14 +6,14 @@ namespace Service::Time { -TIME::TIME(std::shared_ptr time, const char* name) +Time::Time(std::shared_ptr time, const char* name) : Module::Interface(std::move(time), name) { static const FunctionInfo functions[] = { - {0, &TIME::GetStandardUserSystemClock, "GetStandardUserSystemClock"}, - {1, &TIME::GetStandardNetworkSystemClock, "GetStandardNetworkSystemClock"}, - {2, &TIME::GetStandardSteadyClock, "GetStandardSteadyClock"}, - {3, &TIME::GetTimeZoneService, "GetTimeZoneService"}, - {4, &TIME::GetStandardLocalSystemClock, "GetStandardLocalSystemClock"}, + {0, &Time::GetStandardUserSystemClock, "GetStandardUserSystemClock"}, + {1, &Time::GetStandardNetworkSystemClock, "GetStandardNetworkSystemClock"}, + {2, &Time::GetStandardSteadyClock, "GetStandardSteadyClock"}, + {3, &Time::GetTimeZoneService, "GetTimeZoneService"}, + {4, &Time::GetStandardLocalSystemClock, "GetStandardLocalSystemClock"}, {5, nullptr, "GetEphemeralNetworkSystemClock"}, {50, nullptr, "SetStandardSteadyClockInternalOffset"}, {100, nullptr, "IsStandardUserSystemClockAutomaticCorrectionEnabled"}, diff --git a/src/core/hle/service/time/interface.h b/src/core/hle/service/time/interface.h index 0f97cec35..183a53db1 100644 --- a/src/core/hle/service/time/interface.h +++ b/src/core/hle/service/time/interface.h @@ -8,9 +8,9 @@ namespace Service::Time { -class TIME final : public Module::Interface { +class Time final : public Module::Interface { public: - explicit TIME(std::shared_ptr time, const char* name); + explicit Time(std::shared_ptr time, const char* name); }; } // namespace Service::Time diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index dbaa661bb..e32c088e8 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp @@ -211,8 +211,9 @@ Module::Interface::Interface(std::shared_ptr time, const char* name) void InstallInterfaces(SM::ServiceManager& service_manager) { auto time = std::make_shared(); - std::make_shared