summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-06-23 20:18:49 +0200
committerGitHub <noreply@github.com>2017-06-23 20:18:49 +0200
commit6d436d7a5244ce54ae8ff7990cf8b90e9ea70355 (patch)
tree139073bfa7dc1a7de4ba4a66d7caf715ff2194f1 /src/core/hle
parentMerge pull request #2795 from chris062689/master (diff)
parentKernel: Implement CreateSession SVC (diff)
downloadyuzu-6d436d7a5244ce54ae8ff7990cf8b90e9ea70355.tar
yuzu-6d436d7a5244ce54ae8ff7990cf8b90e9ea70355.tar.gz
yuzu-6d436d7a5244ce54ae8ff7990cf8b90e9ea70355.tar.bz2
yuzu-6d436d7a5244ce54ae8ff7990cf8b90e9ea70355.tar.lz
yuzu-6d436d7a5244ce54ae8ff7990cf8b90e9ea70355.tar.xz
yuzu-6d436d7a5244ce54ae8ff7990cf8b90e9ea70355.tar.zst
yuzu-6d436d7a5244ce54ae8ff7990cf8b90e9ea70355.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/function_wrappers.h10
-rw-r--r--src/core/hle/svc.cpp19
2 files changed, 26 insertions, 3 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index 18b6e7017..b19b64509 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -232,6 +232,16 @@ void Wrap() {
FuncReturn(retval);
}
+template <ResultCode func(Kernel::Handle*, Kernel::Handle*)>
+void Wrap() {
+ Kernel::Handle param_1 = 0;
+ Kernel::Handle param_2 = 0;
+ u32 retval = func(&param_1, &param_2).raw;
+ Core::CPU().SetReg(1, param_1);
+ Core::CPU().SetReg(2, param_2);
+ FuncReturn(retval);
+}
+
////////////////////////////////////////////////////////////////////////////////////////////////////
// Function wrappers that return type u32
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index e68b9f16a..f459b1314 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -36,8 +36,9 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
// Namespace SVC
-using Kernel::SharedPtr;
using Kernel::ERR_INVALID_HANDLE;
+using Kernel::Handle;
+using Kernel::SharedPtr;
namespace SVC {
@@ -933,7 +934,6 @@ static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client
using Kernel::ServerPort;
using Kernel::ClientPort;
- using Kernel::SharedPtr;
auto ports = ServerPort::CreatePortPair(max_sessions);
CASCADE_RESULT(*client_port, Kernel::g_handle_table.Create(
@@ -947,6 +947,19 @@ static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client
return RESULT_SUCCESS;
}
+static ResultCode CreateSession(Handle* server_session, Handle* client_session) {
+ auto sessions = Kernel::ServerSession::CreateSessionPair();
+
+ auto& server = std::get<SharedPtr<Kernel::ServerSession>>(sessions);
+ CASCADE_RESULT(*server_session, Kernel::g_handle_table.Create(std::move(server)));
+
+ auto& client = std::get<SharedPtr<Kernel::ClientSession>>(sessions);
+ CASCADE_RESULT(*client_session, Kernel::g_handle_table.Create(std::move(client)));
+
+ LOG_TRACE(Kernel_SVC, "called");
+ return RESULT_SUCCESS;
+}
+
static ResultCode GetSystemInfo(s64* out, u32 type, s32 param) {
using Kernel::MemoryRegion;
@@ -1122,7 +1135,7 @@ static const FunctionDef SVC_Table[] = {
{0x46, nullptr, "Unknown"},
{0x47, HLE::Wrap<CreatePort>, "CreatePort"},
{0x48, nullptr, "CreateSessionToPort"},
- {0x49, nullptr, "CreateSession"},
+ {0x49, HLE::Wrap<CreateSession>, "CreateSession"},
{0x4A, nullptr, "AcceptSession"},
{0x4B, nullptr, "ReplyAndReceive1"},
{0x4C, nullptr, "ReplyAndReceive2"},