arm_adi_v5: deconflict local variables from global symbols

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

diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c
index ad6ef3c7a55243a351848f1ac38b1278e0f35e50..77d7141155bdbd2ebb8760a54816a992de8f91ae 100644 (file)
--- a/src/target/adi_v5_jtag.c
+++ b/src/target/adi_v5_jtag.c
@@ -271,7 +271,8 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap)
        if (ctrlstat & (SSTICKYORUN | SSTICKYERR)) {
                LOG_DEBUG("jtag-dp: CTRL/STAT error, 0x%" PRIx32, ctrlstat);
                /* Check power to debug regions */
-               if ((ctrlstat & 0xf0000000) != 0xf0000000) {
+               if ((ctrlstat & (CDBGPWRUPREQ | CDBGPWRUPACK | CSYSPWRUPREQ | CSYSPWRUPACK)) !=
+                                               (CDBGPWRUPREQ | CDBGPWRUPACK | CSYSPWRUPREQ | CSYSPWRUPACK)) {
                        LOG_ERROR("Debug regions are unpowered, an unexpected reset might have happened");
                        return ERROR_JTAG_DEVICE_ERROR;
                } else {
@@ -332,14 +333,14 @@ static int jtag_dp_q_write(struct adiv5_dap *dap, unsigned reg,
 static int jtag_ap_q_bankselect(struct adiv5_ap *ap, unsigned reg)
 {
        struct adiv5_dap *dap = ap->dap;
-       uint32_t select = ((uint32_t)ap->ap_num << 24) | (reg & 0x000000F0);
+       uint32_t sel = ((uint32_t)ap->ap_num << 24) | (reg & 0x000000F0);
 
-       if (select == dap->select)
+       if (sel == dap->select)
                return ERROR_OK;
 
-       dap->select = select;
+       dap->select = sel;
 
-       return jtag_dp_q_write(dap, DP_SELECT, select);
+       return jtag_dp_q_write(dap, DP_SELECT, sel);
 }
 
 static int jtag_ap_q_read(struct adiv5_ap *ap, unsigned reg,