X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_adi_v5.c;h=c2929ef7fe466679bcfc558fc90ed2f9c1ea458f;hb=bfba15a898ae8eb2086f8981fcabf1298ec5c761;hp=f7e58d08b8fbc561fe4c8ed47c1e05d6059418a6;hpb=5387d616a3d1b4550f9acecda26ead380d37dedf;p=openocd.git

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index f7e58d08b8..c2929ef7fe 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -844,7 +844,7 @@ int dap_get_debugbase(struct adiv5_dap *dap, int ap,
 	if (ap >= 256)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	ap_old = dap->ap_current;
+	ap_old = dap_ap_get_select(dap);
 	dap_ap_select(dap, ap);
 
 	retval = dap_queue_ap_read(dap, AP_REG_BASE, dbgbase);
@@ -873,7 +873,7 @@ int dap_lookup_cs_component(struct adiv5_dap *dap, int ap,
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	*addr = 0;
-	ap_old = dap->ap_current;
+	ap_old = dap_ap_get_select(dap);
 	dap_ap_select(dap, ap);
 
 	do {
@@ -1408,7 +1408,7 @@ static int dap_info_command(struct command_context *cmd_ctx,
 	if (retval != ERROR_OK)
 		return retval;
 
-	ap_old = dap->ap_current;
+	ap_old = dap_ap_get_select(dap);
 	dap_ap_select(dap, ap);
 
 	/* Now we read ROM table ID registers, ref. ARM IHI 0029B sec  */