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

index 8f43f78a855f6acd7ca20bc146eccf5d4819724c..aae60fc1f358a93ac64f7b9441fd46a6ddf62991 100644 (file)
@@ -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.
                 */