From 50153a1cb2edbb9ae3aef79a464779099c1e2827 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 13 Jun 2018 13:01:05 -0400 Subject: Avoid initializing single-joycon layouts with handheld controller --- src/core/hle/service/hid/hid.cpp | 5 ++++- src/core/hle/service/hid/hid.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 85ca4bf06..d84c0a0b2 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -83,7 +83,10 @@ 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 < HID_NUM_LAYOUTS; index++) { + for (int index = 0; + index < + (controller != Controller_Handheld ? HID_NUM_LAYOUTS : HID_NUM_LAYOUTS_HANDHELD); + index++) { ControllerLayout& layout = mem.controllers[controller].layouts[index]; layout.header.num_entries = HID_NUM_ENTRIES; layout.header.max_entry_index = HID_NUM_ENTRIES - 1; diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index b499308d6..a032f59dc 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -13,6 +13,7 @@ namespace Service::HID { constexpr u32 HID_NUM_ENTRIES = 17; constexpr u32 HID_NUM_LAYOUTS = 7; +constexpr u32 HID_NUM_LAYOUTS_HANDHELD = 2; constexpr s32 HID_JOYSTICK_MAX = 0x8000; constexpr s32 HID_JOYSTICK_MIN = -0x8000; -- cgit v1.2.3