diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-11-27 02:41:56 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 02:41:56 -0300 |
| commit | ee5e77fbf97da699e5ded623c12cad56dd7ce0da (patch) | |
| tree | 66940e6456e66688af258d1e56d846eedd82d5b6 /src/core/hle/service/es | |
| parent | ab315011fb964de132be5cbe5e64cf40fe3d7b17 (diff) | |
| parent | 1a954b2a596fdfd4fc4b5feb9b43c8147de4cc7f (diff) | |
Merge pull request #5018 from lioncash/service-global
service: Eliminate usages of the global system instance
Diffstat (limited to 'src/core/hle/service/es')
| -rw-r--r-- | src/core/hle/service/es/es.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/es/es.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/core/hle/service/es/es.cpp b/src/core/hle/service/es/es.cpp index c2737a365..26d1e3306 100644 --- a/src/core/hle/service/es/es.cpp +++ b/src/core/hle/service/es/es.cpp @@ -14,7 +14,7 @@ constexpr ResultCode ERROR_INVALID_RIGHTS_ID{ErrorModule::ETicket, 3}; class ETicket final : public ServiceFramework<ETicket> { public: - explicit ETicket() : ServiceFramework{"es"} { + explicit ETicket(Core::System& system_) : ServiceFramework{system_, "es"} { // clang-format off static const FunctionInfo functions[] = { {1, &ETicket::ImportTicket, "ImportTicket"}, @@ -305,8 +305,8 @@ private: Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::Instance(); }; -void InstallInterfaces(SM::ServiceManager& service_manager) { - std::make_shared<ETicket>()->InstallAsService(service_manager); +void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { + std::make_shared<ETicket>(system)->InstallAsService(service_manager); } } // namespace Service::ES diff --git a/src/core/hle/service/es/es.h b/src/core/hle/service/es/es.h index afe70465b..2a7b27d12 100644 --- a/src/core/hle/service/es/es.h +++ b/src/core/hle/service/es/es.h @@ -4,6 +4,10 @@ #pragma once +namespace Core { +class System; +} + namespace Service::SM { class ServiceManager; } @@ -11,6 +15,6 @@ class ServiceManager; namespace Service::ES { /// Registers all ES services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager); +void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); } // namespace Service::ES |