summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/npad.h
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-12-05 23:17:52 +0100
committergerman77 <juangerman-13@hotmail.com>2021-12-05 23:18:23 +0100
commitd6ae9c68f80792cf11f13ca2c81ac34ddf01dafa (patch)
treec09f3cbe3806d91999a1d36fad5842e7ae89669e /src/core/hle/service/hid/controllers/npad.h
parentMerge pull request #7518 from german77/is_npad_valid (diff)
downloadyuzu-d6ae9c68f80792cf11f13ca2c81ac34ddf01dafa.tar
yuzu-d6ae9c68f80792cf11f13ca2c81ac34ddf01dafa.tar.gz
yuzu-d6ae9c68f80792cf11f13ca2c81ac34ddf01dafa.tar.bz2
yuzu-d6ae9c68f80792cf11f13ca2c81ac34ddf01dafa.tar.lz
yuzu-d6ae9c68f80792cf11f13ca2c81ac34ddf01dafa.tar.xz
yuzu-d6ae9c68f80792cf11f13ca2c81ac34ddf01dafa.tar.zst
yuzu-d6ae9c68f80792cf11f13ca2c81ac34ddf01dafa.zip
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
-rw-r--r--src/core/hle/service/hid/controllers/npad.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index de5fa5a64..63281cb35 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -113,7 +113,8 @@ public:
void SetNpadCommunicationMode(NpadCommunicationMode communication_mode_);
NpadCommunicationMode GetNpadCommunicationMode() const;
- void SetNpadMode(Core::HID::NpadIdType npad_id, NpadJoyAssignmentMode assignment_mode);
+ void SetNpadMode(Core::HID::NpadIdType npad_id, NpadJoyDeviceType npad_device_type,
+ NpadJoyAssignmentMode assignment_mode);
bool VibrateControllerAtIndex(Core::HID::NpadIdType npad_id, std::size_t device_index,
const Core::HID::VibrationValue& vibration_value);
@@ -464,7 +465,10 @@ private:
std::array<VibrationData, 2> vibration{};
bool unintended_home_button_input_protection{};
bool is_connected{};
- Core::HID::NpadStyleIndex npad_type{Core::HID::NpadStyleIndex::None};
+
+ // Dual joycons can have only one side connected
+ bool is_dual_left_connected{true};
+ bool is_dual_right_connected{true};
// Motion parameters
bool sixaxis_at_rest{true};