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/pcie | |
| 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/pcie')
| -rw-r--r-- | src/core/hle/service/pcie/pcie.cpp | 8 | ||||
| -rw-r--r-- | src/core/hle/service/pcie/pcie.h | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/core/hle/service/pcie/pcie.cpp b/src/core/hle/service/pcie/pcie.cpp index c568a0adc..80c0fc7ac 100644 --- a/src/core/hle/service/pcie/pcie.cpp +++ b/src/core/hle/service/pcie/pcie.cpp @@ -12,7 +12,7 @@ namespace Service::PCIe { class ISession final : public ServiceFramework<ISession> { public: - explicit ISession() : ServiceFramework{"ISession"} { + explicit ISession(Core::System& system_) : ServiceFramework{system_, "ISession"} { // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "QueryFunctions"}, @@ -48,7 +48,7 @@ public: class PCIe final : public ServiceFramework<PCIe> { public: - explicit PCIe() : ServiceFramework{"pcie"} { + explicit PCIe(Core::System& system_) : ServiceFramework{system, "pcie"} { // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "RegisterClassDriver"}, @@ -60,8 +60,8 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm) { - std::make_shared<PCIe>()->InstallAsService(sm); +void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { + std::make_shared<PCIe>(system)->InstallAsService(sm); } } // namespace Service::PCIe diff --git a/src/core/hle/service/pcie/pcie.h b/src/core/hle/service/pcie/pcie.h index 59c22ca45..e5709a72f 100644 --- a/src/core/hle/service/pcie/pcie.h +++ b/src/core/hle/service/pcie/pcie.h @@ -4,12 +4,16 @@ #pragma once +namespace Core { +class System; +} + namespace Service::SM { class ServiceManager; } namespace Service::PCIe { -void InstallInterfaces(SM::ServiceManager& sm); +void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); } // namespace Service::PCIe |