]> git.sur5r.net Git - openocd/commitdiff
adi_v5_jtag: -Wshadow warning fixes
authorØyvind Harboe <oyvind.harboe@zylin.com>
Tue, 15 Jun 2010 21:15:50 +0000 (23:15 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Tue, 15 Jun 2010 21:15:50 +0000 (23:15 +0200)
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/target/adi_v5_jtag.c

index 04c6ae7bbdb6ef22ec776a1590f2378e3556b3d3..b3687084c8bef37987e2d7a73a14dd1c71dc9f2e 100644 (file)
@@ -366,15 +366,15 @@ static int jtag_dp_q_write(struct adiv5_dap *dap, unsigned reg,
 /** Select the AP register bank matching bits 7:4 of reg. */
 static int jtag_ap_q_bankselect(struct adiv5_dap *dap, unsigned reg)
 {
-       uint32_t select = reg & 0x000000F0;
+       uint32_t select_ap_bank = reg & 0x000000F0;
 
-       if (select == dap->ap_bank_value)
+       if (select_ap_bank == dap->ap_bank_value)
                return ERROR_OK;
-       dap->ap_bank_value = select;
+       dap->ap_bank_value = select_ap_bank;
 
-       select |= dap->apsel;
+       select_ap_bank |= dap->apsel;
 
-       return jtag_dp_q_write(dap, DP_SELECT, select);
+       return jtag_dp_q_write(dap, DP_SELECT, select_ap_bank);
 }
 
 static int jtag_ap_q_read(struct adiv5_dap *dap, unsigned reg,