summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2016-03-24 16:55:39 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-24 23:58:26 +0000
commit6cfa6305dc22be1489cec97f8ddcf595d75f2a75 (patch)
treed8eaf9338d4fd022ea18bc81cce920a4665c7217 /device
parent6781323221029e2f5c0ca1b0f055b81bb2d69153 (diff)
downloadchromium_src-6cfa6305dc22be1489cec97f8ddcf595d75f2a75.zip
chromium_src-6cfa6305dc22be1489cec97f8ddcf595d75f2a75.tar.gz
chromium_src-6cfa6305dc22be1489cec97f8ddcf595d75f2a75.tar.bz2
Track USB endpoint state in Blink.lkgr
The last in a series of patches putting input validation for the WebUSB directly into Blink. This one adds bit vectors that track which endpoints are available given the current set of claimed interfaces and selected alternate interfaces. BUG=593164 Review URL: https://codereview.chromium.org/1830833002 Cr-Commit-Position: refs/heads/master@{#383194}
Diffstat (limited to 'device')
-rw-r--r--device/usb/mojo/type_converters.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/device/usb/mojo/type_converters.cc b/device/usb/mojo/type_converters.cc
index a2daeaa..b7bfd7f 100644
--- a/device/usb/mojo/type_converters.cc
+++ b/device/usb/mojo/type_converters.cc
@@ -138,7 +138,7 @@ device::usb::EndpointInfoPtr
TypeConverter<device::usb::EndpointInfoPtr, device::UsbEndpointDescriptor>::
Convert(const device::UsbEndpointDescriptor& endpoint) {
device::usb::EndpointInfoPtr info = device::usb::EndpointInfo::New();
- info->endpoint_number = endpoint.address;
+ info->endpoint_number = endpoint.address & 0xf;
info->direction =
ConvertTo<device::usb::TransferDirection>(endpoint.direction);
info->type = ConvertTo<device::usb::EndpointType>(endpoint.transfer_type);