This is an automated email from Gerrit.
Paul Fertser (fercer...@gmail.com) just uploaded a new patch set to Gerrit,
which you can find at http://openocd.zylin.com/2179
-- gerrit
commit 3d8be4d0c7d6735984432ca66f1466eab64bcbbc
Author: Paul Fertser <fercer...@gmail.com>
Date: Thu Jun 19 14:21:21 2014 +0400
Auto-select JTAG transport when appropriate
I looked through all the target configs after stripping comments and
such from them with sed to see what jtag-specific commands can appear
first, and it looks like all the meaningful combinations should be
covered.
Change-Id: I8d543407b7f4ac8aca7354ecd50e841c8a04d5f3
Signed-off-by: Paul Fertser <fercer...@gmail.com>
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 94590e1..6f9c000 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -87,6 +87,32 @@ 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
+ eval $f $args
+ } {
+ error "session transport is \"$current_transport\" but your
config requires JTAG"
+ }
+}
+
+proc jtag args {
+ eval default_to_jtag jtag $args
+}
+
+proc jtag_rclk args {
+ eval default_to_jtag jtag_rclk $args
+}
+
+proc jtag_ntrst_delay args {
+ eval default_to_jtag jtag_ntrst_delay $args
+}
+
+proc jtag_ntrst_assert_width args {
+ eval default_to_jtag jtag_ntrst_assert_width $args
+}
+
# BEGIN MIGRATION AIDS ... these adapter operations originally had
# JTAG-specific names despite the fact that the operations were not
# specific to JTAG, or otherewise had troublesome/misleading names.
diff --git a/tcl/target/swj-dp.tcl b/tcl/target/swj-dp.tcl
index bd348e6..2fa82ed 100644
--- a/tcl/target/swj-dp.tcl
+++ b/tcl/target/swj-dp.tcl
@@ -18,6 +18,11 @@
# split out "chip" and "tag" so we can someday handle
# them more uniformly irlen too...)
+if [catch {transport select}] {
+ echo "Info : session transport was not selected, defaulting to JTAG"
+ transport select jtag
+}
+
proc swj_newdap {chip tag args} {
if {[using_jtag]} { eval jtag newtap $chip $tag $args }
if {[using_swd]} { eval swd newdap $chip $tag $args }
--
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
