diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-05 12:03:04 +0000 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-06 11:00:36 +0000 |
| commit | 374127301ec1d72033b9d573b72c7abdfd61990d (patch) | |
| tree | b56f5f4bba1718f9ac482d1fabdff18f5d170196 /src/target/arm_jtag.c | |
| parent | de0130a0aad83c1ef692ee4d68ab996a8668424d (diff) | |
build: cleanup src/target directory
Change-Id: Ia055b6d2b5f6449a38afd0539a8c66e7d7e0c059
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/430
Tested-by: jenkins
Diffstat (limited to 'src/target/arm_jtag.c')
| -rw-r--r-- | src/target/arm_jtag.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c index 3a552eeb..22538ca5 100644 --- a/src/target/arm_jtag.c +++ b/src/target/arm_jtag.c @@ -20,18 +20,19 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "arm_jtag.h" - #if 0 #define _ARM_JTAG_SCAN_N_CHECK_ #endif -int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr, void *no_verify_capture, tap_state_t end_state) +int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, + uint32_t new_instr, void *no_verify_capture, tap_state_t end_state) { struct jtag_tap *tap; tap = jtag_info->tap; @@ -44,10 +45,8 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr, vo field.in_value = NULL; if (no_verify_capture == NULL) - { jtag_add_ir_scan(tap, &field, end_state); - } else - { + else { /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to * have special verification code. */ @@ -63,13 +62,12 @@ int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, ta uint32_t values[1]; int num_bits[1]; - values[0]=new_scan_chain; - num_bits[0]=jtag_info->scann_size; + values[0] = new_scan_chain; + num_bits[0] = jtag_info->scann_size; - if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state)) != ERROR_OK) - { + retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state); + if (retval != ERROR_OK) return retval; - } jtag_add_dr_out(jtag_info->tap, 1, @@ -87,9 +85,7 @@ static int arm_jtag_reset_callback(enum jtag_event event, void *priv) struct arm_jtag *jtag_info = priv; if (event == JTAG_TRST_ASSERTED) - { jtag_info->cur_scan_chain = 0; - } return ERROR_OK; } |