From 25a66da4ca3689a6673ac6c5f30bb8325c214d4c Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 8 Feb 2021 22:57:07 +0100 Subject: [PATCH] Input: rename some functions --- rpcs3/Input/ds4_pad_handler.cpp | 8 ++++---- rpcs3/Input/ds4_pad_handler.h | 2 +- rpcs3/Input/dualsense_pad_handler.cpp | 6 +++--- rpcs3/Input/dualsense_pad_handler.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rpcs3/Input/ds4_pad_handler.cpp b/rpcs3/Input/ds4_pad_handler.cpp index d017d54940..6693e90a86 100644 --- a/rpcs3/Input/ds4_pad_handler.cpp +++ b/rpcs3/Input/ds4_pad_handler.cpp @@ -238,7 +238,7 @@ void ds4_pad_handler::SetPadData(const std::string& padId, u32 largeMotor, u32 s } // Start/Stop the engines :) - SendVibrateData(device); + send_output_report(device); } std::shared_ptr ds4_pad_handler::GetDS4Device(const std::string& padId) @@ -590,7 +590,7 @@ ds4_pad_handler::~ds4_pad_handler() controller.second->largeVibrate = 0; controller.second->led_delay_on = 0; controller.second->led_delay_off = 0; - SendVibrateData(controller.second); + send_output_report(controller.second); hid_close(controller.second->hidDevice); } @@ -601,7 +601,7 @@ ds4_pad_handler::~ds4_pad_handler() } } -int ds4_pad_handler::SendVibrateData(const std::shared_ptr& device) +int ds4_pad_handler::send_output_report(const std::shared_ptr& device) { if (!device) return -2; @@ -1004,7 +1004,7 @@ void ds4_pad_handler::apply_pad_data(const std::shared_ptr& device, c ds4_dev->largeVibrate = speed_large; ds4_dev->smallVibrate = speed_small; - if (ds4_dev->newVibrateData && SendVibrateData(ds4_dev) >= 0) + if (ds4_dev->newVibrateData && send_output_report(ds4_dev) >= 0) { ds4_dev->newVibrateData = false; } diff --git a/rpcs3/Input/ds4_pad_handler.h b/rpcs3/Input/ds4_pad_handler.h index 4bb6ecfb2b..ce479c974b 100644 --- a/rpcs3/Input/ds4_pad_handler.h +++ b/rpcs3/Input/ds4_pad_handler.h @@ -125,7 +125,7 @@ private: // This function gets us usuable buffer from the rawbuffer of padData bool GetCalibrationData(const std::shared_ptr& ds4Device); void CheckAddDevice(hid_device* hidDevice, hid_device_info* hidDevInfo); - int SendVibrateData(const std::shared_ptr& device); + int send_output_report(const std::shared_ptr& device); inline s16 ApplyCalibration(s32 rawValue, const DS4CalibData& calibData) { const s32 biased = rawValue - calibData.bias; diff --git a/rpcs3/Input/dualsense_pad_handler.cpp b/rpcs3/Input/dualsense_pad_handler.cpp index 9628de71b6..a30c47f290 100644 --- a/rpcs3/Input/dualsense_pad_handler.cpp +++ b/rpcs3/Input/dualsense_pad_handler.cpp @@ -847,7 +847,7 @@ dualsense_pad_handler::~dualsense_pad_handler() // Disable vibration controller.second->smallVibrate = 0; controller.second->largeVibrate = 0; - SendVibrateData(controller.second); + send_output_report(controller.second); hid_close(controller.second->hidDevice); } @@ -858,7 +858,7 @@ dualsense_pad_handler::~dualsense_pad_handler() } } -int dualsense_pad_handler::SendVibrateData(const std::shared_ptr& device) +int dualsense_pad_handler::send_output_report(const std::shared_ptr& device) { if (!device) return -2; @@ -923,7 +923,7 @@ void dualsense_pad_handler::apply_pad_data(const std::shared_ptr& dev if (dualsense_dev->newVibrateData) { - if (SendVibrateData(dualsense_dev) >= 0) + if (send_output_report(dualsense_dev) >= 0) { dualsense_dev->newVibrateData = false; } diff --git a/rpcs3/Input/dualsense_pad_handler.h b/rpcs3/Input/dualsense_pad_handler.h index 7f07d55080..ac0f0a858b 100644 --- a/rpcs3/Input/dualsense_pad_handler.h +++ b/rpcs3/Input/dualsense_pad_handler.h @@ -132,7 +132,7 @@ private: } void CheckAddDevice(hid_device* hidDevice, hid_device_info* hidDevInfo); - int SendVibrateData(const std::shared_ptr& device); + int send_output_report(const std::shared_ptr& device); std::shared_ptr get_device(const std::string& device) override; bool get_is_left_trigger(u64 keyCode) override; bool get_is_right_trigger(u64 keyCode) override;