Introduced jtag_init and "jtag arp_init" to allow target scripts more control over...

[openocd.git] / src / helper / startup.tcl

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index dc7b045049d7186f194e0b10c5e59715b212a0c1..229aa066f23026a81414ff678b2edc6bca73e204 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -202,27 +202,32 @@ proc ocd_process_reset_inner { MODE } {
        }
 
        # Assert SRST, and report the pre/post events.
-       #
-       # REVISIT this presumes a single-target config, since SRST
-       # applies to the whole device-under-test.  When two targets
-       # both need special setup before SRST, it's only done for
-       # the first one...
+       # Note:  no target sees SRST before "pre" or after "post".
        foreach t $targets {
                $t invoke-event reset-assert-pre
+       }
+       foreach t $targets {
                # C code needs to know if we expect to 'halt'
                if {[jtag tapisenabled [$t cget -chain-position]]} {
                        $t arp_reset assert $halt
                }
+       }
+       foreach t $targets {
                $t invoke-event reset-assert-post
        }
 
        # Now de-assert SRST, and report the pre/post events.
+       # Note:  no target sees !SRST before "pre" or after "post".
        foreach t $targets {
                $t invoke-event reset-deassert-pre
-               # Again, de-assert code needs to know..
+       }
+       foreach t $targets {
+               # Again, de-assert code needs to know if we 'halt'
                if {[jtag tapisenabled [$t cget -chain-position]]} {
                        $t arp_reset deassert $halt
                }
+       }
+       foreach t $targets {
                $t invoke-event reset-deassert-post
        }
 
@@ -354,3 +359,13 @@ proc capture_catch {a} {
        } result
        return $result
 }
+
+
+# Executed during "init". Can be implemented by target script 
+# tar
+proc jtag_init {} {
+       if {[catch {jtag arp_init} err]!=0} {
+               # try resetting additionally
+               jtag arp_init-reset
+       }
+}
\ No newline at end of file