diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-07-19 14:37:45 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-07-19 22:13:49 +0200 |
| commit | 4333840ee3d6d79299bf90b719a3c1628c688690 (patch) | |
| tree | 5311bc6d4ec2b5d6534a3910eff052cdb12e2b71 /src/target/arm7tdmi.c | |
| parent | 5164fe55639877be4dd6a7c0a504aa1bc279d64d (diff) | |
| download | openocd+libswd-4333840ee3d6d79299bf90b719a3c1628c688690.tar.gz openocd+libswd-4333840ee3d6d79299bf90b719a3c1628c688690.tar.bz2 openocd+libswd-4333840ee3d6d79299bf90b719a3c1628c688690.tar.xz openocd+libswd-4333840ee3d6d79299bf90b719a3c1628c688690.zip | |
arm: error propagation of arm_jtag_set_instr
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/target/arm7tdmi.c')
| -rw-r--r-- | src/target/arm7tdmi.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index 541adc8e..8befe2bf 100644 --- a/src/target/arm7tdmi.c +++ b/src/target/arm7tdmi.c @@ -68,7 +68,9 @@ static int arm7tdmi_examine_debug_reason(struct target *target) { return retval; } - arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL, TAP_DRPAUSE); + retval = arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL, TAP_DRPAUSE); + if (retval != ERROR_OK) + return retval; jtag_add_dr_scan(arm7_9->jtag_info.tap, 2, fields, TAP_DRPAUSE); if ((retval = jtag_execute_queue()) != ERROR_OK) @@ -117,8 +119,11 @@ static __inline int arm7tdmi_clock_out_inner(struct arm_jtag *jtag_info, uint32_ static __inline int arm7tdmi_clock_out(struct arm_jtag *jtag_info, uint32_t out, uint32_t *deprecated, int breakpoint) { + int retval; arm_jtag_scann(jtag_info, 0x1, TAP_DRPAUSE); - arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE); + retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE); + if (retval != ERROR_OK) + return retval; return arm7tdmi_clock_out_inner(jtag_info, out, breakpoint); } @@ -133,7 +138,9 @@ static int arm7tdmi_clock_data_in(struct arm_jtag *jtag_info, uint32_t *in) { return retval; } - arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE); + retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE); + if (retval != ERROR_OK) + return retval; fields[0].num_bits = 1; fields[0].out_value = NULL; @@ -217,7 +224,9 @@ static int arm7tdmi_clock_data_in_endianness(struct arm_jtag *jtag_info, { return retval; } - arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE); + retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE); + if (retval != ERROR_OK) + return retval; fields[0].num_bits = 1; fields[0].out_value = NULL; |