RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 22:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve pad support (#8800)

Browse source 
* Add support for another DS3 HID Report ID for Win7
* Add support for reading accel/gyro pad data over SCP
This commit is contained in:
SEt 2020-09-16 23:36:06 +03:00 • committed by GitHub
parent 4c70864588
commit 9a6aac1662
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rpcs3/Input/ds3_pad_handler.cpp
View file

@ -96,7 +96,17 @@ bool ds3_pad_handler::Init()
#ifdef _WIN32
u8 buf[0xFF];
buf[0] = 0xF2;
if (handle && (hid_get_feature_report(handle, buf, 0xFF) >= 0))
bool got_report = false;
if (handle)
{
got_report = hid_get_feature_report(handle, buf, 0xFF) >= 0;
if (!got_report)
{
buf[0] = 0;
got_report = hid_get_feature_report(handle, buf, 0xFF) >= 0;
}
}
if (got_report)
#else
if(handle)
#endif
@ -104,6 +114,9 @@ bool ds3_pad_handler::Init()
std::shared_ptr<ds3_device> ds3dev = std::make_shared<ds3_device>();
ds3dev->device = hid_info->path;
ds3dev->handle = handle;
#ifdef _WIN32
ds3dev->report_id = buf[0];
#endif
controllers.emplace_back(ds3dev);
}
else
@ -286,7 +299,7 @@ ds3_pad_handler::DS3Status ds3_pad_handler::get_data(const std::shared_ptr<ds3_d
auto& dbuf = ds3dev->buf;
#ifdef _WIN32
dbuf[0] = 0xF2;
dbuf[0] = ds3dev->report_id;
int result = hid_get_feature_report(ds3dev->handle, dbuf, sizeof(dbuf));
#else
int result = hid_read(ds3dev->handle, dbuf, sizeof(dbuf));
@ -295,7 +308,7 @@ ds3_pad_handler::DS3Status ds3_pad_handler::get_data(const std::shared_ptr<ds3_d
if (result > 0)
{
#ifdef _WIN32
if(dbuf[0] == 0xF2)
if (dbuf[0] == ds3dev->report_id)
#else
if (dbuf[0] == 0x01 && dbuf[1] != 0xFF)
#endif