mirror of
				https://git.suyu.dev/suyu/suyu.git
				synced 2025-10-31 23:06:43 +08:00 
			
		
		
		
	Merge pull request #1448 from ogniK5377/frontend-access
Ported #4296 from citra
This commit is contained in:
		
						commit
						450c0a5adf
					
				| @ -17,6 +17,10 @@ namespace Kernel { | |||||||
| ClientPort::ClientPort(KernelCore& kernel) : Object{kernel} {} | ClientPort::ClientPort(KernelCore& kernel) : Object{kernel} {} | ||||||
| ClientPort::~ClientPort() = default; | ClientPort::~ClientPort() = default; | ||||||
| 
 | 
 | ||||||
|  | SharedPtr<ServerPort> ClientPort::GetServerPort() const { | ||||||
|  |     return server_port; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() { | ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() { | ||||||
|     // Note: Threads do not wait for the server endpoint to call
 |     // Note: Threads do not wait for the server endpoint to call
 | ||||||
|     // AcceptSession before returning from this call.
 |     // AcceptSession before returning from this call.
 | ||||||
|  | |||||||
| @ -30,6 +30,8 @@ public: | |||||||
|         return HANDLE_TYPE; |         return HANDLE_TYPE; | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  |     SharedPtr<ServerPort> GetServerPort() const; | ||||||
|  | 
 | ||||||
|     /**
 |     /**
 | ||||||
|      * Creates a new Session pair, adds the created ServerSession to the associated ServerPort's |      * Creates a new Session pair, adds the created ServerSession to the associated ServerPort's | ||||||
|      * list of pending sessions, and signals the ServerPort, causing any threads |      * list of pending sessions, and signals the ServerPort, causing any threads | ||||||
|  | |||||||
| @ -11,6 +11,7 @@ | |||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
| #include "core/hle/kernel/object.h" | #include "core/hle/kernel/object.h" | ||||||
| #include "core/hle/kernel/wait_object.h" | #include "core/hle/kernel/wait_object.h" | ||||||
|  | #include "core/hle/result.h" | ||||||
| 
 | 
 | ||||||
| namespace Kernel { | namespace Kernel { | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -6,9 +6,12 @@ | |||||||
| 
 | 
 | ||||||
| #include <memory> | #include <memory> | ||||||
| #include <string> | #include <string> | ||||||
|  | #include <type_traits> | ||||||
| #include <unordered_map> | #include <unordered_map> | ||||||
| 
 | 
 | ||||||
|  | #include "core/hle/kernel/client_port.h" | ||||||
| #include "core/hle/kernel/object.h" | #include "core/hle/kernel/object.h" | ||||||
|  | #include "core/hle/kernel/server_port.h" | ||||||
| #include "core/hle/result.h" | #include "core/hle/result.h" | ||||||
| #include "core/hle/service/service.h" | #include "core/hle/service/service.h" | ||||||
| 
 | 
 | ||||||
| @ -48,6 +51,22 @@ public: | |||||||
|     ResultVal<Kernel::SharedPtr<Kernel::ClientPort>> GetServicePort(const std::string& name); |     ResultVal<Kernel::SharedPtr<Kernel::ClientPort>> GetServicePort(const std::string& name); | ||||||
|     ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ConnectToService(const std::string& name); |     ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ConnectToService(const std::string& name); | ||||||
| 
 | 
 | ||||||
|  |     template <typename T> | ||||||
|  |     std::shared_ptr<T> GetService(const std::string& service_name) const { | ||||||
|  |         static_assert(std::is_base_of_v<Kernel::SessionRequestHandler, T>, | ||||||
|  |                       "Not a base of ServiceFrameworkBase"); | ||||||
|  |         auto service = registered_services.find(service_name); | ||||||
|  |         if (service == registered_services.end()) { | ||||||
|  |             LOG_DEBUG(Service, "Can't find service: {}", service_name); | ||||||
|  |             return nullptr; | ||||||
|  |         } | ||||||
|  |         auto port = service->second->GetServerPort(); | ||||||
|  |         if (port == nullptr) { | ||||||
|  |             return nullptr; | ||||||
|  |         } | ||||||
|  |         return std::static_pointer_cast<T>(port->hle_handler); | ||||||
|  |     } | ||||||
|  | 
 | ||||||
|     void InvokeControlRequest(Kernel::HLERequestContext& context); |     void InvokeControlRequest(Kernel::HLERequestContext& context); | ||||||
| 
 | 
 | ||||||
| private: | private: | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user