X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Fstartup.tcl;h=f1e69e591e8d59018243415696c53c8def614bef;hb=b0fe92dba7c01adc25e5fe3552253a4a8c69ae1a;hp=c49c43e1b46d74451f85a8fe3b4885d8c9d86941;hpb=96f9790279f74f39b35fc3ad09340fd03123180c;p=fw%2Fopenocd

diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index c49c43e1b..f1e69e591 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -21,66 +21,177 @@ 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
+	}
 }
 
 #########
 
 # TODO: power_restore and power_dropout are currently neither
-# documented nor supported except on ZY1000.
+# documented nor supported.
 
 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.
 	#
 	# After GDB is halted, then output is no longer forwarded
 	# to the GDB console.
-	set targets [target names]	
+	set targets [target names]
 	foreach t $targets {
 		# New event script.
 		$t invoke-event arp_halt_gdb
-	}	
+	}
 }
 
 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."
 }
 
 #########
 
 # TODO: srst_deasserted and srst_asserted are currently neither
-# documented nor supported except on ZY1000.
+# documented nor supported.
 
 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.
 	#
 	# After GDB is halted, then output is no longer forwarded
 	# to the GDB console.
-	set targets [target names]	
+	set targets [target names]
 	foreach t $targets {
 		# New event script.
 		$t invoke-event arp_halt_gdb
-	}		
+	}
 }
 
 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];
+        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.
+# specific to JTAG, or otherwise had troublesome/misleading names.
 #
-# FIXME phase these aids out after about April 2011
+# FIXME phase these aids out after some releases
 #
-proc jtag_khz args { eval adapter_khz $args }
+proc jtag_reset args {
+	echo "DEPRECATED! use 'adapter \[de\]assert' not 'jtag_reset'"
+	switch $args {
+		"0 0"
+			{eval adapter deassert trst deassert srst}
+		"0 1"
+			{eval adapter deassert trst assert srst}
+		"1 0"
+			{eval adapter assert trst deassert srst}
+		"1 1"
+			{eval adapter assert trst assert srst}
+		default
+			{return -code 1 -level 1 "jtag_reset: syntax error"}
+	}
+}
+
+proc adapter_khz args {
+	echo "DEPRECATED! use 'adapter speed' not 'adapter_khz'"
+	eval adapter speed $args
+}
+
+proc adapter_name args {
+	echo "DEPRECATED! use 'adapter name' not 'adapter_name'"
+	eval adapter name $args
+}
+
+proc adapter_nsrst_delay args {
+	echo "DEPRECATED! use 'adapter srst delay' not 'adapter_nsrst_delay'"
+	eval adapter srst delay $args
+}
+
+proc adapter_nsrst_assert_width args {
+	echo "DEPRECATED! use 'adapter srst pulse_width' not 'adapter_nsrst_assert_width'"
+	eval adapter srst pulse_width $args
+}
+
+proc interface args {
+	echo "DEPRECATED! use 'adapter driver' not 'interface'"
+	eval adapter driver $args
+}
+
+proc  interface_transports args {
+	echo "DEPRECATED! use 'adapter transports' not 'interface_transports'"
+	eval adapter transports $args
+}
+
+proc  interface_list args {
+	echo "DEPRECATED! use 'adapter list' not 'interface_list'"
+	eval adapter list $args
+}
+
+proc ftdi_location args {
+	echo "DEPRECATED! use 'adapter usb location' not 'ftdi_location'"
+	eval adapter usb location $args
+}
+
+proc xds110_serial args {
+	echo "DEPRECATED! use 'xds110 serial' not 'xds110_serial'"
+	eval xds110 serial $args
+}
+
+proc xds110_supply_voltage args {
+	echo "DEPRECATED! use 'xds110 supply' not 'xds110_supply_voltage'"
+	eval xds110 supply $args
+}
+
+proc hla {cmd args} {
+        tailcall "hla $cmd" {*}$args
+}
+
+proc "hla newtap" {args} {
+	echo "DEPRECATED! use 'swj_newdap' not 'hla newtap'"
+	eval swj_newdap $args
+}
+
 # END MIGRATION AIDS