Commit 073b9b87 authored by juanlang's avatar juanlang Committed by Commit bot

Only enumerate known WinUSB devices using chrome.usb, to avoid errors

attempting to open HID devices using libusb.

BUG=410623

Review URL: https://codereview.chromium.org/540693002

Cr-Commit-Position: refs/heads/master@{#293306}
parent f95a312b
......@@ -373,27 +373,30 @@ UsbGnubbyDevice.prototype.queueCommand = function(cid, cmd, data) {
if (wasEmpty) this.writeOneRequest_();
};
/**
* @const
*/
UsbGnubbyDevice.WINUSB_VID_PIDS = [
{'vendorId': 4176, 'productId': 529} // Yubico WinUSB
];
/**
* @param {function(Array)} cb Enumerate callback
*/
UsbGnubbyDevice.enumerate = function(cb) {
var permittedDevs;
var numEnumerated = 0;
var allDevs = [];
function enumerated(devs) {
allDevs = allDevs.concat(devs);
if (++numEnumerated == permittedDevs.length) {
if (++numEnumerated == UsbGnubbyDevice.WINUSB_VID_PIDS.length) {
cb(allDevs);
}
}
GnubbyDevice.getPermittedUsbDevices(function(devs) {
permittedDevs = devs;
for (var i = 0; i < devs.length; i++) {
chrome.usb.getDevices(devs[i], enumerated);
}
});
for (var i = 0; i < UsbGnubbyDevice.WINUSB_VID_PIDS.length; i++) {
chrome.usb.getDevices(UsbGnubbyDevice.WINUSB_VID_PIDS[i], enumerated);
}
};
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment