X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Fswj-dp.tcl;h=f2b233fb78133fd5e45395fd307674c16a65ed70;hb=e6505b04892ccacf75603c3d173616f5d92809e7;hp=377b7b5f4182f6d77841d30f3186ba914e608539;hpb=e3773e3e3d1f1ee0dbb0b69e8babe8419784d1c1;p=fw%2Fopenocd

diff --git a/tcl/target/swj-dp.tcl b/tcl/target/swj-dp.tcl
index 377b7b5f4..f2b233fb7 100644
--- 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,8 +20,18 @@
 # split out "chip" and "tag" so we can someday handle
 # them more uniformly irlen too...)
 
+if [catch {transport select}] {
+  echo "Error: unable to select a session transport. Can't continue."
+  shutdown
+}
+
 proc swj_newdap {chip tag args} {
-set tran [transport select]
-if [string equal $tran "jtag"] { eval jtag newtap $chip $tag $args}
-if [string equal $tran "swd"] { eval swd newdap $chip $tag $args }
+ 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
+ }
 }