summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Morph2021-01-27 13:05:07 -0500
committerGravatar Morph2021-01-27 13:05:31 -0500
commitd4d39aa4c7e92cac429446f5f22e6c2283770c5b (patch)
treeb6c1939c96b7ccafec2c9f8f953307b1d880056e
parentMerge pull request #5812 from german77/StubSixaxisFusion (diff)
downloadyuzu-d4d39aa4c7e92cac429446f5f22e6c2283770c5b.tar.gz
yuzu-d4d39aa4c7e92cac429446f5f22e6c2283770c5b.tar.xz
yuzu-d4d39aa4c7e92cac429446f5f22e6c2283770c5b.zip
npad: Remove unused device handle parameter
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp7
-rw-r--r--src/core/hle/service/hid/controllers/npad.h6
-rw-r--r--src/core/hle/service/hid/hid.cpp7
3 files changed, 9 insertions, 11 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 265c986e2..0c227b135 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -946,20 +946,19 @@ void Controller_NPad::SetSixAxisEnabled(bool six_axis_status) {
946 sixaxis_sensors_enabled = six_axis_status; 946 sixaxis_sensors_enabled = six_axis_status;
947} 947}
948 948
949void Controller_NPad::SetSixAxisFusionParameters(const DeviceHandle& handle, f32 parameter1, 949void Controller_NPad::SetSixAxisFusionParameters(f32 parameter1, f32 parameter2) {
950 f32 parameter2) {
951 sixaxis_fusion_parameter1 = parameter1; 950 sixaxis_fusion_parameter1 = parameter1;
952 sixaxis_fusion_parameter2 = parameter2; 951 sixaxis_fusion_parameter2 = parameter2;
953} 952}
954 953
955std::pair<f32, f32> Controller_NPad::GetSixAxisFusionParameters(const DeviceHandle& handle) { 954std::pair<f32, f32> Controller_NPad::GetSixAxisFusionParameters() {
956 return { 955 return {
957 sixaxis_fusion_parameter1, 956 sixaxis_fusion_parameter1,
958 sixaxis_fusion_parameter2, 957 sixaxis_fusion_parameter2,
959 }; 958 };
960} 959}
961 960
962void Controller_NPad::ResetSixAxisFusionParameters(const DeviceHandle& handle) { 961void Controller_NPad::ResetSixAxisFusionParameters() {
963 sixaxis_fusion_parameter1 = 0.0f; 962 sixaxis_fusion_parameter1 = 0.0f;
964 sixaxis_fusion_parameter2 = 0.0f; 963 sixaxis_fusion_parameter2 = 0.0f;
965} 964}
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index bfd06372a..2e13922b9 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -202,9 +202,9 @@ public:
202 GyroscopeZeroDriftMode GetGyroscopeZeroDriftMode() const; 202 GyroscopeZeroDriftMode GetGyroscopeZeroDriftMode() const;
203 bool IsSixAxisSensorAtRest() const; 203 bool IsSixAxisSensorAtRest() const;
204 void SetSixAxisEnabled(bool six_axis_status); 204 void SetSixAxisEnabled(bool six_axis_status);
205 void SetSixAxisFusionParameters(const DeviceHandle& handle, f32 parameter1, f32 parameter2); 205 void SetSixAxisFusionParameters(f32 parameter1, f32 parameter2);
206 std::pair<f32, f32> GetSixAxisFusionParameters(const DeviceHandle& handle); 206 std::pair<f32, f32> GetSixAxisFusionParameters();
207 void ResetSixAxisFusionParameters(const DeviceHandle& handle); 207 void ResetSixAxisFusionParameters();
208 LedPattern GetLedPattern(u32 npad_id); 208 LedPattern GetLedPattern(u32 npad_id);
209 bool IsUnintendedHomeButtonInputProtectionEnabled(u32 npad_id) const; 209 bool IsUnintendedHomeButtonInputProtectionEnabled(u32 npad_id) const;
210 void SetUnintendedHomeButtonInputProtectionEnabled(bool is_protection_enabled, u32 npad_id); 210 void SetUnintendedHomeButtonInputProtectionEnabled(bool is_protection_enabled, u32 npad_id);
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 7fd3161e8..1360ea26e 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -546,8 +546,7 @@ void Hid::SetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) {
546 const auto parameters{rp.PopRaw<Parameters>()}; 546 const auto parameters{rp.PopRaw<Parameters>()};
547 547
548 applet_resource->GetController<Controller_NPad>(HidController::NPad) 548 applet_resource->GetController<Controller_NPad>(HidController::NPad)
549 .SetSixAxisFusionParameters(parameters.sixaxis_handle, parameters.parameter1, 549 .SetSixAxisFusionParameters(parameters.parameter1, parameters.parameter2);
550 parameters.parameter2);
551 550
552 LOG_WARNING(Service_HID, 551 LOG_WARNING(Service_HID,
553 "(STUBBED) called, float1={}, float2={}, npad_type={}, npad_id={}, " 552 "(STUBBED) called, float1={}, float2={}, npad_type={}, npad_id={}, "
@@ -573,7 +572,7 @@ void Hid::GetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) {
573 572
574 std::tie(parameter1, parameter2) = 573 std::tie(parameter1, parameter2) =
575 applet_resource->GetController<Controller_NPad>(HidController::NPad) 574 applet_resource->GetController<Controller_NPad>(HidController::NPad)
576 .GetSixAxisFusionParameters(parameters.sixaxis_handle); 575 .GetSixAxisFusionParameters();
577 576
578 LOG_WARNING(Service_HID, 577 LOG_WARNING(Service_HID,
579 "(STUBBED) called, npad_type={}, npad_id={}, " 578 "(STUBBED) called, npad_type={}, npad_id={}, "
@@ -597,7 +596,7 @@ void Hid::ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) {
597 const auto parameters{rp.PopRaw<Parameters>()}; 596 const auto parameters{rp.PopRaw<Parameters>()};
598 597
599 applet_resource->GetController<Controller_NPad>(HidController::NPad) 598 applet_resource->GetController<Controller_NPad>(HidController::NPad)
600 .ResetSixAxisFusionParameters(parameters.sixaxis_handle); 599 .ResetSixAxisFusionParameters();
601 600
602 LOG_WARNING(Service_HID, 601 LOG_WARNING(Service_HID,
603 "(STUBBED) called, npad_type={}, npad_id={}, " 602 "(STUBBED) called, npad_type={}, npad_id={}, "