[openocd-svn] Main OpenOCD repository branch, master, updated. 0.2.0-355-g9aab763

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  9aab763fa555f049f03a242114ade0d1978f4291 (commit)
      from  59d09ff393daaf3cb2a5a27c808c40384bc3f74a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9aab763fa555f049f03a242114ade0d1978f4291
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Oct 12 15:25:00 2009 +0200

    More error propagation fixes.

diff --git a/src/target/arm11.c b/src/target/arm11.c
index f7265da..36ed6b8 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1401,7 +1401,9 @@ int arm11_write_memory_inner(struct target_s *target, uint32_t address, uint32_t
 
 	arm11_common_t * arm11 = target->arch_info;
 
-	arm11_run_instr_data_prepare(arm11);
+	retval = arm11_run_instr_data_prepare(arm11);
+	if (retval != ERROR_OK)
+		return retval;
 
 	/* MRC p14,0,r0,c0,c5,0 */
 	retval = arm11_run_instr_data_to_core1(arm11, 0xee100e15, address);
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 1ab6c52..57685cf 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -925,7 +925,10 @@ void arm11_sc7_set_vcr(arm11_common_t * arm11, uint32_t value)
  */
 int arm11_read_memory_word(arm11_common_t * arm11, uint32_t address, uint32_t * result)
 {
-	arm11_run_instr_data_prepare(arm11);
+	int retval;
+	retval = arm11_run_instr_data_prepare(arm11);
+	if (retval != ERROR_OK)
+		return retval;
 
 	/* MRC p14,0,r0,c0,c5,0 (r0 = address) */
 	CHECK_RETVAL(arm11_run_instr_data_to_core1(arm11, 0xee100e15, address));
@@ -933,9 +936,7 @@ int arm11_read_memory_word(arm11_common_t * arm11, uint32_t address, uint32_t *
 	/* LDC p14,c5,[R0],#4 (DTR = [r0]) */
 	CHECK_RETVAL(arm11_run_instr_data_from_core(arm11, 0xecb05e01, result, 1));
 
-	arm11_run_instr_data_finish(arm11);
-
-	return ERROR_OK;
+	return arm11_run_instr_data_finish(arm11);
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 src/target/arm11.c        |    4 +++-
 src/target/arm11_dbgtap.c |    9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository