arm_adi_v5: add/move apsel member in struct adiv5_dap

[openocd.git] / src / target / cortex_a9.c

diff --git a/src/target/cortex_a9.c b/src/target/cortex_a9.c
index 95bb07f2b056590c6c3834c63ee9016496d4ce6e..ce72ecd8c1db00194c02511d7a75a7e31a501736 100644 (file)
--- a/src/target/cortex_a9.c
+++ b/src/target/cortex_a9.c
@@ -1462,7 +1462,7 @@ static int cortex_a9_read_phys_memory(struct target *target,
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct adiv5_dap *swjdp = &armv7a->dap;
        int retval = ERROR_INVALID_ARGUMENTS;
-       uint8_t apsel = dap_ap_get_select(swjdp);
+       uint8_t apsel = swjdp->apsel;
 
        LOG_DEBUG("Reading memory at real address 0x%x; size %d; count %d", address, size, count);
 
@@ -1591,15 +1591,16 @@ static int cortex_a9_write_phys_memory(struct target *target,
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct adiv5_dap *swjdp = &armv7a->dap;
        int retval = ERROR_INVALID_ARGUMENTS;
+       uint8_t apsel = swjdp->apsel;
 
        LOG_DEBUG("Writing memory to real address 0x%x; size %d; count %d", address, size, count);
 
        if (count && buffer) {
-               uint8_t apsel = dap_ap_get_select(swjdp);
 
                if ( apsel == swjdp_memoryap ) {
 
                        /* write memory through AHB-AP */
+
                        switch (size) {
                                case 4:
                                        retval = mem_ap_sel_write_buf_u32(swjdp, swjdp_memoryap,