arm_adi: -Wshadow warning fix

[fw/openocd] / src / target / arm_adi_v5.c

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 8b18fa3c125d53366aa50ed42757f9dc40945258..aae60fc1f358a93ac64f7b9441fd46a6ddf62991 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -102,11 +102,11 @@ static uint32_t max_tar_block_size(uint32_t tar_autoincr_block, uint32_t address
  */
 void dap_ap_select(struct adiv5_dap *dap,uint8_t apsel)
 {
-       uint32_t select = (apsel << 24) & 0xFF000000;
+       uint32_t select_apsel = (apsel << 24) & 0xFF000000;
 
-       if (select != dap->apsel)
+       if (select_apsel != dap->apsel)
        {
-               dap->apsel = select;
+               dap->apsel = select_apsel;
                /* Switching AP invalidates cached values.
                 * Values MUST BE UPDATED BEFORE AP ACCESS.
                 */
@@ -967,6 +967,9 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
        retval = dap_queue_ap_read(dap, AP_REG_IDR, &idreg);
        retval = dap_queue_ap_read(dap, AP_REG_BASE, &romaddr);
 
+       if ((retval = dap_run(dap)) != ERROR_OK)
+               return retval;
+
        LOG_DEBUG("MEM-AP #%" PRId32 " ID Register 0x%" PRIx32
                ", Debug ROM Address 0x%" PRIx32,
                dap->apsel, idreg, romaddr);