From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Tue, 15 Jun 2010 21:14:41 +0000 (+0200)
Subject: arm_adi: -Wshadow warning fix
X-Git-Tag: v0.5.0-rc1~622
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=66f42b6f74125a98fed6d9402f6dc83a0f829100;p=openocd

arm_adi: -Wshadow warning fix

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 8f43f78a..aae60fc1 100644
--- 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.
 		 */