From 50153a1cb2edbb9ae3aef79a464779099c1e2827 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 13 Jun 2018 13:01:05 -0400 Subject: [PATCH 1/3] 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(-) diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 85ca4bf06e..d84c0a0b22 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 b499308d63..a032f59dcd 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; From a353322b58afa439eabce0694f457381fd80a7fe Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 13 Jun 2018 13:44:46 -0400 Subject: [PATCH 2/3] Move loop condition to free function --- src/core/hle/service/hid/hid.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index d84c0a0b22..d4f741505c 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; From ac88d3e89f68cf9eac11014225c2847e96f8a620 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 13 Jun 2018 20:03:12 -0400 Subject: [PATCH 3/3] Narrow down filter of layout configs --- src/core/hle/service/hid/hid.cpp | 14 +++++--------- src/core/hle/service/hid/hid.h | 1 - 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index d4f741505c..2696a8bf03 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -16,14 +16,6 @@ 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; @@ -91,7 +83,11 @@ 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 < GetNumberLayoutsForController(controller); index++) { + for (int index = 0; index < HID_NUM_LAYOUTS; index++) { + // TODO(DarkLordZach): Is this layout/controller config actually invalid? + if (controller == Controller_Handheld && index == Layout_Single) + continue; + 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 a032f59dcd..b499308d63 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -13,7 +13,6 @@ 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;