[Openocd-svn] r2753 - trunk/src/helper

[dbrownell at B. <dbr...@ma...>]

Author: dbrownell
Date: 2009-09-24 00:03:41 +0200 (Thu, 24 Sep 2009)
New Revision: 2753

Modified:
   trunk/src/helper/startup.tcl
Log:
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.


Modified: trunk/src/helper/startup.tcl
===================================================================
--- trunk/src/helper/startup.tcl	2009-09-23 21:52:40 UTC (rev 2752)
+++ trunk/src/helper/startup.tcl	2009-09-23 22:03:41 UTC (rev 2753)
@@ -202,27 +202,32 @@
 	}
 
 	# 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
 	}