drivers/bcm2835gpio: Migrate to adapter gpio commands

[fw/openocd] / tcl / target / swj-dp.tcl

diff --git a/tcl/target/swj-dp.tcl b/tcl/target/swj-dp.tcl
index fa44583a436fb1f2e6e3614252833f89ef035e1d..f2b233fb78133fd5e45395fd307674c16a65ed70 100644 (file)
--- a/tcl/target/swj-dp.tcl
+++ b/tcl/target/swj-dp.tcl
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 # ARM Debug Interface V5 (ADI_V5) utility
 # ... Mostly for SWJ-DP (not SW-DP or JTAG-DP, since
 # SW-DP and JTAG-DP targets don't need to switch based
@@ -18,13 +20,18 @@
 # split out "chip" and "tag" so we can someday handle
 # them more uniformly irlen too...)
 
-global using_jtag
-set using_jtag 1
+if [catch {transport select}] {
+  echo "Error: unable to select a session transport. Can't continue."
+  shutdown
+}
 
 proc swj_newdap {chip tag args} {
- global using_jtag
- set tran [transport select]
- if [string equal $tran "jtag"] { eval jtag newtap $chip $tag $args; set using_jtag 1 }
- if [string equal $tran "swd"] { eval swd newdap $chip $tag $args; set using_jtag 0 }
- if [string equal $tran "cmsis-dap"] { eval cmsis-dap newdap $chip $tag $args; set using_jtag 0 }
+ if [using_jtag] {
+     eval jtag newtap $chip $tag $args
+ } elseif [using_swd] {
+     eval swd newdap $chip $tag $args
+ } else {
+     echo "Error: transport '[ transport select ]' not supported by swj_newdap"
+     shutdown
+ }
 }