summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2021-05-08 12:11:36 -0400
committerGravatar Lioncash2021-05-08 12:33:26 -0400
commit2f62bae9e3bbdd80cd374aaf0b93890e937d5b3d (patch)
treeda5cbd25dcb367559c1bf619a7438fa1e18ff600 /src/core/hle/kernel/kernel.cpp
parentMerge pull request #6266 from bunnei/kautoobject-refactor (diff)
downloadyuzu-2f62bae9e3bbdd80cd374aaf0b93890e937d5b3d.tar.gz
yuzu-2f62bae9e3bbdd80cd374aaf0b93890e937d5b3d.tar.xz
yuzu-2f62bae9e3bbdd80cd374aaf0b93890e937d5b3d.zip
kernel: Eliminate variable shadowing
Now that the large kernel refactor is merged, we can eliminate the remaining variable shadowing cases.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 32bbf2d9b..bd4e4d350 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -51,11 +51,11 @@ MICROPROFILE_DEFINE(Kernel_SVC, "Kernel", "SVC", MP_RGB(70, 200, 70));
51namespace Kernel { 51namespace Kernel {
52 52
53struct KernelCore::Impl { 53struct KernelCore::Impl {
54 explicit Impl(Core::System& system, KernelCore& kernel) 54 explicit Impl(Core::System& system_, KernelCore& kernel_)
55 : time_manager{system}, object_list_container{kernel}, system{system} {} 55 : time_manager{system_}, object_list_container{kernel_}, system{system_} {}
56 56
57 void SetMulticore(bool is_multicore) { 57 void SetMulticore(bool is_multi) {
58 this->is_multicore = is_multicore; 58 is_multicore = is_multi;
59 } 59 }
60 60
61 void Initialize(KernelCore& kernel) { 61 void Initialize(KernelCore& kernel) {
@@ -599,19 +599,19 @@ struct KernelCore::Impl {
599 irs_shared_mem = KSharedMemory::Create(system.Kernel()); 599 irs_shared_mem = KSharedMemory::Create(system.Kernel());
600 time_shared_mem = KSharedMemory::Create(system.Kernel()); 600 time_shared_mem = KSharedMemory::Create(system.Kernel());
601 601
602 hid_shared_mem->Initialize(system.Kernel(), system.DeviceMemory(), nullptr, 602 hid_shared_mem->Initialize(system.DeviceMemory(), nullptr,
603 {hid_phys_addr, hid_size / PageSize}, 603 {hid_phys_addr, hid_size / PageSize},
604 Svc::MemoryPermission::None, Svc::MemoryPermission::Read, 604 Svc::MemoryPermission::None, Svc::MemoryPermission::Read,
605 hid_phys_addr, hid_size, "HID:SharedMemory"); 605 hid_phys_addr, hid_size, "HID:SharedMemory");
606 font_shared_mem->Initialize(system.Kernel(), system.DeviceMemory(), nullptr, 606 font_shared_mem->Initialize(system.DeviceMemory(), nullptr,
607 {font_phys_addr, font_size / PageSize}, 607 {font_phys_addr, font_size / PageSize},
608 Svc::MemoryPermission::None, Svc::MemoryPermission::Read, 608 Svc::MemoryPermission::None, Svc::MemoryPermission::Read,
609 font_phys_addr, font_size, "Font:SharedMemory"); 609 font_phys_addr, font_size, "Font:SharedMemory");
610 irs_shared_mem->Initialize(system.Kernel(), system.DeviceMemory(), nullptr, 610 irs_shared_mem->Initialize(system.DeviceMemory(), nullptr,
611 {irs_phys_addr, irs_size / PageSize}, 611 {irs_phys_addr, irs_size / PageSize},
612 Svc::MemoryPermission::None, Svc::MemoryPermission::Read, 612 Svc::MemoryPermission::None, Svc::MemoryPermission::Read,
613 irs_phys_addr, irs_size, "IRS:SharedMemory"); 613 irs_phys_addr, irs_size, "IRS:SharedMemory");
614 time_shared_mem->Initialize(system.Kernel(), system.DeviceMemory(), nullptr, 614 time_shared_mem->Initialize(system.DeviceMemory(), nullptr,
615 {time_phys_addr, time_size / PageSize}, 615 {time_phys_addr, time_size / PageSize},
616 Svc::MemoryPermission::None, Svc::MemoryPermission::Read, 616 Svc::MemoryPermission::None, Svc::MemoryPermission::Read,
617 time_phys_addr, time_size, "Time:SharedMemory"); 617 time_phys_addr, time_size, "Time:SharedMemory");