summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-06-10 06:37:11 +0200
committerbunnei <bunneidev@gmail.com>2021-06-10 06:37:11 +0200
commitb2971b48ed8f86857878f0fc0e1a744c4bc9d766 (patch)
tree165e8f13b5e5be2a870cef7799f50c086e5f5d12
parentMerge pull request #6439 from lat9nq/ci-no-7z (diff)
downloadyuzu-b2971b48ed8f86857878f0fc0e1a744c4bc9d766.tar
yuzu-b2971b48ed8f86857878f0fc0e1a744c4bc9d766.tar.gz
yuzu-b2971b48ed8f86857878f0fc0e1a744c4bc9d766.tar.bz2
yuzu-b2971b48ed8f86857878f0fc0e1a744c4bc9d766.tar.lz
yuzu-b2971b48ed8f86857878f0fc0e1a744c4bc9d766.tar.xz
yuzu-b2971b48ed8f86857878f0fc0e1a744c4bc9d766.tar.zst
yuzu-b2971b48ed8f86857878f0fc0e1a744c4bc9d766.zip
-rw-r--r--src/core/hle/kernel/hle_ipc.cpp4
-rw-r--r--src/core/hle/kernel/k_server_session.h11
-rw-r--r--src/core/hle/service/service.h2
3 files changed, 8 insertions, 9 deletions
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index 45aced99f..28ed6265a 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -57,11 +57,11 @@ bool SessionRequestManager::HasSessionRequestHandler(const HLERequestContext& co
}
void SessionRequestHandler::ClientConnected(KServerSession* session) {
- session->SetSessionHandler(shared_from_this());
+ session->ClientConnected(shared_from_this());
}
void SessionRequestHandler::ClientDisconnected(KServerSession* session) {
- session->SetSessionHandler(nullptr);
+ session->ClientDisconnected();
}
HLERequestContext::HLERequestContext(KernelCore& kernel_, Core::Memory::Memory& memory_,
diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h
index 9efd400bc..d44bc9d4f 100644
--- a/src/core/hle/kernel/k_server_session.h
+++ b/src/core/hle/kernel/k_server_session.h
@@ -62,15 +62,14 @@ public:
void OnClientClosed();
- /**
- * Sets the HLE handler for the session. This handler will be called to service IPC requests
- * instead of the regular IPC machinery. (The regular IPC machinery is currently not
- * implemented.)
- */
- void SetSessionHandler(SessionRequestHandlerPtr handler) {
+ void ClientConnected(SessionRequestHandlerPtr handler) {
manager->SetSessionHandler(std::move(handler));
}
+ void ClientDisconnected() {
+ manager = nullptr;
+ }
+
/**
* Handle a sync request from the emulated application.
*
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index 7f133a7cb..78afd7c73 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -42,7 +42,7 @@ class ServiceManager;
static const int kMaxPortSize = 8; ///< Maximum size of a port name (8 characters)
/// Arbitrary default number of maximum connections to an HLE service.
-static const u32 DefaultMaxSessions = 0x10000;
+static const u32 DefaultMaxSessions = 0x100;
/**
* This is an non-templated base of ServiceFramework to reduce code bloat and compilation times, it