diff options
| author | 2020-11-26 15:19:08 -0500 | |
|---|---|---|
| committer | 2020-11-26 20:03:11 -0500 | |
| commit | 1a954b2a596fdfd4fc4b5feb9b43c8147de4cc7f (patch) | |
| tree | 3593cd42e0ba676c3919561983f7e9766fcb641c /src/core/hle/service/mig | |
| parent | Merge pull request #4975 from comex/invalid-syncpoint-id (diff) | |
| download | yuzu-1a954b2a596fdfd4fc4b5feb9b43c8147de4cc7f.tar.gz yuzu-1a954b2a596fdfd4fc4b5feb9b43c8147de4cc7f.tar.xz yuzu-1a954b2a596fdfd4fc4b5feb9b43c8147de4cc7f.zip | |
service: Eliminate usages of the global system instance
Completely removes all usages of the global system instance within the
services code by passing in the using system instance to the services.
Diffstat (limited to 'src/core/hle/service/mig')
| -rw-r--r-- | src/core/hle/service/mig/mig.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/mig/mig.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/core/hle/service/mig/mig.cpp b/src/core/hle/service/mig/mig.cpp index 113a4665c..1599d941b 100644 --- a/src/core/hle/service/mig/mig.cpp +++ b/src/core/hle/service/mig/mig.cpp | |||
| @@ -12,7 +12,7 @@ namespace Service::Migration { | |||
| 12 | 12 | ||
| 13 | class MIG_USR final : public ServiceFramework<MIG_USR> { | 13 | class MIG_USR final : public ServiceFramework<MIG_USR> { |
| 14 | public: | 14 | public: |
| 15 | explicit MIG_USR() : ServiceFramework{"mig:usr"} { | 15 | explicit MIG_USR(Core::System& system_) : ServiceFramework{system_, "mig:usr"} { |
| 16 | // clang-format off | 16 | // clang-format off |
| 17 | static const FunctionInfo functions[] = { | 17 | static const FunctionInfo functions[] = { |
| 18 | {10, nullptr, "TryGetLastMigrationInfo"}, | 18 | {10, nullptr, "TryGetLastMigrationInfo"}, |
| @@ -33,8 +33,8 @@ public: | |||
| 33 | } | 33 | } |
| 34 | }; | 34 | }; |
| 35 | 35 | ||
| 36 | void InstallInterfaces(SM::ServiceManager& sm) { | 36 | void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { |
| 37 | std::make_shared<MIG_USR>()->InstallAsService(sm); | 37 | std::make_shared<MIG_USR>(system)->InstallAsService(sm); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | } // namespace Service::Migration | 40 | } // namespace Service::Migration |
diff --git a/src/core/hle/service/mig/mig.h b/src/core/hle/service/mig/mig.h index 288c1c1b3..2b24cdf2c 100644 --- a/src/core/hle/service/mig/mig.h +++ b/src/core/hle/service/mig/mig.h | |||
| @@ -4,12 +4,16 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | namespace Core { | ||
| 8 | class System; | ||
| 9 | } | ||
| 10 | |||
| 7 | namespace Service::SM { | 11 | namespace Service::SM { |
| 8 | class ServiceManager; | 12 | class ServiceManager; |
| 9 | } | 13 | } |
| 10 | 14 | ||
| 11 | namespace Service::Migration { | 15 | namespace Service::Migration { |
| 12 | 16 | ||
| 13 | void InstallInterfaces(SM::ServiceManager& sm); | 17 | void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); |
| 14 | 18 | ||
| 15 | } // namespace Service::Migration | 19 | } // namespace Service::Migration |