ADIv5: 'adi.v5.max_invalid_ap_count' session option.

Author: flit

docs/options.md

@@ -14,6 +14,14 @@ processed. The consequence of this is that these options cannot be set in a YAML
 
 <tr><th>Option Name</th><th>Type</th><th>Default</th><th>Description</th></tr>
 
+<tr><td>adi.v5.max_invalid_ap_count</td>
+<td>int</td>
+<td>3</td>
+<td>
+If this number of invalid APs is found in a row, then AP scanning will stop. The 'scan_all_aps' option
+takes precedence over this option if set.
+</td></tr>
+
 <tr><td>allow_no_cores</td>
 <td>bool</td>
 <td>False</td>

pyocd/core/options.py

@@ -22,6 +22,9 @@
 ## @brief Definitions of the builtin options.
 BUILTIN_OPTIONS = [
     # Common options
+    OptionInfo('adi.v5.max_invalid_ap_count', int, 3,
+        "If this number of invalid APs is found in a row, then AP scanning will stop. The 'scan_all_aps' option "
+        "takes precedence over this option if set."),
     OptionInfo('allow_no_cores', bool, False,
         "Prevents raising an error if no core were found after CoreSight discovery."),
     OptionInfo('auto_unlock', bool, True,

pyocd/coresight/discovery.py

@@ -127,7 +127,7 @@ def _find_aps(self):
                     invalid_count = 0
                 elif not self.session.options.get('scan_all_aps'):
                     invalid_count += 1
-                    if invalid_count == 2:
+                    if invalid_count == self.session.options.get('adi.v5.max_invalid_ap_count'):
                         break
             except exceptions.Error as e:
                 LOG.error("Exception while probing AP#%d: %s", apsel, e,