Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-30 21:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #512 from lioncash/assignment

Browse source 
shared_memory: Fix assignments in SharedMemory::Map
This commit is contained in:
Tony Wasserka 2015-01-31 12:59:00 +01:00
commit 73a7a379d6
2 changed files with 4 additions and 4 deletions
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)