summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/CMakeLists.txt6
-rw-r--r--src/core/hle/service/time/interface.cpp (renamed from src/core/hle/service/time/time_s.cpp)15
-rw-r--r--src/core/hle/service/time/interface.h (renamed from src/core/hle/service/time/time_s.h)4
-rw-r--r--src/core/hle/service/time/time.cpp8
-rw-r--r--src/core/hle/service/time/time_u.cpp31
-rw-r--r--src/core/hle/service/time/time_u.h16
6 files changed, 16 insertions, 64 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 4f6c45085..833605475 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -235,12 +235,10 @@ add_library(core STATIC
hle/service/spl/spl.h
hle/service/ssl/ssl.cpp
hle/service/ssl/ssl.h
+ hle/service/time/interface.cpp
+ hle/service/time/interface.h
hle/service/time/time.cpp
hle/service/time/time.h
- hle/service/time/time_s.cpp
- hle/service/time/time_s.h
- hle/service/time/time_u.cpp
- hle/service/time/time_u.h
hle/service/vi/vi.cpp
hle/service/vi/vi.h
hle/service/vi/vi_m.cpp
diff --git a/src/core/hle/service/time/time_s.cpp b/src/core/hle/service/time/interface.cpp
index 0b599ea00..048d5b077 100644
--- a/src/core/hle/service/time/time_s.cpp
+++ b/src/core/hle/service/time/interface.cpp
@@ -2,17 +2,18 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/time/time_s.h"
+#include "core/hle/service/time/interface.h"
namespace Service::Time {
-TIME_S::TIME_S(std::shared_ptr<Module> time) : Module::Interface(std::move(time), "time:s") {
+Time::Time(std::shared_ptr<Module> time, const char* name)
+ : Module::Interface(std::move(time), name) {
static const FunctionInfo functions[] = {
- {0, &TIME_S::GetStandardUserSystemClock, "GetStandardUserSystemClock"},
- {1, &TIME_S::GetStandardNetworkSystemClock, "GetStandardNetworkSystemClock"},
- {2, &TIME_S::GetStandardSteadyClock, "GetStandardSteadyClock"},
- {3, &TIME_S::GetTimeZoneService, "GetTimeZoneService"},
- {4, &TIME_S::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/time_s.h b/src/core/hle/service/time/interface.h
index 4a2daa513..183a53db1 100644
--- a/src/core/hle/service/time/time_s.h
+++ b/src/core/hle/service/time/interface.h
@@ -8,9 +8,9 @@
namespace Service::Time {
-class TIME_S final : public Module::Interface {
+class Time final : public Module::Interface {
public:
- explicit TIME_S(std::shared_ptr<Module> time);
+ explicit Time(std::shared_ptr<Module> 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 f60bf7b91..37b58bb77 100644
--- a/src/core/hle/service/time/time.cpp
+++ b/src/core/hle/service/time/time.cpp
@@ -10,9 +10,8 @@
#include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/client_port.h"
#include "core/hle/kernel/client_session.h"
+#include "core/hle/service/time/interface.h"
#include "core/hle/service/time/time.h"
-#include "core/hle/service/time/time_s.h"
-#include "core/hle/service/time/time_u.h"
namespace Service::Time {
@@ -213,8 +212,9 @@ Module::Interface::Interface(std::shared_ptr<Module> time, const char* name)
void InstallInterfaces(SM::ServiceManager& service_manager) {
auto time = std::make_shared<Module>();
- std::make_shared<TIME_S>(time)->InstallAsService(service_manager);
- std::make_shared<TIME_U>(time)->InstallAsService(service_manager);
+ std::make_shared<Time>(time, "time:a")->InstallAsService(service_manager);
+ std::make_shared<Time>(time, "time:s")->InstallAsService(service_manager);
+ std::make_shared<Time>(time, "time:u")->InstallAsService(service_manager);
}
} // namespace Service::Time
diff --git a/src/core/hle/service/time/time_u.cpp b/src/core/hle/service/time/time_u.cpp
deleted file mode 100644
index 1ed42c419..000000000
--- a/src/core/hle/service/time/time_u.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/service/time/time_u.h"
-
-namespace Service::Time {
-
-TIME_U::TIME_U(std::shared_ptr<Module> time) : Module::Interface(std::move(time), "time:u") {
- static const FunctionInfo functions[] = {
- {0, &TIME_U::GetStandardUserSystemClock, "GetStandardUserSystemClock"},
- {1, &TIME_U::GetStandardNetworkSystemClock, "GetStandardNetworkSystemClock"},
- {2, &TIME_U::GetStandardSteadyClock, "GetStandardSteadyClock"},
- {3, &TIME_U::GetTimeZoneService, "GetTimeZoneService"},
- {4, &TIME_U::GetStandardLocalSystemClock, "GetStandardLocalSystemClock"},
- {5, nullptr, "GetEphemeralNetworkSystemClock"},
- {50, nullptr, "SetStandardSteadyClockInternalOffset"},
- {100, nullptr, "IsStandardUserSystemClockAutomaticCorrectionEnabled"},
- {101, nullptr, "SetStandardUserSystemClockAutomaticCorrectionEnabled"},
- {102, nullptr, "GetStandardUserSystemClockInitialYear"},
- {200, nullptr, "IsStandardNetworkSystemClockAccuracySufficient"},
- {300, nullptr, "CalculateMonotonicSystemClockBaseTimePoint"},
- {400, nullptr, "GetClockSnapshot"},
- {401, nullptr, "GetClockSnapshotFromSystemClockContext"},
- {500, nullptr, "CalculateStandardUserSystemClockDifferenceByUser"},
- {501, nullptr, "CalculateSpanBetween"},
- };
- RegisterHandlers(functions);
-}
-
-} // namespace Service::Time
diff --git a/src/core/hle/service/time/time_u.h b/src/core/hle/service/time/time_u.h
deleted file mode 100644
index 3724bcdc7..000000000
--- a/src/core/hle/service/time/time_u.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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_U final : public Module::Interface {
-public:
- explicit TIME_U(std::shared_ptr<Module> time);
-};
-
-} // namespace Service::Time