summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/service.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-09-07 09:17:06 +0200
committerLioncash <mathew1800@gmail.com>2020-09-07 09:18:45 +0200
commitffdf8c0cb334b4454e5913832ad74d68117e38e7 (patch)
treec7b601ba20df631eb901d72fa707ae04f8cbd6e0 /src/core/hle/service/service.cpp
parentMerge pull request #4606 from lioncash/constexpr (diff)
downloadyuzu-ffdf8c0cb334b4454e5913832ad74d68117e38e7.tar
yuzu-ffdf8c0cb334b4454e5913832ad74d68117e38e7.tar.gz
yuzu-ffdf8c0cb334b4454e5913832ad74d68117e38e7.tar.bz2
yuzu-ffdf8c0cb334b4454e5913832ad74d68117e38e7.tar.lz
yuzu-ffdf8c0cb334b4454e5913832ad74d68117e38e7.tar.xz
yuzu-ffdf8c0cb334b4454e5913832ad74d68117e38e7.tar.zst
yuzu-ffdf8c0cb334b4454e5913832ad74d68117e38e7.zip
Diffstat (limited to 'src/core/hle/service/service.cpp')
-rw-r--r--src/core/hle/service/service.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 538f28495..94bc5ade7 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -105,10 +105,9 @@ void ServiceFrameworkBase::InstallAsService(SM::ServiceManager& service_manager)
port_installed = true;
}
-void ServiceFrameworkBase::InstallAsNamedPort() {
+void ServiceFrameworkBase::InstallAsNamedPort(Kernel::KernelCore& kernel) {
ASSERT(!port_installed);
- auto& kernel = Core::System::GetInstance().Kernel();
auto [server_port, client_port] =
Kernel::ServerPort::CreatePortPair(kernel, max_sessions, service_name);
server_port->SetHleHandler(shared_from_this());
@@ -116,10 +115,9 @@ void ServiceFrameworkBase::InstallAsNamedPort() {
port_installed = true;
}
-std::shared_ptr<Kernel::ClientPort> ServiceFrameworkBase::CreatePort() {
+std::shared_ptr<Kernel::ClientPort> ServiceFrameworkBase::CreatePort(Kernel::KernelCore& kernel) {
ASSERT(!port_installed);
- auto& kernel = Core::System::GetInstance().Kernel();
auto [server_port, client_port] =
Kernel::ServerPort::CreatePortPair(kernel, max_sessions, service_name);
auto port = MakeResult(std::move(server_port)).Unwrap();