From: Paul Fertser <fercerpav@gmail.com>
Date: Fri, 3 Apr 2015 04:55:50 +0000 (+0300)
Subject: jtag/startup.tcl: fix regression with autoselecting JTAG
X-Git-Tag: v0.9.0-rc1~30
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e51d591641c9a9cd0af9c4c2200d7051c4a88ef0;p=openocd

jtag/startup.tcl: fix regression with autoselecting JTAG

This regression was introduced with d90b86d8. "transport select" doesn't
throw an error anymore and autoselects the first available transport on
its own.

Reported by moyix on IRC.

Change-Id: I3f303c0372e915931cca4b28af450694abc1a63e
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2693
Tested-by: jenkins
---

diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index f88ef1fa..d57cafb2 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -89,9 +89,8 @@ proc measure_clk {} {
 add_help_text measure_clk "Runs a test to measure the JTAG clk. Useful with RCLK / RTCK."
 
 proc default_to_jtag { f args } {
-	if [catch {transport select} current_transport] {
-		echo "Info : session transport was not selected, defaulting to JTAG"
-		transport select jtag
+	set current_transport [transport select]
+	if {[using_jtag]} {
 		eval $f $args
 	} {
 		error "session transport is \"$current_transport\" but your config requires JTAG"