Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Narrow down filter of layout configs

Browse source
This commit is contained in:
Zach Hilman 2018-06-13 20:03:12 -04:00
parent a353322b58
commit ac88d3e89f
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/hle/service/hid/hid.cpp
View file

@ -16,14 +16,6 @@
namespace Service::HID { 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. // Updating period for each HID device.
// TODO(shinyquagsire23): These need better values. // TODO(shinyquagsire23): These need better values.
constexpr u64 pad_update_ticks = CoreTiming::BASE_CLOCK_RATE / 10000; constexpr u64 pad_update_ticks = CoreTiming::BASE_CLOCK_RATE / 10000;
@ -91,7 +83,11 @@ private:
controller_header.left_color_buttons = JOYCON_BUTTONS_NEON_BLUE; controller_header.left_color_buttons = JOYCON_BUTTONS_NEON_BLUE;
for (size_t controller = 0; controller < mem.controllers.size(); controller++) { 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]; ControllerLayout& layout = mem.controllers[controller].layouts[index];
layout.header.num_entries = HID_NUM_ENTRIES; layout.header.num_entries = HID_NUM_ENTRIES;
layout.header.max_entry_index = HID_NUM_ENTRIES - 1; layout.header.max_entry_index = HID_NUM_ENTRIES - 1;

1
src/core/hle/service/hid/hid.h
View file

@ -13,7 +13,6 @@ namespace Service::HID {
constexpr u32 HID_NUM_ENTRIES = 17; constexpr u32 HID_NUM_ENTRIES = 17;
constexpr u32 HID_NUM_LAYOUTS = 7; constexpr u32 HID_NUM_LAYOUTS = 7;
constexpr u32 HID_NUM_LAYOUTS_HANDHELD = 2;
constexpr s32 HID_JOYSTICK_MAX = 0x8000; constexpr s32 HID_JOYSTICK_MAX = 0x8000;
constexpr s32 HID_JOYSTICK_MIN = -0x8000; constexpr s32 HID_JOYSTICK_MIN = -0x8000;