summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanteri Salko <santeri.salko@gmail.com>2011-01-13 15:21:06 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2011-01-14 14:55:24 +0100
commit5b1efd0176c2e32a5f6766175e518ccfc45239a6 (patch)
tree9fa4cc67baa6077bc050ddd144f5883066d3571b
parent11193c040cf0db5c64e7db808b10184aa8915aa3 (diff)
downloadopenocd_libswd-5b1efd0176c2e32a5f6766175e518ccfc45239a6.tar.gz
openocd_libswd-5b1efd0176c2e32a5f6766175e518ccfc45239a6.tar.bz2
openocd_libswd-5b1efd0176c2e32a5f6766175e518ccfc45239a6.tar.xz
openocd_libswd-5b1efd0176c2e32a5f6766175e518ccfc45239a6.zip
str9xpec: Find flash controller from the chain.
Find the flash controller by position since it is before the core, not after it. This fixes the problem that str9xpec enable_turbo (or any other str9xpec command) did not work. (See my post in http://forum.sparkfun.com/viewtopic.php?f=18&t=25542) Signed-off-by: Santeri Salko <santeri.salko@gmail.com>
-rw-r--r--src/flash/nor/str9xpec.c3
-rw-r--r--src/jtag/core.c2
-rw-r--r--src/jtag/jtag.h1
3 files changed, 4 insertions, 2 deletions
diff --git a/src/flash/nor/str9xpec.c b/src/flash/nor/str9xpec.c
index 18761c2f..c06e6d16 100644
--- a/src/flash/nor/str9xpec.c
+++ b/src/flash/nor/str9xpec.c
@@ -306,7 +306,8 @@ FLASH_BANK_COMMAND_HANDLER(str9xpec_flash_bank_command)
arm7_9 = armv4_5->arch_info;
jtag_info = &arm7_9->jtag_info;
- str9xpec_info->tap = bank->target->tap;
+ /* The core is the next tap after the flash controller in the chain */
+ str9xpec_info->tap = jtag_tap_by_position(jtag_info->tap->abs_chain_position - 1);
str9xpec_info->isc_enable = 0;
str9xpec_build_block_list(bank);
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 0c222db9..d7e1ccec 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -216,7 +216,7 @@ void jtag_tap_add(struct jtag_tap *t)
}
/* returns a pointer to the n-th device in the scan chain */
-static inline struct jtag_tap *jtag_tap_by_position(unsigned n)
+struct jtag_tap *jtag_tap_by_position(unsigned n)
{
struct jtag_tap *t = jtag_all_taps();
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index df015376..6709cf71 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -173,6 +173,7 @@ struct jtag_tap* jtag_all_taps(void);
const char *jtag_tap_name(const struct jtag_tap *tap);
struct jtag_tap* jtag_tap_by_string(const char* dotted_name);
struct jtag_tap* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj);
+struct jtag_tap* jtag_tap_by_position(unsigned abs_position);
struct jtag_tap* jtag_tap_next_enabled(struct jtag_tap* p);
unsigned jtag_tap_count_enabled(void);
unsigned jtag_tap_count(void);