early-access version 2636

src/core/hle/kernel/hle_ipc.cpp

@@ -25,9 +25,9 @@
 namespace Kernel {
 
 SessionRequestHandler::SessionRequestHandler(KernelCore& kernel_, const char* service_name_,
-                                             bool create_service_thread_)
+                                             ServiceThreadType thread_type)
     : kernel{kernel_} {
-    if (create_service_thread_) {
+    if (thread_type == ServiceThreadType::CreateNew) {
         service_thread = kernel.CreateServiceThread(service_name_);
     } else {
         service_thread = kernel.GetDefaultServiceThread();

src/core/hle/kernel/hle_ipc.h

@@ -33,6 +33,11 @@ namespace Service {
 class ServiceFrameworkBase;
 }
 
+enum class ServiceThreadType {
+    Default,
+    CreateNew,
+};
+
 namespace Kernel {
 
 class Domain;
@@ -58,7 +63,7 @@ enum class ThreadWakeupReason;
 class SessionRequestHandler : public std::enable_shared_from_this<SessionRequestHandler> {
 public:
     SessionRequestHandler(KernelCore& kernel_, const char* service_name_,
-                          bool create_service_thread_);
+                          ServiceThreadType thread_type);
     virtual ~SessionRequestHandler();
 
     /**

src/core/hle/kernel/kernel.cpp

@@ -1091,7 +1091,7 @@ std::weak_ptr<Kernel::ServiceThread> KernelCore::CreateServiceThread(const std::
     return impl->CreateServiceThread(*this, name);
 }
 
-std::weak_ptr<Kernel::ServiceThread> KernelCore::GetDefaultServiceThread() {
+std::weak_ptr<Kernel::ServiceThread> KernelCore::GetDefaultServiceThread() const {
     return impl->default_service_thread;
 }
 

src/core/hle/kernel/kernel.h

@@ -294,7 +294,7 @@ public:
      * creating a new service thread.
      * @returns The a weak pointer for the default service thread.
      */
-    std::weak_ptr<Kernel::ServiceThread> GetDefaultServiceThread();
+    std::weak_ptr<Kernel::ServiceThread> GetDefaultServiceThread() const;
 
     /**
      * Releases a HLE service thread, instructing KernelCore to free it. This should be called when