Nikilite/suyu
1
1
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Reset adapter state on init, fixes errors relating driver hang from unexpected unplug

Browse source
This commit is contained in:
Ameer 2020-07-01 12:52:50 -04:00
parent a76e11e7f0
commit 34a590e509
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/input_common/gcadapter/gc_adapter.cpp
View file

@ -97,6 +97,7 @@ void Adapter::Read() {
libusb_interrupt_transfer(usb_adapter_handle, input_endpoint, adapter_payload.data(), libusb_interrupt_transfer(usb_adapter_handle, input_endpoint, adapter_payload.data(),
sizeof(adapter_payload), &payload_size_in, 16); sizeof(adapter_payload), &payload_size_in, 16);
payload_size_copy = 0; payload_size_copy = 0;
// this mutex might be redundant?
{ {
std::lock_guard<std::mutex> lk(s_mutex); std::lock_guard<std::mutex> lk(s_mutex);
std::copy(std::begin(adapter_payload), std::end(adapter_payload), std::copy(std::begin(adapter_payload), std::end(adapter_payload),
@ -265,10 +266,17 @@ void Adapter::GetGCEndpoint(libusb_device* device) {
const libusb_endpoint_descriptor* endpoint = &interface->endpoint[e]; const libusb_endpoint_descriptor* endpoint = &interface->endpoint[e];
if (endpoint->bEndpointAddress & LIBUSB_ENDPOINT_IN) { if (endpoint->bEndpointAddress & LIBUSB_ENDPOINT_IN) {
input_endpoint = endpoint->bEndpointAddress; input_endpoint = endpoint->bEndpointAddress;
} else {
output_endpoint = endpoint->bEndpointAddress;
} }
} }
} }
} }
// This transfer seems to be responsible for clearing the state of the adapter
// Used to clear the "busy" state of when the device is unexpectedly unplugged
unsigned char clear_payload = 0x13;
libusb_interrupt_transfer(usb_adapter_handle, output_endpoint, &clear_payload,
sizeof(clear_payload), nullptr, 16);
adapter_thread_running = true; adapter_thread_running = true;
current_status = ADAPTER_DETECTED; current_status = ADAPTER_DETECTED;

1
src/input_common/gcadapter/gc_adapter.h
View file

@ -152,6 +152,7 @@ private:
libusb_context* libusb_ctx; libusb_context* libusb_ctx;
u8 input_endpoint = 0; u8 input_endpoint = 0;
u8 output_endpoint = 0;
bool configuring = false; bool configuring = false;