flywithu/usb-serial-for-android
1
0
Fork 0
mirror of https://github.com/mik3y/usb-serial-for-android.git synced 2026-08-14 18:03:08 +00:00
Code Issues Releases Wiki Activity

simplify write timeout handling

Browse Source
This commit is contained in:
kai-morich
2021-02-08 22:28:46 +01:00
parent f60414f8ec
commit 4ffcc8d0fb
4 changed files with 120 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/CommonUsbSerialPort.java
+9 -12
View File
@@ -205,15 +205,15 @@ public abstract class CommonUsbSerialPort implements UsbSerialPort {
@Override
public void write(final byte[] src, final int timeout) throws IOException {
int offset = 0;
int requestTimeout = timeout;
final long endTime = (timeout == 0) ? 0 : (System.currentTimeMillis() + timeout);
if(mConnection == null) {
throw new IOException("Connection closed");
}
while (offset < src.length) {
final int requestTimeout;
final int requestLength;
final int actualLength;
final int requestDuration;
synchronized (mWriteBufferLock) {
final byte[] writeBuffer;
@@ -226,24 +226,21 @@ public abstract class CommonUsbSerialPort implements UsbSerialPort {
System.arraycopy(src, offset, mWriteBuffer, 0, requestLength);
writeBuffer = mWriteBuffer;
}
if (timeout == 0 || offset == 0) {
requestTimeout = timeout;
} else {
requestTimeout = (int)(endTime - System.currentTimeMillis());
}
if (requestTimeout < 0) {
actualLength = -2;
requestDuration = 0;
} else {
final long startTime = System.currentTimeMillis();
actualLength = mConnection.bulkTransfer(mWriteEndpoint, writeBuffer, requestLength, requestTimeout);
requestDuration = (int) (System.currentTimeMillis() - startTime);
}
}
Log.d(TAG, "Wrote " + actualLength + "/" + requestLength + " offset " + offset + "/" + src.length + " timeout " + requestTimeout);
if (requestTimeout > 0) {
requestTimeout -= requestDuration;
if (requestTimeout == 0)
requestTimeout = -1;
}
if (actualLength <= 0) {
if(requestTimeout < 0) {
SerialTimeoutException ex = new SerialTimeoutException("Error writing " + requestLength + " bytes at offset " + offset + " of total " + src.length);
if (timeout != 0 && System.currentTimeMillis() >= endTime) {
SerialTimeoutException ex = new SerialTimeoutException("Error writing " + requestLength + " bytes at offset " + offset + " of total " + src.length + ", rc=" + actualLength);
ex.bytesTransferred = offset;
throw ex;
} else {