diff options
author | bunnei <bunneidev@gmail.com> | 2014-11-24 21:31:53 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-11-24 21:31:53 +0100 |
commit | bb730855e58d18d8964d158a55822c40503d548f (patch) | |
tree | 9c3ff113839583d1deca837e9888d81f25d485a0 /src/core/hle/kernel/shared_memory.h | |
parent | Merge pull request #191 from archshift/deletexyz (diff) | |
parent | Use pointers instead of passing handles around in some functions. (diff) | |
download | yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.gz yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.bz2 yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.lz yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.xz yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.zst yuzu-bb730855e58d18d8964d158a55822c40503d548f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/shared_memory.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index 0aec03538..304cf5b67 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h @@ -32,9 +32,8 @@ Handle CreateSharedMemory(const std::string& name="Unknown"); * @param address Address in system memory to map shared memory block to * @param permissions Memory block map permissions (specified by SVC field) * @param other_permissions Memory block map other permissions (specified by SVC field) - * @return Result of operation, 0 on success, otherwise error code */ -Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions, +ResultCode MapSharedMemory(Handle handle, u32 address, MemoryPermission permissions, MemoryPermission other_permissions); /** @@ -43,6 +42,6 @@ Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions, * @param offset Offset from the start of the shared memory block to get pointer * @return Pointer to the shared memory block from the specified offset */ -u8* GetSharedMemoryPointer(Handle handle, u32 offset); +ResultVal<u8*> GetSharedMemoryPointer(Handle handle, u32 offset); } // namespace |