summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/npad.h
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-10-11 17:56:49 +0200
committerDavid Marcec <dmarcecguzman@gmail.com>2018-10-11 17:56:49 +0200
commit85b0d9a7be05eeec2fc230003341f9b444a17bf5 (patch)
tree5dca2a50ae7fa24be3213a60cb39fa09dbfd88f7 /src/core/hle/service/hid/controllers/npad.h
parentAdded BeginPermitVibrationSession and EndPermitVibrationSession (diff)
downloadyuzu-85b0d9a7be05eeec2fc230003341f9b444a17bf5.tar
yuzu-85b0d9a7be05eeec2fc230003341f9b444a17bf5.tar.gz
yuzu-85b0d9a7be05eeec2fc230003341f9b444a17bf5.tar.bz2
yuzu-85b0d9a7be05eeec2fc230003341f9b444a17bf5.tar.lz
yuzu-85b0d9a7be05eeec2fc230003341f9b444a17bf5.tar.xz
yuzu-85b0d9a7be05eeec2fc230003341f9b444a17bf5.tar.zst
yuzu-85b0d9a7be05eeec2fc230003341f9b444a17bf5.zip
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
-rw-r--r--src/core/hle/service/hid/controllers/npad.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index b1aa98820..bc3d15ce6 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -65,7 +65,6 @@ public:
None,
ProController,
Handheld,
- HandheldVariant, // Games which require the handheld controller to be at index 8
JoyLeft,
JoyRight,
Tabletop,
@@ -106,12 +105,13 @@ public:
Kernel::SharedPtr<Kernel::Event> GetStyleSetChangedEvent() const;
Vibration GetLastVibration() const;
- void AddNewController(NPadControllerType controller);
+ void AddNewController(NPadControllerType controller, bool is_handheld_variant = false);
void ConnectNPad(u32 npad_id);
void DisconnectNPad(u32 npad_id);
LedPattern GetLedPattern(u32 npad_id);
void SetVibrationEnabled(bool can_vibrate);
+ void SetHandheldActiviationMode(u32 mode);
private:
struct CommonHeader {
@@ -273,10 +273,10 @@ private:
Kernel::SharedPtr<Kernel::Event> styleset_changed_event;
std::size_t dump_idx{};
Vibration last_processed_vibration{};
- std::size_t controller_count{};
static constexpr std::array<u32, 10> npad_id_list{0, 1, 2, 3, 4, 5, 6, 7, 32, 16};
std::array<ControllerHolder, 10> connected_controllers{};
bool can_controllers_vibrate{true};
+ void CheckForHandheldVariant();
void InitNewlyAddedControler(std::size_t controller_idx);
};