summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_server_session.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-06-07 07:52:07 +0200
committerGitHub <noreply@github.com>2021-06-07 07:52:07 +0200
commit28eb8c83d479403b5da88ae7d3d2a1c6b81a6552 (patch)
tree43b28bb3b8df05e3f19fe4a151571dedd7171255 /src/core/hle/kernel/k_server_session.h
parentMerge pull request #6400 from ameerj/disable-uniform-simplify (diff)
parenthle: kernel: KServerSession: Use ASSERT_MSG where appropriate. (diff)
downloadyuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.gz
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.bz2
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.lz
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.xz
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.zst
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_server_session.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h
index 27b757ad2..9efd400bc 100644
--- a/src/core/hle/kernel/k_server_session.h
+++ b/src/core/hle/kernel/k_server_session.h
@@ -32,6 +32,7 @@ class HLERequestContext;
class KernelCore;
class KSession;
class SessionRequestHandler;
+class SessionRequestManager;
class KThread;
class KServerSession final : public KSynchronizationObject,
@@ -46,7 +47,8 @@ public:
void Destroy() override;
- void Initialize(KSession* parent_, std::string&& name_);
+ void Initialize(KSession* parent_session_, std::string&& name_,
+ std::shared_ptr<SessionRequestManager> manager_);
KSession* GetParent() {
return parent;
@@ -104,16 +106,6 @@ public:
return manager;
}
- /// Gets the session request manager, which forwards requests to the underlying service
- const std::shared_ptr<SessionRequestManager>& GetSessionRequestManager() const {
- return manager;
- }
-
- /// Sets the session request manager, which forwards requests to the underlying service
- void SetSessionRequestManager(std::shared_ptr<SessionRequestManager> manager_) {
- manager = std::move(manager_);
- }
-
private:
/// Queues a sync request from the emulated application.
ResultCode QueueSyncRequest(KThread* thread, Core::Memory::Memory& memory);
@@ -131,9 +123,6 @@ private:
/// When set to True, converts the session to a domain at the end of the command
bool convert_to_domain{};
- /// Thread to dispatch service requests
- std::weak_ptr<ServiceThread> service_thread;
-
/// KSession that owns this KServerSession
KSession* parent{};
};