From 761d4555b8f8c8eb2b899dee16584656a43b6444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= Date: Mon, 1 Mar 2010 08:22:12 +0100 Subject: [PATCH] jtag: the post TAP state is now passed to the drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit after clocking out a tms sequence, then the TAP will be in some state. This state is now handed to the drivers. TAP_INVALID is a possible state after a TMS sequence if switching to SWD. Signed-off-by: Øyvind Harboe --- src/jtag/core.c | 2 +- src/jtag/drivers/driver.c | 2 +- src/jtag/minidriver.h | 3 ++- src/jtag/minidummy/minidummy.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/jtag/core.c b/src/jtag/core.c index 7f417b737..d43bd1cec 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -512,7 +512,7 @@ int jtag_add_tms_seq(unsigned nbits, const uint8_t *seq, enum tap_state state) jtag_checks(); cmd_queue_cur_state = state; - retval = interface_add_tms_seq(nbits, seq); + retval = interface_add_tms_seq(nbits, seq, state); jtag_set_error(retval); return retval; } diff --git a/src/jtag/drivers/driver.c b/src/jtag/drivers/driver.c index 14efe965e..ca59239eb 100644 --- a/src/jtag/drivers/driver.c +++ b/src/jtag/drivers/driver.c @@ -388,7 +388,7 @@ int interface_jtag_add_tlr(void) return ERROR_OK; } -int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq) +int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq, enum tap_state state) { struct jtag_command *cmd; diff --git a/src/jtag/minidriver.h b/src/jtag/minidriver.h index 5caec58b1..810bb0e50 100644 --- a/src/jtag/minidriver.h +++ b/src/jtag/minidriver.h @@ -67,7 +67,8 @@ int interface_jtag_add_tlr(void); int interface_jtag_add_pathmove(int num_states, const tap_state_t* path); int interface_jtag_add_runtest(int num_cycles, tap_state_t endstate); -int interface_add_tms_seq(unsigned num_bits, const uint8_t *bits); +int interface_add_tms_seq(unsigned num_bits, + const uint8_t *bits, enum tap_state state); /** * This drives the actual srst and trst pins. srst will always be 0 diff --git a/src/jtag/minidummy/minidummy.c b/src/jtag/minidummy/minidummy.c index 6410c2d2b..705f1b47f 100644 --- a/src/jtag/minidummy/minidummy.c +++ b/src/jtag/minidummy/minidummy.c @@ -147,7 +147,7 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path) return ERROR_OK; } -int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq) +int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq, enum tap_state state) { /* synchronously do the operation here */