diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 6 |
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 { | |||
| 492 | constexpr static size_t CodeRegionAlign = PageSize; | 492 | constexpr static size_t CodeRegionAlign = PageSize; |
| 493 | constexpr static VAddr code_region_start = | 493 | constexpr static VAddr code_region_start = |
| 494 | Common::AlignDown(code_start_virt_addr, CodeRegionAlign); | 494 | Common::AlignDown(code_start_virt_addr, CodeRegionAlign); |
| 495 | constexpr static VAddr code_region_end = Common::AlignUp(code_end_virt_addr, CodeRegionAlign); | 495 | constexpr static VAddr code_region_end = |
| 496 | Common::AlignUp(code_end_virt_addr, CodeRegionAlign); | ||
| 496 | constexpr static size_t code_region_size = code_region_end - code_region_start; | 497 | constexpr static size_t code_region_size = code_region_end - code_region_start; |
| 497 | ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( | 498 | ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( |
| 498 | code_region_start, code_region_size, KMemoryRegionType_KernelCode)); | 499 | 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) { | |||
| 439 | using btn = Core::HID::NpadButton; | 439 | using btn = Core::HID::NpadButton; |
| 440 | pad_entry.npad_buttons.raw = btn::None; | 440 | pad_entry.npad_buttons.raw = btn::None; |
| 441 | if (controller_type != Core::HID::NpadStyleIndex::JoyconLeft) { | 441 | if (controller_type != Core::HID::NpadStyleIndex::JoyconLeft) { |
| 442 | constexpr static btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | btn::R | | 442 | constexpr static btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | |
| 443 | btn::ZR | btn::Plus | btn::StickRLeft | btn::StickRUp | | 443 | btn::R | btn::ZR | btn::Plus | btn::StickRLeft | |
| 444 | btn::StickRRight | btn::StickRDown; | 444 | btn::StickRUp | btn::StickRRight | btn::StickRDown; |
| 445 | pad_entry.npad_buttons.raw = button_state.raw & right_button_mask; | 445 | pad_entry.npad_buttons.raw = button_state.raw & right_button_mask; |
| 446 | pad_entry.r_stick = stick_state.right; | 446 | pad_entry.r_stick = stick_state.right; |
| 447 | } | 447 | } |