diff options
| author | 2015-01-31 12:59:00 +0100 | |
|---|---|---|
| committer | 2015-01-31 12:59:00 +0100 | |
| commit | 73a7a379d6951e70a947ab41922b91340c6729cd (patch) | |
| tree | cd64954f4d300435bc60a5fd0d639a8c74e1b68d /src/core | |
| parent | Merge pull request #516 from lioncash/cleanup (diff) | |
| parent | shared_memory: Fix assignments in SharedMemory::Map (diff) | |
| download | yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.tar.gz yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.tar.xz yuzu-73a7a379d6951e70a947ab41922b91340c6729cd.zip | |
Merge pull request #512 from lioncash/assignment
shared_memory: Fix assignments in SharedMemory::Map
Diffstat (limited to 'src/core')
| -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, | |||
| 30 | ErrorSummary::InvalidArgument, ErrorLevel::Permanent); | 30 | ErrorSummary::InvalidArgument, ErrorLevel::Permanent); |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | base_address = address; | 33 | this->base_address = address; |
| 34 | permissions = permissions; | 34 | this->permissions = permissions; |
| 35 | other_permissions = other_permissions; | 35 | this->other_permissions = other_permissions; |
| 36 | 36 | ||
| 37 | return RESULT_SUCCESS; | 37 | return RESULT_SUCCESS; |
| 38 | } | 38 | } |
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: | |||
| 51 | */ | 51 | */ |
| 52 | ResultVal<u8*> GetPointer(u32 offset = 0); | 52 | ResultVal<u8*> GetPointer(u32 offset = 0); |
| 53 | 53 | ||
| 54 | VAddr base_address; ///< Address of shared memory block in RAM | 54 | VAddr base_address; ///< Address of shared memory block in RAM |
| 55 | MemoryPermission permissions; ///< Permissions of shared memory block (SVC field) | 55 | MemoryPermission permissions; ///< Permissions of shared memory block (SVC field) |
| 56 | MemoryPermission other_permissions; ///< Other permissions of shared memory block (SVC field) | 56 | MemoryPermission other_permissions; ///< Other permissions of shared memory block (SVC field) |
| 57 | std::string name; ///< Name of shared memory object (optional) | 57 | std::string name; ///< Name of shared memory object (optional) |