jtag: remove redundant id check

[fw/openocd] / src / jtag / startup.tcl

diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 496fdc82e7707d035d2244ace05d7a712bfa69cb..11a79779341488001978d030fbfc0379221642eb 100644 (file)
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -30,7 +30,7 @@ proc init_reset { mode } {
 # documented nor supported except on ZY1000.
 
 proc power_restore {} {
-       puts "Sensed power restore, running reset init and halting GDB."
+       echo "Sensed power restore, running reset init and halting GDB."
        reset init
        
        # Halt GDB so user can deal with a detected power restore.
@@ -47,7 +47,7 @@ proc power_restore {} {
 add_help_text power_restore "Overridable procedure run when power restore is detected. Runs 'reset init' by default."
 
 proc power_dropout {} {
-       puts "Sensed power dropout."
+       echo "Sensed power dropout."
 }
 
 #########
@@ -56,7 +56,7 @@ proc power_dropout {} {
 # documented nor supported except on ZY1000.
 
 proc srst_deasserted {} {
-       puts "Sensed nSRST deasserted, running reset init and halting GDB."
+       echo "Sensed nSRST deasserted, running reset init and halting GDB."
        reset init
 
        # Halt GDB so user can deal with a detected reset.
@@ -73,17 +73,37 @@ proc srst_deasserted {} {
 add_help_text srst_deasserted "Overridable procedure run when srst deassert is detected. Runs 'reset init' by default."
 
 proc srst_asserted {} {
-       puts "Sensed nSRST asserted."
+       echo "Sensed nSRST asserted."
 }
 
+# measure actual JTAG clock
+proc measure_clk {} {
+       set start_time [ms];
+       runtest 10000000; 
+       echo "Running at more than [expr 10000.0 / ([ms]-$start_time)] kHz";
+}
+
+add_help_text measure_clk "Runs a test to measure the JTAG clk. Useful with RCLK / RTCK."
+
 # BEGIN MIGRATION AIDS ...  these adapter operations originally had
 # JTAG-specific names despite the fact that the operations were not
 # specific to JTAG, or otherewise had troublesome/misleading names.
 #
 # FIXME phase these aids out after about April 2011
 #
-proc jtag_khz args { eval adapter_khz $args }
-proc jtag_nsrst_delay args { eval adapter_nsrst_delay $args }
-proc jtag_nsrst_assert_width args { eval adapter_nsrst_assert_width $args }
+proc jtag_khz args {
+       echo "DEPRECATED! use 'adapter_khz' not 'jtag_khz'"
+       eval adapter_khz $args
+}
+
+proc jtag_nsrst_delay args {
+       echo "DEPRECATED! use 'adapter_nsrst_delay' not 'jtag_nsrst_delay'"
+       eval adapter_nsrst_delay $args
+}
+
+proc jtag_nsrst_assert_width args {
+       echo "DEPRECATED! use 'adapter_nsrst_assert_width' not 'jtag_nsrst_assert_width'"
+       eval adapter_nsrst_assert_width $args
+}
 
 # END MIGRATION AIDS