X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Fstartup.tcl;h=a72775e666dc0d80e1db3e31cafb2ea075e9d6a5;hb=ace028262ba0bda0e921afb11e6eb7d87708d889;hp=80d21e7bde1e7ef44651ea313342f822f9e3e0fa;hpb=8399cbc9584985c2b9e4aafb3a6afdb17df89b7f;p=fw%2Fopenocd

diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 80d21e7bd..a72775e66 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 # Defines basic Tcl procs for OpenOCD JTAG module
 
 # Executed during "init". Can be overridden
@@ -120,6 +122,66 @@ proc jtag_ntrst_assert_width args {
 #
 # FIXME phase these aids out after some releases
 #
+lappend _telnet_autocomplete_skip adapter_gpio_helper_with_caller
+# Helper for deprecated driver functions that should call "adapter gpio XXX".
+
+# Call this function as:
+#               adapter_gpio_helper_with_caller caller sig_name
+#               adapter_gpio_helper_with_caller caller sig_name gpio_num
+#               adapter_gpio_helper_with_caller caller sig_name chip_num gpio_num
+proc adapter_gpio_helper_with_caller {caller sig_name args} {
+	echo "DEPRECATED! use 'adapter gpio $sig_name' not '$caller'"
+	switch [llength $args] {
+		0 {}
+		1 {eval adapter gpio $sig_name $args}
+		2 {eval adapter gpio $sig_name [lindex $args 1] -chip [lindex $args 0]}
+		default {return -code 1 -level 1 "$caller: syntax error"}
+	}
+	eval adapter gpio $sig_name
+}
+
+lappend _telnet_autocomplete_skip adapter_gpio_helper
+# Call this function as:
+#               adapter_gpio_helper sig_name
+#               adapter_gpio_helper sig_name gpio_num
+#               adapter_gpio_helper sig_name chip_num gpio_num
+proc adapter_gpio_helper {sig_name args} {
+	set caller [lindex [info level -1] 0]
+	eval adapter_gpio_helper_with_caller {"$caller"} $sig_name $args
+}
+
+lappend _telnet_autocomplete_skip adapter_gpio_jtag_nums_with_caller
+# Helper for deprecated driver functions that implemented jtag_nums
+proc adapter_gpio_jtag_nums_with_caller {caller tck_num tms_num tdi_num tdo_num} {
+	echo "DEPRECATED! use 'adapter gpio tck; adapter gpio tms; adapter gpio tdi; adapter gpio tdo' not '$caller'"
+	eval adapter gpio tck $tck_num
+	eval adapter gpio tms $tms_num
+	eval adapter gpio tdi $tdi_num
+	eval adapter gpio tdo $tdo_num
+}
+
+lappend _telnet_autocomplete_skip adapter_gpio_jtag_nums
+# Helper for deprecated driver functions that implemented jtag_nums
+proc adapter_gpio_jtag_nums {args} {
+	set caller [lindex [info level -1] 0]
+	eval adapter_gpio_jtag_nums_with_caller {"$caller"} $args
+}
+
+lappend _telnet_autocomplete_skip adapter_gpio_swd_nums_with_caller
+# Helper for deprecated driver functions that implemented swd_nums
+proc adapter_gpio_swd_nums_with_caller {caller swclk_num swdio_num} {
+	echo "DEPRECATED! use 'adapter gpio swclk; adapter gpio swdio' not '$caller'"
+	eval adapter gpio swclk $swclk_num
+	eval adapter gpio swdio $swdio_num
+}
+
+lappend _telnet_autocomplete_skip adapter_gpio_swd_nums
+# Helper for deprecated driver functions that implemented jtag_nums
+proc adapter_gpio_swd_nums {args} {
+	set caller [lindex [info level -1] 0]
+	eval adapter_gpio_swd_nums_with_caller {"$caller"} $args
+}
+
 lappend _telnet_autocomplete_skip jtag_reset
 proc jtag_reset args {
 	echo "DEPRECATED! use 'adapter \[de\]assert' not 'jtag_reset'"
@@ -187,8 +249,8 @@ proc ftdi_location args {
 
 lappend _telnet_autocomplete_skip xds110_serial
 proc xds110_serial args {
-	echo "DEPRECATED! use 'xds110 serial' not 'xds110_serial'"
-	eval xds110 serial $args
+	echo "DEPRECATED! use 'adapter serial' not 'xds110_serial'"
+	eval adapter serial $args
 }
 
 lappend _telnet_autocomplete_skip xds110_supply_voltage
@@ -215,8 +277,8 @@ proc ftdi_device_desc args {
 
 lappend _telnet_autocomplete_skip ftdi_serial
 proc ftdi_serial args {
-	echo "DEPRECATED! use 'ftdi serial' not 'ftdi_serial'"
-	eval ftdi serial $args
+	echo "DEPRECATED! use 'adapter serial' not 'ftdi_serial'"
+	eval adapter serial $args
 }
 
 lappend _telnet_autocomplete_skip ftdi_channel
@@ -371,8 +433,8 @@ proc vsllink_usb_pid args {
 
 lappend _telnet_autocomplete_skip vsllink_usb_serial
 proc vsllink_usb_serial args {
-	echo "DEPRECATED! use 'vsllink usb_serial' not 'vsllink_usb_serial'"
-	eval vsllink usb_serial $args
+	echo "DEPRECATED! use 'adapter serial' not 'vsllink_usb_serial'"
+	eval adapter serial $args
 }
 
 lappend _telnet_autocomplete_skip vsllink_usb_bulkin
@@ -645,4 +707,262 @@ proc buspirate_port args {
 	eval buspirate port $args
 }
 
+lappend _telnet_autocomplete_skip usb_blaster_device_desc
+proc usb_blaster_device_desc args {
+	echo "DEPRECATED! use 'usb_blaster device_desc' not 'usb_blaster_device_desc'"
+	eval usb_blaster device_desc $args
+}
+
+lappend _telnet_autocomplete_skip usb_blaster_vid_pid
+proc usb_blaster_vid_pid args {
+	echo "DEPRECATED! use 'usb_blaster vid_pid' not 'usb_blaster_vid_pid'"
+	eval usb_blaster vid_pid $args
+}
+
+lappend _telnet_autocomplete_skip usb_blaster_lowlevel_driver
+proc usb_blaster_lowlevel_driver args {
+	echo "DEPRECATED! use 'usb_blaster lowlevel_driver' not 'usb_blaster_lowlevel_driver'"
+	eval usb_blaster lowlevel_driver $args
+}
+
+lappend _telnet_autocomplete_skip usb_blaster_pin
+proc usb_blaster_pin args {
+	echo "DEPRECATED! use 'usb_blaster pin' not 'usb_blaster_pin'"
+	eval usb_blaster pin $args
+}
+
+lappend _telnet_autocomplete_skip usb_blaster_firmware
+proc usb_blaster_firmware args {
+	echo "DEPRECATED! use 'usb_blaster firmware' not 'usb_blaster_firmware'"
+	eval usb_blaster firmware $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_serial_desc
+proc ft232r_serial_desc args {
+	echo "DEPRECATED! use 'adapter serial_desc' not 'ft232r_serial_desc'"
+	eval adapter serial_desc $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_vid_pid
+proc ft232r_vid_pid args {
+	echo "DEPRECATED! use 'ft232r vid_pid' not 'ft232r_vid_pid'"
+	eval ft232r vid_pid $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_jtag_nums
+proc ft232r_jtag_nums args {
+	echo "DEPRECATED! use 'ft232r jtag_nums' not 'ft232r_jtag_nums'"
+	eval ft232r jtag_nums $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_tck_num
+proc ft232r_tck_num args {
+	echo "DEPRECATED! use 'ft232r tck_num' not 'ft232r_tck_num'"
+	eval ft232r tck_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_tms_num
+proc ft232r_tms_num args {
+	echo "DEPRECATED! use 'ft232r tms_num' not 'ft232r_tms_num'"
+	eval ft232r tms_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_tdo_num
+proc ft232r_tdo_num args {
+	echo "DEPRECATED! use 'ft232r tdo_num' not 'ft232r_tdo_num'"
+	eval ft232r tdo_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_tdi_num
+proc ft232r_tdi_num args {
+	echo "DEPRECATED! use 'ft232r tdi_num' not 'ft232r_tdi_num'"
+	eval ft232r tdi_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_srst_num
+proc ft232r_srst_num args {
+	echo "DEPRECATED! use 'ft232r srst_num' not 'ft232r_srst_num'"
+	eval ft232r srst_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_trst_num
+proc ft232r_trst_num args {
+	echo "DEPRECATED! use 'ft232r trst_num' not 'ft232r_trst_num'"
+	eval ft232r trst_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_restore_serial
+proc ft232r_restore_serial args {
+	echo "DEPRECATED! use 'ft232r restore_serial' not 'ft232r_restore_serial'"
+	eval ft232r restore_serial $args
+}
+
+lappend _telnet_autocomplete_skip "aice serial"
+proc "aice serial" {args} {
+	echo "DEPRECATED! use 'adapter serial' not 'aice serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip cmsis_dap_serial
+proc cmsis_dap_serial args {
+	echo "DEPRECATED! use 'adapter serial' not 'cmsis_dap_serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip "ft232r serial_desc"
+proc "ft232r serial_desc" {args} {
+	echo "DEPRECATED! use 'adapter serial' not 'ft232r serial_desc'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip "ftdi serial"
+proc "ftdi serial" {args} {
+	echo "DEPRECATED! use 'adapter serial' not 'ftdi serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip hla_serial
+proc hla_serial args {
+	echo "DEPRECATED! use 'adapter serial' not 'hla_serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip "jlink serial"
+proc "jlink serial" {args} {
+	echo "DEPRECATED! use 'adapter serial' not 'jlink serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip kitprog_serial
+proc kitprog_serial args {
+	echo "DEPRECATED! use 'adapter serial' not 'kitprog_serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip "presto serial"
+proc "presto serial" {args} {
+	echo "DEPRECATED! use 'adapter serial' not 'presto serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip "st-link serial"
+proc "st-link serial" {args} {
+	echo "DEPRECATED! use 'adapter serial' not 'st-link serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip "vsllink usb_serial"
+proc "vsllink usb_serial" {args} {
+	echo "DEPRECATED! use 'adapter serial' not 'vsllink usb_serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip "xds110 serial"
+proc "xds110 serial" {args} {
+	echo "DEPRECATED! use 'adapter serial' not 'xds110 serial'"
+	eval adapter serial $args
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio jtag_nums"
+proc "am335xgpio jtag_nums" {tck_num tms_num tdi_num tdo_num} {
+	echo "DEPRECATED! use 'adapter gpio tck; adapter gpio tms; adapter gpio tdi; adapter gpio tdo' not 'am335xgpio jtag_nums'"
+	eval adapter gpio tck [expr {$tck_num % 32}] -chip [expr {$tck_num / 32}]
+	eval adapter gpio tms [expr {$tms_num % 32}] -chip [expr {$tms_num / 32}]
+	eval adapter gpio tdi [expr {$tdi_num % 32}] -chip [expr {$tdi_num / 32}]
+	eval adapter gpio tdo [expr {$tdo_num % 32}] -chip [expr {$tdo_num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio tck_num"
+proc "am335xgpio tck_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio tck' not 'am335xgpio tck_num'"
+	eval adapter gpio tck [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio tms_num"
+proc "am335xgpio tms_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio tms' not 'am335xgpio tms_num'"
+	eval adapter gpio tms [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio tdi_num"
+proc "am335xgpio tdi_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio tdi' not 'am335xgpio tdi_num'"
+	eval adapter gpio tdi [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio tdo_num"
+proc "am335xgpio tdo_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio tdo' not 'am335xgpio tdo_num'"
+	eval adapter gpio tdo [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio swd_nums"
+proc "am335xgpio swd_nums" {swclk swdio} {
+	echo "DEPRECATED! use 'adapter gpio swclk; adapter gpio swdio' not 'am335xgpio jtag_nums'"
+	eval adapter gpio swclk [expr {$swclk % 32}] -chip [expr {$swclk / 32}]
+	eval adapter gpio swdio [expr {$swdio % 32}] -chip [expr {$swdio / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio swclk_num"
+proc "am335xgpio swclk_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio swclk' not 'am335xgpio swclk_num'"
+	eval adapter gpio swclk [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio swdio_num"
+proc "am335xgpio swdio_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio swdio' not 'am335xgpio swdio_num'"
+	eval adapter gpio swdio [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio swdio_dir_num"
+proc "am335xgpio swdio_dir_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio swdio_dir' not 'am335xgpio swdio_dir_num'"
+	eval adapter gpio swdio_dir [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio swdio_dir_output_state"
+proc "am335xgpio swdio_dir_output_state" {state} {
+	echo "DEPRECATED! use 'adapter gpio swdio_dir -active-high' or 'adapter gpio swdio_dir -active-low', not 'am335xgpio swdio_dir_output_state'"
+	switch $state {
+		"high"
+			{eval adapter gpio swdio_dir -active-high}
+		"low"
+			{eval adapter gpio swdio_dir -active-low}
+		default
+			{return -code 1 -level 1 "am335xgpio swdio_dir_output_state: syntax error"}
+	}
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio srst_num"
+proc "am335xgpio srst_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio srst' not 'am335xgpio srst_num'"
+	eval adapter gpio srst [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio trst_num"
+proc "am335xgpio trst_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio trst' not 'am335xgpio trst_num'"
+	eval adapter gpio trst [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio led_num"
+proc "am335xgpio led_num" {num} {
+	echo "DEPRECATED! use 'adapter gpio led' not 'am335xgpio led_num'"
+	eval adapter gpio led [expr {$num % 32}] -chip [expr {$num / 32}]
+}
+
+lappend _telnet_autocomplete_skip "am335xgpio led_on_state"
+proc "am335xgpio led_on_state" {state} {
+	echo "DEPRECATED! use 'adapter gpio led -active-high' or 'adapter gpio led -active-low', not 'am335xgpio led_on_state'"
+	switch $state {
+		"high"
+			{eval adapter gpio led -active-high}
+		"low"
+			{eval adapter gpio led -active-low}
+		default
+			{return -code 1 -level 1 "am335xgpio led_on_state: syntax error"}
+	}
+}
+
 # END MIGRATION AIDS