summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp42
-rw-r--r--src/core/hle/service/hid/controllers/npad.h14
-rw-r--r--src/core/hle/service/hid/hid.cpp4
3 files changed, 38 insertions, 22 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index cc54b164d..81725efbb 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -117,7 +117,10 @@ u32 Controller_NPad::IndexToNPad(std::size_t index) {
}
Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system), system(system) {}
-Controller_NPad::~Controller_NPad() = default;
+
+Controller_NPad::~Controller_NPad() {
+ OnRelease();
+}
void Controller_NPad::InitNewlyAddedController(std::size_t controller_idx) {
const auto controller_type = connected_controllers[controller_idx].type;
@@ -274,7 +277,11 @@ void Controller_NPad::OnLoadInputDevices() {
}
}
-void Controller_NPad::OnRelease() {}
+void Controller_NPad::OnRelease() {
+ for (std::size_t index = 0; index < connected_controllers.size(); ++index) {
+ VibrateControllerAtIndex(index, {});
+ }
+}
void Controller_NPad::RequestPadStateUpdate(u32 npad_id) {
const auto controller_idx = NPadIdToIndex(npad_id);
@@ -667,8 +674,24 @@ void Controller_NPad::SetNpadMode(u32 npad_id, NpadAssignments assignment_mode)
}
}
-void Controller_NPad::VibrateController(const std::vector<DeviceHandle>& vibration_device_handles,
- const std::vector<VibrationValue>& vibration_values) {
+bool Controller_NPad::VibrateControllerAtIndex(std::size_t npad_index,
+ const VibrationValue& vibration_value) {
+ if (!connected_controllers[npad_index].is_connected) {
+ return false;
+ }
+
+ using namespace Settings::NativeButton;
+ const auto& button_state = buttons[npad_index];
+
+ return button_state[A - BUTTON_HID_BEGIN]->SetRumblePlay(
+ vibration_value.amp_low * Settings::values.vibration_strength.GetValue() / 100,
+ vibration_value.freq_low,
+ vibration_value.amp_high * Settings::values.vibration_strength.GetValue() / 100,
+ vibration_value.freq_high);
+}
+
+void Controller_NPad::VibrateControllers(const std::vector<DeviceHandle>& vibration_device_handles,
+ const std::vector<VibrationValue>& vibration_values) {
LOG_TRACE(Service_HID, "called");
if (!Settings::values.vibration_enabled.GetValue() || !can_controllers_vibrate) {
@@ -717,17 +740,8 @@ void Controller_NPad::VibrateController(const std::vector<DeviceHandle>& vibrati
continue;
}
- using namespace Settings::NativeButton;
- const auto& button_state = buttons[npad_index];
-
// TODO: Vibrate left/right vibration motors independently if possible.
- const bool success = button_state[A - BUTTON_HID_BEGIN]->SetRumblePlay(
- vibration_values[i].amp_low * Settings::values.vibration_strength.GetValue() / 100,
- vibration_values[i].freq_low,
- vibration_values[i].amp_high * Settings::values.vibration_strength.GetValue() / 100,
- vibration_values[i].freq_high);
-
- if (success) {
+ if (VibrateControllerAtIndex(npad_index, vibration_values[i])) {
switch (connected_controllers[npad_index].type) {
case NPadControllerType::None:
UNREACHABLE();
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index c1b19103a..4dc2a974d 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -110,10 +110,10 @@ public:
static_assert(sizeof(NpadStyleSet) == 4, "NpadStyleSet is an invalid size");
struct VibrationValue {
- f32 amp_low;
- f32 freq_low;
- f32 amp_high;
- f32 freq_high;
+ f32 amp_low{0.0f};
+ f32 freq_low{160.0f};
+ f32 amp_high{0.0f};
+ f32 freq_high{320.0f};
};
static_assert(sizeof(VibrationValue) == 0x10, "Vibration is an invalid size");
@@ -148,8 +148,10 @@ public:
void SetNpadMode(u32 npad_id, NpadAssignments assignment_mode);
- void VibrateController(const std::vector<DeviceHandle>& vibration_device_handles,
- const std::vector<VibrationValue>& vibration_values);
+ bool VibrateControllerAtIndex(std::size_t npad_index, const VibrationValue& vibration_value);
+
+ void VibrateControllers(const std::vector<DeviceHandle>& vibration_device_handles,
+ const std::vector<VibrationValue>& vibration_values);
VibrationValue GetLastVibration(const DeviceHandle& vibration_device_handle) const;
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 89327cd86..878f20bd2 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -1022,7 +1022,7 @@ void Hid::SendVibrationValue(Kernel::HLERequestContext& ctx) {
const auto parameters{rp.PopRaw<Parameters>()};
applet_resource->GetController<Controller_NPad>(HidController::NPad)
- .VibrateController({parameters.vibration_device_handle}, {parameters.vibration_value});
+ .VibrateControllers({parameters.vibration_device_handle}, {parameters.vibration_value});
LOG_DEBUG(Service_HID,
"called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}",
@@ -1100,7 +1100,7 @@ void Hid::SendVibrationValues(Kernel::HLERequestContext& ctx) {
std::memcpy(vibration_values.data(), vibrations.data(), vibrations.size());
applet_resource->GetController<Controller_NPad>(HidController::NPad)
- .VibrateController(vibration_device_handles, vibration_values);
+ .VibrateControllers(vibration_device_handles, vibration_values);
LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);