diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/function_wrappers.h | 6 | ||||
| -rw-r--r-- | src/core/hle/svc.cpp | 4 |
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() { | |||
| 206 | FuncReturn(func(PARAM(0), PARAM(1)).raw); | 206 | FuncReturn(func(PARAM(0), PARAM(1)).raw); |
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | template <ResultCode func(Kernel::Handle*, Kernel::Handle*, const char*, u32)> | 209 | template <ResultCode func(Kernel::Handle*, Kernel::Handle*, VAddr, u32)> |
| 210 | void Wrap() { | 210 | void Wrap() { |
| 211 | Kernel::Handle param_1 = 0; | 211 | Kernel::Handle param_1 = 0; |
| 212 | Kernel::Handle param_2 = 0; | 212 | Kernel::Handle param_2 = 0; |
| 213 | u32 retval = func(¶m_1, ¶m_2, | 213 | u32 retval = func(¶m_1, ¶m_2, PARAM(2), PARAM(3)).raw; |
| 214 | reinterpret_cast<const char*>(Memory::GetPointer(PARAM(2))), PARAM(3)) | ||
| 215 | .raw; | ||
| 216 | Core::CPU().SetReg(1, param_1); | 214 | Core::CPU().SetReg(1, param_1); |
| 217 | Core::CPU().SetReg(2, param_2); | 215 | Core::CPU().SetReg(2, param_2); |
| 218 | FuncReturn(retval); | 216 | 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 | |||
| 1104 | } | 1104 | } |
| 1105 | 1105 | ||
| 1106 | static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client_port, | 1106 | static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client_port, |
| 1107 | const char* name, u32 max_sessions) { | 1107 | VAddr name_address, u32 max_sessions) { |
| 1108 | // TODO(Subv): Implement named ports. | 1108 | // TODO(Subv): Implement named ports. |
| 1109 | ASSERT_MSG(name == nullptr, "Named ports are currently unimplemented"); | 1109 | ASSERT_MSG(name_address == 0, "Named ports are currently unimplemented"); |
| 1110 | 1110 | ||
| 1111 | using Kernel::ServerPort; | 1111 | using Kernel::ServerPort; |
| 1112 | using Kernel::ClientPort; | 1112 | using Kernel::ClientPort; |