[polymer] Merge of master into polymer10-migration

devil/devil/utils/battor_device_mapping.py

 #!/usr/bin/python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 '''
 This script provides tools to map BattOrs to phones.
 
 Phones are identified by the following string:
@@ skipping 141 matching lines @@
 
   Generates a dict of:
   {<phone serial 1>: <battor serial 1>,
    <phone serial 2>: <battor serial 2>}
   indicating which phone serial numbers should be matched with
   which BattOr serial numbers. Mapping is based on the physical port numbers
   of the hubs that the BattOrs and phones are connected to.
 
   Args:
       hub_types: List of hub types to check for.
-      Defaults to ['plugable_7port']
+      Defaults to ['plugable_7port',
+                   'plugable_7port_usb3_part2',
+                   'plugable_7port_usb3_part3']
+      (see usb_hubs.py for details)
   """
   hub_types = [usb_hubs.GetHubType(x)
-               for x in hub_types or ['plugable_7port']]
+               for x in hub_types or ['plugable_7port',
+                                      'plugable_7port_usb3_part2',
+                                      'plugable_7port_usb3_part3']]
   devtree = find_usb_devices.GetBusNumberToDeviceTreeMap()
 
   # List of serial numbers in the system that represent BattOrs.
   battor_serials = list(GetBattorSerialNumbers(devtree))
 
+  # If there's only one BattOr in the system, then a serial number ma
+  # is not necessary.
+  if len(battor_serials) == 1:
+    return {}
+
   # List of dictionaries, one for each hub, that maps the physical
   # port number to the serial number of that hub. For instance, in a 2
   # hub system, this could return [{1:'ab', 2:'cd'}, {1:'jkl', 2:'xyz'}]
   # where 'ab' and 'cd' are the phone serial numbers and 'jkl' and 'xyz'
   # are the BattOr serial numbers.
   port_to_serial = find_usb_devices.GetAllPhysicalPortToSerialMaps(
       hub_types, device_tree_map=devtree)
 
   class serials(object):
     def __init__(self):
@@ skipping 108 matching lines @@
 
   if not tty_string:
     raise battor_error.BattorError(
         'No device with given serial number detected.')
 
   if IsBattor(tty_string, devtree):
     return '/dev/' + tty_string
   else:
     raise battor_error.BattorError(
         'Device with given serial number is not a BattOr.')