Merge pull request #3361 from ARMmbed/release-candidate

Release candidate for mbed-os-5.3.0-rc2

Author: 0xc0170

features/FEATURE_COMMON_PAL/sal-stack-nanostack-eventloop/source/timeout.c renamed to features/FEATURE_COMMON_PAL/sal-stack-nanostack-eventloop/source/ns_timeout.c

@@ -293,16 +293,20 @@ static void mbed_lwip_netif_status_irq(struct netif *lwip_netif)
 {
     static bool any_addr = true;
 
-    // Indicates that has address
-    if (any_addr == true && mbed_lwip_get_ip_addr(true, lwip_netif)) {
-        sys_sem_signal(&lwip_netif_has_addr);
-        any_addr = false;
-        return;
-    }
+    if (netif_is_up(lwip_netif)) {
+        // Indicates that has address
+        if (any_addr == true && mbed_lwip_get_ip_addr(true, lwip_netif)) {
+            sys_sem_signal(&lwip_netif_has_addr);
+            any_addr = false;
+            return;
+        }
 
-    // Indicates that has preferred address
-    if (mbed_lwip_get_ip_addr(false, lwip_netif)) {
-        sys_sem_signal(&lwip_netif_has_addr);
+        // Indicates that has preferred address
+        if (mbed_lwip_get_ip_addr(false, lwip_netif)) {
+            sys_sem_signal(&lwip_netif_has_addr);
+        }
+    } else {
+        any_addr = true;
     }
 }
 
@@ -509,6 +513,15 @@ nsapi_error_t mbed_lwip_bringup(bool dhcp, const char *ip, const char *netmask,
     return 0;
 }
 
+#if LWIP_IPV6
+void mbed_lwip_clear_ipv6_addresses(struct netif *lwip_netif)
+{
+    for (u8_t i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
+        netif_ip6_addr_set_state(lwip_netif, i, IP6_ADDR_INVALID);
+    }
+}
+#endif
+
 nsapi_error_t mbed_lwip_bringdown(void)
 {
     // Check if we've connected
@@ -522,13 +535,18 @@ nsapi_error_t mbed_lwip_bringdown(void)
         dhcp_release(&lwip_netif);
         dhcp_stop(&lwip_netif);
         lwip_dhcp = false;
-    } else {
-        netif_set_down(&lwip_netif);
     }
 #endif
 
+    netif_set_down(&lwip_netif);
+
+#if LWIP_IPV6
+    mbed_lwip_clear_ipv6_addresses(&lwip_netif);
+#endif
+
+    sys_sem_free(&lwip_netif_has_addr);
+    sys_sem_new(&lwip_netif_has_addr, 0);
     lwip_connected = false;
-    // TO DO - actually remove addresses from stack, and shut down properly
     return 0;
 }
 

features/FEATURE_LWIP/lwip-interface/lwip_stack.c

@@ -41,8 +41,6 @@
 extern ARM_DRIVER_STORAGE ARM_Driver_Storage_MTD_K64F;
 static ARM_DRIVER_STORAGE *cfstore_svm_storage_drv = &ARM_Driver_Storage_MTD_K64F;
 
-#endif /* CFSTORE_CONFIG_BACKEND_FLASH_ENABLED */
-
 /* the storage volume manager instance used to generate virtual mtd descriptors */
 StorageVolumeManager volumeManager;
 
@@ -79,3 +77,6 @@ int32_t cfstore_svm_init(struct _ARM_DRIVER_STORAGE *storage_mtd)
     }
     return ret;
 }
+
+#endif /* CFSTORE_CONFIG_BACKEND_FLASH_ENABLED */
+

features/storage/FEATURE_STORAGE/cfstore/source/cfstore_svm.cpp

@@ -111,8 +111,31 @@
     {
       "name": "mbed-os-example-uvisor",
       "github":"https://github.com/ARMmbed/mbed-os-example-uvisor",
-      "mbed": [
-      ],
+      "mbed": [],
+      "features" : [],
+      "targets" : ["K64F"],
+      "toolchains" : ["GCC_ARM"],
+      "exporters": [],
+      "compile" : true,
+      "export": false,
+      "auto-update" : false
+    },
+    {
+      "name": "mbed-os-example-uvisor-thread",
+      "github":"https://github.com/ARMmbed/mbed-os-example-uvisor-thread",
+      "mbed": [],
+      "features" : [],
+      "targets" : ["K64F"],
+      "toolchains" : ["GCC_ARM"],
+      "exporters": [],
+      "compile" : true,
+      "export": false,
+      "auto-update" : false
+    },
+    {
+      "name": "mbed-os-example-uvisor-number-store",
+      "github":"https://github.com/ARMmbed/mbed-os-example-uvisor-number-store",
+      "mbed": [],
       "features" : [],
       "targets" : ["K64F"],
       "toolchains" : ["GCC_ARM"],
@@ -122,4 +145,4 @@
       "auto-update" : false
     }
   ]
-}
+}