diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2015-01-31 12:59:00 +0100 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2015-01-31 12:59:00 +0100 |
| commit | 73a7a379d6951e70a947ab41922b91340c6729cd (patch) | |
| tree | cd64954f4d300435bc60a5fd0d639a8c74e1b68d | |
| parent | Merge pull request #516 from lioncash/cleanup (diff) | |
| parent | shared_memory: Fix assignments in SharedMemory::Map (diff) | |
| download | yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.tar yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.tar.gz yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.tar.bz2 yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.tar.lz yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.tar.xz yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.tar.zst yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.zip | |
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/shared_memory.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 536d134b0..eff68d481 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -30,9 +30,9 @@ ResultCode SharedMemory::Map(VAddr address, MemoryPermission permissions, ErrorSummary::InvalidArgument, ErrorLevel::Permanent); } - base_address = address; - permissions = permissions; - other_permissions = other_permissions; + this->base_address = address; + this->permissions = permissions; + this->other_permissions = other_permissions; return RESULT_SUCCESS; } diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index f9ae23e93..d393e8175 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h @@ -51,7 +51,7 @@ public: */ ResultVal<u8*> GetPointer(u32 offset = 0); - VAddr base_address; ///< Address of shared memory block in RAM + VAddr base_address; ///< Address of shared memory block in RAM MemoryPermission permissions; ///< Permissions of shared memory block (SVC field) MemoryPermission other_permissions; ///< Other permissions of shared memory block (SVC field) std::string name; ///< Name of shared memory object (optional) |