diff options
| author | Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au> | 2014-05-31 12:05:02 +1000 |
|---|---|---|
| committer | Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au> | 2014-05-31 12:09:33 +1000 |
| commit | 7d6ddcd5d54e30e7437f0ba1aa4676224e68bf6a (patch) | |
| tree | e93979d3945f78d07ae357ea97a2ad7ac2c2f045 /heimdall/source/BridgeManager.cpp | |
| parent | 7e29d7ef9acb2378d5ec10dc44b1525c52432fbc (diff) | |
| download | external_heimdall-7d6ddcd5d54e30e7437f0ba1aa4676224e68bf6a.zip external_heimdall-7d6ddcd5d54e30e7437f0ba1aa4676224e68bf6a.tar.gz external_heimdall-7d6ddcd5d54e30e7437f0ba1aa4676224e68bf6a.tar.bz2 | |
Give devices some leeway to handle empty bulk transfers.
Diffstat (limited to 'heimdall/source/BridgeManager.cpp')
| -rw-r--r-- | heimdall/source/BridgeManager.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/heimdall/source/BridgeManager.cpp b/heimdall/source/BridgeManager.cpp index a2cba80..96c22fb 100644 --- a/heimdall/source/BridgeManager.cpp +++ b/heimdall/source/BridgeManager.cpp @@ -624,12 +624,12 @@ bool BridgeManager::EndSession(bool reboot) const return (true); } -bool BridgeManager::SendBulkTransfer(unsigned char *data, int length, int timeout) const +bool BridgeManager::SendBulkTransfer(unsigned char *data, int length, int timeout, bool retry) const { int dataTransferred; int result = libusb_bulk_transfer(deviceHandle, outEndpoint, data, length, &dataTransferred, timeout); - if (result != LIBUSB_SUCCESS) + if (result != LIBUSB_SUCCESS && retry) { static const int retryDelay = 250; @@ -667,8 +667,10 @@ bool BridgeManager::SendPacket(OutboundPacket *packet, int timeout, int sendEmpt if (sendEmptyTransferFlags & kSendEmptyTransferBefore) { - if (!SendBulkTransfer(nullptr, 0, timeout)) - return (false); + if (!SendBulkTransfer(nullptr, 0, kDefaultTimeoutSendEmptyTransfer, false) && verbose) + { + Interface::PrintWarning("Empty bulk transfer before sending packet failed. Continuing anyway...\n"); + } } if (!SendBulkTransfer(packet->GetData(), packet->GetSize(), timeout)) @@ -676,8 +678,10 @@ bool BridgeManager::SendPacket(OutboundPacket *packet, int timeout, int sendEmpt if (sendEmptyTransferFlags & kSendEmptyTransferAfter) { - if (!SendBulkTransfer(nullptr, 0, timeout)) - return (false); + if (!SendBulkTransfer(nullptr, 0, kDefaultTimeoutSendEmptyTransfer, false) && verbose) + { + Interface::PrintWarning("Empty bulk transfer after sending packet failed. Continuing anyway...\n"); + } } return (true); |