Merge pull request #3080 from ARMmbed/release-candidate

Release candidate for mbed-os-5.2-rc4

Author: 0xc0170

TESTS/mbed_drivers/lp_timeout/main.cpp

@@ -43,8 +43,18 @@ void lp_timeout_1s_deepsleep(void)
 {
     complete = false;
 
-    /* 
-     * We use here lp_ticker_read() instead of us_ticker_read() for start and 
+    /*
+     * Since deepsleep() may shut down the UART peripheral, we wait for 10ms
+     * to allow for hardware serial buffers to completely flush.
+
+     * 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.
+     */
+    wait_ms(10);
+
+    /*
+     * We use here lp_ticker_read() instead of us_ticker_read() for start and
      * end because the microseconds timer might be disable during deepsleep.
      */
     timestamp_t start = lp_ticker_read();

TESTS/mbed_hal/lp_ticker/main.cpp

@@ -65,12 +65,22 @@ void lp_ticker_1s_deepsleep()
     complete = false;
     uint32_t delay_ts;
 
+    /*
+     * Since deepsleep() may shut down the UART peripheral, we wait for 10ms
+     * to allow for hardware serial buffers to completely flush.
+
+     * 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.
+     */
+    wait_ms(10);
+
     ticker_set_handler(lp_ticker_data, cb_done);
     ticker_remove_event(lp_ticker_data, &delay_event);
     delay_ts = lp_ticker_read() + 1000000;
 
-    /* 
-     * We use here lp_ticker_read() instead of us_ticker_read() for start and 
+    /*
+     * We use here lp_ticker_read() instead of us_ticker_read() for start and
      * end because the microseconds timer might be disable during deepsleep.
      */
     timestamp_t start = lp_ticker_read();

features/FEATURE_LWIP/lwip-interface/lwip_stack.c

@@ -698,8 +698,9 @@ static int mbed_lwip_socket_accept(nsapi_stack_t *stack, nsapi_socket_t server,
     netconn_set_recvtimeout(ns->conn, 1);
     *(struct lwip_socket **)handle = ns;
 
-    (void) netconn_peer(ns->conn, (ip_addr_t *)addr->bytes, port);
-    addr->version = NSAPI_IPv4;
+    ip_addr_t peer_addr;
+    (void) netconn_peer(ns->conn, &peer_addr, port);
+    convert_lwip_addr_to_mbed(addr, &peer_addr);
 
     return 0;
 }

features/mbedtls/VERSION.txt

@@ -1 +1 @@
-8e004104020dd4328434e8a207245b0327bbb9b1
+mbedtls-2.4.0

features/mbedtls/importer/Makefile

@@ -27,15 +27,15 @@
 #
 
 # Set the mbed TLS release to import (this can/should be edited before import)
-MBED_TLS_RELEASE ?= a592dcc1c6277bb191269e709cdd3d5593e593ed
+MBED_TLS_RELEASE ?= mbedtls-2.4.0
 
 # Translate between mbed TLS namespace and mbed namespace
 TARGET_PREFIX:=../
 TARGET_SRC:=$(TARGET_PREFIX)src
 TARGET_INC:=$(TARGET_PREFIX)inc
 
 # mbed TLS source directory - hidden from mbed via TARGET_IGNORE
-MBED_TLS_URL:=https://github.com/ARMmbed/mbedtls.git
+MBED_TLS_URL:=https://github.com/ARMmbed/mbedtls-restricted.git
 MBED_TLS_DIR:=TARGET_IGNORE/mbedtls
 MBED_TLS_API:=$(MBED_TLS_DIR)/include/mbedtls
 MBED_TLS_GIT_CFG=$(MBED_TLS_DIR)/.git/config

features/mbedtls/inc/mbedtls/version.h

@@ -38,17 +38,17 @@
  * Major, Minor, Patchlevel
  */
 #define MBEDTLS_VERSION_MAJOR  2
-#define MBEDTLS_VERSION_MINOR  3
+#define MBEDTLS_VERSION_MINOR  4
 #define MBEDTLS_VERSION_PATCH  0
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define MBEDTLS_VERSION_NUMBER         0x02030000
-#define MBEDTLS_VERSION_STRING         "2.3.0"
-#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.3.0"
+#define MBEDTLS_VERSION_NUMBER         0x02040000
+#define MBEDTLS_VERSION_STRING         "2.4.0"
+#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.4.0"
 
 #if defined(MBEDTLS_VERSION_C)
 

…ostack/FEATURE_NANOSTACK/CONTRIBUTING.md features/nanostack/CONTRIBUTING.mdfeatures/nanostack/FEATURE_NANOSTACK/CONTRIBUTING.md renamed to features/nanostack/CONTRIBUTING.md features/nanostack/FEATURE_NANOSTACK/CONTRIBUTING.md renamed to features/nanostack/CONTRIBUTING.md

@@ -58,6 +58,7 @@ clean() {
         rm -rf $dir
     done
     clean_nanostack_binaries
+    clean_nanostack_licenses
 }
 
 clone() {
@@ -80,12 +81,23 @@ export_repos() {
 }
 
 copy_nanostack_binaries() {
-    mkdir -p ../nanostack-binaries
-    mv sal-stack-nanostack/FEATURE_* ../nanostack-binaries/
+    mv sal-stack-nanostack/FEATURE_* ../
 }
 
 clean_nanostack_binaries() {
-    rm -rf ../nanostack-binaries
+    for binaries in ../FEATURE_*; do
+        if [ "$binaries" != "../FEATURE_NANOSTACK" ]; then
+            rm -rf $binaries        
+        fi
+    done
+}
+
+copy_nanostack_licenses() {
+    mv sal-stack-nanostack/LICENSE* ../
+}
+
+clean_nanostack_licenses() {
+    rm -rf ../LICENSE*
 }
 
 case "${1-}" in
@@ -99,6 +111,7 @@ case "${1-}" in
     export)
         export_repos
         copy_nanostack_binaries
+        copy_nanostack_licenses
         ;;
     *)
         print_usage