[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-43-g5b31186

[David B. <dbr...@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  5b311865788009445a1457f62204899a4aa1c7b3 (commit)
      from  cb72b7a270c7be60c1ec2ee47282156397bea846 (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 5b311865788009445a1457f62204899a4aa1c7b3
Author: David Brownell <dbr...@us...>
Date:   Tue Mar 2 09:39:36 2010 -0800

    ADIv5: use right ID for Cortex-M3 ETM
    
    Correct a mistake made copying the ID of the Cortex-M3 ETM module
    from the TRM, so that "dap info" on a CM3 with an ETM will now
    correctly describe ROM table entries for such modules.  (They are
    included on LPC17xx and some other cores.)
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 6be60af..115ccf1 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1530,10 +1530,6 @@ int dap_info_command(struct command_context *cmd_ctx,
 					type = "TI DAPCTL";
 					full = "";
 					break;
-				case 0x4e0:
-					type = "Cortex-M3 ETM";
-					full = "(Embedded Trace)";
-					break;
 				case 0x906:
 					type = "Coresight CTI";
 					full = "(Cross Trigger)";
@@ -1566,6 +1562,10 @@ int dap_info_command(struct command_context *cmd_ctx,
 					type = "Cortex-M3 TPIU";
 					full = "(Trace Port Interface Unit)";
 					break;
+				case 0x924:
+					type = "Cortex-M3 ETM";
+					full = "(Embedded Trace)";
+					break;
 				case 0xc08:
 					type = "Cortex-A8 Debug";
 					full = "(Debug Unit)";

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

Summary of changes:
 src/target/arm_adi_v5.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository