interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix NetBSD build warning 

Seems NetBSD does like the name reboot, so rename to keep happy.

Change-Id: I60ada9d217c4a8386a8d1ff1c88db7335451794e
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1623
Tested-by: jenkins
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
This commit is contained in:
Petri Laakso 2013-09-14 21:55:57 +01:00 committed by Spencer Oliver
parent cfe9ca039f
commit b89917020d
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/flash/nor/mini51.c
View File

@ -102,7 +102,6 @@
#define PAGE_SIZE 512 #define PAGE_SIZE 512
#define TIMEOUT 1000 #define TIMEOUT 1000
struct mini51_flash_bank { struct mini51_flash_bank {
bool probed; bool probed;
}; };
@ -112,7 +111,6 @@ enum mini51_boot_source {
LDROM = 1 LDROM = 1
}; };
/* Private methods */ /* Private methods */
static int mini51_unlock_reg(struct flash_bank *bank) static int mini51_unlock_reg(struct flash_bank *bank)
@ -139,7 +137,7 @@ static int mini51_reboot_with_source(struct flash_bank *bank,
{ {
uint32_t ispcon; uint32_t ispcon;
uint32_t isprtc1; uint32_t isprtc1;
bool reboot = false; bool mini51_reboot = false;
int status; int status;
int timeout = TIMEOUT; int timeout = TIMEOUT;
@ -153,13 +151,13 @@ static int mini51_reboot_with_source(struct flash_bank *bank,
if ((new_source == APROM) && (*prev_source != APROM)) { if ((new_source == APROM) && (*prev_source != APROM)) {
ispcon &= ~ISPCON_BS_LDROM; ispcon &= ~ISPCON_BS_LDROM;
reboot = true; mini51_reboot = true;
} else if ((new_source == LDROM) && (*prev_source != LDROM)) { } else if ((new_source == LDROM) && (*prev_source != LDROM)) {
ispcon |= ISPCON_BS_LDROM; ispcon |= ISPCON_BS_LDROM;
reboot = true; mini51_reboot = true;
} }
if (reboot) { if (mini51_reboot) {
mini51_unlock_reg(bank); mini51_unlock_reg(bank);
status = target_write_u32(target, ISPCON, ispcon); status = target_write_u32(target, ISPCON, ispcon);
if (status != ERROR_OK) if (status != ERROR_OK)
@ -215,7 +213,6 @@ static int mini51_get_flash_size(struct flash_bank *bank, uint32_t *flash_size)
return ERROR_OK; return ERROR_OK;
} }
/* Public (API) methods */ /* Public (API) methods */
FLASH_BANK_COMMAND_HANDLER(mini51_flash_bank_command) FLASH_BANK_COMMAND_HANDLER(mini51_flash_bank_command)
@ -398,7 +395,6 @@ static int mini51_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offse
return ERROR_OK; return ERROR_OK;
} }
static int get_mini51_info(struct flash_bank *bank, char *buf, int buf_size) static int get_mini51_info(struct flash_bank *bank, char *buf, int buf_size)
{ {
snprintf(buf, buf_size, "Mini51 flash driver"); snprintf(buf, buf_size, "Mini51 flash driver");
@ -460,4 +456,3 @@ struct flash_driver mini51_flash = {
.protect_check = mini51_protect_check, .protect_check = mini51_protect_check,
.info = get_mini51_info, .info = get_mini51_info,
}; };