ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input: rename some functions

This commit is contained in:
Megamouse 2021-02-08 22:57:07 +01:00
parent ff61bc9e7c
commit 25a66da4ca
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Input/ds4_pad_handler.cpp
View File

@ -238,7 +238,7 @@ void ds4_pad_handler::SetPadData(const std::string& padId, u32 largeMotor, u32 s
} }
// Start/Stop the engines :) // Start/Stop the engines :)
SendVibrateData(device); send_output_report(device);
} }
std::shared_ptr<ds4_pad_handler::DS4Device> ds4_pad_handler::GetDS4Device(const std::string& padId) std::shared_ptr<ds4_pad_handler::DS4Device> ds4_pad_handler::GetDS4Device(const std::string& padId)
@ -590,7 +590,7 @@ ds4_pad_handler::~ds4_pad_handler()
controller.second->largeVibrate = 0; controller.second->largeVibrate = 0;
controller.second->led_delay_on = 0; controller.second->led_delay_on = 0;
controller.second->led_delay_off = 0; controller.second->led_delay_off = 0;
SendVibrateData(controller.second); send_output_report(controller.second);
hid_close(controller.second->hidDevice); hid_close(controller.second->hidDevice);
} }
@ -601,7 +601,7 @@ ds4_pad_handler::~ds4_pad_handler()
} }
} }
int ds4_pad_handler::SendVibrateData(const std::shared_ptr<DS4Device>& device) int ds4_pad_handler::send_output_report(const std::shared_ptr<DS4Device>& device)
{ {
if (!device) if (!device)
return -2; return -2;
@ -1004,7 +1004,7 @@ void ds4_pad_handler::apply_pad_data(const std::shared_ptr<PadDevice>& device, c
ds4_dev->largeVibrate = speed_large; ds4_dev->largeVibrate = speed_large;
ds4_dev->smallVibrate = speed_small; 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; ds4_dev->newVibrateData = false;
} }

2
rpcs3/Input/ds4_pad_handler.h
View File

@ -125,7 +125,7 @@ private:
// This function gets us usuable buffer from the rawbuffer of padData // This function gets us usuable buffer from the rawbuffer of padData
bool GetCalibrationData(const std::shared_ptr<DS4Device>& ds4Device); bool GetCalibrationData(const std::shared_ptr<DS4Device>& ds4Device);
void CheckAddDevice(hid_device* hidDevice, hid_device_info* hidDevInfo); void CheckAddDevice(hid_device* hidDevice, hid_device_info* hidDevInfo);
int SendVibrateData(const std::shared_ptr<DS4Device>& device); int send_output_report(const std::shared_ptr<DS4Device>& device);
inline s16 ApplyCalibration(s32 rawValue, const DS4CalibData& calibData) inline s16 ApplyCalibration(s32 rawValue, const DS4CalibData& calibData)
{ {
const s32 biased = rawValue - calibData.bias; const s32 biased = rawValue - calibData.bias;

6
rpcs3/Input/dualsense_pad_handler.cpp
View File

@ -847,7 +847,7 @@ dualsense_pad_handler::~dualsense_pad_handler()
// Disable vibration // Disable vibration
controller.second->smallVibrate = 0; controller.second->smallVibrate = 0;
controller.second->largeVibrate = 0; controller.second->largeVibrate = 0;
SendVibrateData(controller.second); send_output_report(controller.second);
hid_close(controller.second->hidDevice); hid_close(controller.second->hidDevice);
} }
@ -858,7 +858,7 @@ dualsense_pad_handler::~dualsense_pad_handler()
} }
} }
int dualsense_pad_handler::SendVibrateData(const std::shared_ptr<DualSenseDevice>& device) int dualsense_pad_handler::send_output_report(const std::shared_ptr<DualSenseDevice>& device)
{ {
if (!device) if (!device)
return -2; return -2;
@ -923,7 +923,7 @@ void dualsense_pad_handler::apply_pad_data(const std::shared_ptr<PadDevice>& dev
if (dualsense_dev->newVibrateData) if (dualsense_dev->newVibrateData)
{ {
if (SendVibrateData(dualsense_dev) >= 0) if (send_output_report(dualsense_dev) >= 0)
{ {
dualsense_dev->newVibrateData = false; dualsense_dev->newVibrateData = false;
} }

2
rpcs3/Input/dualsense_pad_handler.h
View File

@ -132,7 +132,7 @@ private:
} }
void CheckAddDevice(hid_device* hidDevice, hid_device_info* hidDevInfo); void CheckAddDevice(hid_device* hidDevice, hid_device_info* hidDevInfo);
int SendVibrateData(const std::shared_ptr<DualSenseDevice>& device); int send_output_report(const std::shared_ptr<DualSenseDevice>& device);
std::shared_ptr<PadDevice> get_device(const std::string& device) override; std::shared_ptr<PadDevice> get_device(const std::string& device) override;
bool get_is_left_trigger(u64 keyCode) override; bool get_is_left_trigger(u64 keyCode) override;
bool get_is_right_trigger(u64 keyCode) override; bool get_is_right_trigger(u64 keyCode) override;