From e626a520ca8d3047449d7d7028d6b9c773a6b570 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 4 Jun 2017 21:52:19 -0700 Subject: HLE: Move SessionRequestHandler from Service:: to Kernel:: Most of the code that works with this is or will be in the kernel, so it's a more appropriate place for it to be. --- src/core/hle/kernel/server_session.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/core/hle/kernel/server_session.h') diff --git a/src/core/hle/kernel/server_session.h b/src/core/hle/kernel/server_session.h index f1b76d8aa..62d23cf0a 100644 --- a/src/core/hle/kernel/server_session.h +++ b/src/core/hle/kernel/server_session.h @@ -12,7 +12,6 @@ #include "core/hle/kernel/session.h" #include "core/hle/kernel/wait_object.h" #include "core/hle/result.h" -#include "core/hle/service/service.h" #include "core/memory.h" namespace Kernel { @@ -20,6 +19,7 @@ namespace Kernel { class ClientSession; class ClientPort; class ServerSession; +class SessionRequestHandler; class Thread; /** @@ -56,7 +56,7 @@ public: */ static SessionPair CreateSessionPair( const std::string& name = "Unknown", - std::shared_ptr hle_handler = nullptr, + std::shared_ptr hle_handler = nullptr, SharedPtr client_port = nullptr); /** @@ -72,7 +72,7 @@ public: std::string name; ///< The name of this session (optional) bool signaled; ///< Whether there's new data available to this ServerSession std::shared_ptr parent; ///< The parent session, which links to the client endpoint. - std::shared_ptr + std::shared_ptr hle_handler; ///< This session's HLE request handler (optional) private: @@ -87,8 +87,7 @@ private: * @return The created server session */ static ResultVal> Create( - std::string name = "Unknown", - std::shared_ptr hle_handler = nullptr); + std::string name = "Unknown", std::shared_ptr hle_handler = nullptr); }; /** -- cgit v1.2.3