mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

ds4: Add workarounds for some 3rd party controllers

Browse Source
This commit is contained in:
kd-11 2019-11-27 13:39:38 +03:00 committed by kd-11
parent 2eaaf5b132
commit 6ae8fd0d34
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpcs3/ds4_pad_handler.cpp
View File

@ -407,7 +407,7 @@ bool ds4_pad_handler::GetCalibrationData(const std::shared_ptr<DS4Device>& ds4De
ds4Dev->calibData[DS4CalibIndex::ROLL].bias = GetS16LEData(&buf[5]); ds4Dev->calibData[DS4CalibIndex::ROLL].bias = GetS16LEData(&buf[5]);
s16 pitchPlus, pitchNeg, rollPlus, rollNeg, yawPlus, yawNeg; s16 pitchPlus, pitchNeg, rollPlus, rollNeg, yawPlus, yawNeg;
if (ds4Dev->btCon) if (ds4Dev->btCon || ds4Dev->unAuthentic)
{ {
pitchPlus = GetS16LEData(&buf[7]); pitchPlus = GetS16LEData(&buf[7]);
yawPlus = GetS16LEData(&buf[9]); yawPlus = GetS16LEData(&buf[9]);
@ -479,8 +479,20 @@ void ds4_pad_handler::CheckAddDevice(hid_device* hidDevice, hid_device_info* hid
// Let's try getting 0x81 feature report, which should will return mac address on wired, and should error on bluetooth // Let's try getting 0x81 feature report, which should will return mac address on wired, and should error on bluetooth
std::array<u8, 64> buf{}; std::array<u8, 64> buf{};
buf[0] = 0x81; buf[0] = 0x81;
if (hid_get_feature_report(hidDevice, buf.data(), DS4_FEATURE_REPORT_0x81_SIZE) > 0) if (const auto length = hid_get_feature_report(hidDevice, buf.data(), DS4_FEATURE_REPORT_0x81_SIZE); length > 0)
{ {
if (length != DS4_FEATURE_REPORT_0x81_SIZE)
{
// Controller may not be genuine. These controllers do not have feature 0x81 implemented and calibration data is in bluetooth format even in USB mode!
ds4Dev->unAuthentic = true;
LOG_WARNING(HLE, "DS4 controller may not be genuine. Workaround enabled.");
// Read feature report 0x12 instead which is what the console uses.
buf[0] = 0x12;
buf[1] = 0;
hid_get_feature_report(hidDevice, buf.data(), 16);
}
serial = fmt::format("%x%x%x%x%x%x", buf[6], buf[5], buf[4], buf[3], buf[2], buf[1]); serial = fmt::format("%x%x%x%x%x%x", buf[6], buf[5], buf[4], buf[3], buf[2], buf[1]);
} }
else else

1
rpcs3/ds4_pad_handler.h
View File

@ -81,6 +81,7 @@ class ds4_pad_handler final : public PadHandlerBase
std::string path{ "" }; std::string path{ "" };
bool btCon{ false }; bool btCon{ false };
bool hasCalibData{ false }; bool hasCalibData{ false };
bool unAuthentic{ false };
std::array<DS4CalibData, DS4CalibIndex::COUNT> calibData{}; std::array<DS4CalibData, DS4CalibIndex::COUNT> calibData{};
bool newVibrateData{ true }; bool newVibrateData{ true };
u8 largeVibrate{ 0 }; u8 largeVibrate{ 0 };