summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-06-07 06:22:28 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-06-08 09:11:37 +0200
commitc92a8a615419d82d19a533de2c8e09cc242694e8 (patch)
tree8424c3db6c832cbe81ef1e185e6aab3198d02429 /src/core/hle/service
parentService: Add new ServiceFramework framework for writing HLE services (diff)
downloadyuzu-c92a8a615419d82d19a533de2c8e09cc242694e8.tar
yuzu-c92a8a615419d82d19a533de2c8e09cc242694e8.tar.gz
yuzu-c92a8a615419d82d19a533de2c8e09cc242694e8.tar.bz2
yuzu-c92a8a615419d82d19a533de2c8e09cc242694e8.tar.lz
yuzu-c92a8a615419d82d19a533de2c8e09cc242694e8.tar.xz
yuzu-c92a8a615419d82d19a533de2c8e09cc242694e8.tar.zst
yuzu-c92a8a615419d82d19a533de2c8e09cc242694e8.zip
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/service.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 10f2b3ee3..f184736e0 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -53,7 +53,7 @@ using Kernel::SharedPtr;
namespace Service {
-std::unordered_map<std::string, Kernel::SharedPtr<Kernel::ClientPort>> g_kernel_named_ports;
+std::unordered_map<std::string, SharedPtr<ClientPort>> g_kernel_named_ports;
/**
* Creates a function string for logging, complete with the name (or header code, depending
@@ -75,7 +75,7 @@ static std::string MakeFunctionString(const char* name, const char* port_name,
Interface::Interface(u32 max_sessions) : max_sessions(max_sessions) {}
Interface::~Interface() = default;
-void Interface::HandleSyncRequest(Kernel::SharedPtr<Kernel::ServerSession> server_session) {
+void Interface::HandleSyncRequest(SharedPtr<ServerSession> server_session) {
// TODO(Subv): Make use of the server_session in the HLE service handlers to distinguish which
// session triggered each command.
@@ -187,10 +187,10 @@ void AddNamedPort(std::string name, SharedPtr<ClientPort> port) {
}
static void AddNamedPort(Interface* interface_) {
- Kernel::SharedPtr<Kernel::ServerPort> server_port;
- Kernel::SharedPtr<Kernel::ClientPort> client_port;
+ SharedPtr<ServerPort> server_port;
+ SharedPtr<ClientPort> client_port;
std::tie(server_port, client_port) =
- Kernel::ServerPort::CreatePortPair(interface_->GetMaxSessions(), interface_->GetPortName());
+ ServerPort::CreatePortPair(interface_->GetMaxSessions(), interface_->GetPortName());
server_port->SetHleHandler(std::shared_ptr<Interface>(interface_));
AddNamedPort(interface_->GetPortName(), std::move(client_port));