diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-17 03:28:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-17 03:28:06 +0100 |
commit | 4c16a1a26f3d35c5d3a57a6b1e988d3c3e07a932 (patch) | |
tree | 76d8d54e9874693467b66cd3d68cdbd4dc664cfa /src/core/hle/service/hid/controllers | |
parent | Merge pull request #12053 from german77/no_functional (diff) | |
parent | service: hid: Introduce firmware settings and update activate controller calls (diff) | |
download | yuzu-4c16a1a26f3d35c5d3a57a6b1e988d3c3e07a932.tar yuzu-4c16a1a26f3d35c5d3a57a6b1e988d3c3e07a932.tar.gz yuzu-4c16a1a26f3d35c5d3a57a6b1e988d3c3e07a932.tar.bz2 yuzu-4c16a1a26f3d35c5d3a57a6b1e988d3c3e07a932.tar.lz yuzu-4c16a1a26f3d35c5d3a57a6b1e988d3c3e07a932.tar.xz yuzu-4c16a1a26f3d35c5d3a57a6b1e988d3c3e07a932.tar.zst yuzu-4c16a1a26f3d35c5d3a57a6b1e988d3c3e07a932.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers')
4 files changed, 18 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/controllers/controller_base.cpp b/src/core/hle/service/hid/controllers/controller_base.cpp index c58d67d7d..0bcd87062 100644 --- a/src/core/hle/service/hid/controllers/controller_base.cpp +++ b/src/core/hle/service/hid/controllers/controller_base.cpp @@ -8,12 +8,17 @@ namespace Service::HID { ControllerBase::ControllerBase(Core::HID::HIDCore& hid_core_) : hid_core(hid_core_) {} ControllerBase::~ControllerBase() = default; -void ControllerBase::ActivateController() { +Result ControllerBase::Activate() { if (is_activated) { - return; + return ResultSuccess; } is_activated = true; OnInit(); + return ResultSuccess; +} + +Result ControllerBase::Activate(u64 aruid) { + return Activate(); } void ControllerBase::DeactivateController() { diff --git a/src/core/hle/service/hid/controllers/controller_base.h b/src/core/hle/service/hid/controllers/controller_base.h index d6f7a5073..9a44ee41e 100644 --- a/src/core/hle/service/hid/controllers/controller_base.h +++ b/src/core/hle/service/hid/controllers/controller_base.h @@ -4,6 +4,7 @@ #pragma once #include "common/common_types.h" +#include "core/hle/result.h" namespace Core::Timing { class CoreTiming; @@ -31,7 +32,8 @@ public: // When the controller is requesting a motion update for the shared memory virtual void OnMotionUpdate(const Core::Timing::CoreTiming& core_timing) {} - void ActivateController(); + Result Activate(); + Result Activate(u64 aruid); void DeactivateController(); diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 949e58a4c..e23b4986c 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -86,6 +86,13 @@ public: Default = 3, }; + enum class NpadRevision : u32 { + Revision0 = 0, + Revision1 = 1, + Revision2 = 2, + Revision3 = 3, + }; + void SetSupportedStyleSet(Core::HID::NpadStyleTag style_set); Core::HID::NpadStyleTag GetSupportedStyleSet() const; diff --git a/src/core/hle/service/hid/controllers/palma.cpp b/src/core/hle/service/hid/controllers/palma.cpp index 73a2a2b91..51a18335f 100644 --- a/src/core/hle/service/hid/controllers/palma.cpp +++ b/src/core/hle/service/hid/controllers/palma.cpp @@ -44,7 +44,7 @@ Result Controller_Palma::InitializePalma(const PalmaConnectionHandle& handle) { if (handle.npad_id != active_handle.npad_id) { return InvalidPalmaHandle; } - ActivateController(); + Activate(); return ResultSuccess; } |