NVStore: Calling thread wait doesn't depend on RTOS being defined any more.

David Saada · David Saada · commit f43e7b1301ae · 2018-02-26T23:17:59.000+02:00
diff --git a/features/nvstore/source/nvstore.cpp b/features/nvstore/source/nvstore.cpp
@@ -23,9 +23,7 @@
 #include "FlashIAP.h"
 #include "mbed_critical.h"
 #include "mbed_assert.h"
-#ifdef MBED_CONF_RTOS_PRESENT
 #include "Thread.h"
-#endif
 #include <algorithm>
 #include <string.h>
 #include <stdio.h>
@@ -184,9 +182,7 @@ int NVStore::flash_write_area(uint8_t area, uint32_t offset, uint32_t size, cons
         if (!ret) {
             return ret;
         }
-#ifdef MBED_CONF_RTOS_PRESENT
         rtos::Thread::wait(1);
-#endif
     }
     return ret;
 }
@@ -201,9 +197,7 @@ int NVStore::flash_erase_area(uint8_t area)
         if (!ret) {
             return ret;
         }
-#ifdef MBED_CONF_RTOS_PRESENT
             rtos::Thread::wait(1);
-#endif
     }
     return ret;
 }
@@ -729,10 +723,8 @@ int NVStore::init()
     // wait until init is finished.
     init_attempts_val = core_util_atomic_incr_u32(&_init_attempts, 1);
     if (init_attempts_val != 1) {
-#ifdef MBED_CONF_RTOS_PRESENT
         while (!_init_done)
             rtos::Thread::wait(1);
-#endif
         return NVSTORE_SUCCESS;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@`
`23`	`23`	`#include "FlashIAP.h"`
`24`	`24`	`#include "mbed_critical.h"`
`25`	`25`	`#include "mbed_assert.h"`
`26`		`-#ifdef MBED_CONF_RTOS_PRESENT`
`27`	`26`	`#include "Thread.h"`
`28`		`-#endif`
`29`	`27`	`#include <algorithm>`
`30`	`28`	`#include <string.h>`
`31`	`29`	`#include <stdio.h>`
`@@ -184,9 +182,7 @@ int NVStore::flash_write_area(uint8_t area, uint32_t offset, uint32_t size, cons`
`184`	`182`	`if (!ret) {`
`185`	`183`	`return ret;`
`186`	`184`	`}`
`187`		`-#ifdef MBED_CONF_RTOS_PRESENT`
`188`	`185`	`rtos::Thread::wait(1);`
`189`		`-#endif`
`190`	`186`	`}`
`191`	`187`	`return ret;`
`192`	`188`	`}`
`@@ -201,9 +197,7 @@ int NVStore::flash_erase_area(uint8_t area)`
`201`	`197`	`if (!ret) {`
`202`	`198`	`return ret;`
`203`	`199`	`}`
`204`		`-#ifdef MBED_CONF_RTOS_PRESENT`
`205`	`200`	`rtos::Thread::wait(1);`
`206`		`-#endif`
`207`	`201`	`}`
`208`	`202`	`return ret;`
`209`	`203`	`}`
`@@ -729,10 +723,8 @@ int NVStore::init()`
`729`	`723`	`// wait until init is finished.`
`730`	`724`	`init_attempts_val = core_util_atomic_incr_u32(&_init_attempts, 1);`
`731`	`725`	`if (init_attempts_val != 1) {`
`732`		`-#ifdef MBED_CONF_RTOS_PRESENT`
`733`	`726`	`while (!_init_done)`
`734`	`727`	`rtos::Thread::wait(1);`
`735`		`-#endif`
`736`	`728`	`return NVSTORE_SUCCESS;`
`737`	`729`	`}`
`738`	`730`