X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.c;h=9d8132d43b665c635f6ad506f1f30c836f9a48de;hb=1b3f15d51ee3388e18edb06201f5c6c8b75c3361;hp=d4f6309ff6f021cbfe5a882583a95c21f78dc91b;hpb=bbb754aa395be74ceac0c01640fb33c0fae52c20;p=openocd.git

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index d4f6309ff6..9d8132d43b 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);
 
@@ -834,7 +839,7 @@ static const struct command_registration armv7m_exec_command_handlers[] = {
 const struct command_registration armv7m_command_handlers[] = {
 	{
 		.name = "dap",
-		.mode = COMMAND_ANY,
+		.mode = COMMAND_EXEC,
 		.help = "Cortex DAP command group",
 		.chain = armv7m_exec_command_handlers,
 	},