diff options
author | bunnei <bunneidev@gmail.com> | 2021-05-11 00:57:59 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2021-05-11 05:34:38 +0200 |
commit | c6de9657be71a9c659f9c991ec8d024ebf44d56e (patch) | |
tree | 8e5e3087a136fdcc218d789ae6f6457e83554919 /src/core/hle/kernel/kernel.cpp | |
parent | hle: kernel: KSession: Improve implementation of CloneCurrentObject. (diff) | |
download | yuzu-c6de9657be71a9c659f9c991ec8d024ebf44d56e.tar yuzu-c6de9657be71a9c659f9c991ec8d024ebf44d56e.tar.gz yuzu-c6de9657be71a9c659f9c991ec8d024ebf44d56e.tar.bz2 yuzu-c6de9657be71a9c659f9c991ec8d024ebf44d56e.tar.lz yuzu-c6de9657be71a9c659f9c991ec8d024ebf44d56e.tar.xz yuzu-c6de9657be71a9c659f9c991ec8d024ebf44d56e.tar.zst yuzu-c6de9657be71a9c659f9c991ec8d024ebf44d56e.zip |
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index bd4e4d350..8b55df82e 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -44,6 +44,7 @@ #include "core/hle/kernel/time_manager.h" #include "core/hle/lock.h" #include "core/hle/result.h" +#include "core/hle/service/sm/sm.h" #include "core/memory.h" MICROPROFILE_DEFINE(Kernel_SVC, "Kernel", "SVC", MP_RGB(70, 200, 70)); @@ -656,6 +657,7 @@ struct KernelCore::Impl { /// Map of named ports managed by the kernel, which can be retrieved using /// the ConnectToPort SVC. + std::unordered_map<std::string, ServiceInterfaceFactory> service_interface_factory; NamedPortTable named_ports; std::unique_ptr<Core::ExclusiveMonitor> exclusive_monitor; @@ -844,18 +846,17 @@ void KernelCore::PrepareReschedule(std::size_t id) { // TODO: Reimplement, this } -void KernelCore::AddNamedPort(std::string name, KClientPort* port) { - port->Open(); - impl->named_ports.emplace(std::move(name), port); +void KernelCore::RegisterNamedService(std::string name, ServiceInterfaceFactory&& factory) { + impl->service_interface_factory.emplace(std::move(name), factory); } -KernelCore::NamedPortTable::iterator KernelCore::FindNamedPort(const std::string& name) { - return impl->named_ports.find(name); -} - -KernelCore::NamedPortTable::const_iterator KernelCore::FindNamedPort( - const std::string& name) const { - return impl->named_ports.find(name); +KClientPort* KernelCore::CreateNamedServicePort(std::string name) { + auto search = impl->service_interface_factory.find(name); + if (search == impl->service_interface_factory.end()) { + UNIMPLEMENTED(); + return {}; + } + return &search->second(impl->system.ServiceManager(), impl->system); } bool KernelCore::IsValidNamedPort(NamedPortTable::const_iterator port) const { |