From 3cd428ffdb8c65f97f282e8c493c21cd4e9cf8a2 Mon Sep 17 00:00:00 2001 From: zwelch Date: Tue, 9 Jun 2009 02:24:05 +0000 Subject: [PATCH 1/1] - Replace 'jtag_tap_by_abs_position' with 'jtag_tap_by_position'. git-svn-id: svn://svn.berlios.de/openocd/trunk@2146 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/str9xpec.c | 2 +- src/jtag/jtag.c | 4 ++-- src/jtag/jtag.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c index 1ca7360c09..2c243a97a5 100644 --- a/src/flash/str9xpec.c +++ b/src/flash/str9xpec.c @@ -325,7 +325,7 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char * arm7_9 = armv4_5->arch_info; jtag_info = &arm7_9->jtag_info; - str9xpec_info->tap = jtag_tap_by_abs_position( jtag_info->tap->abs_chain_position - 1); + 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/jtag.c b/src/jtag/jtag.c index 0d7cdb3dd4..3292bc1328 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -296,7 +296,7 @@ jtag_tap_t *jtag_tap_by_string(const char *s) if ((s == cp) || (*cp != 0)) return NULL; - return jtag_tap_by_abs_position(n); + return jtag_tap_by_position(n); } jtag_tap_t *jtag_tap_by_jim_obj(Jim_Interp *interp, Jim_Obj *o) @@ -311,7 +311,7 @@ jtag_tap_t *jtag_tap_by_jim_obj(Jim_Interp *interp, Jim_Obj *o) } /* returns a pointer to the n-th device in the scan chain */ -jtag_tap_t *jtag_tap_by_abs_position(unsigned n) +jtag_tap_t *jtag_tap_by_position(unsigned n) { jtag_tap_t *t = jtag_all_taps(); diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index a7f70a345a..99ed93954d 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -179,7 +179,7 @@ extern jtag_tap_t* jtag_all_taps(void); extern const char *jtag_tap_name(const jtag_tap_t *tap); extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name); extern jtag_tap_t* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj); -extern jtag_tap_t* jtag_tap_by_abs_position(unsigned abs_position); +extern jtag_tap_t* jtag_tap_by_position(unsigned abs_position); extern unsigned jtag_tap_count_enabled(void); extern unsigned jtag_tap_count(void); -- 2.30.2