diff options
| author | bunnei <bunneidev@gmail.com> | 2021-04-17 09:52:53 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2021-05-06 01:40:51 +0200 |
| commit | c7d8b7421cd6bdb64410bbb0094ce540f0280c27 (patch) | |
| tree | 0b24ec86f194395fac5f5688a6e14fc5dec0b7dd /src/core/hle/kernel/svc_wrap.h | |
| parent | hle: kernel: Migrate KSession, KClientSession, and KServerSession to KAutoObject. (diff) | |
| download | yuzu-c7d8b7421cd6bdb64410bbb0094ce540f0280c27.tar yuzu-c7d8b7421cd6bdb64410bbb0094ce540f0280c27.tar.gz yuzu-c7d8b7421cd6bdb64410bbb0094ce540f0280c27.tar.bz2 yuzu-c7d8b7421cd6bdb64410bbb0094ce540f0280c27.tar.lz yuzu-c7d8b7421cd6bdb64410bbb0094ce540f0280c27.tar.xz yuzu-c7d8b7421cd6bdb64410bbb0094ce540f0280c27.tar.zst yuzu-c7d8b7421cd6bdb64410bbb0094ce540f0280c27.zip | |
Diffstat (limited to 'src/core/hle/kernel/svc_wrap.h')
| -rw-r--r-- | src/core/hle/kernel/svc_wrap.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h index 96afd544b..819eadfbb 100644 --- a/src/core/hle/kernel/svc_wrap.h +++ b/src/core/hle/kernel/svc_wrap.h @@ -273,11 +273,12 @@ void SvcWrap64(Core::System& system) { FuncReturn(system, retval); } -template <ResultCode func(Core::System&, u32*, u64, u64, u32)> +// Used by CreateTransferMemory +template <ResultCode func(Core::System&, Handle*, u64, u64, Svc::MemoryPermission)> void SvcWrap64(Core::System& system) { u32 param_1 = 0; const u32 retval = func(system, ¶m_1, Param(system, 1), Param(system, 2), - static_cast<u32>(Param(system, 3))) + static_cast<Svc::MemoryPermission>(Param(system, 3))) .raw; system.CurrentArmInterface().SetReg(1, param_1); @@ -586,11 +587,12 @@ void SvcWrap32(Core::System& system) { } // Used by CreateTransferMemory32 -template <ResultCode func(Core::System&, Handle*, u32, u32, u32)> +template <ResultCode func(Core::System&, Handle*, u32, u32, Svc::MemoryPermission)> void SvcWrap32(Core::System& system) { Handle handle = 0; - const u32 retval = - func(system, &handle, Param32(system, 1), Param32(system, 2), Param32(system, 3)).raw; + const u32 retval = func(system, &handle, Param32(system, 1), Param32(system, 2), + static_cast<Svc::MemoryPermission>(Param32(system, 3))) + .raw; system.CurrentArmInterface().SetReg(1, handle); FuncReturn(system, retval); } |