octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup! Give frontend access to the hle service interfaces

This commit is contained in:
B3n30 2018-10-03 20:08:01 +02:00
parent d3694a930e
commit 544eb25c99
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/hle/kernel/server_port.h
View File

@ -10,6 +10,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "core/hle/kernel/object.h" #include "core/hle/kernel/object.h"
#include "core/hle/kernel/wait_object.h" #include "core/hle/kernel/wait_object.h"
#include "core/hle/result.h"
namespace Kernel { namespace Kernel {

4
src/core/hle/service/sm/sm.h
View File

@ -47,7 +47,7 @@ public:
ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ConnectToService(const std::string& name); ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ConnectToService(const std::string& name);
template <typename T> template <typename T>
std::shared_ptr<T> GetService(const std::string& service_name) { std::shared_ptr<T> GetService(const std::string& service_name) const {
static_assert(std::is_base_of_v<Kernel::SessionRequestHandler, T>, static_assert(std::is_base_of_v<Kernel::SessionRequestHandler, T>,
"Not a base of ServiceFrameworkBase"); "Not a base of ServiceFrameworkBase");
auto service = registered_services.find(service_name); auto service = registered_services.find(service_name);
@ -59,7 +59,7 @@ public:
if (port == nullptr) { if (port == nullptr) {
return nullptr; return nullptr;
} }
return std::dynamic_pointer_cast<T>(port->hle_handler); return std::static_pointer_cast<T>(port->hle_handler);
} }
private: private: