A bit of a redesign.

Sessions and Ports are now detached from each other.
HLE services are handled by means of a SessionRequestHandler class, Interface now inherits from this class.
The File and Directory classes are no longer kernel objects, but SessionRequestHandlers instead, bound to a ServerSession when requested.
File::OpenLinkFile now creates a new session pair and binds the File instance to it.

1 files changed, 2 insertions, 14 deletions

diff --git a/src/core/hle/kernel/client_session.cpp b/src/core/hle/kernel/client_session.cpp
index 22fa2ff03..31ea8045a 100644
--- a/src/core/hle/kernel/client_session.cpp
+++ b/src/core/hle/kernel/client_session.cpp
@@ -15,29 +15,17 @@ namespace Kernel {
 ClientSession::ClientSession() {}
 ClientSession::~ClientSession() {}
 
-ResultVal<SharedPtr<ClientSession>> ClientSession::Create(SharedPtr<ServerSession> server_session, SharedPtr<ClientPort> client_port, std::string name) {
+ResultVal<SharedPtr<ClientSession>> ClientSession::Create(SharedPtr<ServerSession> server_session, std::string name) {
     SharedPtr<ClientSession> client_session(new ClientSession);
 
     client_session->name = std::move(name);
     client_session->server_session = server_session;
-    client_session->client_port = client_port;
-    client_session->hle_helper = client_port->hle_interface;
-
     return MakeResult<SharedPtr<ClientSession>>(std::move(client_session));
 }
 
 ResultCode ClientSession::HandleSyncRequest() {
     // Signal the server session that new data is available
-    ResultCode result = server_session->HandleSyncRequest();
-
-    if (result.IsError())
-        return result;
-
-    // If this ClientSession has an associated HLE helper, forward the request to it.
-    if (hle_helper != nullptr)
-        result = hle_helper->HandleSyncRequest(server_session);
-
-    return result;
+    return server_session->HandleSyncRequest();
 }
 
 } // namespace