diff options
| author | David Marcec <dmarcecguzman@gmail.com> | 2019-09-21 11:11:52 +0200 |
|---|---|---|
| committer | David Marcec <dmarcecguzman@gmail.com> | 2019-09-22 08:30:34 +0200 |
| commit | 8d3ff2b12723b577909e5996fffcc1532b6fbad6 (patch) | |
| tree | 8be3229d0d8f954853d526a3f0d547af2bf9399d | |
| parent | Deglobalize System: Nifm (diff) | |
| download | yuzu-8d3ff2b12723b577909e5996fffcc1532b6fbad6.tar yuzu-8d3ff2b12723b577909e5996fffcc1532b6fbad6.tar.gz yuzu-8d3ff2b12723b577909e5996fffcc1532b6fbad6.tar.bz2 yuzu-8d3ff2b12723b577909e5996fffcc1532b6fbad6.tar.lz yuzu-8d3ff2b12723b577909e5996fffcc1532b6fbad6.tar.xz yuzu-8d3ff2b12723b577909e5996fffcc1532b6fbad6.tar.zst yuzu-8d3ff2b12723b577909e5996fffcc1532b6fbad6.zip | |
| -rw-r--r-- | src/core/hle/service/nim/nim.cpp | 13 | ||||
| -rw-r--r-- | src/core/hle/service/nim/nim.h | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp index f319a3ca1..8c47b2d75 100644 --- a/src/core/hle/service/nim/nim.cpp +++ b/src/core/hle/service/nim/nim.cpp @@ -126,7 +126,7 @@ public: class IEnsureNetworkClockAvailabilityService final : public ServiceFramework<IEnsureNetworkClockAvailabilityService> { public: - IEnsureNetworkClockAvailabilityService() + IEnsureNetworkClockAvailabilityService(Core::System& system) : ServiceFramework("IEnsureNetworkClockAvailabilityService") { static const FunctionInfo functions[] = { {0, &IEnsureNetworkClockAvailabilityService::StartTask, "StartTask"}, @@ -139,7 +139,7 @@ public: }; RegisterHandlers(functions); - auto& kernel = Core::System::GetInstance().Kernel(); + auto& kernel = system.Kernel(); finished_event = Kernel::WritableEvent::CreateEventPair( kernel, Kernel::ResetType::Automatic, "IEnsureNetworkClockAvailabilityService:FinishEvent"); @@ -200,7 +200,7 @@ private: class NTC final : public ServiceFramework<NTC> { public: - explicit NTC() : ServiceFramework{"ntc"} { + explicit NTC(Core::System& system) : ServiceFramework{"ntc"}, system(system) { // clang-format off static const FunctionInfo functions[] = { {0, &NTC::OpenEnsureNetworkClockAvailabilityService, "OpenEnsureNetworkClockAvailabilityService"}, @@ -218,7 +218,7 @@ private: IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(RESULT_SUCCESS); - rb.PushIpcInterface<IEnsureNetworkClockAvailabilityService>(); + rb.PushIpcInterface<IEnsureNetworkClockAvailabilityService>(system); } // TODO(ogniK): Do we need these? @@ -235,13 +235,14 @@ private: IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); } + Core::System& system; }; -void InstallInterfaces(SM::ServiceManager& sm) { +void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { std::make_shared<NIM>()->InstallAsService(sm); std::make_shared<NIM_ECA>()->InstallAsService(sm); std::make_shared<NIM_SHP>()->InstallAsService(sm); - std::make_shared<NTC>()->InstallAsService(sm); + std::make_shared<NTC>(system)->InstallAsService(sm); } } // namespace Service::NIM diff --git a/src/core/hle/service/nim/nim.h b/src/core/hle/service/nim/nim.h index 2a2a92df0..dbe25dc01 100644 --- a/src/core/hle/service/nim/nim.h +++ b/src/core/hle/service/nim/nim.h @@ -8,8 +8,12 @@ namespace Service::SM { class ServiceManager; } +namespace Core { +class System; +} + namespace Service::NIM { -void InstallInterfaces(SM::ServiceManager& sm); +void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); } // namespace Service::NIM |