Merge pull request #3297 from nsearchf/master

BernardXiong · web-flow · commit 93b50db41d18 · 2019-12-30T19:48:43.000+08:00
修复不能发现禁止写spi flash失败的情形
diff --git a/components/drivers/spi/sfud/src/sfud.c b/components/drivers/spi/sfud/src/sfud.c
@@ -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) {
             SFUD_INFO("Error: Can't enable write status.");
             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.");
             return SFUD_ERR_WRITE;
         }
diff --git a/src/thread.c b/src/thread.c
@@ -585,7 +585,7 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick)
 
     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.

Original file line number	Diff line number	Diff line change
`@@ -897,7 +897,7 @@ static sfud_err set_write_enabled(const sfud_flash *flash, bool enabled) {`
`897`	`897`	`if (enabled && (register_status & SFUD_STATUS_REGISTER_WEL) == 0) {`
`898`	`898`	`SFUD_INFO("Error: Can't enable write status.");`
`899`	`899`	`return SFUD_ERR_WRITE;`
`900`		`- } else if (!enabled && (register_status & SFUD_STATUS_REGISTER_WEL) == 1) {`
	`900`	`+ } else if (!enabled && (register_status & SFUD_STATUS_REGISTER_WEL) != 0) {`
`901`	`901`	`SFUD_INFO("Error: Can't disable write status.");`
`902`	`902`	`return SFUD_ERR_WRITE;`
`903`	`903`	`}`
Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick)`
`585`	`585`
`586`	`586`	`return RT_EOK;`
`587`	`587`	`}`
`588`		`-RTM_EXPORT(rt_thread_delay_util);`
	`588`	`+RTM_EXPORT(rt_thread_delay_until);`
`589`	`589`
`590`	`590`	`/**`
`591`	`591`	`* This function will let current thread delay for some milliseconds.`