summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2017-10-04 19:11:55 +0200
committerSubv <subv2112@gmail.com>2017-10-04 21:04:03 +0200
commit46fc7595b4f5f161ecd5ae21259c661c15ca46f3 (patch)
tree4c6c0e988414c1635a7a9b4a6d4954157ebe1adb
parentSVC: Replace GetPointer usage with ReadCString in ConnectToPort. (diff)
downloadyuzu-46fc7595b4f5f161ecd5ae21259c661c15ca46f3.tar
yuzu-46fc7595b4f5f161ecd5ae21259c661c15ca46f3.tar.gz
yuzu-46fc7595b4f5f161ecd5ae21259c661c15ca46f3.tar.bz2
yuzu-46fc7595b4f5f161ecd5ae21259c661c15ca46f3.tar.lz
yuzu-46fc7595b4f5f161ecd5ae21259c661c15ca46f3.tar.xz
yuzu-46fc7595b4f5f161ecd5ae21259c661c15ca46f3.tar.zst
yuzu-46fc7595b4f5f161ecd5ae21259c661c15ca46f3.zip
-rw-r--r--src/core/hle/function_wrappers.h6
-rw-r--r--src/core/hle/svc.cpp4
2 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index a982b2b54..f93439f21 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -206,13 +206,11 @@ void Wrap() {
FuncReturn(func(PARAM(0), PARAM(1)).raw);
}
-template <ResultCode func(Kernel::Handle*, Kernel::Handle*, const char*, u32)>
+template <ResultCode func(Kernel::Handle*, Kernel::Handle*, VAddr, u32)>
void Wrap() {
Kernel::Handle param_1 = 0;
Kernel::Handle param_2 = 0;
- u32 retval = func(&param_1, &param_2,
- reinterpret_cast<const char*>(Memory::GetPointer(PARAM(2))), PARAM(3))
- .raw;
+ u32 retval = func(&param_1, &param_2, PARAM(2), PARAM(3)).raw;
Core::CPU().SetReg(1, param_1);
Core::CPU().SetReg(2, param_2);
FuncReturn(retval);
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 2ae177ab5..b72ca3581 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -1104,9 +1104,9 @@ static ResultCode CreateMemoryBlock(Kernel::Handle* out_handle, u32 addr, u32 si
}
static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client_port,
- const char* name, u32 max_sessions) {
+ VAddr name_address, u32 max_sessions) {
// TODO(Subv): Implement named ports.
- ASSERT_MSG(name == nullptr, "Named ports are currently unimplemented");
+ ASSERT_MSG(name_address == 0, "Named ports are currently unimplemented");
using Kernel::ServerPort;
using Kernel::ClientPort;