From: David Brownell <dbrownell@users.sourceforge.net>
Date: Tue, 5 Jan 2010 06:11:34 +0000 (-0800)
Subject: ARMv7-M:  use AP_REG_* symbol
X-Git-Tag: v0.4.0-rc2~151
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1b3f15d51ee3388e18edb06201f5c6c8b75c3361;p=openocd

ARMv7-M:  use AP_REG_* symbol

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index d0f58dee..9d8132d4 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -731,7 +731,12 @@ COMMAND_HANDLER(handle_dap_baseaddr_command)
 	if (apselsave != apsel)
 		dap_ap_select(swjdp, apsel);
 
-	dap_ap_read_reg_u32(swjdp, 0xF8, &baseaddr);
+	/* NOTE:  assumes we're talking to a MEM-AP, which
+	 * has a base address.  There are other kinds of AP,
+	 * though they're not common for now.  This should
+	 * use the ID register to verify it's a MEM-AP.
+	 */
+	dap_ap_read_reg_u32(swjdp, AP_REG_BASE, &baseaddr);
 	retval = swjdp_transaction_endcheck(swjdp);
 	command_print(CMD_CTX, "0x%8.8" PRIx32 "", baseaddr);