summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/controller_base.cpp
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-11-17 03:28:06 +0100
committerGitHub <noreply@github.com>2023-11-17 03:28:06 +0100
commit4c16a1a26f3d35c5d3a57a6b1e988d3c3e07a932 (patch)
tree76d8d54e9874693467b66cd3d68cdbd4dc664cfa /src/core/hle/service/hid/controllers/controller_base.cpp
parentMerge pull request #12053 from german77/no_functional (diff)
parentservice: hid: Introduce firmware settings and update activate controller calls (diff)
downloadyuzu-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/controller_base.cpp')
-rw-r--r--src/core/hle/service/hid/controllers/controller_base.cpp9
1 files changed, 7 insertions, 2 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() {