summaryrefslogtreecommitdiffstats
path: root/src/core/hle/svc.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-07-05 06:59:58 +0200
committerbunnei <bunneidev@gmail.com>2014-07-05 16:24:52 +0200
commit7b7a435094654da2a707a2089ed5ca9584679c38 (patch)
treeccaecd65308654a5499ba3b26494cadca39dc0ee /src/core/hle/svc.cpp
parentKernel: Added support for shared memory objects. (diff)
downloadyuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.gz
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.bz2
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.lz
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.xz
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.zst
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.zip
Diffstat (limited to 'src/core/hle/svc.cpp')
-rw-r--r--src/core/hle/svc.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 441d8ce8d..746d24a70 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -12,6 +12,7 @@
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/mutex.h"
+#include "core/hle/kernel/shared_memory.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/function_wrappers.h"
@@ -58,17 +59,17 @@ Result ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 addr1, u32 siz
}
/// Maps a memory block to specified address
-Result MapMemoryBlock(Handle memblock, u32 addr, u32 mypermissions, u32 otherpermission) {
+Result MapMemoryBlock(Handle handle, u32 addr, u32 permissions, u32 other_permissions) {
DEBUG_LOG(SVC, "called memblock=0x08X, addr=0x%08X, mypermissions=0x%08X, otherpermission=%d",
- memblock, addr, mypermissions, otherpermission);
- switch (mypermissions) {
+ handle, addr, permissions, other_permissions);
+ switch (permissions) {
case MEMORY_PERMISSION_NORMAL:
case MEMORY_PERMISSION_NORMAL + 1:
case MEMORY_PERMISSION_NORMAL + 2:
- Memory::MapBlock_Shared(memblock, addr, mypermissions);
+ Kernel::MapSharedMemory(handle, addr, permissions, other_permissions);
break;
default:
- ERROR_LOG(OSHLE, "unknown permissions=0x%08X", mypermissions);
+ ERROR_LOG(OSHLE, "unknown permissions=0x%08X", permissions);
}
return 0;
}