diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/client_session.cpp | 8 | ||||
| -rw-r--r-- | src/core/hle/kernel/client_session.h | 7 | ||||
| -rw-r--r-- | src/core/hle/kernel/server_session.cpp | 4 |
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 | ||
| 28 | ResultVal<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 | |||
| 36 | ResultCode ClientSession::SendSyncRequest() { | 28 | ResultCode 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: | |||
| 47 | private: | 47 | private: |
| 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(); |