prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix offbrand GCAdapter

Browse Source
This commit is contained in:
german
2020-09-30 21:30:37 -05:00
parent 4d0ae1a17a
commit 7ea82c2ade
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/input_common/gcadapter/gc_adapter.cpp
View File

@@ -123,11 +123,10 @@ void Adapter::Read() {
sizeof(adapter_payload), &payload_size, 16); sizeof(adapter_payload), &payload_size, 16);
if (payload_size != sizeof(adapter_payload) || adapter_payload[0] != LIBUSB_DT_HID) { if (payload_size != sizeof(adapter_payload) || adapter_payload[0] != LIBUSB_DT_HID) {
// This can occur for a few frames on initialization.
LOG_ERROR(Input, LOG_ERROR(Input,
"Error reading payload (size: {}, type: {:02x}) Is the adapter connected?", "Error reading payload (size: {}, type: {:02x}) Is the adapter connected?",
payload_size, adapter_payload[0]); payload_size, adapter_payload[0]);
adapter_thread_running = false; // error reading from adapter, stop reading.
break;
} }
for (std::size_t port = 0; port < pads.size(); ++port) { for (std::size_t port = 0; port < pads.size(); ++port) {
pads[port] = GetPadStatus(port, adapter_payload); pads[port] = GetPadStatus(port, adapter_payload);
@@ -218,6 +217,13 @@ bool Adapter::CheckDeviceAccess(libusb_device* device) {
} }
} }
// This fixes payload problems from offbrand GCAdapters
const int control_transfer_error =
libusb_control_transfer(usb_adapter_handle, 0x21, 11, 0x0001, 0, nullptr, 0, 1000);
if (control_transfer_error < 0) {
LOG_ERROR(Input, "libusb_control_transfer failed with error= {}", control_transfer_error);
}
if (kernel_driver_error && kernel_driver_error != LIBUSB_ERROR_NOT_SUPPORTED) { if (kernel_driver_error && kernel_driver_error != LIBUSB_ERROR_NOT_SUPPORTED) {
libusb_close(usb_adapter_handle); libusb_close(usb_adapter_handle);
usb_adapter_handle = nullptr; usb_adapter_handle = nullptr;