X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fstartup.tcl;h=d57cafb23aa18bde0c84f1830d156903acb79e50;hb=c6ba0a22404a1f0c806e45ef627f4ab101982c3f;hp=11a79779341488001978d030fbfc0379221642eb;hpb=e224b64d700db906f5b40e7d1d97edb7ae9257b2;p=openocd.git

diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 11a7977934..d57cafb23a 100644
--- 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,12 +81,38 @@ 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 } {
+	set current_transport [transport select]
+	if {[using_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.
@@ -106,4 +134,30 @@ proc jtag_nsrst_assert_width args {
 	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