interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flash: fix shadow issues on Mac 

Wait is declared in /usr/include/sys/wait.h

Signed-off-by: Edgar Grimberg <edgar.grimberg@zylin.com>
This commit is contained in:
Edgar Grimberg 2010-06-21 23:02:41 +02:00 committed by Øyvind Harboe
parent fe1f7f63b6
commit bef497aeb0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/mflash.c
View File

@ -209,7 +209,7 @@ static int mg_init_gpio (void)
return ret; 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; uint8_t status, error;
struct target *target = mflash_bank->target; 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 (status & mg_io_rbit_status_busy)
{ {
if (wait == mg_io_wait_bsy) if (wait_local == mg_io_wait_bsy)
return ERROR_OK; return ERROR_OK;
} else { } else {
switch (wait) switch (wait_local)
{ {
case mg_io_wait_not_bsy: case mg_io_wait_not_bsy:
return ERROR_OK; 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; return ERROR_MG_IO;
} }
switch (wait) switch (wait_local)
{ {
case mg_io_wait_rdy: case mg_io_wait_rdy:
if (status & mg_io_rbit_status_ready) if (status & mg_io_rbit_status_ready)