From: David Brownell <dbrownell@users.sourceforge.net>
Date: Tue, 2 Mar 2010 17:39:36 +0000 (-0800)
Subject: ADIv5: use right ID for Cortex-M3 ETM
X-Git-Tag: v0.5.0-rc1~888
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5b311865788009445a1457f62204899a4aa1c7b3;p=openocd

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 <dbrownell@users.sourceforge.net>
---

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 6be60af3..115ccf12 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)";