PeterCxy/OpenEUICC
9
10
Fork 10
Code Issues 15 Pull requests Actions Projects Releases 6 Wiki Activity

Revert "UsbCcidTransceiver: Stop spamming logs"
All checks were successful
/ build-debug (push) Successful in 5m29s
Details

Browse source 
This reverts commit c7afeea845.
This commit is contained in:
Peter Cai 2024-07-02 21:23:32 -04:00
parent 9c7cf2c797
commit d78985bd72
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app-common/src/main/java/im/angry/openeuicc/core/usb/UsbCcidTransceiver.kt
View file

@ -172,11 +172,13 @@ 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")
@ -228,6 +230,9 @@ 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)
} }
@ -274,6 +279,7 @@ 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
} }