diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index d84c0a0b2..d4f741505 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -16,6 +16,14 @@ namespace Service::HID { +int GetNumberLayoutsForController(size_t controller_id) { + if (controller_id == Controller_Handheld) { + return HID_NUM_LAYOUTS_HANDHELD; + } else { + return HID_NUM_LAYOUTS; + } +} + // Updating period for each HID device. // TODO(shinyquagsire23): These need better values. constexpr u64 pad_update_ticks = CoreTiming::BASE_CLOCK_RATE / 10000; @@ -83,10 +91,7 @@ private: controller_header.left_color_buttons = JOYCON_BUTTONS_NEON_BLUE; for (size_t controller = 0; controller < mem.controllers.size(); controller++) { - for (int index = 0; - index < - (controller != Controller_Handheld ? HID_NUM_LAYOUTS : HID_NUM_LAYOUTS_HANDHELD); - index++) { + for (int index = 0; index < GetNumberLayoutsForController(controller); index++) { ControllerLayout& layout = mem.controllers[controller].layouts[index]; layout.header.num_entries = HID_NUM_ENTRIES; layout.header.max_entry_index = HID_NUM_ENTRIES - 1; |