|
@@ -172,13 +172,11 @@ class UsbCcidTransceiver(
|
|
|
* if things really turn sour.
|
|
* if things really turn sour.
|
|
|
*/
|
|
*/
|
|
|
var attempts = 3
|
|
var attempts = 3
|
|
|
- Log.d(TAG, "Receive data block immediate seq=$expectedSequenceNumber")
|
|
|
|
|
var readBytes: Int
|
|
var readBytes: Int
|
|
|
do {
|
|
do {
|
|
|
readBytes = usbConnection.bulkTransfer(
|
|
readBytes = usbConnection.bulkTransfer(
|
|
|
usbBulkIn, inputBuffer, inputBuffer.size, DEVICE_COMMUNICATE_TIMEOUT_MILLIS
|
|
usbBulkIn, inputBuffer, inputBuffer.size, DEVICE_COMMUNICATE_TIMEOUT_MILLIS
|
|
|
)
|
|
)
|
|
|
- Log.d(TAG, "Received " + readBytes + " bytes: " + inputBuffer.encodeHex())
|
|
|
|
|
} while (readBytes <= 0 && attempts-- > 0)
|
|
} while (readBytes <= 0 && attempts-- > 0)
|
|
|
if (readBytes < CCID_HEADER_LENGTH) {
|
|
if (readBytes < CCID_HEADER_LENGTH) {
|
|
|
throw UsbTransportException("USB-CCID error - failed to receive CCID header")
|
|
throw UsbTransportException("USB-CCID error - failed to receive CCID header")
|
|
@@ -230,9 +228,6 @@ class UsbCcidTransceiver(
|
|
|
ignoredBytes = usbConnection.bulkTransfer(
|
|
ignoredBytes = usbConnection.bulkTransfer(
|
|
|
usbBulkIn, inputBuffer, inputBuffer.size, DEVICE_SKIP_TIMEOUT_MILLIS
|
|
usbBulkIn, inputBuffer, inputBuffer.size, DEVICE_SKIP_TIMEOUT_MILLIS
|
|
|
)
|
|
)
|
|
|
- if (ignoredBytes > 0) {
|
|
|
|
|
- Log.e(TAG, "Skipped $ignoredBytes bytes")
|
|
|
|
|
- }
|
|
|
|
|
} while (ignoredBytes > 0)
|
|
} while (ignoredBytes > 0)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -279,7 +274,6 @@ class UsbCcidTransceiver(
|
|
|
}
|
|
}
|
|
|
val ccidDataBlock = receiveDataBlock(sequenceNumber)
|
|
val ccidDataBlock = receiveDataBlock(sequenceNumber)
|
|
|
val elapsedTime = SystemClock.elapsedRealtime() - startTime
|
|
val elapsedTime = SystemClock.elapsedRealtime() - startTime
|
|
|
- Log.d(TAG, "USB XferBlock call took " + elapsedTime + "ms")
|
|
|
|
|
return ccidDataBlock
|
|
return ccidDataBlock
|
|
|
}
|
|
}
|
|
|
|
|
|