diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-11-04 17:31:23 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-11-04 17:31:23 +0000 |
| commit | 56a1fed30982c01f76cdfe3544a5943b7192df17 (patch) | |
| tree | 9f4ba0794f3fc2c4a7f346cc8ff6205f5c035cc5 /src/target | |
| parent | c7e9d09e966b582731b4c2036e83092cb3555fc8 (diff) | |
| download | openocd+libswd-56a1fed30982c01f76cdfe3544a5943b7192df17.tar.gz openocd+libswd-56a1fed30982c01f76cdfe3544a5943b7192df17.tar.bz2 openocd+libswd-56a1fed30982c01f76cdfe3544a5943b7192df17.tar.xz openocd+libswd-56a1fed30982c01f76cdfe3544a5943b7192df17.zip | |
arm7_9_execute_sys_speed error propagation. Found by code inspection, no observed problems as such.
git-svn-id: svn://svn.berlios.de/openocd/trunk@1132 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target')
| -rw-r--r-- | src/target/arm7_9_common.c | 6 | ||||
| -rw-r--r-- | src/target/arm920t.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index d7684c5e..4fd97c5c 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -2016,9 +2016,11 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count * from a sufficiently high clock (32 kHz is usually too slow) */ if (arm7_9->fast_memory_access) - arm7_9_execute_fast_sys_speed(target); + retval = arm7_9_execute_fast_sys_speed(target); else - arm7_9_execute_sys_speed(target); + retval = arm7_9_execute_sys_speed(target); + if (retval != ERROR_OK) + return retval; arm7_9->read_core_regs_target_buffer(target, reg_list, buffer, 4); diff --git a/src/target/arm920t.c b/src/target/arm920t.c index 5f499d64..b22a8c2b 100644 --- a/src/target/arm920t.c +++ b/src/target/arm920t.c @@ -293,7 +293,9 @@ int arm920t_execute_cp15(target_t *target, u32 cp15_opcode, u32 arm_opcode) arm9tdmi_clock_out(jtag_info, arm_opcode, 0, NULL, 0); arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 1); - arm7_9_execute_sys_speed(target); + retval = arm7_9_execute_sys_speed(target); + if (retval != ERROR_OK) + return retval; if ((retval = jtag_execute_queue()) != ERROR_OK) { |