jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-24 07:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(sdk): add bus number, device address, and ids in usb devices (#1802)

Browse Source 
The combination of bus number and device address is the only way to
uniquely identify a USB device, so we'll use that for the `device` and
`raw` properties.

Also, we store the USB vendor and product IDs as properties of the
drives, since they will be handy when implementing the prepare function.

Change-Type: patch
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
This commit is contained in:
Juan Cruz Viotti 2017-10-24 14:32:33 -04:00 committed by GitHub
parent acb4271833
commit 5bf6633cbe
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/shared/sdk/usbboot/index.js
View File

@ -361,25 +361,24 @@ exports.scan = (options) => {
return usb.listDevices().filter(isUsbBootCapableUSBDevice).map((device) => {
/* eslint-enable lodash/prefer-lodash-method */
const idPair = _.join([
usbIdToString(device.deviceDescriptor.idVendor),
usbIdToString(device.deviceDescriptor.idProduct)
], ':')
// This is the only way we can unique identify devices
device.device = `${device.busNumber}:${device.deviceAddress}`
device.device = idPair
device.displayName = 'Initializing device'
device.description = 'Compute Module'
device.raw = idPair
device.raw = device.device
device.size = null
device.mountpoints = []
device.protected = false
device.system = false
device.disabled = true
device.icon = 'loading'
device.vendor = usbIdToString(device.deviceDescriptor.idVendor)
device.product = usbIdToString(device.deviceDescriptor.idProduct)
device.adaptor = exports.name
// We need to open the device in order to access _configDescriptor
debug(`Opening device: ${device.displayName}`)
debug(`Opening device: ${device.device} (${device.vendor}:${device.product})`)
device.open()
// Ensures we don't wait forever if an issue occurs