summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-01-30 17:37:53 +0100
committerLioncash <mathew1800@gmail.com>2015-01-30 17:37:53 +0100
commit96c174aed4d22fffb32b49afaa7558cc1852323c (patch)
tree6e8eb9f4f8421cdefd4fa00dc328b4df5a60255c /src/core/hle
parentMerge pull request #503 from yuriks/kernel-lifetime4 (diff)
downloadyuzu-96c174aed4d22fffb32b49afaa7558cc1852323c.tar
yuzu-96c174aed4d22fffb32b49afaa7558cc1852323c.tar.gz
yuzu-96c174aed4d22fffb32b49afaa7558cc1852323c.tar.bz2
yuzu-96c174aed4d22fffb32b49afaa7558cc1852323c.tar.lz
yuzu-96c174aed4d22fffb32b49afaa7558cc1852323c.tar.xz
yuzu-96c174aed4d22fffb32b49afaa7558cc1852323c.tar.zst
yuzu-96c174aed4d22fffb32b49afaa7558cc1852323c.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/kernel/shared_memory.cpp6
-rw-r--r--src/core/hle/kernel/shared_memory.h2
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)