summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/npad.h
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-09-18 16:10:30 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2020-09-18 16:10:30 +0200
commitab961e07014cb308cc983fa869696bf5cb9a0c7d (patch)
tree3ff650bd2d018c916ca331cc7cd27f941e6e4b0d /src/core/hle/service/hid/controllers/npad.h
parentMerge pull request #4323 from ReinUsesLisp/no-spin (diff)
downloadyuzu-ab961e07014cb308cc983fa869696bf5cb9a0c7d.tar
yuzu-ab961e07014cb308cc983fa869696bf5cb9a0c7d.tar.gz
yuzu-ab961e07014cb308cc983fa869696bf5cb9a0c7d.tar.bz2
yuzu-ab961e07014cb308cc983fa869696bf5cb9a0c7d.tar.lz
yuzu-ab961e07014cb308cc983fa869696bf5cb9a0c7d.tar.xz
yuzu-ab961e07014cb308cc983fa869696bf5cb9a0c7d.tar.zst
yuzu-ab961e07014cb308cc983fa869696bf5cb9a0c7d.zip
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
-rw-r--r--src/core/hle/service/hid/controllers/npad.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index e9788da8d..54e950e1b 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -74,6 +74,12 @@ public:
Single = 1,
};
+ enum class NpadHandheldActivationMode : u64 {
+ Dual = 0,
+ Single = 1,
+ None = 2,
+ };
+
enum class NPadControllerType {
None,
ProController,
@@ -110,6 +116,9 @@ public:
void SetHoldType(NpadHoldType joy_hold_type);
NpadHoldType GetHoldType() const;
+ void SetNpadHandheldActivationMode(NpadHandheldActivationMode activation_mode);
+ NpadHandheldActivationMode GetNpadHandheldActivationMode() const;
+
void SetNpadMode(u32 npad_id, NPadAssignments assignment_mode);
void VibrateController(const std::vector<u32>& controller_ids,
@@ -335,6 +344,7 @@ private:
sticks;
std::vector<u32> supported_npad_id_types{};
NpadHoldType hold_type{NpadHoldType::Vertical};
+ NpadHandheldActivationMode handheld_activation_mode{NpadHandheldActivationMode::Dual};
// Each controller should have their own styleset changed event
std::array<Kernel::EventPair, 10> styleset_changed_events;
Vibration last_processed_vibration{};