summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Subv2017-05-21 18:52:42 -0500
committerGravatar Subv2017-05-21 18:52:42 -0500
commit37347bfa380464a1ee1236d2a35f1ec1b697e4b6 (patch)
treeb8bd602646825ddfa78189f3d89d1a9437a543fa
parentKernel: Remove a now unused enum and variable regarding a session's status. (diff)
downloadyuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.tar.gz
yuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.tar.xz
yuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.zip
Kernel/Sessions: Remove the ClientSession::Create function.
It is not meant to be used by anything other than CreateSessionPair.
-rw-r--r--src/core/hle/kernel/client_session.cpp8
-rw-r--r--src/core/hle/kernel/client_session.h7
-rw-r--r--src/core/hle/kernel/server_session.cpp4
3 files changed, 3 insertions, 16 deletions
diff --git a/src/core/hle/kernel/client_session.cpp b/src/core/hle/kernel/client_session.cpp
index 6737b204b..e297b7464 100644
--- a/src/core/hle/kernel/client_session.cpp
+++ b/src/core/hle/kernel/client_session.cpp
@@ -25,14 +25,6 @@ ClientSession::~ClientSession() {
25 parent->client = nullptr; 25 parent->client = nullptr;
26} 26}
27 27
28ResultVal<SharedPtr<ClientSession>> ClientSession::Create(std::string name) {
29 SharedPtr<ClientSession> client_session(new ClientSession);
30
31 client_session->name = std::move(name);
32 client_session->parent = nullptr;
33 return MakeResult<SharedPtr<ClientSession>>(std::move(client_session));
34}
35
36ResultCode ClientSession::SendSyncRequest() { 28ResultCode ClientSession::SendSyncRequest() {
37 // Signal the server session that new data is available 29 // Signal the server session that new data is available
38 if (parent->server) 30 if (parent->server)
diff --git a/src/core/hle/kernel/client_session.h b/src/core/hle/kernel/client_session.h
index 5ec4ee901..9f3adb72b 100644
--- a/src/core/hle/kernel/client_session.h
+++ b/src/core/hle/kernel/client_session.h
@@ -47,13 +47,6 @@ public:
47private: 47private:
48 ClientSession(); 48 ClientSession();
49 ~ClientSession() override; 49 ~ClientSession() override;
50
51 /**
52 * Creates a client session.
53 * @param name Optional name of client session
54 * @return The created client session
55 */
56 static ResultVal<SharedPtr<ClientSession>> Create(std::string name = "Unknown");
57}; 50};
58 51
59} // namespace 52} // namespace
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp
index a93e55c76..500b909ab 100644
--- a/src/core/hle/kernel/server_session.cpp
+++ b/src/core/hle/kernel/server_session.cpp
@@ -74,7 +74,9 @@ ServerSession::SessionPair ServerSession::CreateSessionPair(
74 74
75 auto server_session = 75 auto server_session =
76 ServerSession::Create(name + "_Server", std::move(hle_handler)).MoveFrom(); 76 ServerSession::Create(name + "_Server", std::move(hle_handler)).MoveFrom();
77 auto client_session = ClientSession::Create(name + "_Client").MoveFrom(); 77
78 SharedPtr<ClientSession> client_session(new ClientSession);
79 client_session->name = name + "_Client";
78 80
79 std::shared_ptr<Session> parent(new Session); 81 std::shared_ptr<Session> parent(new Session);
80 parent->client = client_session.get(); 82 parent->client = client_session.get();