From 389e9b14e4ded34424311b2071cfa687558773b7 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Sun, 17 Mar 2019 14:55:58 +0000 Subject: [PATCH] usbboot: Add more logging Change-type: patch Signed-off-by: Juan Cruz Viotti --- lib/sdk/adapters/usbboot/index.js | 2 ++ lib/sdk/adapters/usbboot/protocol.js | 6 ++++++ lib/sdk/adapters/usbboot/usb.js | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/lib/sdk/adapters/usbboot/index.js b/lib/sdk/adapters/usbboot/index.js index 60052d1d..f41ed0c5 100644 --- a/lib/sdk/adapters/usbboot/index.js +++ b/lib/sdk/adapters/usbboot/index.js @@ -419,6 +419,7 @@ class USBBootAdapter extends EventEmitter { const endpoint = deviceInterface.endpoint(addresses.endpoint) if (serialNumberIndex === USB_DESCRIPTOR_NULL_INDEX) { + debug('Writing boot code') return this.queryBlobFromCache(USBBOOT_BOOTCODE_FILE_NAME).then((bootcode) => { return USBBootAdapter.writeBootCode(device, endpoint, bootcode) }) @@ -441,6 +442,7 @@ class USBBootAdapter extends EventEmitter { setProgress((step * (PERCENTAGE_TOTAL - PERCENTAGE_START) / STEPS_TOTAL) + PERCENTAGE_START) } }).tap(() => { + debug('File server started') setProgress(utils.PERCENTAGE_MAXIMUM) }) }).return(device).catch({ diff --git a/lib/sdk/adapters/usbboot/protocol.js b/lib/sdk/adapters/usbboot/protocol.js index 12b8fdaa..9452e029 100644 --- a/lib/sdk/adapters/usbboot/protocol.js +++ b/lib/sdk/adapters/usbboot/protocol.js @@ -232,16 +232,22 @@ const chunks = function *(buffer, size) { * }) */ exports.write = (device, endpoint, buffer) => { + console.log(`SEND BUFFER SIZE: ${buffer.length}`) return exports.sendBufferSize(device, buffer.length) + .then(() => { + console.log(`BUFFER SIZE SENT: ${buffer.length}`) + }) // We get LIBUSB_TRANSFER_STALL sometimes // in future bulk transfers without this .delay(USB_REQUEST_DELAY_MS) .then(() => { + console.log(`SENDING CHUNKS: ${buffer.length} (max ${ONE_MEGABYTE})`) endpoint.timeout = USB_BULK_TRANSFER_TIMEOUT_MS return Bluebird.each(chunks(buffer, ONE_MEGABYTE), (chunk) => { return Bluebird.fromCallback((callback) => { + console.log(`SENDING CHUNK: ${chunk.length}`) endpoint.transfer(chunk, callback) }) }) diff --git a/lib/sdk/adapters/usbboot/usb.js b/lib/sdk/adapters/usbboot/usb.js index df5460d9..fb994a6c 100644 --- a/lib/sdk/adapters/usbboot/usb.js +++ b/lib/sdk/adapters/usbboot/usb.js @@ -74,6 +74,11 @@ exports.listDevices = () => { return device }) + console.log(devices.map((device) => { + const descriptor = device.deviceDescriptor + return `${descriptor.idVendor.toString(16)}:${descriptor.idProduct.toString(16)}` + })) + // Include driverless devices into the list of USB devices. if (process.platform === 'win32') { // NOTE: Temporarily ignore errors when loading winusb-driver-generator,