summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/npad.h
diff options
context:
space:
mode:
authorFernando S <fsahmkow27@gmail.com>2022-07-07 08:29:34 +0200
committerGitHub <noreply@github.com>2022-07-07 08:29:34 +0200
commitd244677df90ec6dced586efee637d2f529877f71 (patch)
tree8033efae521636281fd5ca973a0587fecacf65cf /src/core/hle/service/hid/controllers/npad.h
parentMerge pull request #8522 from lat9nq/consolidate-settings (diff)
parentservice: hid: Correct some mistakes and add more validations (diff)
downloadyuzu-d244677df90ec6dced586efee637d2f529877f71.tar
yuzu-d244677df90ec6dced586efee637d2f529877f71.tar.gz
yuzu-d244677df90ec6dced586efee637d2f529877f71.tar.bz2
yuzu-d244677df90ec6dced586efee637d2f529877f71.tar.lz
yuzu-d244677df90ec6dced586efee637d2f529877f71.tar.xz
yuzu-d244677df90ec6dced586efee637d2f529877f71.tar.zst
yuzu-d244677df90ec6dced586efee637d2f529877f71.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/hid/controllers/npad.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index 8b54724ed..1a589cca2 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -81,6 +81,7 @@ public:
Dual = 0,
Single = 1,
None = 2,
+ MaxActivationMode = 3,
};
// This is nn::hid::NpadCommunicationMode
@@ -196,7 +197,7 @@ public:
Core::HID::NpadButton GetAndResetPressState();
static bool IsNpadIdValid(Core::HID::NpadIdType npad_id);
- static bool IsDeviceHandleValid(const Core::HID::VibrationDeviceHandle& device_handle);
+ static Result IsDeviceHandleValid(const Core::HID::VibrationDeviceHandle& device_handle);
static Result VerifyValidSixAxisSensorHandle(
const Core::HID::SixAxisSensorHandle& device_handle);