[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc1-42-gdc6cad855

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  dc6cad855d1557e01437ba777b55ad023ddd04ef (commit)
      from  1f84f34850de6dde354bfeb41bb1e7bf5d3fa6a0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc6cad855d1557e01437ba777b55ad023ddd04ef
Author: Tomas Vanek <va...@fb...>
Date:   Wed Sep 28 23:19:00 2022 +0200

    target: re-examine before arp_waitstate in ocd_process_reset_inner
    
    arp_waitstate will not work on not-examined state
    
    Change-Id: I56c3e1c7e63af108e4ed1dbacebb567f9bf46264
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7230
    Tested-by: jenkins
    Reviewed-by: Erwan Gouriou
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index 290e79d1e..35492a6d9 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -114,10 +114,21 @@ proc ocd_process_reset_inner { MODE } {
 				continue
 			}
 
-			# don't wait for targets where examination is deferred
-			# they can not be halted anyway at this point
-			if { ![$t was_examined] && [$t examine_deferred] } {
-				continue
+			if { ![$t was_examined] } {
+				# don't wait for targets where examination is deferred
+				# they can not be halted anyway at this point
+				if { [$t examine_deferred] } {
+					continue
+				}
+				# try to re-examine or target state will be unknown
+				$t invoke-event examine-start
+				set err [catch "$t arp_examine allow-defer"]
+				if { $err } {
+					$t invoke-event examine-fail
+					return -code error [format "TARGET: %s - Not examined" $t]
+				} else {
+					$t invoke-event examine-end
+				}
 			}
 
 			# Wait up to 1 second for target to halt. Why 1sec? Cause

-----------------------------------------------------------------------

Summary of changes:
 src/target/startup.tcl | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository