libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3297 from nsearchf/master 

修复不能发现禁止写spi flash失败的情形
This commit is contained in:
Bernard Xiong 2019-12-30 19:48:43 +08:00 committed by GitHub
parent 4bee990bbf b135b70934
commit 93b50db41d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/drivers/spi/sfud/src/sfud.c
View File

@ -897,7 +897,7 @@ static sfud_err set_write_enabled(const sfud_flash *flash, bool enabled) {
if (enabled && (register_status & SFUD_STATUS_REGISTER_WEL) == 0) { if (enabled && (register_status & SFUD_STATUS_REGISTER_WEL) == 0) {
SFUD_INFO("Error: Can't enable write status."); SFUD_INFO("Error: Can't enable write status.");
return SFUD_ERR_WRITE; return SFUD_ERR_WRITE;
} else if (!enabled && (register_status & SFUD_STATUS_REGISTER_WEL) == 1) { } else if (!enabled && (register_status & SFUD_STATUS_REGISTER_WEL) != 0) {
SFUD_INFO("Error: Can't disable write status."); SFUD_INFO("Error: Can't disable write status.");
return SFUD_ERR_WRITE; return SFUD_ERR_WRITE;
} }

2
src/thread.c
View File

@ -585,7 +585,7 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick)
return RT_EOK; return RT_EOK;
} }
RTM_EXPORT(rt_thread_delay_util); RTM_EXPORT(rt_thread_delay_until);
/** /**
* This function will let current thread delay for some milliseconds. * This function will let current thread delay for some milliseconds.