diff options
| author | 2015-05-08 18:12:25 -0300 | |
|---|---|---|
| committer | 2015-05-08 22:12:10 -0300 | |
| commit | 3cb19c95895ab151d64682e5cbe64e938f995f46 (patch) | |
| tree | a3d14fcd598c7d55d2e5ef6d746613df916799ec /src/core/hle/kernel | |
| parent | Process: Add more documentation to the class members (diff) | |
| download | yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.gz yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.xz yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.zip | |
Process: Rename StaticAddressMapping => AddressMapping
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/process.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index be916e76a..9d83d03d6 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -59,16 +59,16 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) { | |||
| 59 | u32 end_desc = kernel_caps[i+1]; | 59 | u32 end_desc = kernel_caps[i+1]; |
| 60 | ++i; // Skip over the second descriptor on the next iteration | 60 | ++i; // Skip over the second descriptor on the next iteration |
| 61 | 61 | ||
| 62 | StaticAddressMapping mapping; | 62 | AddressMapping mapping; |
| 63 | mapping.address = descriptor << 12; | 63 | mapping.address = descriptor << 12; |
| 64 | mapping.size = (end_desc << 12) - mapping.address; | 64 | mapping.size = (end_desc << 12) - mapping.address; |
| 65 | mapping.writable = descriptor & BIT(20); | 65 | mapping.writable = descriptor & BIT(20); |
| 66 | mapping.unk_flag = end_desc & BIT(20); | 66 | mapping.unk_flag = end_desc & BIT(20); |
| 67 | 67 | ||
| 68 | static_address_mappings.push_back(mapping); | 68 | address_mappings.push_back(mapping); |
| 69 | } else if ((type & 0xFFF) == 0xFFE) { // 0x000F | 69 | } else if ((type & 0xFFF) == 0xFFE) { // 0x000F |
| 70 | // Mapped memory page | 70 | // Mapped memory page |
| 71 | StaticAddressMapping mapping; | 71 | AddressMapping mapping; |
| 72 | mapping.address = descriptor << 12; | 72 | mapping.address = descriptor << 12; |
| 73 | mapping.size = Memory::PAGE_SIZE; | 73 | mapping.size = Memory::PAGE_SIZE; |
| 74 | mapping.writable = true; // TODO: Not sure if correct | 74 | mapping.writable = true; // TODO: Not sure if correct |
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 260db8a63..88ed9a5a5 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | namespace Kernel { | 17 | namespace Kernel { |
| 18 | 18 | ||
| 19 | struct StaticAddressMapping { | 19 | struct AddressMapping { |
| 20 | // Address and size must be page-aligned | 20 | // Address and size must be page-aligned |
| 21 | VAddr address; | 21 | VAddr address; |
| 22 | u32 size; | 22 | u32 size; |
| @@ -66,7 +66,7 @@ public: | |||
| 66 | unsigned int handle_table_size = 0x200; | 66 | unsigned int handle_table_size = 0x200; |
| 67 | /// Special memory ranges mapped into this processes address space. This is used to give | 67 | /// Special memory ranges mapped into this processes address space. This is used to give |
| 68 | /// processes access to specific I/O regions and device memory. | 68 | /// processes access to specific I/O regions and device memory. |
| 69 | boost::container::static_vector<StaticAddressMapping, 8> static_address_mappings; | 69 | boost::container::static_vector<AddressMapping, 8> address_mappings; |
| 70 | ProcessFlags flags; | 70 | ProcessFlags flags; |
| 71 | 71 | ||
| 72 | /** | 72 | /** |