startup: Fixed measure_clk to return kHz instead of MHz.

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

diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 1779df51bfa682fc90f56b1a85000b4a9238a171..f88ef1fa4cd1016f04c5e8e3c131eb64d901d4d8 100644 (file)
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -21,7 +21,9 @@ proc jtag_init {} {
 # 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
+       if {[using_jtag]} {
+               jtag arp_init-reset
+       }
 }
 
 #########
@@ -79,20 +81,84 @@ proc srst_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";
+        set iterations 10000000;
+       runtest $iterations;
+       echo "Running at more than [expr $iterations.0 / ([ms]-$start_time)] kHz";
 }
 
 add_help_text measure_clk "Runs a test to measure the JTAG clk. Useful with RCLK / RTCK."
 
+proc default_to_jtag { f args } {
+       if [catch {transport select} current_transport] {
+               echo "Info : session transport was not selected, defaulting to JTAG"
+               transport select jtag
+               eval $f $args
+       } {
+               error "session transport is \"$current_transport\" but your config requires JTAG"
+       }
+}
+
+proc jtag args {
+       eval default_to_jtag jtag $args
+}
+
+proc jtag_rclk args {
+       eval default_to_jtag jtag_rclk $args
+}
+
+proc jtag_ntrst_delay args {
+       eval default_to_jtag jtag_ntrst_delay $args
+}
+
+proc jtag_ntrst_assert_width args {
+       eval default_to_jtag jtag_ntrst_assert_width $args
+}
+
 # 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
+}
+
+# stlink migration helpers
+proc stlink_device_desc args {
+       echo "DEPRECATED! use 'hla_device_desc' not 'stlink_device_desc'"
+       eval hla_device_desc $args
+}
+
+proc stlink_serial args {
+       echo "DEPRECATED! use 'hla_serial' not 'stlink_serial'"
+       eval hla_serial $args
+}
+
+proc stlink_layout args {
+       echo "DEPRECATED! use 'hla_layout' not 'stlink_layout'"
+       eval hla_layout $args
+}
+
+proc stlink_vid_pid args {
+       echo "DEPRECATED! use 'hla_vid_pid' not 'stlink_vid_pid'"
+       eval hla_vid_pid $args
+}
+
+proc stlink args {
+       echo "DEPRECATED! use 'hla' not 'stlink'"
+       eval hla $args
+}
 
 # END MIGRATION AIDS