diff options
Diffstat (limited to 'src/core/hle/service/wlan')
| -rw-r--r-- | src/core/hle/service/wlan/wlan.cpp | 22 | ||||
| -rw-r--r-- | src/core/hle/service/wlan/wlan.h | 6 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/core/hle/service/wlan/wlan.cpp b/src/core/hle/service/wlan/wlan.cpp index 0260d7dcf..ddbf04069 100644 --- a/src/core/hle/service/wlan/wlan.cpp +++ b/src/core/hle/service/wlan/wlan.cpp | |||
| @@ -12,7 +12,7 @@ namespace Service::WLAN { | |||
| 12 | 12 | ||
| 13 | class WLANInfra final : public ServiceFramework<WLANInfra> { | 13 | class WLANInfra final : public ServiceFramework<WLANInfra> { |
| 14 | public: | 14 | public: |
| 15 | explicit WLANInfra() : ServiceFramework{"wlan:inf"} { | 15 | explicit WLANInfra(Core::System& system_) : ServiceFramework{system_, "wlan:inf"} { |
| 16 | // clang-format off | 16 | // clang-format off |
| 17 | static const FunctionInfo functions[] = { | 17 | static const FunctionInfo functions[] = { |
| 18 | {0, nullptr, "OpenMode"}, | 18 | {0, nullptr, "OpenMode"}, |
| @@ -55,7 +55,7 @@ public: | |||
| 55 | 55 | ||
| 56 | class WLANLocal final : public ServiceFramework<WLANLocal> { | 56 | class WLANLocal final : public ServiceFramework<WLANLocal> { |
| 57 | public: | 57 | public: |
| 58 | explicit WLANLocal() : ServiceFramework{"wlan:lcl"} { | 58 | explicit WLANLocal(Core::System& system_) : ServiceFramework{system_, "wlan:lcl"} { |
| 59 | // clang-format off | 59 | // clang-format off |
| 60 | static const FunctionInfo functions[] = { | 60 | static const FunctionInfo functions[] = { |
| 61 | {0, nullptr, "Unknown0"}, | 61 | {0, nullptr, "Unknown0"}, |
| @@ -120,7 +120,7 @@ public: | |||
| 120 | 120 | ||
| 121 | class WLANLocalGetFrame final : public ServiceFramework<WLANLocalGetFrame> { | 121 | class WLANLocalGetFrame final : public ServiceFramework<WLANLocalGetFrame> { |
| 122 | public: | 122 | public: |
| 123 | explicit WLANLocalGetFrame() : ServiceFramework{"wlan:lg"} { | 123 | explicit WLANLocalGetFrame(Core::System& system_) : ServiceFramework{system_, "wlan:lg"} { |
| 124 | // clang-format off | 124 | // clang-format off |
| 125 | static const FunctionInfo functions[] = { | 125 | static const FunctionInfo functions[] = { |
| 126 | {0, nullptr, "Unknown"}, | 126 | {0, nullptr, "Unknown"}, |
| @@ -133,7 +133,7 @@ public: | |||
| 133 | 133 | ||
| 134 | class WLANSocketGetFrame final : public ServiceFramework<WLANSocketGetFrame> { | 134 | class WLANSocketGetFrame final : public ServiceFramework<WLANSocketGetFrame> { |
| 135 | public: | 135 | public: |
| 136 | explicit WLANSocketGetFrame() : ServiceFramework{"wlan:sg"} { | 136 | explicit WLANSocketGetFrame(Core::System& system_) : ServiceFramework{system_, "wlan:sg"} { |
| 137 | // clang-format off | 137 | // clang-format off |
| 138 | static const FunctionInfo functions[] = { | 138 | static const FunctionInfo functions[] = { |
| 139 | {0, nullptr, "Unknown"}, | 139 | {0, nullptr, "Unknown"}, |
| @@ -146,7 +146,7 @@ public: | |||
| 146 | 146 | ||
| 147 | class WLANSocketManager final : public ServiceFramework<WLANSocketManager> { | 147 | class WLANSocketManager final : public ServiceFramework<WLANSocketManager> { |
| 148 | public: | 148 | public: |
| 149 | explicit WLANSocketManager() : ServiceFramework{"wlan:soc"} { | 149 | explicit WLANSocketManager(Core::System& system_) : ServiceFramework{system_, "wlan:soc"} { |
| 150 | // clang-format off | 150 | // clang-format off |
| 151 | static const FunctionInfo functions[] = { | 151 | static const FunctionInfo functions[] = { |
| 152 | {0, nullptr, "Unknown0"}, | 152 | {0, nullptr, "Unknown0"}, |
| @@ -169,12 +169,12 @@ public: | |||
| 169 | } | 169 | } |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| 172 | void InstallInterfaces(SM::ServiceManager& sm) { | 172 | void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { |
| 173 | std::make_shared<WLANInfra>()->InstallAsService(sm); | 173 | std::make_shared<WLANInfra>(system)->InstallAsService(sm); |
| 174 | std::make_shared<WLANLocal>()->InstallAsService(sm); | 174 | std::make_shared<WLANLocal>(system)->InstallAsService(sm); |
| 175 | std::make_shared<WLANLocalGetFrame>()->InstallAsService(sm); | 175 | std::make_shared<WLANLocalGetFrame>(system)->InstallAsService(sm); |
| 176 | std::make_shared<WLANSocketGetFrame>()->InstallAsService(sm); | 176 | std::make_shared<WLANSocketGetFrame>(system)->InstallAsService(sm); |
| 177 | std::make_shared<WLANSocketManager>()->InstallAsService(sm); | 177 | std::make_shared<WLANSocketManager>(system)->InstallAsService(sm); |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | } // namespace Service::WLAN | 180 | } // namespace Service::WLAN |
diff --git a/src/core/hle/service/wlan/wlan.h b/src/core/hle/service/wlan/wlan.h index 054ea928a..3899eedbb 100644 --- a/src/core/hle/service/wlan/wlan.h +++ b/src/core/hle/service/wlan/wlan.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::WLAN { | 15 | namespace Service::WLAN { |
| 12 | 16 | ||
| 13 | void InstallInterfaces(SM::ServiceManager& sm); | 17 | void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); |
| 14 | 18 | ||
| 15 | } // namespace Service::WLAN | 19 | } // namespace Service::WLAN |