From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Tue, 15 Jun 2010 21:25:32 +0000 (+0200)
Subject: mips_m4k: -Wshadow warning fixes
X-Git-Tag: v0.5.0-rc1~614
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e85fe0a637d1be9c652ac1779218c1297aaaafec;p=openocd

mips_m4k: -Wshadow warning fixes

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

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 5604b6a5..e258b714 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -951,7 +951,7 @@ int mips_m4k_bulk_write_memory(struct target *target, uint32_t address,
 	struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
 	struct working_area *source;
 	int retval;
-	int write = 1;
+	int write_t = 1;
 
 	LOG_DEBUG("address: 0x%8.8" PRIx32 ", count: 0x%8.8" PRIx32 "", address, count);
 
@@ -984,7 +984,7 @@ int mips_m4k_bulk_write_memory(struct target *target, uint32_t address,
 		}
 	}
 
-	retval = mips32_pracc_fastdata_xfer(ejtag_info, source, write, address,
+	retval = mips32_pracc_fastdata_xfer(ejtag_info, source, write_t, address,
 			count, (uint32_t*) buffer);
 	if (retval != ERROR_OK)
 	{