X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=tcl%2Ftarget%2Fswj-dp.tcl;h=4f2b49692bb1582351e0ab23a38d22528aac4d2e;hp=fa44583a436fb1f2e6e3614252833f89ef035e1d;hb=45a86f8e2a58c7c0acb6328a660846946e81ed1c;hpb=4dc8cd201c667bac72bc083ef1fa1b285eb093fc diff --git a/tcl/target/swj-dp.tcl b/tcl/target/swj-dp.tcl index fa44583a43..4f2b49692b 100644 --- a/tcl/target/swj-dp.tcl +++ b/tcl/target/swj-dp.tcl @@ -18,13 +18,19 @@ # 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 "Info : session transport was not selected, defaulting to JTAG" + transport select jtag +} 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_hla] { + eval hla newtap $chip $tag $args + } elseif [using_jtag] { + eval jtag newtap $chip $tag $args + } elseif [using_swd] { + eval swd newdap $chip $tag $args + } elseif [string equal [transport select] "cmsis-dap"] { + eval cmsis-dap newdap $chip $tag $args + } }