From bef497aeb069314cae3a13dd339a181a3ecf67cd Mon Sep 17 00:00:00 2001
From: Edgar Grimberg <edgar.grimberg@zylin.com>
Date: Mon, 21 Jun 2010 23:02:41 +0200
Subject: flash: fix shadow issues on Mac
Wait is declared in /usr/include/sys/wait.h
Signed-off-by: Edgar Grimberg <edgar.grimberg@zylin.com>
---
src/flash/mflash.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'src/flash')
diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 90e9888b..43721280 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -209,7 +209,7 @@ static int mg_init_gpio (void)
return ret;
}
-static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time_var)
+static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var)
{
uint8_t status, error;
struct target *target = mflash_bank->target;
@@ -228,10 +228,10 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time_var)
if (status & mg_io_rbit_status_busy)
{
- if (wait == mg_io_wait_bsy)
+ if (wait_local == mg_io_wait_bsy)
return ERROR_OK;
} else {
- switch (wait)
+ switch (wait_local)
{
case mg_io_wait_not_bsy:
return ERROR_OK;
@@ -259,7 +259,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time_var)
return ERROR_MG_IO;
}
- switch (wait)
+ switch (wait_local)
{
case mg_io_wait_rdy:
if (status & mg_io_rbit_status_ready)
--
cgit v1.2.3