From 46202e984e176241fd5a2f766907035e87198c99 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 17 Oct 2018 20:34:25 -0400 Subject: hid/controller: Default the destructors of all controller types in the cpp file These classes are non-trivial and are definitely going to be changed in the future, so we default these to prevent issues with forward declarations, and to keep the compiler from inlining tear-down code. --- src/core/hle/service/hid/controllers/npad.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/core/hle/service/hid/controllers/npad.cpp') diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index d17e64b2a..5b70a344d 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -31,6 +31,7 @@ constexpr u32 BATTERY_FULL = 2; enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right }; Controller_NPad::Controller_NPad() = default; +Controller_NPad::~Controller_NPad() = default; void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) { const auto controller_type = connected_controllers[controller_idx].type; -- cgit v1.2.3 From aeca22489097879b507a47ada77133b8b867c89e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 17 Oct 2018 20:37:45 -0400 Subject: hid/controller/npad: Remove unnecessary const from void return type This literally does nothing. --- src/core/hle/service/hid/controllers/npad.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/hle/service/hid/controllers/npad.cpp') diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 5b70a344d..954869619 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -316,7 +316,7 @@ void Controller_NPad::SetSupportedNPadIdTypes(u8* data, std::size_t length) { std::memcpy(supported_npad_id_types.data(), data, length); } -const void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) { +void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) { ASSERT(max_length < supported_npad_id_types.size()); std::memcpy(data, supported_npad_id_types.data(), supported_npad_id_types.size()); } -- cgit v1.2.3 From aeda7434465e2aa076ede9a23aa1726a8d78d66b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 17 Oct 2018 20:41:45 -0400 Subject: hid/controller/npad: Move npad_id_list into the cpp file This is just a lookup table, and since it's private, there's nothing really stateful about it, so we can just move it into the cpp file. --- src/core/hle/service/hid/controllers/npad.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/core/hle/service/hid/controllers/npad.cpp') diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 954869619..9a781b026 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -20,6 +20,7 @@ #include "core/settings.h" namespace Service::HID { + constexpr u32 JOYCON_BODY_NEON_RED = 0xFF3C28; constexpr u32 JOYCON_BUTTONS_NEON_RED = 0x1E0A0A; constexpr u32 JOYCON_BODY_NEON_BLUE = 0x0AB9E6; @@ -28,7 +29,15 @@ constexpr s32 HID_JOYSTICK_MAX = 0x7fff; constexpr s32 HID_JOYSTICK_MIN = -0x7fff; constexpr std::size_t NPAD_OFFSET = 0x9A00; constexpr u32 BATTERY_FULL = 2; -enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right }; + +constexpr std::array npad_id_list{ + 0, 1, 2, 3, 4, 5, 6, 7, 32, 16, +}; + +enum class JoystickId : std::size_t { + Joystick_Left, + Joystick_Right, +}; Controller_NPad::Controller_NPad() = default; Controller_NPad::~Controller_NPad() = default; -- cgit v1.2.3 From 929ed59f1fc752b0d1262748841b3a5c263e1078 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 17 Oct 2018 20:42:57 -0400 Subject: hid/controller/npad: Remove #pragma once from the cpp file This is only useful in headers. --- src/core/hle/service/hid/controllers/npad.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/core/hle/service/hid/controllers/npad.cpp') diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 9a781b026..379df97cc 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -2,8 +2,6 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#pragma once - #include #include #include -- cgit v1.2.3 From 452aa30cb72d19e62556d4927f575b4b48e20c8b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 17 Oct 2018 20:47:12 -0400 Subject: hid/controller: Remove unused header inclusions swap.h only needs to be present in the header for the type aliases and definitions, it's not actually needed in the cpp files though. input.h is just unused entirely in xpad.h --- src/core/hle/service/hid/controllers/npad.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/core/hle/service/hid/controllers/npad.cpp') diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 379df97cc..b26593b4f 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -9,7 +9,6 @@ #include "common/bit_field.h" #include "common/common_types.h" #include "common/logging/log.h" -#include "common/swap.h" #include "core/core.h" #include "core/core_timing.h" #include "core/frontend/input.h" -- cgit v1.2.3