summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorarades79 <scravers@protonmail.com>2023-02-11 20:27:14 +0100
committerarades79 <scravers@protonmail.com>2023-02-14 18:35:39 +0100
commit26e44a3be4d5d7299c5b38e5d521957fd856e134 (patch)
treee6a2dd70150c5bd8f640951f54b8ff918cc25929 /src
parentdon't use static inside constexpr function (diff)
downloadyuzu-26e44a3be4d5d7299c5b38e5d521957fd856e134.tar
yuzu-26e44a3be4d5d7299c5b38e5d521957fd856e134.tar.gz
yuzu-26e44a3be4d5d7299c5b38e5d521957fd856e134.tar.bz2
yuzu-26e44a3be4d5d7299c5b38e5d521957fd856e134.tar.lz
yuzu-26e44a3be4d5d7299c5b38e5d521957fd856e134.tar.xz
yuzu-26e44a3be4d5d7299c5b38e5d521957fd856e134.tar.zst
yuzu-26e44a3be4d5d7299c5b38e5d521957fd856e134.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/kernel.cpp3
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 563e2681b..e9270c6f3 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -492,7 +492,8 @@ struct KernelCore::Impl {
constexpr static size_t CodeRegionAlign = PageSize;
constexpr static VAddr code_region_start =
Common::AlignDown(code_start_virt_addr, CodeRegionAlign);
- constexpr static VAddr code_region_end = Common::AlignUp(code_end_virt_addr, CodeRegionAlign);
+ constexpr static VAddr code_region_end =
+ Common::AlignUp(code_end_virt_addr, CodeRegionAlign);
constexpr static size_t code_region_size = code_region_end - code_region_start;
ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert(
code_region_start, code_region_size, KMemoryRegionType_KernelCode));
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index f4485141c..d5dcd5567 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -439,9 +439,9 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) {
using btn = Core::HID::NpadButton;
pad_entry.npad_buttons.raw = btn::None;
if (controller_type != Core::HID::NpadStyleIndex::JoyconLeft) {
- constexpr static btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | btn::R |
- btn::ZR | btn::Plus | btn::StickRLeft | btn::StickRUp |
- btn::StickRRight | btn::StickRDown;
+ constexpr static btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR |
+ btn::R | btn::ZR | btn::Plus | btn::StickRLeft |
+ btn::StickRUp | btn::StickRRight | btn::StickRDown;
pad_entry.npad_buttons.raw = button_state.raw & right_button_mask;
pad_entry.r_stick = stick_state.right;
}