From 23e22b6ec42c137b48ef6359075a0fe819706f3c Mon Sep 17 00:00:00 2001 From: dbrownell Date: Wed, 23 Sep 2009 22:03:41 +0000 Subject: Start handling the (second) SRST stage of reset better: make sure that when there are two or more targets, their various pre/post event reports are correctly ordered. Previously, only the first target always saw its "pre" method before SRST was asserted or deasserted. git-svn-id: svn://svn.berlios.de/openocd/trunk@2753 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/startup.tcl | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl index dc7b0450..7225929f 100644 --- 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 } -- cgit v1.2.3