improve startup tcl scripts

Fix a couple of layering violations missed in the last round.
Add missing comment headers.

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index fc84943a5d3891056ba55b4e57b09efa4f30eb19..845198adfb6fb2d1a31b6d0cbf7c035461e36759 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -61,10 +61,6 @@ proc unknown {args} {
        return -code error "Unknown command: $args"
 }
 
        return -code error "Unknown command: $args"
 }
 

-proc new_target_name { } {
-       return [target number [expr [target count] - 1 ]]
-}
-

 # Try flipping / and \ to find file if the filename does not
 # match the precise spelling
 proc find {filename} {
 # Try flipping / and \ to find file if the filename does not
 # match the precise spelling
 proc find {filename} {

diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 999f5d02819bba6e65f19dfdf198ce298536d413..ab215babd44dea2210d80f7f7d887fab4e82aca2 100644 (file)
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -9,6 +9,21 @@ proc jtag_init {} {
        }
 }
 
        }
 }
 

+# This reset logic may be overridden by board/target/... scripts as needed
+# to provide a reset that, if possible, is close to a power-up reset.
+#
+# Exit requirements include:  (a) JTAG must be working, (b) the scan
+# chain was validated with "jtag arp_init" (or equivalent), (c) nothing
+# stays in reset.  No TAP-specific scans were performed.  It's OK if
+# some targets haven't been reset yet; they may need TAP-specific scans.
+#
+# The "mode" values include:  halt, init, run (from "reset" command);
+# startup (at OpenOCD server startup, when JTAG may not yet work); and
+# potentially more (for reset types like cold, warm, etc)
+proc init_reset { mode } {
+       jtag arp_init-reset
+}
+

 #########
 
 # TODO: power_restore and power_dropout are currently neither
 #########
 
 # TODO: power_restore and power_dropout are currently neither

diff --git a/src/server/startup.tcl b/src/server/startup.tcl
index 677bb2de74d2fab64b6f49d58620c8e8a4a11d46..7801d1b0c1224fe299f8626706284c4ab90aecc9 100644 (file)
--- a/src/server/startup.tcl
+++ b/src/server/startup.tcl
@@ -1,3 +1,5 @@
+# Defines basic Tcl procs for OpenOCD server modules
+

 # Handle GDB 'R' packet. Can be overriden by configuration script,
 # but it's not something one would expect target scripts to do
 # normally
 # Handle GDB 'R' packet. Can be overriden by configuration script,
 # but it's not something one would expect target scripts to do
 # normally

diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index d480f335dd0fbc09f7c6d1eff17bcd88378015e0..b597b84d15e7ec575e7e05a33ad08f274ab57a65 100644 (file)
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -1,21 +1,9 @@
-#########
+# Defines basic Tcl procs for OpenOCD target module

 
 

-# This reset logic may be overridden by board/target/... scripts as needed
-# to provide a reset that, if possible, is close to a power-up reset.
-#
-# Exit requirements include:  (a) JTAG must be working, (b) the scan
-# chain was validated with "jtag arp_init" (or equivalent), (c) nothing
-# stays in reset.  No TAP-specific scans were performed.  It's OK if
-# some targets haven't been reset yet; they may need TAP-specific scans.
-#
-# The "mode" values include:  halt, init, run (from "reset" command);
-# startup (at OpenOCD server startup, when JTAG may not yet work); and
-# potentially more (for reset types like cold, warm, etc)
-proc init_reset { mode } {
-       jtag arp_init-reset
+proc new_target_name { } {
+       return [target number [expr [target count] - 1 ]]

 }
 
 }
 

-

 global in_process_reset
 set in_process_reset 0
 
 global in_process_reset
 set in_process_reset 0