Techwizz/xboxdrv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added some handling of LIBUSB_TRANSFER_NO_DEVICE errors to USBController

Browse source 
Fixes #35
This commit is contained in:
Ingo Ruhnke 2015-10-24 12:45:21 +02:00
parent 8c422b7301
commit 0b168bfa30
1 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/usb_controller.cpp
View file

@ -218,10 +218,21 @@ USBController::on_control(libusb_transfer* transfer)
void
USBController::on_write_data(libusb_transfer* transfer)
{
if (transfer->status != LIBUSB_TRANSFER_COMPLETED)
if (transfer->status == LIBUSB_TRANSFER_COMPLETED)
{
if (transfer->status != LIBUSB_TRANSFER_CANCELLED)
log_error("USB write failure: " << transfer->length << ": " << usb_transfer_strerror(transfer->status));
// ok
}
else if (transfer->status == LIBUSB_TRANSFER_CANCELLED)
{
// ok
}
else if (transfer->status == LIBUSB_TRANSFER_NO_DEVICE)
{
send_disconnect();
}
else
{
log_error("USB write failure: " << transfer->length << ": " << usb_transfer_strerror(transfer->status));
}
m_transfers.erase(transfer);
@ -233,15 +244,7 @@ USBController::on_read_data(libusb_transfer* transfer)
{
assert(transfer);
if (transfer->status != LIBUSB_TRANSFER_COMPLETED)
{
if (transfer->status != LIBUSB_TRANSFER_CANCELLED)
log_error("USB read failure: " << transfer->length << ": " << usb_transfer_strerror(transfer->status));
m_transfers.erase(transfer);
libusb_free_transfer(transfer);
}
else
if (transfer->status == LIBUSB_TRANSFER_COMPLETED)
{
// process data
XboxGenericMsg msg;
@ -255,12 +258,27 @@ USBController::on_read_data(libusb_transfer* transfer)
if (ret != LIBUSB_SUCCESS) // could also check for LIBUSB_ERROR_NO_DEVICE
{
log_error("failed to resubmit USB transfer: " << usb_strerror(ret));
m_transfers.erase(transfer);
libusb_free_transfer(transfer);
send_disconnect();
}
}
else if (transfer->status == LIBUSB_TRANSFER_CANCELLED)
{
// ok
}
else if (transfer->status == LIBUSB_TRANSFER_NO_DEVICE)
{
m_transfers.erase(transfer);
libusb_free_transfer(transfer);
send_disconnect();
}
else
{
log_error("USB read failure: " << transfer->length << ": " << usb_transfer_strerror(transfer->status));
m_transfers.erase(transfer);
libusb_free_transfer(transfer);
}
}
void