From d78985bd724f65d72b686d6ebcfdaa22c7f3f88d Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 2 Jul 2024 21:23:32 -0400 Subject: [PATCH] Revert "UsbCcidTransceiver: Stop spamming logs" This reverts commit c7afeea8452c6da6535761be7fd10d14b3a88f3c. --- .../java/im/angry/openeuicc/core/usb/UsbCcidTransceiver.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app-common/src/main/java/im/angry/openeuicc/core/usb/UsbCcidTransceiver.kt b/app-common/src/main/java/im/angry/openeuicc/core/usb/UsbCcidTransceiver.kt index 85d9e94..09d324b 100644 --- a/app-common/src/main/java/im/angry/openeuicc/core/usb/UsbCcidTransceiver.kt +++ b/app-common/src/main/java/im/angry/openeuicc/core/usb/UsbCcidTransceiver.kt @@ -172,11 +172,13 @@ class UsbCcidTransceiver( * if things really turn sour. */ var attempts = 3 + Log.d(TAG, "Receive data block immediate seq=$expectedSequenceNumber") var readBytes: Int do { readBytes = usbConnection.bulkTransfer( usbBulkIn, inputBuffer, inputBuffer.size, DEVICE_COMMUNICATE_TIMEOUT_MILLIS ) + Log.d(TAG, "Received " + readBytes + " bytes: " + inputBuffer.encodeHex()) } while (readBytes <= 0 && attempts-- > 0) if (readBytes < CCID_HEADER_LENGTH) { throw UsbTransportException("USB-CCID error - failed to receive CCID header") @@ -228,6 +230,9 @@ class UsbCcidTransceiver( ignoredBytes = usbConnection.bulkTransfer( usbBulkIn, inputBuffer, inputBuffer.size, DEVICE_SKIP_TIMEOUT_MILLIS ) + if (ignoredBytes > 0) { + Log.e(TAG, "Skipped $ignoredBytes bytes") + } } while (ignoredBytes > 0) } @@ -274,6 +279,7 @@ class UsbCcidTransceiver( } val ccidDataBlock = receiveDataBlock(sequenceNumber) val elapsedTime = SystemClock.elapsedRealtime() - startTime + Log.d(TAG, "USB XferBlock call took " + elapsedTime + "ms") return ccidDataBlock }