NVStore: Use wait_ms to delay instead of Thread::wait.

Author: David Saada

features/nvstore/TESTS/nvstore/functionality/main.cpp

@@ -18,6 +18,7 @@
 #ifdef MBED_CONF_RTOS_PRESENT
 #include "Thread.h"
 #endif
+#include "mbed_wait_api.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"
 #include "utest/utest.h"
@@ -391,7 +392,7 @@ static void thread_test_worker()
             thread_test_check_key(key);
         }
 
-        rtos::Thread::wait(1);
+        wait_ms(1);
     }
 }
 #endif
@@ -431,7 +432,7 @@ static void nvstore_multi_thread_test()
         threads[i]->start(callback(thread_test_worker));
     }
 
-    rtos::Thread::wait(thr_test_num_secs * 1000);
+    wait_ms(thr_test_num_secs * 1000);
 
     for (i = 0; i < num_threads; i++) {
         threads[i]->terminate();
@@ -440,7 +441,7 @@ static void nvstore_multi_thread_test()
 
     delete[] threads;
 
-    rtos::Thread::wait(1000);
+    wait_ms(1000);
 
     nvstore.deinit();
 

features/nvstore/source/nvstore.cpp

@@ -24,6 +24,7 @@
 #include "mbed_critical.h"
 #include "mbed_assert.h"
 #include "Thread.h"
+#include "mbed_wait_api.h"
 #include <algorithm>
 #include <string.h>
 #include <stdio.h>
@@ -182,7 +183,7 @@ int NVStore::flash_write_area(uint8_t area, uint32_t offset, uint32_t size, cons
         if (!ret) {
             return ret;
         }
-        rtos::Thread::wait(1);
+        wait_ms(1);
     }
     return ret;
 }
@@ -197,7 +198,7 @@ int NVStore::flash_erase_area(uint8_t area)
         if (!ret) {
             return ret;
         }
-            rtos::Thread::wait(1);
+        wait_ms(1);
     }
     return ret;
 }
@@ -723,8 +724,9 @@ int NVStore::init()
     // wait until init is finished.
     init_attempts_val = core_util_atomic_incr_u32(&_init_attempts, 1);
     if (init_attempts_val != 1) {
-        while (!_init_done)
-            rtos::Thread::wait(1);
+        while (!_init_done) {
+            wait_ms(1);
+        }
         return NVSTORE_SUCCESS;
     }