Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
jtag: linuxgpiod: drop extra parenthesis
[openocd.git] / src / jtag / startup.tcl
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 1a638a30f8f9c8b042113daee06ddf021b69dd16..41db38e4ac5baaa2566da06ebd39f914684bcc0e 100644 (file)
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -455,70 +455,140 @@ proc vsllink_usb_interface args {
        eval vsllink usb_interface $args
 }
 
+
+lappend _telnet_autocomplete_skip bcm2835_gpio_helper
+proc bcm2835_gpio_helper {sig_name args} {
+       set caller [lindex [info level -1] 0]
+       echo "DEPRECATED! use 'adapter gpio $sig_name' not '$caller'"
+       switch [llength $args] {
+               0 {}
+               1 {eval adapter gpio $sig_name $args -chip 0}
+               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 bcm2835gpio_jtag_nums
-proc bcm2835gpio_jtag_nums args {
-       echo "DEPRECATED! use 'bcm2835gpio jtag_nums' not 'bcm2835gpio_jtag_nums'"
-       eval bcm2835gpio jtag_nums $args
+proc bcm2835gpio_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 'bcm2835gpio_jtag_nums'"
+       eval adapter gpio tck $tck_num -chip 0
+       eval adapter gpio tms $tms_num -chip 0
+       eval adapter gpio tdi $tdi_num -chip 0
+       eval adapter gpio tdo $tdo_num -chip 0
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_tck_num
 proc bcm2835gpio_tck_num args {
-       echo "DEPRECATED! use 'bcm2835gpio tck_num' not 'bcm2835gpio_tck_num'"
-       eval bcm2835gpio tck_num $args
+       eval bcm2835_gpio_helper tck $args
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_tms_num
 proc bcm2835gpio_tms_num args {
-       echo "DEPRECATED! use 'bcm2835gpio tms_num' not 'bcm2835gpio_tms_num'"
-       eval bcm2835gpio tms_num $args
+       eval bcm2835_gpio_helper tms $args
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_tdo_num
 proc bcm2835gpio_tdo_num args {
-       echo "DEPRECATED! use 'bcm2835gpio tdo_num' not 'bcm2835gpio_tdo_num'"
-       eval bcm2835gpio tdo_num $args
+       eval bcm2835_gpio_helper tdo $args
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_tdi_num
 proc bcm2835gpio_tdi_num args {
-       echo "DEPRECATED! use 'bcm2835gpio tdi_num' not 'bcm2835gpio_tdi_num'"
-       eval bcm2835gpio tdi_num $args
+       eval bcm2835_gpio_helper tdi $args
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_swd_nums
-proc bcm2835gpio_swd_nums args {
-       echo "DEPRECATED! use 'bcm2835gpio swd_nums' not 'bcm2835gpio_swd_nums'"
-       eval bcm2835gpio swd_nums $args
+proc bcm2835gpio_swd_nums {swclk_num swdio_num} {
+       echo "DEPRECATED! use 'adapter gpio swclk; adapter gpio swdio' not 'bcm2835gpio_swd_nums'"
+       eval adapter gpio swclk $swclk_num -chip 0
+       eval adapter gpio swdio $swdio_num -chip 0
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_swclk_num
 proc bcm2835gpio_swclk_num args {
-       echo "DEPRECATED! use 'bcm2835gpio swclk_num' not 'bcm2835gpio_swclk_num'"
-       eval bcm2835gpio swclk_num $args
+       eval bcm2835_gpio_helper swclk $args
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_swdio_num
 proc bcm2835gpio_swdio_num args {
-       echo "DEPRECATED! use 'bcm2835gpio swdio_num' not 'bcm2835gpio_swdio_num'"
-       eval bcm2835gpio swdio_num $args
+       eval bcm2835_gpio_helper swdio $args
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_swdio_dir_num
 proc bcm2835gpio_swdio_dir_num args {
-       echo "DEPRECATED! use 'bcm2835gpio swdio_dir_num' not 'bcm2835gpio_swdio_dir_num'"
-       eval bcm2835gpio swdio_dir_num $args
+       eval bcm2835_gpio_helper swdio_dir $args
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_srst_num
 proc bcm2835gpio_srst_num args {
-       echo "DEPRECATED! use 'bcm2835gpio srst_num' not 'bcm2835gpio_srst_num'"
-       eval bcm2835gpio srst_num $args
+       eval bcm2835_gpio_helper srst $args
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_trst_num
 proc bcm2835gpio_trst_num args {
-       echo "DEPRECATED! use 'bcm2835gpio trst_num' not 'bcm2835gpio_trst_num'"
-       eval bcm2835gpio trst_num $args
+       eval bcm2835_gpio_helper trst $args
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio jtag_nums"
+proc "bcm2835gpio 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 'bcm2835gpio jtag_nums'"
+       eval adapter gpio tck $tck_num -chip 0
+       eval adapter gpio tms $tms_num -chip 0
+       eval adapter gpio tdi $tdi_num -chip 0
+       eval adapter gpio tdo $tdo_num -chip 0
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio tck_num"
+proc "bcm2835gpio tck_num" args {
+       eval bcm2835_gpio_helper tck $args
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio tms_num"
+proc "bcm2835gpio tms_num" args {
+       eval bcm2835_gpio_helper tms $args
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio tdo_num"
+proc "bcm2835gpio tdo_num" args {
+       eval bcm2835_gpio_helper tdo $args
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio tdi_num"
+proc "bcm2835gpio tdi_num" args {
+       eval bcm2835_gpio_helper tdi $args
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio swd_nums"
+proc "bcm2835gpio swd_nums" {swclk_num swdio_num} {
+       echo "DEPRECATED! use 'adapter gpio swclk; adapter gpio swdio' not 'bcm2835gpio swd_nums'"
+       eval adapter gpio swclk $swclk_num -chip 0
+       eval adapter gpio swdio $swdio_num -chip 0
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio swclk_num"
+proc "bcm2835gpio swclk_num" args {
+       eval bcm2835_gpio_helper swclk $args
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio swdio_num"
+proc "bcm2835gpio swdio_num" args {
+       eval bcm2835_gpio_helper swdio $args
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio swdio_dir_num"
+proc "bcm2835gpio swdio_dir_num" args {
+       eval bcm2835_gpio_helper swdio_dir $args
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio srst_num"
+proc "bcm2835gpio srst_num" args {
+       eval bcm2835_gpio_helper srst $args
+}
+
+lappend _telnet_autocomplete_skip "bcm2835gpio trst_num"
+proc "bcm2835gpio trst_num" args {
+       eval bcm2835_gpio_helper trst $args
 }
 
 lappend _telnet_autocomplete_skip bcm2835gpio_speed_coeffs
@@ -795,12 +865,6 @@ proc ft232r_restore_serial args {
        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'"
@@ -1044,4 +1108,170 @@ proc "am335xgpio led_on_state" {state} {
        }
 }
 
+lappend _telnet_autocomplete_skip "cmsis_dap_backend"
+proc "cmsis_dap_backend" {backend} {
+       echo "DEPRECATED! use 'cmsis-dap backend', not 'cmsis_dap_backend'"
+       eval cmsis-dap backend $backend
+}
+
+lappend _telnet_autocomplete_skip "cmsis_dap_vid_pid"
+proc "cmsis_dap_vid_pid" {args} {
+       echo "DEPRECATED! use 'cmsis-dap vid_pid', not 'cmsis_dap_vid_pid'"
+       eval cmsis-dap vid_pid $args
+}
+
+lappend _telnet_autocomplete_skip "cmsis_dap_usb"
+proc "cmsis_dap_usb" {args} {
+       echo "DEPRECATED! use 'cmsis-dap usb', not 'cmsis_dap_usb'"
+       eval cmsis-dap usb $args
+}
+
+lappend _telnet_autocomplete_skip "kitprog_init_acquire_psoc"
+proc "kitprog_init_acquire_psoc" {} {
+       echo "DEPRECATED! use 'kitprog init_acquire_psoc', not 'kitprog_init_acquire_psoc'"
+       eval kitprog init_acquire_psoc
+}
+
+lappend _telnet_autocomplete_skip "pld device"
+proc "pld device" {driver tap_name {opt 0}} {
+       echo "DEPRECATED! use 'pld create ...', not 'pld device ...'"
+       if {[string is integer -strict $opt]} {
+               if {$opt == 0} {
+                       eval pld create [lindex [split $tap_name .] 0].pld $driver -chain-position $tap_name
+               } else {
+                       eval pld create [lindex [split $tap_name .] 0].pld $driver -chain-position $tap_name -no_jstart
+               }
+       } else {
+               eval pld create [lindex [split $tap_name .] 0].pld $driver -chain-position $tap_name -family $opt
+       }
+}
+
+lappend _telnet_autocomplete_skip "ipdbg -start"
+proc "ipdbg -start" {args} {
+       echo "DEPRECATED! use 'ipdbg create-hub' and 'chip.ipdbghub ipdbg start ...', not 'ipdbg -start ...'"
+       set tap_name ""
+       set pld_name ""
+       set tool_num "1"
+       set port_num "4242"
+       set idx 0
+       set num_args [llength $args]
+       while {$idx < $num_args} {
+               set arg [lindex $args $idx]
+               switch -- $arg {
+                       "-tap" {
+                               incr idx
+                               if {$idx >= $num_args || [string index [lindex $args $idx] 0] == "-"} {
+                                       echo "no TAP name given"
+                                       return
+                               }
+                               set tap_name [lindex $args $idx]
+                       }
+                       "-pld" {
+                               incr idx
+                               if {$idx >= $num_args || [string index [lindex $args $idx] 0] == "-"} {
+                                       echo "no PLD name given"
+                                       return
+                               }
+                               set pld_name [lindex $args $idx]
+                       }
+                       "-tool" {
+                               if {[expr {$idx + 1}] < $num_args && [string index [lindex $args [expr {$idx + 1}]] 0] != "-"} {
+                                       set tool_num [lindex $args [expr {$idx + 1}]]
+                                       set args [lreplace $args [expr {$idx + 1}] [expr {$idx + 1}]]
+                                       incr num_args -1
+                               }
+                               set args [lreplace $args $idx $idx]
+                               incr num_args -1
+                               incr idx -1
+                       }
+                       "-port" {
+                               if {[expr {$idx + 1}] < $num_args && [string index [lindex $args [expr {$idx + 1}]] 0] != "-"} {
+                                       set port_num [lindex $args [expr {$idx + 1}]]
+                                       set args [lreplace $args [expr {$idx + 1}] [expr {$idx + 1}]]
+                                       incr num_args -1
+                               }
+                               set args [lreplace $args $idx $idx]
+                               incr num_args -1
+                               incr idx -1
+                       }
+                       "-hub" {
+                               set args [lreplace $args $idx $idx "-ir" ]
+                       }
+                       default {
+#                              don't touch remaining arguments
+                       }
+               }
+               incr idx
+       }
+
+       set hub_name ""
+       if {$tap_name != ""} {
+               set hub_name [lindex [split $tap_name .] 0].ipdbghub
+       } elseif {$pld_name != ""} {
+               set hub_name [lindex [split $pld_name .] 0].ipdbghub
+       } else {
+               echo "parsing arguments failed: no tap and no pld given."
+               return
+       }
+
+       echo "name: $hub_name"
+       echo "ipdbg create-hub $hub_name $args"
+
+       catch {eval ipdbg create-hub $hub_name $args}
+
+       eval $hub_name ipdbg start -tool $tool_num -port $port_num
+}
+
+lappend _telnet_autocomplete_skip "ipdbg -stop"
+proc "ipdbg -stop" {args} {
+       echo "DEPRECATED! use 'chip.ipdbghub ipdbg stop ...', not 'ipdbg -stop ...'"
+       set tap_name ""
+       set pld_name ""
+       set tool_num "1"
+       set idx 0
+       set num_args [llength $args]
+       while {$idx < $num_args} {
+               set arg [lindex $args $idx]
+               switch -- $arg {
+                       "-tap" {
+                               incr idx
+                               if {$idx >= $num_args || [string index [lindex $args $idx] 0] == "-"} {
+                                       echo "no TAP name given"
+                                       return
+                               }
+                               set tap_name [lindex $args $idx]
+                       }
+                       "-pld" {
+                               incr idx
+                               if {$idx >= $num_args || [string index [lindex $args $idx] 0] == "-"} {
+                                       echo "no PLD name given"
+                                       return
+                               }
+                               set pld_name [lindex $args $idx]
+                       }
+                       "-tool" {
+                               if {[expr {$idx + 1}] < $num_args && [string index [lindex $args [expr {$idx + 1}]] 0] != "-"} {
+                                       set tool_num [lindex $args [expr {$idx + 1}]]
+                               }
+                       }
+                       default {
+#                              don't touch remaining arguments
+                       }
+               }
+               incr idx
+       }
+
+       set hub_name ""
+       if {$tap_name != ""} {
+               set hub_name [lindex [split $tap_name .] 0].ipdbghub
+       } elseif {$pld_name != ""} {
+               set hub_name [lindex [split $pld_name .] 0].ipdbghub
+       } else {
+               echo "parsing arguments failed: no tap and no pld given."
+               return
+       }
+
+       eval $hub_name ipdbg stop -tool $tool_num
+}
+
 # END MIGRATION AIDS
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)