hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #512 from lioncash/assignment 

shared_memory: Fix assignments in SharedMemory::Map
This commit is contained in:
Tony Wasserka 2015-01-31 12:59:00 +01:00
parent dbff4e5e12 96c174aed4
commit 73a7a379d6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/kernel/shared_memory.cpp
View File

@ -30,9 +30,9 @@ ResultCode SharedMemory::Map(VAddr address, MemoryPermission permissions,
ErrorSummary::InvalidArgument, ErrorLevel::Permanent); ErrorSummary::InvalidArgument, ErrorLevel::Permanent);
} }
base_address = address; this->base_address = address;
permissions = permissions; this->permissions = permissions;
other_permissions = other_permissions; this->other_permissions = other_permissions;
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }

2
src/core/hle/kernel/shared_memory.h
View File

@ -51,7 +51,7 @@ public:
*/ */
ResultVal<u8*> GetPointer(u32 offset = 0); 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 permissions; ///< Permissions of shared memory block (SVC field)
MemoryPermission other_permissions; ///< Other 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) std::string name; ///< Name of shared memory object (optional)