diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-07-20 08:23:59 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-07-20 08:24:53 +0200 |
| commit | e0525cd182aee35549f13e786143ccc0a252aeab (patch) | |
| tree | 51f6cb173c4299e2d95f757396c8a0f0918162fa /src/target/embeddedice.c | |
| parent | a9761c90931101d280b9443126db017f96d92e3d (diff) | |
| download | openocd+libswd-e0525cd182aee35549f13e786143ccc0a252aeab.tar.gz openocd+libswd-e0525cd182aee35549f13e786143ccc0a252aeab.tar.bz2 openocd+libswd-e0525cd182aee35549f13e786143ccc0a252aeab.tar.xz openocd+libswd-e0525cd182aee35549f13e786143ccc0a252aeab.zip | |
arm_jtag_scann error propagation fixes
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/target/embeddedice.c')
| -rw-r--r-- | src/target/embeddedice.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c index 965260ca..abc49d7e 100644 --- a/src/target/embeddedice.c +++ b/src/target/embeddedice.c @@ -346,7 +346,9 @@ int embeddedice_read_reg_w_check(struct reg *reg, uint8_t field2_out[1]; int retval; - arm_jtag_scann(ice_reg->jtag_info, 0x2, TAP_IDLE); + retval = arm_jtag_scann(ice_reg->jtag_info, 0x2, TAP_IDLE); + if (retval != ERROR_OK) + return retval; retval = arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL, TAP_IDLE); if (retval != ERROR_OK) @@ -410,7 +412,9 @@ int embeddedice_receive(struct arm_jtag *jtag_info, uint32_t *data, uint32_t siz uint8_t field2_out[1]; int retval; - arm_jtag_scann(jtag_info, 0x2, TAP_IDLE); + retval = arm_jtag_scann(jtag_info, 0x2, TAP_IDLE); + if (retval != ERROR_OK) + return retval; retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE); if (retval != ERROR_OK) return retval; @@ -497,7 +501,7 @@ void embeddedice_write_reg(struct reg *reg, uint32_t value) LOG_DEBUG("%i: 0x%8.8" PRIx32 "", ice_reg->addr, value); - arm_jtag_scann(ice_reg->jtag_info, 0x2, TAP_IDLE); + retval = arm_jtag_scann(ice_reg->jtag_info, 0x2, TAP_IDLE); retval = arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL, TAP_IDLE); @@ -530,7 +534,9 @@ int embeddedice_send(struct arm_jtag *jtag_info, uint32_t *data, uint32_t size) uint8_t field2_out[1]; int retval; - arm_jtag_scann(jtag_info, 0x2, TAP_IDLE); + retval = arm_jtag_scann(jtag_info, 0x2, TAP_IDLE); + if (retval != ERROR_OK) + return retval; retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE); if (retval != ERROR_OK) return retval; @@ -584,7 +590,9 @@ int embeddedice_handshake(struct arm_jtag *jtag_info, int hsbit, uint32_t timeou else return ERROR_INVALID_ARGUMENTS; - arm_jtag_scann(jtag_info, 0x2, TAP_IDLE); + retval = arm_jtag_scann(jtag_info, 0x2, TAP_IDLE); + if (retval != ERROR_OK) + return retval; retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE); if (retval != ERROR_OK) return retval; |