target/adi_v5_xxx: use ADIV5_DP_SELECT_APBANK

and DP_SELECT_DPBANK.
Use the defined symbols instead of magic numbers.

Change-Id: I19c86b183e57e42b96f76eed180c0492cd67bee1
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: https://review.openocd.org/c/openocd/+/7539
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>

diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c
index 9f66adc6880ae785898c9ab7f1bc77e6e05b0bc6..afdc0e577595f44ac74bf357adb04a82d8e29f2d 100644 (file)
--- a/src/target/adi_v5_jtag.c
+++ b/src/target/adi_v5_jtag.c
@@ -350,7 +350,7 @@ static int adi_jtag_dp_scan_u32(struct adiv5_dap *dap,
 {
        uint8_t out_value_buf[4];
        int retval;
-       uint64_t sel = (reg_addr >> 4) & 0xf;
+       uint64_t sel = (reg_addr >> 4) & DP_SELECT_DPBANK;
 
        /* No need to change SELECT or RDBUFF as they are not banked */
        if (instr == JTAG_DP_DPACC && reg_addr != DP_SELECT && reg_addr != DP_RDBUFF &&
@@ -775,7 +775,7 @@ static int jtag_ap_q_bankselect(struct adiv5_ap *ap, unsigned reg)
        }
 
        /* ADIv5 */
-       sel = (ap->ap_num << 24) | (reg & 0x000000F0);
+       sel = (ap->ap_num << 24) | (reg & ADIV5_DP_SELECT_APBANK);
 
        if (sel == dap->select)
                return ERROR_OK;

diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index 5f40588d2f82b263995264b82157dca8d598523b..1b743657c231427abfad10fe0b95e6f365d945b2 100644 (file)
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -523,7 +523,7 @@ static int swd_queue_ap_bankselect(struct adiv5_ap *ap, unsigned reg)
        }
 
        /* ADIv5 */
-       sel = (ap->ap_num << 24) | (reg & 0x000000F0);
+       sel = (ap->ap_num << 24) | (reg & ADIV5_DP_SELECT_APBANK);
        if (dap->select != DP_SELECT_INVALID)
                sel |= dap->select & DP_SELECT_DPBANK;