From 65be230fdda302b25447f2f09b06e3238bd09e79 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Sun, 19 Feb 2023 14:42:12 -0500
Subject: service: move hle_ipc from kernel

---
 src/core/hle/service/server_manager.h | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'src/core/hle/service/server_manager.h')

diff --git a/src/core/hle/service/server_manager.h b/src/core/hle/service/server_manager.h
index 57b954ae8..fdb8af2ff 100644
--- a/src/core/hle/service/server_manager.h
+++ b/src/core/hle/service/server_manager.h
@@ -20,30 +20,30 @@ class System;
 }
 
 namespace Kernel {
-class HLERequestContext;
 class KEvent;
 class KServerPort;
 class KServerSession;
 class KSynchronizationObject;
-class SessionRequestHandler;
-class SessionRequestManager;
 } // namespace Kernel
 
 namespace Service {
 
+class HLERequestContext;
+class SessionRequestHandler;
+class SessionRequestManager;
+
 class ServerManager {
 public:
     explicit ServerManager(Core::System& system);
     ~ServerManager();
 
     Result RegisterSession(Kernel::KServerSession* session,
-                           std::shared_ptr<Kernel::SessionRequestManager> manager);
+                           std::shared_ptr<SessionRequestManager> manager);
     Result RegisterNamedService(const std::string& service_name,
-                                std::shared_ptr<Kernel::SessionRequestHandler>&& handler,
+                                std::shared_ptr<SessionRequestHandler>&& handler,
                                 u32 max_sessions = 64);
     Result ManageNamedPort(const std::string& service_name,
-                           std::shared_ptr<Kernel::SessionRequestHandler>&& handler,
-                           u32 max_sessions = 64);
+                           std::shared_ptr<SessionRequestHandler>&& handler, u32 max_sessions = 64);
     Result ManageDeferral(Kernel::KEvent** out_event);
 
     Result LoopProcess();
@@ -56,10 +56,9 @@ private:
 
     Result LoopProcessImpl();
     Result WaitAndProcessImpl();
-    Result OnPortEvent(Kernel::KServerPort* port,
-                       std::shared_ptr<Kernel::SessionRequestHandler>&& handler);
+    Result OnPortEvent(Kernel::KServerPort* port, std::shared_ptr<SessionRequestHandler>&& handler);
     Result OnSessionEvent(Kernel::KServerSession* session,
-                          std::shared_ptr<Kernel::SessionRequestManager>&& manager);
+                          std::shared_ptr<SessionRequestManager>&& manager);
     Result OnDeferralEvent(std::list<RequestState>&& deferrals);
     Result CompleteSyncRequest(RequestState&& state);
 
@@ -69,16 +68,16 @@ private:
     std::mutex m_list_mutex;
 
     // Guest state tracking
-    std::map<Kernel::KServerPort*, std::shared_ptr<Kernel::SessionRequestHandler>> m_ports{};
-    std::map<Kernel::KServerSession*, std::shared_ptr<Kernel::SessionRequestManager>> m_sessions{};
+    std::map<Kernel::KServerPort*, std::shared_ptr<SessionRequestHandler>> m_ports{};
+    std::map<Kernel::KServerSession*, std::shared_ptr<SessionRequestManager>> m_sessions{};
     Kernel::KEvent* m_event{};
     Kernel::KEvent* m_deferral_event{};
 
     // Deferral tracking
     struct RequestState {
         Kernel::KServerSession* session;
-        std::shared_ptr<Kernel::HLERequestContext> context;
-        std::shared_ptr<Kernel::SessionRequestManager> manager;
+        std::shared_ptr<HLERequestContext> context;
+        std::shared_ptr<SessionRequestManager> manager;
     };
     std::list<RequestState> m_deferrals{};
 
-- 
cgit v1.2.3