CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hid: Fix controller rumble based on new research 

This fixes the issue where rumble is only sent to the first controller.
Now, individual controllers can receive their own rumble commands.
master
Morph 2020-10-07 14:22:47 +07:00
parent 31de52513e
commit 07b81f57ba
3 changed files with 69 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/core/hle/service/hid/controllers/npad.cpp
Unescape Escape View File

@ -667,35 +667,44 @@ void Controller_NPad::SetNpadMode(u32 npad_id, NpadAssignments assignment_mode)
} }
} }
void Controller_NPad::VibrateController(const std::vector<u32>& controllers, void Controller_NPad::VibrateController(const std::vector<DeviceHandle>& vibration_device_handles,
const std::vector<Vibration>& vibrations) { const std::vector<VibrationValue>& vibration_values) {
LOG_TRACE(Service_HID, "called"); LOG_TRACE(Service_HID, "called");
if (!Settings::values.vibration_enabled.GetValue() || !can_controllers_vibrate) { if (!Settings::values.vibration_enabled.GetValue() || !can_controllers_vibrate) {
return; return;
} }
bool success = true;
for (std::size_t i = 0; i < controllers.size(); ++i) { ASSERT_MSG(vibration_device_handles.size() == vibration_values.size(),
if (!connected_controllers[i].is_connected) { "The amount of device handles does not match with the amount of vibration values,"
"this is undefined behavior!");
for (std::size_t i = 0; i < vibration_device_handles.size(); ++i) {
const auto npad_index = NPadIdToIndex(vibration_device_handles[i].npad_id);
const auto device_index =
static_cast<std::size_t>(vibration_device_handles[i].device_index);
if (!connected_controllers[npad_index].is_connected) {
continue; continue;
} }
using namespace Settings::NativeButton; using namespace Settings::NativeButton;
const auto& button_state = buttons[i]; const auto& button_state = buttons[npad_index];
if (button_state[A - BUTTON_HID_BEGIN]) {
if (button_state[A - BUTTON_HID_BEGIN]->SetRumblePlay( // TODO: Vibrate left/right vibration motors independently if possible.
vibrations[0].amp_high, vibrations[0].amp_low, vibrations[0].freq_high, button_state[A - BUTTON_HID_BEGIN]->SetRumblePlay(
vibrations[0].freq_low)) { vibration_values[i].amp_high, vibration_values[i].amp_low,
success = false; vibration_values[i].freq_high, vibration_values[i].freq_low);
}
} latest_vibration_values[npad_index][device_index] = vibration_values[i];
}
if (success) {
last_processed_vibration = vibrations.back();
} }
} }
Controller_NPad::Vibration Controller_NPad::GetLastVibration() const { Controller_NPad::VibrationValue Controller_NPad::GetLastVibration(
return last_processed_vibration; const DeviceHandle& vibration_device_handle) const {
const auto npad_index = NPadIdToIndex(vibration_device_handle.npad_id);
const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index);
return latest_vibration_values[npad_index][device_index];
} }
std::shared_ptr<Kernel::ReadableEvent> Controller_NPad::GetStyleSetChangedEvent(u32 npad_id) const { std::shared_ptr<Kernel::ReadableEvent> Controller_NPad::GetStyleSetChangedEvent(u32 npad_id) const {

12
src/core/hle/service/hid/controllers/npad.h
Unescape Escape View File

@ -109,13 +109,13 @@ public:
}; };
static_assert(sizeof(NpadStyleSet) == 4, "NpadStyleSet is an invalid size"); static_assert(sizeof(NpadStyleSet) == 4, "NpadStyleSet is an invalid size");
struct Vibration { struct VibrationValue {
f32 amp_low; f32 amp_low;
f32 freq_low; f32 freq_low;
f32 amp_high; f32 amp_high;
f32 freq_high; f32 freq_high;
}; };
static_assert(sizeof(Vibration) == 0x10, "Vibration is an invalid size"); static_assert(sizeof(VibrationValue) == 0x10, "Vibration is an invalid size");
struct LedPattern { struct LedPattern {
explicit LedPattern(u64 light1, u64 light2, u64 light3, u64 light4) { explicit LedPattern(u64 light1, u64 light2, u64 light3, u64 light4) {
@ -148,10 +148,10 @@ public:
void SetNpadMode(u32 npad_id, NpadAssignments assignment_mode); void SetNpadMode(u32 npad_id, NpadAssignments assignment_mode);
void VibrateController(const std::vector<u32>& controllers, void VibrateController(const std::vector<DeviceHandle>& vibration_device_handles,
const std::vector<Vibration>& vibrations); const std::vector<VibrationValue>& vibration_values);
Vibration GetLastVibration() const; VibrationValue GetLastVibration(const DeviceHandle& vibration_device_handle) const;
std::shared_ptr<Kernel::ReadableEvent> GetStyleSetChangedEvent(u32 npad_id) const; std::shared_ptr<Kernel::ReadableEvent> GetStyleSetChangedEvent(u32 npad_id) const;
void SignalStyleSetChangedEvent(u32 npad_id) const; void SignalStyleSetChangedEvent(u32 npad_id) const;
@ -410,7 +410,7 @@ private:
NpadHandheldActivationMode handheld_activation_mode{NpadHandheldActivationMode::Dual}; NpadHandheldActivationMode handheld_activation_mode{NpadHandheldActivationMode::Dual};
// Each controller should have their own styleset changed event // Each controller should have their own styleset changed event
std::array<Kernel::EventPair, 10> styleset_changed_events; std::array<Kernel::EventPair, 10> styleset_changed_events;
Vibration last_processed_vibration{}; std::array<std::array<VibrationValue, 3>, 10> latest_vibration_values;
std::array<ControllerHolder, 10> connected_controllers{}; std::array<ControllerHolder, 10> connected_controllers{};
std::array<bool, 10> unintended_home_button_input_protection{}; std::array<bool, 10> unintended_home_button_input_protection{};
GyroscopeZeroDriftMode gyroscope_zero_drift_mode{GyroscopeZeroDriftMode::Standard}; GyroscopeZeroDriftMode gyroscope_zero_drift_mode{GyroscopeZeroDriftMode::Standard};

55
src/core/hle/service/hid/hid.cpp
Unescape Escape View File

@ -1012,15 +1012,23 @@ void Hid::GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) {
void Hid::SendVibrationValue(Kernel::HLERequestContext& ctx) { void Hid::SendVibrationValue(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto controller{rp.Pop<u32>()}; struct Parameters {
const auto vibration_values{rp.PopRaw<Controller_NPad::Vibration>()}; Controller_NPad::DeviceHandle vibration_device_handle{};
const auto applet_resource_user_id{rp.Pop<u64>()}; Controller_NPad::VibrationValue vibration_value{};
INSERT_PADDING_WORDS(1);
u64 applet_resource_user_id{};
};
const auto parameters{rp.PopRaw<Parameters>()};
applet_resource->GetController<Controller_NPad>(HidController::NPad) applet_resource->GetController<Controller_NPad>(HidController::NPad)
.VibrateController({controller}, {vibration_values}); .VibrateController({parameters.vibration_device_handle}, {parameters.vibration_value});
LOG_DEBUG(Service_HID, "called, controller={}, applet_resource_user_id={}", controller, LOG_DEBUG(Service_HID,
applet_resource_user_id); "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}",
parameters.vibration_device_handle.npad_type,
parameters.vibration_device_handle.npad_id,
parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id);
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
@ -1028,16 +1036,24 @@ void Hid::SendVibrationValue(Kernel::HLERequestContext& ctx) {
void Hid::GetActualVibrationValue(Kernel::HLERequestContext& ctx) { void Hid::GetActualVibrationValue(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto controller_id{rp.Pop<u32>()}; struct Parameters {
const auto applet_resource_user_id{rp.Pop<u64>()}; Controller_NPad::DeviceHandle vibration_device_handle{};
INSERT_PADDING_WORDS(1);
u64 applet_resource_user_id{};
};
LOG_DEBUG(Service_HID, "called, controller_id={}, applet_resource_user_id={}", controller_id, const auto parameters{rp.PopRaw<Parameters>()};
applet_resource_user_id);
LOG_DEBUG(Service_HID,
"called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}",
parameters.vibration_device_handle.npad_type,
parameters.vibration_device_handle.npad_id,
parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id);
IPC::ResponseBuilder rb{ctx, 6}; IPC::ResponseBuilder rb{ctx, 6};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushRaw( rb.PushRaw(applet_resource->GetController<Controller_NPad>(HidController::NPad)
applet_resource->GetController<Controller_NPad>(HidController::NPad).GetLastVibration()); .GetLastVibration(parameters.vibration_device_handle));
} }
void Hid::CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx) { void Hid::CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx) {
@ -1072,18 +1088,19 @@ void Hid::SendVibrationValues(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto applet_resource_user_id{rp.Pop<u64>()}; const auto applet_resource_user_id{rp.Pop<u64>()};
const auto controllers = ctx.ReadBuffer(0); const auto handles = ctx.ReadBuffer(0);
const auto vibrations = ctx.ReadBuffer(1); const auto vibrations = ctx.ReadBuffer(1);
std::vector<u32> controller_list(controllers.size() / sizeof(u32)); std::vector<Controller_NPad::DeviceHandle> vibration_device_handles(
std::vector<Controller_NPad::Vibration> vibration_list(vibrations.size() / handles.size() / sizeof(Controller_NPad::DeviceHandle));
sizeof(Controller_NPad::Vibration)); std::vector<Controller_NPad::VibrationValue> vibration_values(
vibrations.size() / sizeof(Controller_NPad::VibrationValue));
std::memcpy(controller_list.data(), controllers.data(), controllers.size()); std::memcpy(vibration_device_handles.data(), handles.data(), handles.size());
std::memcpy(vibration_list.data(), vibrations.data(), vibrations.size()); std::memcpy(vibration_values.data(), vibrations.data(), vibrations.size());
applet_resource->GetController<Controller_NPad>(HidController::NPad) applet_resource->GetController<Controller_NPad>(HidController::NPad)
.VibrateController(controller_list, vibration_list); .VibrateController(vibration_device_handles, vibration_values);
LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id); LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);