summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-08 23:12:25 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-09 03:12:10 +0200
commit3cb19c95895ab151d64682e5cbe64e938f995f46 (patch)
treea3d14fcd598c7d55d2e5ef6d746613df916799ec /src/core/hle/kernel
parentProcess: Add more documentation to the class members (diff)
downloadyuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar
yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.gz
yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.bz2
yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.lz
yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.xz
yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.zst
yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/process.cpp6
-rw-r--r--src/core/hle/kernel/process.h4
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) {
u32 end_desc = kernel_caps[i+1];
++i; // Skip over the second descriptor on the next iteration
- StaticAddressMapping mapping;
+ AddressMapping mapping;
mapping.address = descriptor << 12;
mapping.size = (end_desc << 12) - mapping.address;
mapping.writable = descriptor & BIT(20);
mapping.unk_flag = end_desc & BIT(20);
- static_address_mappings.push_back(mapping);
+ address_mappings.push_back(mapping);
} else if ((type & 0xFFF) == 0xFFE) { // 0x000F
// Mapped memory page
- StaticAddressMapping mapping;
+ AddressMapping mapping;
mapping.address = descriptor << 12;
mapping.size = Memory::PAGE_SIZE;
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 @@
namespace Kernel {
-struct StaticAddressMapping {
+struct AddressMapping {
// Address and size must be page-aligned
VAddr address;
u32 size;
@@ -66,7 +66,7 @@ public:
unsigned int handle_table_size = 0x200;
/// Special memory ranges mapped into this processes address space. This is used to give
/// processes access to specific I/O regions and device memory.
- boost::container::static_vector<StaticAddressMapping, 8> static_address_mappings;
+ boost::container::static_vector<AddressMapping, 8> address_mappings;
ProcessFlags flags;
/**