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,