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

input: check for error from libusb_open and report as device invalid

This commit is contained in:
RadWolfie 2022-10-05 06:44:58 -05:00
parent 4dccf6d5b9
commit f17b7f7fa6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/input/LibusbDevice.cpp
View File

@ -185,9 +185,18 @@ namespace Libusb
if (m_Type == XBOX_INPUT_DEVICE::DEVICE_INVALID) { return; } if (m_Type == XBOX_INPUT_DEVICE::DEVICE_INVALID) { return; }
// Duke, S and SBC have 1 configuration, 1 interface and 2 endpoints (input and output) and use the default alternate setting zero. // check if we are able to open device through libusb
// The code below assumes that third-party controllers follow suit. if (int err = libusb_open(Dev, &m_hDev)) {
if (libusb_open(Dev, &m_hDev) == 0) { // Couldn't open device, create an error log report then don't use it.
EmuLog(LOG_LEVEL::ERROR2, "Unable to open original xbox device \"%s\" (%hX:%hX), libusb's error was: %s",
m_Name.c_str(), Desc->idVendor, Desc->idProduct, libusb_strerror(err));
m_Type = XBOX_INPUT_DEVICE::DEVICE_INVALID;
return;
}
// If we are able to open device, continue with query process.
else {
// Duke, S and SBC have 1 configuration, 1 interface and 2 endpoints (input and output) and use the default alternate setting zero.
// The code below assumes that third-party controllers follow suit.
libusb_config_descriptor *ConfDesc; libusb_config_descriptor *ConfDesc;
if (libusb_get_active_config_descriptor(Dev, &ConfDesc) == 0) { if (libusb_get_active_config_descriptor(Dev, &ConfDesc) == 0) {
if (ConfDesc->bNumInterfaces == 1) { if (ConfDesc->bNumInterfaces == 1) {