arm_adi_v5: Convert the AP references from numbers to pointers

Change the debug_ap and memory_ap fields of the cortex_a target and
the debug_ap field of the cortex_m target to be pointers to the
struct adiv5_ap instead of AP numbers in some known DAP.

This reduces the dependency on the DAP struct in the targets and
enables MEM-AP accesses to take the relevant AP as parameter.

Change-Id: I39d7b134d78000564b7eec5bff464adf0ef89147
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3147
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>

1 files changed, 72 insertions, 72 deletions

diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index a65cabf5..61e09895 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -195,11 +195,11 @@ static int cortex_a8_init_debug_access(struct target *target)
 
 	/* Unlocking the debug registers for modification
 	 * The debugport might be uninitialised so try twice */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55);
 	if (retval != ERROR_OK) {
 		/* try again */
-		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55);
 		if (retval == ERROR_OK)
 			LOG_USER(
@@ -228,7 +228,7 @@ static int cortex_a_init_debug_access(struct target *target)
 	switch (cortex_part_num) {
 	case CORTEX_A7_PARTNUM:
 	case CORTEX_A15_PARTNUM:
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 						    armv7a->debug_base + CPUDBG_OSLSR,
 						    &dbg_osreg);
 		if (retval != ERROR_OK)
@@ -238,7 +238,7 @@ static int cortex_a_init_debug_access(struct target *target)
 
 		if (dbg_osreg & CPUDBG_OSLAR_LK_MASK)
 			/* Unlocking the DEBUG OS registers for modification */
-			retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+			retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 							     armv7a->debug_base + CPUDBG_OSLAR,
 							     0);
 		break;
@@ -254,7 +254,7 @@ static int cortex_a_init_debug_access(struct target *target)
 		return retval;
 	/* Clear Sticky Power Down status Bit in PRSR to enable access to
 	   the registers in the Core Power Domain */
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_PRSR, &dbg_osreg);
 	LOG_DEBUG("target->coreid %" PRId32 " DBGPRSR  0x%" PRIx32, target->coreid, dbg_osreg);
 
@@ -262,13 +262,13 @@ static int cortex_a_init_debug_access(struct target *target)
 		return retval;
 
 	/* Disable cacheline fills and force cache write-through in debug state */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCCR, 0);
 	if (retval != ERROR_OK)
 		return retval;
 
 	/* Disable TLB lookup and refill/eviction in debug state */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSMCR, 0);
 	if (retval != ERROR_OK)
 		return retval;
@@ -291,7 +291,7 @@ static int cortex_a_wait_instrcmpl(struct target *target, uint32_t *dscr, bool f
 	long long then = timeval_ms();
 	while ((*dscr & DSCR_INSTR_COMP) == 0 || force) {
 		force = false;
-		int retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		int retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DSCR, dscr);
 		if (retval != ERROR_OK) {
 			LOG_ERROR("Could not read DSCR register");
@@ -327,14 +327,14 @@ static int cortex_a_exec_opcode(struct target *target,
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_ITR, opcode);
 	if (retval != ERROR_OK)
 		return retval;
 
 	long long then = timeval_ms();
 	do {
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DSCR, &dscr);
 		if (retval != ERROR_OK) {
 			LOG_ERROR("Could not read DSCR register");
@@ -373,7 +373,7 @@ static int cortex_a_read_regs_through_mem(struct target *target, uint32_t addres
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap,
+	retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap->ap_num,
 			(uint8_t *)(&regfile[1]), 4, 15, address);
 
 	return retval;
@@ -425,7 +425,7 @@ static int cortex_a_dap_read_coreregister_u32(struct target *target,
 	/* Wait for DTRRXfull then read DTRRTX */
 	long long then = timeval_ms();
 	while ((dscr & DSCR_DTR_TX_FULL) == 0) {
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DSCR, &dscr);
 		if (retval != ERROR_OK)
 			return retval;
@@ -435,7 +435,7 @@ static int cortex_a_dap_read_coreregister_u32(struct target *target,
 		}
 	}
 
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DTRTX, value);
 	LOG_DEBUG("read DCC 0x%08" PRIx32, *value);
 
@@ -454,7 +454,7 @@ static int cortex_a_dap_write_coreregister_u32(struct target *target,
 	LOG_DEBUG("register %i, value 0x%08" PRIx32, regnum, value);
 
 	/* Check that DCCRX is not full */
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, &dscr);
 	if (retval != ERROR_OK)
 		return retval;
@@ -472,7 +472,7 @@ static int cortex_a_dap_write_coreregister_u32(struct target *target,
 
 	/* Write DTRRX ... sets DSCR.DTRRXfull but exec_opcode() won't care */
 	LOG_DEBUG("write DCC 0x%08" PRIx32, value);
-	retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DTRRX, value);
 	if (retval != ERROR_OK)
 		return retval;
@@ -530,7 +530,7 @@ static int cortex_a_dap_write_memap_register_u32(struct target *target,
 	struct armv7a_common *armv7a = target_to_armv7a(target);
 	struct adiv5_dap *swjdp = armv7a->arm.dap;
 
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, address, value);
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num, address, value);
 
 	return retval;
 }
@@ -555,7 +555,7 @@ static int cortex_a_write_dcc(struct cortex_a_common *a, uint32_t data)
 {
 	LOG_DEBUG("write DCC 0x%08" PRIx32, data);
 	return mem_ap_sel_write_u32(a->armv7a_common.arm.dap,
-		a->armv7a_common.debug_ap, a->armv7a_common.debug_base + CPUDBG_DTRRX, data);
+		a->armv7a_common.debug_ap->ap_num, a->armv7a_common.debug_base + CPUDBG_DTRRX, data);
 }
 
 static int cortex_a_read_dcc(struct cortex_a_common *a, uint32_t *data,
@@ -571,7 +571,7 @@ static int cortex_a_read_dcc(struct cortex_a_common *a, uint32_t *data,
 	/* Wait for DTRRXfull */
 	long long then = timeval_ms();
 	while ((dscr & DSCR_DTR_TX_FULL) == 0) {
-		retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap->ap_num,
 				a->armv7a_common.debug_base + CPUDBG_DSCR,
 				&dscr);
 		if (retval != ERROR_OK)
@@ -582,7 +582,7 @@ static int cortex_a_read_dcc(struct cortex_a_common *a, uint32_t *data,
 		}
 	}
 
-	retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap->ap_num,
 			a->armv7a_common.debug_base + CPUDBG_DTRTX, data);
 	if (retval != ERROR_OK)
 		return retval;
@@ -604,7 +604,7 @@ static int cortex_a_dpm_prepare(struct arm_dpm *dpm)
 	/* set up invariant:  INSTR_COMP is set after ever DPM operation */
 	long long then = timeval_ms();
 	for (;; ) {
-		retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap->ap_num,
 				a->armv7a_common.debug_base + CPUDBG_DSCR,
 				&dscr);
 		if (retval != ERROR_OK)
@@ -892,7 +892,7 @@ static int cortex_a_poll(struct target *target)
 		target_call_event_callbacks(target, TARGET_EVENT_HALTED);
 		return retval;
 	}
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, &dscr);
 	if (retval != ERROR_OK)
 		return retval;
@@ -954,7 +954,7 @@ static int cortex_a_halt(struct target *target)
 	 * Tell the core to be halted by writing DRCR with 0x1
 	 * and then wait for the core to be halted.
 	 */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DRCR, DRCR_HALT);
 	if (retval != ERROR_OK)
 		return retval;
@@ -962,19 +962,19 @@ static int cortex_a_halt(struct target *target)
 	/*
 	 * enter halting debug mode
 	 */
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, &dscr);
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, dscr | DSCR_HALT_DBG_MODE);
 	if (retval != ERROR_OK)
 		return retval;
 
 	long long then = timeval_ms();
 	for (;; ) {
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DSCR, &dscr);
 		if (retval != ERROR_OK)
 			return retval;
@@ -1100,7 +1100,7 @@ static int cortex_a_internal_restart(struct target *target)
 	 * disable IRQs by default, with optional override...
 	 */
 
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, &dscr);
 	if (retval != ERROR_OK)
 		return retval;
@@ -1108,12 +1108,12 @@ static int cortex_a_internal_restart(struct target *target)
 	if ((dscr & DSCR_INSTR_COMP) == 0)
 		LOG_ERROR("DSCR InstrCompl must be set before leaving debug!");
 
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, dscr & ~DSCR_ITR_EN);
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DRCR, DRCR_RESTART |
 			DRCR_CLEAR_EXCEPTIONS);
 	if (retval != ERROR_OK)
@@ -1121,7 +1121,7 @@ static int cortex_a_internal_restart(struct target *target)
 
 	long long then = timeval_ms();
 	for (;; ) {
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DSCR, &dscr);
 		if (retval != ERROR_OK)
 			return retval;
@@ -1213,7 +1213,7 @@ static int cortex_a_debug_entry(struct target *target)
 	LOG_DEBUG("dscr = 0x%08" PRIx32, cortex_a->cpudbg_dscr);
 
 	/* REVISIT surely we should not re-read DSCR !! */
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, &dscr);
 	if (retval != ERROR_OK)
 		return retval;
@@ -1225,7 +1225,7 @@ static int cortex_a_debug_entry(struct target *target)
 
 	/* Enable the ITR execution once we are in debug mode */
 	dscr |= DSCR_ITR_EN;
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, dscr);
 	if (retval != ERROR_OK)
 		return retval;
@@ -1237,7 +1237,7 @@ static int cortex_a_debug_entry(struct target *target)
 	if (target->debug_reason == DBG_REASON_WATCHPOINT) {
 		uint32_t wfar;
 
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_WFAR,
 				&wfar);
 		if (retval != ERROR_OK)
@@ -1360,7 +1360,7 @@ int cortex_a_set_dscr_bits(struct target *target, unsigned long bit_mask, unsign
 	uint32_t dscr;
 
 	/* Read DSCR */
-	int retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	int retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, &dscr);
 	if (ERROR_OK != retval)
 		return retval;
@@ -1371,7 +1371,7 @@ int cortex_a_set_dscr_bits(struct target *target, unsigned long bit_mask, unsign
 	dscr |= value & bit_mask;
 
 	/* write new DSCR */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, dscr);
 	return retval;
 }
@@ -1953,7 +1953,7 @@ static int cortex_a_set_dcc_mode(struct target *target, uint32_t mode, uint32_t
 	if (new_dscr != *dscr) {
 		struct armv7a_common *armv7a = target_to_armv7a(target);
 		int retval = mem_ap_sel_write_atomic_u32(armv7a->arm.dap,
-				armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, new_dscr);
+				armv7a->debug_ap->ap_num, armv7a->debug_base + CPUDBG_DSCR, new_dscr);
 		if (retval == ERROR_OK)
 			*dscr = new_dscr;
 		return retval;
@@ -1972,7 +1972,7 @@ static int cortex_a_wait_dscr_bits(struct target *target, uint32_t mask,
 	int retval;
 
 	while ((*dscr & mask) != value) {
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DSCR, dscr);
 		if (retval != ERROR_OK)
 			return retval;
@@ -2011,7 +2011,7 @@ static int cortex_a_read_copro(struct target *target, uint32_t opcode,
 		return retval;
 
 	/* Read the value transferred to DTRTX. */
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DTRTX, data);
 	if (retval != ERROR_OK)
 		return retval;
@@ -2047,7 +2047,7 @@ static int cortex_a_write_copro(struct target *target, uint32_t opcode,
 	struct adiv5_dap *swjdp = armv7a->arm.dap;
 
 	/* Write the value into DTRRX. */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DTRRX, data);
 	if (retval != ERROR_OK)
 		return retval;
@@ -2151,7 +2151,7 @@ static int cortex_a_write_apb_ab_memory_slow(struct target *target,
 			data = target_buffer_get_u16(target, buffer);
 		else
 			data = target_buffer_get_u32(target, buffer);
-		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DTRRX, data);
 		if (retval != ERROR_OK)
 			return retval;
@@ -2212,13 +2212,13 @@ static int cortex_a_write_apb_ab_memory_fast(struct target *target,
 		return retval;
 
 	/* Latch STC instruction. */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_ITR, ARMV4_5_STC(0, 1, 0, 1, 14, 5, 0, 4));
 	if (retval != ERROR_OK)
 		return retval;
 
 	/* Transfer all the data and issue all the instructions. */
-	return mem_ap_sel_write_buf_noincr(swjdp, armv7a->debug_ap, buffer,
+	return mem_ap_sel_write_buf_noincr(swjdp, armv7a->debug_ap->ap_num, buffer,
 			4, count, armv7a->debug_base + CPUDBG_DTRRX);
 }
 
@@ -2244,13 +2244,13 @@ static int cortex_a_write_apb_ab_memory(struct target *target,
 		return ERROR_OK;
 
 	/* Clear any abort. */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS);
 	if (retval != ERROR_OK)
 		return retval;
 
 	/* Read DSCR. */
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, &dscr);
 	if (retval != ERROR_OK)
 		return retval;
@@ -2269,7 +2269,7 @@ static int cortex_a_write_apb_ab_memory(struct target *target,
 		goto out;
 
 	/* Get the memory address into R0. */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DTRRX, address);
 	if (retval != ERROR_OK)
 		goto out;
@@ -2313,7 +2313,7 @@ out:
 	/* If there were any sticky abort flags, clear them. */
 	if (dscr & (DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE)) {
 		fault_dscr = dscr;
-		mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+		mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS);
 		dscr &= ~(DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE);
 	} else {
@@ -2347,7 +2347,7 @@ out:
 	/* If the DCC is nonempty, clear it. */
 	if (dscr & DSCR_DTRTX_FULL_LATCHED) {
 		uint32_t dummy;
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DTRTX, &dummy);
 		if (final_retval == ERROR_OK)
 			final_retval = retval;
@@ -2420,7 +2420,7 @@ static int cortex_a_read_apb_ab_memory_slow(struct target *target,
 			return retval;
 
 		/* Read the value transferred to DTRTX into the buffer. */
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DTRTX, &data);
 		if (retval != ERROR_OK)
 			return retval;
@@ -2473,7 +2473,7 @@ static int cortex_a_read_apb_ab_memory_fast(struct target *target,
 			return retval;
 
 		/* Latch LDC instruction. */
-		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_ITR, ARMV4_5_LDC(0, 1, 0, 1, 14, 5, 0, 4));
 		if (retval != ERROR_OK)
 			return retval;
@@ -2484,7 +2484,7 @@ static int cortex_a_read_apb_ab_memory_fast(struct target *target,
 		 * memory. The last read of DTRTX in this call reads the second-to-last
 		 * word from memory and issues the read instruction for the last word.
 		 */
-		retval = mem_ap_sel_read_buf_noincr(swjdp, armv7a->debug_ap, buffer,
+		retval = mem_ap_sel_read_buf_noincr(swjdp, armv7a->debug_ap->ap_num, buffer,
 				4, count, armv7a->debug_base + CPUDBG_DTRTX);
 		if (retval != ERROR_OK)
 			return retval;
@@ -2518,7 +2518,7 @@ static int cortex_a_read_apb_ab_memory_fast(struct target *target,
 
 	/* Read the value transferred to DTRTX into the buffer. This is the last
 	 * word. */
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DTRTX, &u32);
 	if (retval != ERROR_OK)
 		return retval;
@@ -2549,13 +2549,13 @@ static int cortex_a_read_apb_ab_memory(struct target *target,
 		return ERROR_OK;
 
 	/* Clear any abort. */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS);
 	if (retval != ERROR_OK)
 		return retval;
 
 	/* Read DSCR */
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DSCR, &dscr);
 	if (retval != ERROR_OK)
 		return retval;
@@ -2574,7 +2574,7 @@ static int cortex_a_read_apb_ab_memory(struct target *target,
 		goto out;
 
 	/* Get the memory address into R0. */
-	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DTRRX, address);
 	if (retval != ERROR_OK)
 		goto out;
@@ -2606,7 +2606,7 @@ out:
 	/* If there were any sticky abort flags, clear them. */
 	if (dscr & (DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE)) {
 		fault_dscr = dscr;
-		mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+		mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS);
 		dscr &= ~(DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE);
 	} else {
@@ -2640,7 +2640,7 @@ out:
 	/* If the DCC is nonempty, clear it. */
 	if (dscr & DSCR_DTRTX_FULL_LATCHED) {
 		uint32_t dummy;
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DTRTX, &dummy);
 		if (final_retval == ERROR_OK)
 			final_retval = retval;
@@ -2707,7 +2707,7 @@ static int cortex_a_read_memory_ahb(struct target *target, uint32_t address,
 	struct adiv5_dap *swjdp = armv7a->arm.dap;
 	uint8_t apsel = swjdp->apsel;
 
-	if (!armv7a->memory_ap_available || (apsel != armv7a->memory_ap))
+	if (!armv7a->memory_ap_available || (apsel != armv7a->memory_ap->ap_num))
 		return target_read_memory(target, address, size, count, buffer);
 
 	/* cortex_a handles unaligned memory access */
@@ -2735,7 +2735,7 @@ static int cortex_a_read_memory_ahb(struct target *target, uint32_t address,
 	if (!count || !buffer)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap, buffer, size, count, address);
+	retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap->ap_num, buffer, size, count, address);
 
 	return retval;
 }
@@ -2787,7 +2787,7 @@ static int cortex_a_write_memory_ahb(struct target *target, uint32_t address,
 	struct adiv5_dap *swjdp = armv7a->arm.dap;
 	uint8_t apsel = swjdp->apsel;
 
-	if (!armv7a->memory_ap_available || (apsel != armv7a->memory_ap))
+	if (!armv7a->memory_ap_available || (apsel != armv7a->memory_ap->ap_num))
 		return target_write_memory(target, address, size, count, buffer);
 
 	/* cortex_a handles unaligned memory access */
@@ -2816,7 +2816,7 @@ static int cortex_a_write_memory_ahb(struct target *target, uint32_t address,
 	if (!count || !buffer)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	retval = mem_ap_sel_write_buf(swjdp, armv7a->memory_ap, buffer, size, count, address);
+	retval = mem_ap_sel_write_buf(swjdp, armv7a->memory_ap->ap_num, buffer, size, count, address);
 
 	return retval;
 }
@@ -2904,16 +2904,16 @@ static int cortex_a_handle_target_request(void *priv)
 	if (target->state == TARGET_RUNNING) {
 		uint32_t request;
 		uint32_t dscr;
-		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 				armv7a->debug_base + CPUDBG_DSCR, &dscr);
 
 		/* check if we have data */
 		while ((dscr & DSCR_DTR_TX_FULL) && (retval == ERROR_OK)) {
-			retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+			retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 					armv7a->debug_base + CPUDBG_DTRTX, &request);
 			if (retval == ERROR_OK) {
 				target_request(target, request);
-				retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+				retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 						armv7a->debug_base + CPUDBG_DSCR, &dscr);
 			}
 		}
@@ -2945,7 +2945,7 @@ static int cortex_a_examine_first(struct target *target)
 	/* We do one extra read to ensure DAP is configured,
 	 * we call ahbap_debugport_init(swjdp) instead
 	 */
-	retval = ahbap_debugport_init(swjdp, armv7a->debug_ap);
+	retval = ahbap_debugport_init(swjdp, armv7a->debug_ap->ap_num);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -2983,33 +2983,33 @@ static int cortex_a_examine_first(struct target *target)
 	} else
 		armv7a->debug_base = target->dbgbase;
 
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_CPUID, &cpuid);
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_CPUID, &cpuid);
 	if (retval != ERROR_OK) {
 		LOG_DEBUG("Examine %s failed", "CPUID");
 		return retval;
 	}
 
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_CTYPR, &ctypr);
 	if (retval != ERROR_OK) {
 		LOG_DEBUG("Examine %s failed", "CTYPR");
 		return retval;
 	}
 
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_TTYPR, &ttypr);
 	if (retval != ERROR_OK) {
 		LOG_DEBUG("Examine %s failed", "TTYPR");
 		return retval;
 	}
 
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 			armv7a->debug_base + CPUDBG_DIDR, &didr);
 	if (retval != ERROR_OK) {
 		LOG_DEBUG("Examine %s failed", "DIDR");
@@ -3030,7 +3030,7 @@ static int cortex_a_examine_first(struct target *target)
 	if ((cpuid & CORTEX_A_MIDR_PARTNUM_MASK) >> CORTEX_A_MIDR_PARTNUM_SHIFT ==
 		CORTEX_A15_PARTNUM) {
 
-		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 						     armv7a->debug_base + CPUDBG_OSLAR,
 						     0);
 
@@ -3042,7 +3042,7 @@ static int cortex_a_examine_first(struct target *target)
 	if ((cpuid & CORTEX_A_MIDR_PARTNUM_MASK) >> CORTEX_A_MIDR_PARTNUM_SHIFT ==
 		CORTEX_A7_PARTNUM) {
 
-		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap,
+		retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 						     armv7a->debug_base + CPUDBG_OSLAR,
 						     0);
 
@@ -3050,7 +3050,7 @@ static int cortex_a_examine_first(struct target *target)
 			return retval;
 
 	}
-	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap,
+	retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
 					    armv7a->debug_base + CPUDBG_PRSR, &dbg_osreg);
 
 	if (retval != ERROR_OK)
@@ -3209,7 +3209,7 @@ static int cortex_a_virt2phys(struct target *target,
 	struct armv7a_common *armv7a = target_to_armv7a(target);
 	struct adiv5_dap *swjdp = armv7a->arm.dap;
 	uint8_t apsel = swjdp->apsel;
-	if (armv7a->memory_ap_available && (apsel == armv7a->memory_ap)) {
+	if (armv7a->memory_ap_available && (apsel == armv7a->memory_ap->ap_num)) {
 		uint32_t ret;
 		retval = armv7a_mmu_translate_va(target,
 				virt, &ret);