Merge pull request #4278 from ARMmbed/release-candidate

Release candidate for mbed-os-5.4.5

Author: theotherjimmy

TESTS/mbed_drivers/race_test/main.cpp

@@ -22,6 +22,10 @@
 #include "SingletonPtr.h"
 #include <stdio.h>
 
+#ifndef MBED_RTOS_SINGLE_THREAD
+  #error [NOT_SUPPORTED] test not supported for single threaded enviroment
+#endif
+
 using namespace utest::v1;
 
 #define TEST_STACK_SIZE     1024

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c

@@ -402,7 +402,6 @@ static struct pbuf *lpc_low_level_input(struct netif *netif)
  */
 void lpc_enetif_input(struct netif *netif)
 {
-	struct eth_hdr *ethhdr;
 	struct pbuf *p;
 
 	/* move received packet into a new pbuf */

mbed.h

@@ -16,13 +16,13 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 141
+#define MBED_LIBRARY_VERSION 142
 
 #if MBED_CONF_RTOS_PRESENT
 // RTOS present, this is valid only for mbed OS 5
 #define MBED_MAJOR_VERSION 5
 #define MBED_MINOR_VERSION 4
-#define MBED_PATCH_VERSION 4
+#define MBED_PATCH_VERSION 5
 
 #else
 // mbed 2

platform/mbed_debug.h

@@ -18,49 +18,49 @@
  */
 #ifndef MBED_DEBUG_H
 #define MBED_DEBUG_H
-#include "device.h"
+#if DEVICE_STDIO_MESSAGES
+#include <stdio.h>
+#include <stdarg.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if DEVICE_STDIO_MESSAGES
-#include <stdio.h>
-#include <stdarg.h>
 
 /** Output a debug message
  *
  * @param format printf-style format string, followed by variables
  */
 static inline void debug(const char *format, ...) {
+#if DEVICE_STDIO_MESSAGES && !defined(NDEBUG)
     va_list args;
     va_start(args, format);
     vfprintf(stderr, format, args);
     va_end(args);
+#endif
 }
 
+
 /** Conditionally output a debug message
  *
- * NOTE: If the condition is constant false (!= 1) and the compiler optimization
+ * NOTE: If the condition is constant false (== 0) and the compiler optimization
  * level is greater than 0, then the whole function will be compiled away.
  *
- * @param condition output only if condition is true (== 1)
+ * @param condition output only if condition is true (!= 0)
  * @param format printf-style format string, followed by variables
  */
 static inline void debug_if(int condition, const char *format, ...) {
-    if (condition == 1) {
+#if DEVICE_STDIO_MESSAGES && !defined(NDEBUG)
+    if (condition) {
         va_list args;
         va_start(args, format);
         vfprintf(stderr, format, args);
         va_end(args);
     }
+#endif
 }
 
-#else
-static inline void debug(const char *format, ...) {}
-static inline void debug_if(int condition, const char *format, ...) {}
-
-#endif
 
 #ifdef __cplusplus
 }

rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c

@@ -33,6 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include "cmsis_os.h"
+#include "mbed_error.h"
 
 
 /*----------------------------------------------------------------------------
@@ -244,7 +245,6 @@ void os_idle_demon (void) {
 /*----------------------------------------------------------------------------
  *      RTX Errors
  *---------------------------------------------------------------------------*/
-extern void error(const char* format, ...);
 extern osThreadId svcThreadGetId (void);
 
 void os_error (uint32_t err_code) {

targets/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PinNames.h

@@ -203,6 +203,9 @@ typedef enum {
     //Push buttons
     SW1 = PTC3,
     SW3 = PTC12,
+    // Standardized button names
+    BUTTON1 = SW1,
+    BUTTON2 = SW3,
 
     // USB Pins
     USBTX = PTA2,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/PinNames.h

@@ -204,6 +204,9 @@ typedef enum {
     //Push buttons
     SW2 = PTD11,
     SW3 = PTA10,
+    // Standardized button names
+    BUTTON1 = SW2,
+    BUTTON2 = SW3,
 
     // USB Pins
     USBTX = PTB17,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/PinNames.h

@@ -134,6 +134,9 @@ typedef enum {
     //Push buttons
     SW2 = PTA4,
     SW3 = PTC6,
+    // Standardized button names
+    BUTTON1 = SW2,
+    BUTTON2 = SW3,
 
     // USB Pins
     USBTX = PTC15,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/TARGET_FRDM/PinNames.h

@@ -98,6 +98,9 @@ typedef enum {
     //Push buttons
     SW1 = PTA4,
     SW3 = PTC1,
+    // Standardized button names
+    BUTTON1 = SW1,
+    BUTTON2 = SW3,
 
     // USB Pins
     USBTX = PTA2,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/TARGET_FRDM/PinNames.h

@@ -97,6 +97,9 @@ typedef enum {
     //Push buttons
     SW1 = PTA4,
     SW3 = PTC3,
+    // Standardized button names
+    BUTTON1 = SW1,
+    BUTTON2 = SW3,
 
     // USB Pins
     USBTX = PTA2,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_FRDM/PinNames.h

@@ -118,6 +118,9 @@ typedef enum {
     //Push buttons
     SW2 = PTA4,
     SW3 = PTD0,
+    // Standardized button names
+    BUTTON1 = SW2,
+    BUTTON2 = SW3,
 
     // USB Pins
     USBTX = PTB17,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PinNames.h

@@ -82,6 +82,11 @@ typedef enum {
     SW2 = PTE3,
     SW3 = PTD1,
     SW4 = PTA19,
+    // Standardized button names
+    BUTTON1 = SW1,
+    BUTTON2 = SW2,
+    BUTTON3 = SW3,
+    BUTTON4 = SW4,
 
     // USB Pins
     USBTX = PTE0,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PinNames.h

@@ -69,6 +69,9 @@ typedef enum {
     //Push buttons
     SW3 = PTC4,
     SW4 = PTC5,
+    // Standardized button names
+    BUTTON1 = SW3,
+    BUTTON2 = SW4,
 
     // USB Pins
     USBTX = PTC7,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/TARGET_MCU_K22F512/TARGET_FRDM/PinNames.h

@@ -204,6 +204,9 @@ typedef enum {
     //Push buttons
     SW2 = PTC1,
     SW3 = PTB17,
+    // Standardized button names
+    BUTTON1 = SW2,
+    BUTTON2 = SW3,
 
     // USB Pins
     USBTX = PTE0,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/PinNames.h

@@ -204,6 +204,9 @@ typedef enum {
     //Push buttons
     SW2 = PTC6,
     SW3 = PTA4,
+    // Standardized button names
+    BUTTON1 = SW2,
+    BUTTON2 = SW3,
 
     // USB Pins
     USBTX = PTB17,

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_HEXIWEAR/PinNames.h

@@ -201,6 +201,11 @@ typedef enum {
     LED3 = LED_BLUE,
     LED4 = LED_RED,
 
+    // Standardized button names
+    BUTTON1 = PTA12,
+    BUTTON2 = PTA13,
+    BUTTON3 = PTA15,
+
     // USB Pins
     USBTX = PTB17,
     USBRX = PTB16,

targets/TARGET_Maxim/TARGET_MAX32600/TARGET_MAX32600MBED/PinNames.h

@@ -184,6 +184,9 @@ typedef enum {
     // Push button
     SW2 = P6_4,
     SW3 = P6_5,
+    // Standardized button names
+    BUTTON1 = SW2,
+    BUTTON2 = SW3,
 
     // UART pins
     USBTX = P7_3,

targets/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h

@@ -128,6 +128,8 @@ typedef enum {
 
     // Push button
     SW1 = P1_5,
+    // Standardized button names
+    BUTTON1 = SW1,
 
     // UART Pins
     UART0_RX  = P1_0,

targets/TARGET_Maxim/TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h

@@ -126,6 +126,8 @@ typedef enum {
     SW1 = P2_1,
     SW2 = NOT_CONNECTED,
     SW3 = NOT_CONNECTED,
+    // Standardized button names
+    BUTTON1 = SW1,
 
     // USB bridge connected UART pins
     USBTX = P0_1,

targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/PinNames.h

@@ -76,6 +76,9 @@ typedef enum {
     // Push button
     SW2 = P2_2,
     SW3 = P2_3,
+    // Standardized button names
+    BUTTON1 = SW2,
+    BUTTON2 = SW3,
 
     // USB bridge connected UART pins
     USBTX = P2_1,

targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625NEXPAQ/PinNames.h

@@ -75,6 +75,10 @@ typedef enum {
     SW1 = P4_2,
     SW2 = P4_3,
     SW3 = P4_4,
+    // Standardized button names
+    BUTTON1 = SW1,
+    BUTTON2 = SW2,
+    BUTTON3 = SW3,
 
     // USB bridge connected UART pins
     USBTX = P2_1,

targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h

@@ -79,6 +79,8 @@ typedef enum {
     SW1 = P2_3,
     SW2 = NOT_CONNECTED,
     SW3 = NOT_CONNECTED,
+    // Standardized button names
+    BUTTON1 = SW1,
 
     // USB bridge connected UART pins
     USBTX = P2_1,

targets/TARGET_NXP/TARGET_LPC11UXX/TARGET_LPC11U37H_401/PinNames.h

@@ -106,6 +106,9 @@ typedef enum {
     // BTN Names
     BTN1 = P0_16,
     BTN2 = P0_1,
+    // Standardized button names
+    BUTTON1 = BTN1,
+    BUTTON2 = BTN2,
 
     // UART
     UART_TX = P0_19,

targets/TARGET_NXP/TARGET_LPC176X/TARGET_XBED_LPC1768/PinNames.h

@@ -79,6 +79,8 @@ typedef enum {
 	//xbed lpc1768 Pin Names
     LED5 = P2_6,
     BTN1 = P2_8,
+    // Standardized button names
+    BUTTON1 = BTN1,
     SDA = P0_27,
     SCL = P0_28,
     ISP = P2_10,

targets/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PinNames.h

@@ -615,6 +615,8 @@ typedef enum {
     LED_BLUE = LED4,
 
     BTN1 = P2_7,
+    // Standardized button names
+    BUTTON1 = BTN1,
 
     // Serial pins - UART, SPI, I2C
     //                   210E    210     200E    200

targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h

@@ -128,8 +128,14 @@ typedef enum {
     LED_YELLOW  = GPIO6,
     LED_BLUE    = GPIO5,
     USER_BUTTON = GPIO7,  /*NEW connection on NCS36510-RF Rev 1.1 - Alias of SW1 */
+
     SW1 = GPIO7,  /*NEW connection on NCS36510-RF Rev 1.1 */
     SW2 = GPIO10,   /*NEW connection on NCS36510-RF Rev 1.1 */
+
+    // Standardized button names
+    BUTTON1 = SW1,
+    BUTTON2 = SW2,
+
     SERIAL_TX   = GPIO0,
     SERIAL_RX   = GPIO1,
     USBTX       = GPIO0,

targets/TARGET_ONSEMI/TARGET_NCS36510/device/TOOLCHAIN_IAR/NCS36510.icf

@@ -15,7 +15,7 @@ define region RAM_ALL = Mem:[from 0x3FFF4000 size 0xC000];
 define block CSTACK with size = 0x200, alignment = 8 { };
 
 /* No Heap is created for C library, all memory management should be handled by the application */
- define block HEAP with alignment = 8, size = 0x4000    { }; 
+ define block HEAP with alignment = 8, size = 0x3000    { }; 
 
 /* Handle initialization */
 do not initialize { section .noinit };

targets/TARGET_RENESAS/TARGET_RZ_A1H/PinNames.h

@@ -87,6 +87,8 @@ typedef enum {
     I2C_SDA = D14,
 
     USER_BUTTON0 = P6_0,
+    // Standardized button names
+    BUTTON1 = USER_BUTTON0,
 
     // Not connected
     NC = (int)0xFFFFFFFF

targets/TARGET_STM/TARGET_STM32F0/TARGET_DISCO_F051R8/PinNames.h

@@ -186,6 +186,8 @@ typedef enum {
     LED3        = PC_9,
     LED4        = PC_8,
     USER_BUTTON = PA_0,
+    // Standardized button names
+    BUTTON1 = USER_BUTTON,
     SERIAL_TX   = PA_2,
     SERIAL_RX   = PA_3,
     USBTX       = PA_2,

targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F030R8/PinNames.h

@@ -133,6 +133,8 @@ typedef enum {
     LED3        = PA_5,
     LED4        = PA_5,
     USER_BUTTON = PC_13,
+    // Standardized button names
+    BUTTON1 = USER_BUTTON,
     SERIAL_TX   = PA_2,
     SERIAL_RX   = PA_3,
     USBTX       = PA_2,

targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F070RB/PinNames.h

@@ -129,6 +129,8 @@ typedef enum {
     LED3        = PA_5,
     LED4        = PA_5,
     USER_BUTTON = PC_13,
+    // Standardized button names
+    BUTTON1 = USER_BUTTON,
     SERIAL_TX   = PA_2,
     SERIAL_RX   = PA_3,
     USBTX       = PA_2,

targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F072RB/PinNames.h

@@ -129,6 +129,8 @@ typedef enum {
     LED3        = PA_5,
     LED4        = PA_5,
     USER_BUTTON = PC_13,
+    // Standardized button names
+    BUTTON1 = USER_BUTTON,
     SERIAL_TX   = PA_2,
     SERIAL_RX   = PA_3,
     USBTX       = PA_2,

targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F091RC/PinNames.h

@@ -130,6 +130,8 @@ typedef enum {
     LED3        = PA_5,
     LED4        = PA_5,
     USER_BUTTON = PC_13,
+    // Standardized button names
+    BUTTON1 = USER_BUTTON,
     SERIAL_TX   = PA_2,
     SERIAL_RX   = PA_3,
     USBTX       = PA_2,

targets/TARGET_STM/TARGET_STM32F0/device/stm32f0xx_hal_def.h

@@ -124,7 +124,7 @@ typedef enum
                                     }while (0)
 #endif /* USE_RTOS */
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */