diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-10-16 12:20:11 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-10-16 12:20:11 +0000 |
| commit | 09614074b7eafe413935059d19dcc8df020131ab (patch) | |
| tree | b0eee4dcab2eb698b5f57dca730adcb85724ab33 /src | |
| parent | a3035243dcb3dd9e588bbc56684222415ff28312 (diff) | |
| download | openocd+libswd-09614074b7eafe413935059d19dcc8df020131ab.tar.gz openocd+libswd-09614074b7eafe413935059d19dcc8df020131ab.tar.bz2 openocd+libswd-09614074b7eafe413935059d19dcc8df020131ab.tar.xz openocd+libswd-09614074b7eafe413935059d19dcc8df020131ab.zip | |
more robust error reporting for DCC
git-svn-id: svn://svn.berlios.de/openocd/trunk@1068 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/arm7_9_common.c | 4 | ||||
| -rw-r--r-- | src/target/armv4_5.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index a814d2e9..a9f06df0 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -2282,6 +2282,10 @@ static int arm7_9_dcc_completion(struct target_s *target, u32 exit_point, int ti int retval = ERROR_OK; armv4_5_common_t *armv4_5 = target->arch_info; arm7_9_common_t *arm7_9 = armv4_5->arch_info; + + if ((retval=target_wait_state(target, TARGET_DEBUG_RUNNING, 500))!=ERROR_OK) + return retval; + int little=target->endianness==TARGET_LITTLE_ENDIAN; int count=dcc_count; u8 *buffer=dcc_buffer; diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index c4637aee..bd9ea8e8 100644 --- a/src/target/armv4_5.c +++ b/src/target/armv4_5.c @@ -612,6 +612,9 @@ int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, mem breakpoint_remove(target, exit_point); + if (retval!=ERROR_OK) + return retval; + for (i = 0; i < num_mem_params; i++) { if (mem_params[i].direction != PARAM_OUT) |