Replace deprecated wait calls

Author: kjbracey

TESTS/mbed_drivers/timeout/timeout_tests.h

@@ -315,9 +315,9 @@ void test_deepsleep(void)
 
      * This should be replaced with a better function that checks if the
      * hardware buffers are empty. However, such an API does not exist now,
-     * so we'll use the wait_ms() function for now.
+     * so we'll use the ThisThread::sleep_for() function for now.
      */
-    wait_ms(20);
+    ThisThread::sleep_for(20);
 
     timer.start();
     timeout.attach_callback(mbed::callback(sem_callback, &sem), delay_us);

TESTS/mbed_hal/rtc/main.cpp

@@ -125,7 +125,7 @@ void rtc_persist_test()
     rtc_write(start);
     rtc_free();
 
-    wait(WAIT_TIME);
+    ThisThread::sleep_for(WAIT_TIME * 1000);
 
     rtc_init();
     const uint32_t stop = rtc_read();
@@ -167,7 +167,7 @@ void rtc_range_test()
     for (uint32_t i = 0; i < sizeof(starts) / sizeof(starts[0]); i++) {
         const uint32_t start = starts[i];
         rtc_write(start);
-        wait(WAIT_TIME);
+        ThisThread::sleep_for(WAIT_TIME * 1000);
         const uint32_t stop = rtc_read();
         TEST_ASSERT_UINT32_WITHIN(WAIT_TOLERANCE, WAIT_TIME, stop - start);
     }

TESTS/mbed_platform/error_handling/main.cpp

@@ -228,7 +228,7 @@ void test_error_logging_multithread()
         errThread[i] = new Thread(osPriorityNormal1, THREAD_STACK_SIZE, NULL, NULL);
         errThread[i]->start(callback(err_thread_func, &error_status[i]));
     }
-    wait(2.0);
+    ThisThread::sleep_for(2000);
     for (i = 0; i < NUM_TEST_THREADS; i++) {
         errThread[i]->join();
     }

TESTS/netsocket/dns/asynchronous_dns_cancel.cpp

@@ -81,5 +81,5 @@ void ASYNCHRONOUS_DNS_CANCEL()
 
     delete[] data;
 
-    wait(5.0);
+    ThisThread::sleep_for(5000);
 }

TESTS/netsocket/dns/asynchronous_dns_external_event_queue.cpp

@@ -79,7 +79,7 @@ void ASYNCHRONOUS_DNS_EXTERNAL_EVENT_QUEUE()
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 
     // Give event queue time to finalise before destructors
-    wait(2.0);
+    ThisThread::sleep_for(2000);
 
     nsapi_dns_call_in_set(0);
 }

TESTS/netsocket/dns/asynchronous_dns_timeouts.cpp

@@ -74,7 +74,7 @@ void ASYNCHRONOUS_DNS_TIMEOUTS()
     TEST_ASSERT(result_exp_timeout > 0);
 
     // Give event queue time to finalise before destructors
-    wait(2.0);
+    ThisThread::sleep_for(2000);
 
     nsapi_dns_call_in_set(0);
 }

TESTS/netsocket/udp/udpsocket_echotest_burst.cpp

@@ -106,7 +106,7 @@ void UDPSOCKET_ECHOTEST_BURST()
             } else if (recvd < 0) {
                 pkg_fail += BURST_PKTS - j; // Assume all the following packets of the burst to be lost
                 printf("[%02d] network error %d\n", i, recvd);
-                wait(recv_timeout);
+                ThisThread::sleep_for(recv_timeout * 1000);
                 recv_timeout *= 2; // Back off,
                 break;
             } else if (temp_addr != udp_addr) {

TESTS/netsocket/udp/udpsocket_sendto_repeat.cpp

@@ -45,7 +45,7 @@ void UDPSOCKET_SENDTO_REPEAT()
                 break;
             }
             oom_earlier = true;
-            wait(1);
+            ThisThread::sleep_for(1000);
             continue;
         }
         oom_earlier = false;

TESTS/network/interface/networkinterface_status.cpp

@@ -147,7 +147,7 @@ void NETWORKINTERFACE_STATUS_GET()
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
 
         while (net->get_connection_status() != NSAPI_STATUS_GLOBAL_UP) {
-            wait(0.5);
+            ThisThread::sleep_for(500);
         }
 
         err = net->disconnect();

components/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAtmel.cpp

@@ -525,14 +525,14 @@ static void rf_if_reset_radio(void)
 #endif
     rf->IRQ.rise(0);
     rf->RST = 1;
-    wait_ms(1);
+    ThisThread::sleep_for(2);
     rf->RST = 0;
-    wait_ms(10);
+    ThisThread::sleep_for(10);
     CS_RELEASE();
     rf->SLP_TR = 0;
-    wait_ms(10);
+    ThisThread::sleep_for(10);
     rf->RST = 1;
-    wait_ms(10);
+    ThisThread::sleep_for(10);
 
     rf->IRQ.rise(&rf_if_interrupt_handler);
 }
@@ -883,15 +883,16 @@ static uint8_t rf_if_read_rnd(void)
         rf_if_write_register(TRX_RPC, RX_RPC_CTRL | TRX_RPC_RSVD_1);
     }
 
-    wait_ms(1);
+
+    wait_ns(1000);
     temp = ((rf_if_read_register(PHY_RSSI) >> 5) << 6);
-    wait_ms(1);
+    wait_ns(1000);
     temp |= ((rf_if_read_register(PHY_RSSI) >> 5) << 4);
-    wait_ms(1);
+    wait_ns(1000);
     temp |= ((rf_if_read_register(PHY_RSSI) >> 5) << 2);
-    wait_ms(1);
+    wait_ns(1000);
     temp |= ((rf_if_read_register(PHY_RSSI) >> 5));
-    wait_ms(1);
+    wait_ns(1000);
     if (rf_part_num == PART_AT86RF233) {
         rf_if_write_register(TRX_RPC, tmp_rpc_val);
     }

components/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp

@@ -1058,10 +1058,10 @@ static void rf_reset(void)
 {
     // Shutdown
     rf->SDN = 1;
-    wait_ms(10);
+    ThisThread::sleep_for(10);
     // Wake up
     rf->SDN = 0;
-    wait_ms(10);
+    ThisThread::sleep_for(10);
 }
 
 static void rf_init(void)

components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp

@@ -139,8 +139,8 @@
 #if DEVICE_SPI
 
 #include "SDBlockDevice.h"
+#include "rtos/ThisThread.h"
 #include "platform/mbed_debug.h"
-#include "platform/mbed_wait_api.h"
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif
@@ -872,7 +872,7 @@ uint32_t SDBlockDevice::_go_idle_state()
         if (R1_IDLE_STATE == response) {
             break;
         }
-        wait_ms(1);
+        rtos::ThisThread::sleep_for(1);
     }
     return response;
 }

components/wifi/esp8266-driver/ESP8266Interface.cpp

@@ -28,7 +28,7 @@
 #include "platform/Callback.h"
 #include "platform/mbed_critical.h"
 #include "platform/mbed_debug.h"
-#include "platform/mbed_wait_api.h"
+#include "rtos/ThisThread.h"
 
 #ifndef MBED_CONF_ESP8266_DEBUG
 #define MBED_CONF_ESP8266_DEBUG false
@@ -49,6 +49,7 @@
 #define TRACE_GROUP  "ESPI" // ESP8266 Interface
 
 using namespace mbed;
+using namespace rtos;
 
 #if defined MBED_CONF_ESP8266_TX && defined MBED_CONF_ESP8266_RX
 ESP8266Interface::ESP8266Interface()
@@ -425,7 +426,7 @@ nsapi_error_t ESP8266Interface::_reset()
         _rst_pin.rst_assert();
         // If you happen to use Pin7 CH_EN as reset pin, not needed otherwise
         // https://www.espressif.com/sites/default/files/documentation/esp8266_hardware_design_guidelines_en.pdf
-        wait_ms(2); // Documentation says 200 us should have been enough, but experimentation shows that 1ms was not enough
+        ThisThread::sleep_for(2); // Documentation says 200 us; need 2 ticks to get minimum 1 ms.
         _esp.flush();
         _rst_pin.rst_deassert();
     } else {

features/cellular/framework/AT/AT_CellularContext.cpp

@@ -23,7 +23,7 @@
 #if (DEVICE_SERIAL && DEVICE_INTERRUPTIN) || defined(DOXYGEN_ONLY)
 #include "UARTSerial.h"
 #endif // #if DEVICE_SERIAL
-#include "mbed_wait_api.h"
+#include "ThisThread.h"
 
 #define NETWORK_TIMEOUT 30 * 60 * 1000 // 30 minutes
 #define DEVICE_TIMEOUT 5 * 60 * 1000 // 5 minutes
@@ -45,6 +45,7 @@
 
 using namespace mbed_cellular_util;
 using namespace mbed;
+using namespace rtos;
 
 AT_CellularContext::AT_CellularContext(ATHandler &at, CellularDevice *device, const char *apn, bool cp_req, bool nonip_req) :
     AT_CellularBase(at), _is_connected(false), _is_blocking(true),
@@ -893,7 +894,7 @@ void AT_CellularContext::cellular_callback(nsapi_event_t ev, intptr_t ptr)
                 _cb_data.error == NSAPI_ERROR_OK) {
             if (!_apn) {
                 char imsi[MAX_IMSI_LENGTH + 1];
-                wait(1); // need to wait to access SIM in some modems
+                ThisThread::sleep_for(1000); // need to wait to access SIM in some modems
                 _cb_data.error = _device->open_information()->get_imsi(imsi, sizeof(imsi));
                 if (_cb_data.error == NSAPI_ERROR_OK) {
                     const char *apn_config = apnconfig(imsi);

features/cellular/framework/AT/AT_CellularSMS.cpp

@@ -18,14 +18,15 @@
 #include <time.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "mbed_wait_api.h"
+#include "ThisThread.h"
 #include "AT_CellularSMS.h"
 #include "CellularUtil.h"
 #include "CellularLog.h"
 
 using namespace mbed_cellular_util;
 using namespace mbed;
 using namespace std;
+using namespace rtos;
 
 #define CTRL_Z  "\x1a"
 #define ESC     "\x1b"
@@ -419,14 +420,14 @@ nsapi_size_or_error_t AT_CellularSMS::send_sms(const char *phone_number, const c
     int write_size = 0;
     int remove_plus_sign = (phone_number[0] == '+') ? 1 : 0;
 
-    wait_ms(_sim_wait_time);
+    ThisThread::sleep_for(_sim_wait_time);
 
     if (_mode == CellularSMSMmodeText) {
         _at.cmd_start("AT+CMGS=");
         _at.write_string(phone_number + remove_plus_sign);
         _at.cmd_stop();
 
-        wait_ms(_sim_wait_time);
+        ThisThread::sleep_for(_sim_wait_time);
         _at.resp_start("> ", true);
 
         if (_at.get_last_error() == NSAPI_ERROR_OK) {
@@ -489,7 +490,7 @@ nsapi_size_or_error_t AT_CellularSMS::send_sms(const char *phone_number, const c
             _at.write_int((pdu_len - 2) / 2);
             _at.cmd_stop();
 
-            wait_ms(_sim_wait_time);
+            ThisThread::sleep_for(_sim_wait_time);
             _at.resp_start("> ", true);
 
             if (_at.get_last_error() == NSAPI_ERROR_OK) {
@@ -602,7 +603,7 @@ nsapi_size_or_error_t AT_CellularSMS::read_sms_from_index(int msg_index, char *b
     /*
      * +CMGR: <stat>,<oa>,<alpha>,<scts>[,<tooa>,<fo>,<pid>,<dcs>,<sca>,<tosca>,<length>]<CR><LF><data><CR><LF>OK<CR><LF>
      */
-    wait_ms(_sim_wait_time);
+    ThisThread::sleep_for(_sim_wait_time);
     _at.cmd_start("AT+CMGR=");
     _at.write_int(msg_index);
     _at.cmd_stop();
@@ -661,7 +662,7 @@ nsapi_size_or_error_t AT_CellularSMS::read_sms(sms_info_t *sms, char *buf, char
         int pduSize;
 
         for (int i = 0; i < sms->parts; i++) {
-            wait_ms(_sim_wait_time);
+            ThisThread::sleep_for(_sim_wait_time);
             _at.cmd_start("AT+CMGR=");
             _at.write_int(sms->msg_index[i]);
             _at.cmd_stop();
@@ -786,7 +787,7 @@ nsapi_size_or_error_t AT_CellularSMS::get_data_from_pdu(const char *pdu, sms_inf
     // read first the lower part of first octet as there is message type
     index++;
     tmp = hex_str_to_int(pdu + index, 1);
-    //wait_ms(200);
+    //ThisThread::sleep_for(200);
     if ((tmp & 0x03) == 0) {// SMS-DELIVER type, last two bits should be zero
         // UDH present? Check from first octets higher part
         tmp = hex_str_to_int(pdu + (--index), 1);
@@ -1114,7 +1115,7 @@ AT_CellularSMS::sms_info_t *AT_CellularSMS::get_oldest_sms_index()
     nsapi_size_or_error_t err = 0;
     while (current) {
         if (_mode == CellularSMSMmodeText) {
-            wait_ms(_sim_wait_time);
+            ThisThread::sleep_for(_sim_wait_time);
             err = read_sms_from_index(current->msg_index[0], NULL, 0, NULL, current->date);
             if (err != 0) {
                 return NULL;

features/storage/nvstore/source/nvstore.cpp

@@ -25,7 +25,7 @@
 #include "mbed_critical.h"
 #include "mbed_assert.h"
 #include "mbed_error.h"
-#include "mbed_wait_api.h"
+#include "ThisThread.h"
 #include <algorithm>
 #include <string.h>
 #include <stdio.h>
@@ -837,7 +837,7 @@ int NVStore::init()
     init_attempts_val = core_util_atomic_incr_u32(&_init_attempts, 1);
     if (init_attempts_val != 1) {
         while (!_init_done) {
-            wait_ms(1);
+            rtos::ThisThread::sleep_for(1);
         }
         return NVSTORE_SUCCESS;
     }

usb/device/USBHID/USBMouse.cpp

@@ -17,9 +17,8 @@
 
 #include "stdint.h"
 #include "USBMouse.h"
-#include "PlatformMutex.h"
+#include "ThisThread.h"
 #include "usb_phy_api.h"
-#include "mbed_wait_api.h"
 
 
 USBMouse::USBMouse(bool connect_blocking, MOUSE_TYPE mouse_type, uint16_t vendor_id, uint16_t product_id, uint16_t product_release):
@@ -157,7 +156,7 @@ bool USBMouse::double_click()
         _mutex.unlock();
         return false;
     }
-    wait(0.1);
+    rtos::ThisThread::sleep_for(100);
     bool ret = click(MOUSE_LEFT);
 
     _mutex.unlock();
@@ -172,7 +171,7 @@ bool USBMouse::click(uint8_t button)
         _mutex.unlock();
         return false;
     }
-    wait(0.01);
+    rtos::ThisThread::sleep_for(10);
     bool ret = update(0, 0, 0, 0);
 
     _mutex.unlock();

usb/device/USBHID/USBMouseKeyboard.cpp

@@ -18,7 +18,7 @@
 #include "stdint.h"
 #include "USBMouseKeyboard.h"
 #include "usb_phy_api.h"
-#include "mbed_wait_api.h"
+#include "ThisThread.h"
 
 typedef struct {
     unsigned char usage;
@@ -709,7 +709,7 @@ bool USBMouseKeyboard::doubleClick()
         _mutex.unlock();
         return false;
     }
-    wait(0.1);
+    rtos::ThisThread::sleep_for(100);
     bool ret = click(MOUSE_LEFT);
 
     _mutex.unlock();
@@ -724,7 +724,7 @@ bool USBMouseKeyboard::click(uint8_t button)
         _mutex.unlock();
         return false;
     }
-    wait(0.01);
+    rtos::ThisThread::sleep_for(10);
     bool ret = update(0, 0, 0, 0);
 
     _mutex.unlock();