Merge pull request ARMmbed#3585 from ARMmbed/release-candidate

Release candidate for mbed-os-5.3.3

Author: 0xc0170

events/equeue/equeue_mbed.cpp

@@ -124,7 +124,9 @@ static void equeue_sema_timeout(equeue_sema_t *s) {
 bool equeue_sema_wait(equeue_sema_t *s, int ms) {
     int signal = 0;
     Timeout timeout;
-    timeout.attach_us(s, equeue_sema_timeout, ms*1000);
+    if (ms > 0) {
+        timeout.attach_us(callback(equeue_sema_timeout, s), ms*1000);
+    }
 
     core_util_critical_section_enter();
     while (!*s) {

features/FEATURE_LWIP/lwip-interface/lwip_stack.c

@@ -243,37 +243,43 @@ const ip_addr_t *mbed_lwip_get_ip_addr(bool any_addr, const struct netif *netif)
     return NULL;
 }
 
-#if LWIP_IPV6
 void add_dns_addr(struct netif *lwip_netif)
 {
+    // Do nothing if not brought up
     const ip_addr_t *ip_addr = mbed_lwip_get_ip_addr(true, lwip_netif);
-    if (ip_addr) {
-        if (IP_IS_V6(ip_addr)) {
-            const ip_addr_t *dns_ip_addr;
-            bool dns_addr_exists = false;
-
-            for (char numdns = 0; numdns < DNS_MAX_SERVERS; numdns++) {
-                dns_ip_addr = dns_getserver(numdns);
-                if (!ip_addr_isany(dns_ip_addr)) {
-                   dns_addr_exists = true;
-                   break;
-                }
-            }
+    if (!ip_addr) {
+        return;
+    }
 
-            if (!dns_addr_exists) {
-                /* 2001:4860:4860::8888 google */
-                ip_addr_t ipv6_dns_addr = IPADDR6_INIT(
-                        PP_HTONL(0x20014860UL),
-                        PP_HTONL(0x48600000UL),
-                        PP_HTONL(0x00000000UL),
-                        PP_HTONL(0x00008888UL));
-                dns_setserver(0, &ipv6_dns_addr);
-            }
+    // Check for existing dns server
+    for (char numdns = 0; numdns < DNS_MAX_SERVERS; numdns++) {
+        const ip_addr_t *dns_ip_addr = dns_getserver(numdns);
+        if (!ip_addr_isany(dns_ip_addr)) {
+            return;
         }
     }
-}
+
+#if LWIP_IPV6
+    if (IP_IS_V6(ip_addr)) {
+        /* 2001:4860:4860::8888 google */
+        ip_addr_t ipv6_dns_addr = IPADDR6_INIT(
+                PP_HTONL(0x20014860UL),
+                PP_HTONL(0x48600000UL),
+                PP_HTONL(0x00000000UL),
+                PP_HTONL(0x00008888UL));
+        dns_setserver(0, &ipv6_dns_addr);
+    }
 #endif
 
+#if LWIP_IPV4
+    if (IP_IS_V4(ip_addr)) {
+        /* 8.8.8.8 google */
+        ip_addr_t ipv4_dns_addr = IPADDR4_INIT(0x08080808);
+        dns_setserver(0, &ipv4_dns_addr);
+    }
+#endif
+}
+
 static sys_sem_t lwip_tcpip_inited;
 static void mbed_lwip_tcpip_init_irq(void *eh)
 {
@@ -495,7 +501,6 @@ nsapi_error_t mbed_lwip_bringup(bool dhcp, const char *ip, const char *netmask,
         if (ret == SYS_ARCH_TIMEOUT) {
             return NSAPI_ERROR_DHCP_FAILURE;
         }
-        lwip_connected = true;
     }
 
 #if ADDR_TIMEOUT
@@ -506,10 +511,9 @@ nsapi_error_t mbed_lwip_bringup(bool dhcp, const char *ip, const char *netmask,
     }
 #endif
 
-#if LWIP_IPV6
     add_dns_addr(&lwip_netif);
-#endif
 
+    lwip_connected = true;
     return 0;
 }
 
@@ -618,6 +622,22 @@ static nsapi_error_t mbed_lwip_gethostbyname(nsapi_stack_t *stack, const char *h
     return 0;
 }
 
+static nsapi_error_t mbed_lwip_add_dns_server(nsapi_stack_t *stack, nsapi_addr_t addr)
+{
+    // Shift all dns servers down to give precedence to new server
+    for (int i = DNS_MAX_SERVERS-1; i > 0; i--) {
+        dns_setserver(i, dns_getserver(i-1));
+    }
+
+    ip_addr_t ip_addr;
+    if (!convert_mbed_addr_to_lwip(&ip_addr, &addr)) {
+        return NSAPI_ERROR_PARAMETER;
+    }
+
+    dns_setserver(0, &ip_addr);
+    return 0;
+}
+
 static nsapi_error_t mbed_lwip_socket_open(nsapi_stack_t *stack, nsapi_socket_t *handle, nsapi_protocol_t proto)
 {
     // check if network is connected
@@ -874,6 +894,7 @@ static void mbed_lwip_socket_attach(nsapi_stack_t *stack, nsapi_socket_t handle,
 /* LWIP network stack */
 const nsapi_stack_api_t lwip_stack_api = {
     .gethostbyname      = mbed_lwip_gethostbyname,
+    .add_dns_server     = mbed_lwip_add_dns_server,
     .socket_open        = mbed_lwip_socket_open,
     .socket_close       = mbed_lwip_socket_close,
     .socket_bind        = mbed_lwip_socket_bind,

features/nanostack/FEATURE_ETHERNET_HOST/TOOLCHAIN_ARM/TARGET_LIKE_CORTEX_M0/libnanostack_armcc_Cortex-M0_ethernet_host.ar

@@ -16,8 +16,8 @@
 #define NU_MAX_EPX_BUFSIZE      4096
 #define NU_EP2EPL(ep)           ((ep) >> 1)
 #define NU_EP2EPH(ep)           (((ep) >> 1) + 1)
-#define NU_EPL2EPH(ep)					((ep) + 1)
-#define NU_EPH2EPL(ep)					((ep) - 1)
+#define NU_EPL2EPH(ep)          ((ep) + 1)
+#define NU_EPH2EPL(ep)          ((ep) - 1)
 #define NU_EP_DIR_Pos           0
 #define NU_EP_DIR_Msk           (1 << NU_EP_DIR_Pos)
 #define NU_EP_DIR_OUT           0
@@ -37,22 +37,22 @@
 #define EP2IN       (5)
 #define EP3OUT      (6)
 #define EP3IN       (7)
-#define EP4OUT     	(8)
-#define EP4IN      	(9)
+#define EP4OUT      (8)
+#define EP4IN       (9)
 #define EP5OUT     (10)
 #define EP5IN      (11)
 #define EP6OUT     (12)
 #define EP6IN      (13)
 
 /* Maximum Packet sizes */
-#define MAX_PACKET_SIZE_EP0   64
-#define MAX_PACKET_SIZE_EP1   64
-#define MAX_PACKET_SIZE_EP2   64
-#define MAX_PACKET_SIZE_EP3   0x60
-#define MAX_PACKET_SIZE_EP4  	64
-#define MAX_PACKET_SIZE_EP5  	64
-#define MAX_PACKET_SIZE_EP6  	64
-#define MAX_PACKET_SIZE_EP7  	64
+#define MAX_PACKET_SIZE_EP0     64
+#define MAX_PACKET_SIZE_EP1     64
+#define MAX_PACKET_SIZE_EP2     64
+#define MAX_PACKET_SIZE_EP3     0x60
+#define MAX_PACKET_SIZE_EP4     64
+#define MAX_PACKET_SIZE_EP5     64
+#define MAX_PACKET_SIZE_EP6     64
+#define MAX_PACKET_SIZE_EP7     64
 
 /* Generic endpoints - intended to be portable accross devices */
 /* and be suitable for simple USB devices. */

features/nanostack/FEATURE_ETHERNET_HOST/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_ethernet_host.ar

@@ -16,9 +16,9 @@
 #define NU_MAX_EPX_BUFSIZE      4096
 #define NU_EP2EPL(ep)           ((ep) >> 1)
 #define NU_EP2EPH(ep)           (((ep) >> 1) - 1)
-#define NU_EPX2EP(ep)          ((ep == CEP) ? EP0OUT : ((ep) - EPA + EP1OUT))
-#define NU_EPL2EPH(ep)					((ep) - 1)
-#define NU_EPH2EPL(ep)					((ep) + 1)
+#define NU_EPX2EP(ep)           ((ep == CEP) ? EP0OUT : ((ep) - EPA + EP1OUT))
+#define NU_EPL2EPH(ep)          ((ep) - 1)
+#define NU_EPH2EPL(ep)          ((ep) + 1)
 #define NU_EP_DIR_Pos           0
 #define NU_EP_DIR_Msk           (1 << NU_EP_DIR_Pos)
 #define NU_EP_DIR_OUT           0
@@ -39,26 +39,26 @@
 #define EP2IN       (5)
 #define EP3OUT      (6)
 #define EP3IN       (7)
-#define EP4OUT     	(8)
-#define EP4IN      	(9)
+#define EP4OUT      (8)
+#define EP4IN       (9)
 #define EP5OUT     (10)
 #define EP5IN      (11)
 #define EP6OUT     (12)
 #define EP6IN      (13)
 
 /* Maximum Packet sizes */
-#define MAX_PACKET_SIZE_EP0   64
-#define MAX_PACKET_SIZE_EP1   64
-#define MAX_PACKET_SIZE_EP2   64
-#define MAX_PACKET_SIZE_EP3   0x60
-#define MAX_PACKET_SIZE_EP4  	64
-#define MAX_PACKET_SIZE_EP5  	64
-#define MAX_PACKET_SIZE_EP6  	64
-#define MAX_PACKET_SIZE_EP7  	64
-#define MAX_PACKET_SIZE_EP8  	64
-#define MAX_PACKET_SIZE_EP9  	64
-#define MAX_PACKET_SIZE_EP10  64
-#define MAX_PACKET_SIZE_EP11  64
+#define MAX_PACKET_SIZE_EP0     64
+#define MAX_PACKET_SIZE_EP1     64
+#define MAX_PACKET_SIZE_EP2     64
+#define MAX_PACKET_SIZE_EP3     0x60
+#define MAX_PACKET_SIZE_EP4     64
+#define MAX_PACKET_SIZE_EP5     64
+#define MAX_PACKET_SIZE_EP6     64
+#define MAX_PACKET_SIZE_EP7     64
+#define MAX_PACKET_SIZE_EP8     64
+#define MAX_PACKET_SIZE_EP9     64
+#define MAX_PACKET_SIZE_EP10    64
+#define MAX_PACKET_SIZE_EP11    64
 
 /* Generic endpoints - intended to be portable accross devices */
 /* and be suitable for simple USB devices. */
@@ -83,7 +83,7 @@
 #define MAX_PACKET_SIZE_EPINT   64
 #define MAX_PACKET_SIZE_EPISO   1023
 
-#define USBD_GET_EP_MAX_PAYLOAD(ep)		(*((__IO uint32_t *) ((uint32_t)&USBD->EPAMPS + (uint32_t)((ep)*0x28)))) 
-#define USBD_GET_EP_DATA_COUNT(ep)		((*((__IO uint32_t *) ((uint32_t)&USBD->EPADATCNT + (uint32_t)((ep)*0x28)))) & 0xFFFFF)
-#define USBD_SET_EP_SHORT_PACKET(ep) 	(*((__IO uint32_t *) ((uint32_t)&USBD->EPARSPCTL + (uint32_t)((ep)*0x28))) = (*((__IO uint32_t *) ((uint32_t)&USBD->EPARSPCTL + (uint32_t)((ep)*0x28)))) & 0x10 | 0x40)
-#define USBD_GET_EP_INT_EN(ep)				(*((__IO uint32_t *) ((uint32_t)&USBD->EPAINTEN + (uint32_t)((ep)*0x28))))
+#define USBD_GET_EP_MAX_PAYLOAD(ep)     (*((__IO uint32_t *) ((uint32_t)&USBD->EPAMPS + (uint32_t)((ep)*0x28)))) 
+#define USBD_GET_EP_DATA_COUNT(ep)      ((*((__IO uint32_t *) ((uint32_t)&USBD->EPADATCNT + (uint32_t)((ep)*0x28)))) & 0xFFFFF)
+#define USBD_SET_EP_SHORT_PACKET(ep)    (*((__IO uint32_t *) ((uint32_t)&USBD->EPARSPCTL + (uint32_t)((ep)*0x28))) = (*((__IO uint32_t *) ((uint32_t)&USBD->EPARSPCTL + (uint32_t)((ep)*0x28)))) & 0x10 | 0x40)
+#define USBD_GET_EP_INT_EN(ep)          (*((__IO uint32_t *) ((uint32_t)&USBD->EPAINTEN + (uint32_t)((ep)*0x28))))