RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-31 12:31:45 +01:00
Code Issues Releases Wiki Activity

Put DS3/DS4 instructions to Wiki instead

Browse Source
This commit is contained in:
msuih 2019-05-02 11:20:34 +03:00 committed by Ivan
parent 6b7cd458e3
commit bc42719c48
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpcs3/ds3_pad_handler.cpp
View File

@ -135,20 +135,19 @@ bool ds3_pad_handler::Init()
if (warn_about_drivers) if (warn_about_drivers)
{ {
#ifdef _WIN32
LOG_ERROR(HLE, "[DS3] One or more DS3 pads were detected but couldn't be handled because of drivers");
LOG_ERROR(HLE, "[DS3] We recommend you use Zadig( https://zadig.akeo.ie/ ) to change your ds3 drivers to WinUSB ones");
#else
LOG_ERROR(HLE, "[DS3] One or more DS3 pads were detected but couldn't be interacted with directly"); LOG_ERROR(HLE, "[DS3] One or more DS3 pads were detected but couldn't be interacted with directly");
#ifdef __linux__ #if defined(_WIN32) || defined(__linux__)
LOG_ERROR(HLE, "[DS3] On linux you can try to add those udev rules:\n# DS3 Bluetooth\nKERNEL==\"hidraw*\", KERNELS==\"*054C:0268*\", MODE=\"0666\"\n\n# DS3 USB\nKERNEL==\"hidraw*\", ATTRS{idVendor}==\"054c\", ATTRS{idProduct}==\"0268\", MODE=\"0666\""); LOG_ERROR(HLE, "[DS3] Check https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration for intructions on how to solve this issue");
#endif
#endif #endif
} }
else if (controllers.size() == 0) else if (controllers.size() == 0)
{
LOG_WARNING(HLE, "[DS3] No controllers found!"); LOG_WARNING(HLE, "[DS3] No controllers found!");
}
else else
{
LOG_SUCCESS(HLE, "[DS3] Controllers found: %d", controllers.size()); LOG_SUCCESS(HLE, "[DS3] Controllers found: %d", controllers.size());
}
is_init = true; is_init = true;
return true; return true;

19
rpcs3/ds4_pad_handler.cpp
View File

@ -745,6 +745,7 @@ bool ds4_pad_handler::Init()
fmt::throw_exception("hidapi-init error.threadproc"); fmt::throw_exception("hidapi-init error.threadproc");
// get all the possible controllers at start // get all the possible controllers at start
bool warn_about_drivers = false;
for (auto pid : ds4Pids) for (auto pid : ds4Pids)
{ {
hid_device_info* devInfo = hid_enumerate(DS4_VID, pid); hid_device_info* devInfo = hid_enumerate(DS4_VID, pid);
@ -756,18 +757,34 @@ bool ds4_pad_handler::Init()
hid_device* dev = hid_open_path(devInfo->path); hid_device* dev = hid_open_path(devInfo->path);
if (dev) if (dev)
{
CheckAddDevice(dev, devInfo); CheckAddDevice(dev, devInfo);
}
else else
{
LOG_ERROR(HLE, "[DS4] hid_open_path failed! Reason: %s", hid_error(dev)); LOG_ERROR(HLE, "[DS4] hid_open_path failed! Reason: %s", hid_error(dev));
warn_about_drivers = true;
}
devInfo = devInfo->next; devInfo = devInfo->next;
} }
hid_free_enumeration(head); hid_free_enumeration(head);
} }
if (controllers.size() == 0) if (warn_about_drivers)
{
LOG_ERROR(HLE, "[DS4] One or more DS4 pads were detected but couldn't be interacted with directly");
#if defined(_WIN32) || defined(__linux__)
LOG_ERROR(HLE, "[DS4] Check https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration for intructions on how to solve this issue");
#endif
}
else if (controllers.size() == 0)
{
LOG_WARNING(HLE, "[DS4] No controllers found!"); LOG_WARNING(HLE, "[DS4] No controllers found!");
}
else else
{
LOG_SUCCESS(HLE, "[DS4] Controllers found: %d", controllers.size()); LOG_SUCCESS(HLE, "[DS4] Controllers found: %d", controllers.size());
}
is_init = true; is_init = true;
return true; return true;