Merge commit 'f43b5b3761db0cc431d42f621b366ab16387b2db' into nanostack-as_subtree

* commit 'f43b5b3761db0cc431d42f621b366ab16387b2db':
  Squashed 'connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/' changes from 9441d65aab..063b1af74e

Author: Arto Kinnunen

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

@@ -15,6 +15,7 @@
  */
 #include <string.h>
 #if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
+
 #include "platform/arm_hal_interrupt.h"
 #include "nanostack/platform/arm_hal_phy.h"
 #include "ns_types.h"
@@ -30,6 +31,17 @@
 #include "Thread.h"
 #include "mbed_wait_api.h"
 #include "platform/mbed_error.h"
+#include "platform/mbed_version.h"
+
+#if (MBED_VERSION > MBED_ENCODE_VERSION(6, 0, 0))
+/* Mbed OS 6.0 introduces support for chrono time management */
+using namespace std::chrono;
+    #define S2LP_USE_CHRONO
+    #define S2LP_TIME_50US   50us
+    #define S2LP_TIME_10MS   10ms
+#else
+    #define S2LP_TIME_10MS   10
+#endif
 
 using namespace mbed;
 using namespace rtos;
@@ -276,7 +288,11 @@ static void rf_calculate_symbol_rate(uint32_t baudrate, phy_modulation_e modulat
 
 static uint32_t rf_get_timestamp(void)
 {
+#ifdef S2LP_USE_CHRONO
+    return (uint32_t)rf->tx_timer.elapsed_time().count();
+#else
     return (uint32_t)rf->tx_timer.read_us();
+#endif
 }
 
 static void rf_update_tx_active_time(void)
@@ -866,7 +882,11 @@ static void rf_cca_timer_stop(void)
 
 static void rf_cca_timer_start(uint32_t slots)
 {
+#ifdef S2LP_USE_CHRONO
+    rf->cca_timer.attach(rf_cca_timer_signal, microseconds(slots));
+#else
     rf->cca_timer.attach_us(rf_cca_timer_signal, slots);
+#endif
     TEST_CSMA_STARTED
 }
 
@@ -903,7 +923,11 @@ static void rf_backup_timer_stop(void)
 
 static void rf_backup_timer_start(uint32_t slots)
 {
+#ifdef S2LP_USE_CHRONO
+    rf->backup_timer.attach(rf_backup_timer_signal, microseconds(slots));
+#else
     rf->backup_timer.attach_us(rf_backup_timer_signal, slots);
+#endif
 }
 
 static int8_t rf_start_cca(uint8_t *data_ptr, uint16_t data_length, uint8_t tx_handle, data_protocol_e data_protocol)
@@ -1177,10 +1201,10 @@ static void rf_reset(void)
 {
     // Shutdown
     rf->SDN = 1;
-    ThisThread::sleep_for(10);
+    ThisThread::sleep_for(S2LP_TIME_10MS);
     // Wake up
     rf->SDN = 0;
-    ThisThread::sleep_for(10);
+    ThisThread::sleep_for(S2LP_TIME_10MS);
 }
 
 static void rf_init(void)
@@ -1328,7 +1352,7 @@ NanostackRfPhys2lp::NanostackRfPhys2lp(PinName spi_sdi, PinName spi_sdo, PinName
 #ifdef AT24MAC
     _mac(i2c_sda, i2c_scl),
 #endif //AT24MAC
-    _mac_addr(), _rf(NULL), _mac_set(false),
+    _mac_addr(), _rf(NULL), _test_pins(NULL), _mac_set(false),
     _spi_sdi(spi_sdi), _spi_sdo(spi_sdo), _spi_sclk(spi_sclk), _spi_cs(spi_cs), _spi_sdn(spi_sdn),
     _spi_gpio0(spi_gpio0), _spi_gpio1(spi_gpio1), _spi_gpio2(spi_gpio2), _spi_gpio3(spi_gpio3)
 {