[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.5.0-364-gc527882

[OpenOCD-Gerrit <ope...@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  c527882121e3cc3d7cba5360c20928317c19a5cf (commit)
      from  3a550e5b5fe011e526b150a5d234b48e8e2aaad6 (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 c527882121e3cc3d7cba5360c20928317c19a5cf
Author: Spencer Oliver <sp...@sp...>
Date:   Fri Jan 13 11:23:27 2012 +0000

    stlink: enable cortex special reg writes
    
    Change-Id: I5aa02e8de6dd5ac5a6ca628ba4068decb200c689
    Signed-off-by: Spencer Oliver <sp...@sp...>
    Reviewed-on: http://openocd.zylin.com/378
    Tested-by: jenkins

diff --git a/src/target/stm32_stlink.c b/src/target/stm32_stlink.c
index dec2b24..d00852c 100644
--- a/src/target/stm32_stlink.c
+++ b/src/target/stm32_stlink.c
@@ -133,9 +133,7 @@ static int stm32_stlink_store_core_reg_u32(struct target *target,
 	 */
 	switch (num) {
 	case 0 ... 18:
-		retval =
-		    stlink_if->layout->api->write_reg(stlink_if->fd, num,
-						      value);
+		retval = stlink_if->layout->api->write_reg(stlink_if->fd, num, value);
 
 		if (retval != ERROR_OK) {
 			struct reg *r;
@@ -145,8 +143,7 @@ static int stm32_stlink_store_core_reg_u32(struct target *target,
 			r->dirty = r->valid;
 			return ERROR_JTAG_DEVICE_ERROR;
 		}
-		LOG_DEBUG("write core reg %i value 0x%" PRIx32 "", (int)num,
-			  value);
+		LOG_DEBUG("write core reg %i value 0x%" PRIx32 "", (int)num, value);
 		break;
 
 	case ARMV7M_PRIMASK:
@@ -157,7 +154,8 @@ static int stm32_stlink_store_core_reg_u32(struct target *target,
 		 * in one Debug Core register.  So say r0 and r2 docs;
 		 * it was removed from r1 docs, but still works.
 		 */
-		/* cortexm3_dap_read_coreregister_u32(swjdp, &reg, 20); */
+
+		stlink_if->layout->api->read_reg(stlink_if->fd, 20, &reg);
 
 		switch (num) {
 		case ARMV7M_PRIMASK:
@@ -177,10 +175,9 @@ static int stm32_stlink_store_core_reg_u32(struct target *target,
 			break;
 		}
 
-		/* cortexm3_dap_write_coreregister_u32(swjdp, reg, 20); */
+		stlink_if->layout->api->write_reg(stlink_if->fd, 20, reg);
 
-		LOG_DEBUG("write special reg %i value 0x%" PRIx32 " ", (int)num,
-			  value);
+		LOG_DEBUG("write special reg %i value 0x%" PRIx32 " ", (int)num, value);
 		break;
 
 	default:

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

Summary of changes:
 src/target/stm32_stlink.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository