stable_20.3.x.FOME: merge upstream ChibiOS stable_20.3.x branch

demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile

@@ -5,7 +5,7 @@
 
 # Compiler options here.
 ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
+  USE_OPT = -Os -ggdb -fomit-frame-pointer -falign-functions=16
 endif
 
 # C specific options here (added to USE_OPT).

demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile

@@ -5,7 +5,7 @@
 
 # Compiler options here.
 ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
+  USE_OPT = -Os -ggdb -fomit-frame-pointer -falign-functions=16
 endif
 
 # C specific options here (added to USE_OPT).

demos/STM32/RT-STM32L053-DISCOVERY/cfg/mcuconf.h

@@ -125,16 +125,21 @@
  */
 #define STM32_I2C_USE_I2C1                  FALSE
 #define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_USE_I2C3                  FALSE
 #define STM32_I2C_BUSY_TIMEOUT              50
 #define STM32_I2C_I2C1_IRQ_PRIORITY         3
 #define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_I2C3_IRQ_PRIORITY         3
 #define STM32_I2C_USE_DMA                   TRUE
 #define STM32_I2C_I2C1_DMA_PRIORITY         1
 #define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C3_DMA_PRIORITY         1
 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
 #define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_I2C_I2C3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_I2C_I2C3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
 
 /*

demos/STM32/RT-STM32L053R8-NUCLEO64/cfg/mcuconf.h

@@ -125,16 +125,21 @@
  */
 #define STM32_I2C_USE_I2C1                  FALSE
 #define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_USE_I2C3                  FALSE
 #define STM32_I2C_BUSY_TIMEOUT              50
 #define STM32_I2C_I2C1_IRQ_PRIORITY         3
 #define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_I2C3_IRQ_PRIORITY         3
 #define STM32_I2C_USE_DMA                   TRUE
 #define STM32_I2C_I2C1_DMA_PRIORITY         1
 #define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C3_DMA_PRIORITY         1
 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
 #define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_I2C_I2C3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_I2C_I2C3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
 
 /*

os/common/ports/ARMCMx/chcore_v6m.h

@@ -325,6 +325,23 @@ struct port_context {
 }
 #endif
 
+/**
+ * @brief   Returns a word representing a critical section status.
+ *
+ * @return              The critical section status.
+ */
+#define port_get_lock_status() __port_get_irq_status()
+
+/**
+ * @brief   Determines if in a critical section.
+ *
+ * @param[in] sts       status word returned by @p port_get_lock_status()
+ * @return              The current status.
+ * @retval false        if running outside a critical section.
+ * @retval true         if running within a critical section.
+ */
+#define port_is_locked(sts) !__port_irq_enabled(sts)
+
 /*===========================================================================*/
 /* External declarations.                                                    */
 /*===========================================================================*/
@@ -351,7 +368,7 @@ extern "C" {
  *
  * @return              The interrupts status.
  */
-static inline syssts_t port_get_irq_status(void) {
+static inline syssts_t __port_get_irq_status(void) {
 
   return (syssts_t)__get_PRIMASK();
 }
@@ -365,7 +382,7 @@ static inline syssts_t port_get_irq_status(void) {
  * @retval false        the word specified a disabled interrupts status.
  * @retval true         the word specified an enabled interrupts status.
  */
-static inline bool port_irq_enabled(syssts_t sts) {
+static inline bool __port_irq_enabled(syssts_t sts) {
 
   return (sts & (syssts_t)1) == (syssts_t)0;
 }

os/common/ports/ARMCMx/chcore_v7m.h

@@ -591,6 +591,23 @@ struct port_context {
 #endif
 #endif
 
+/**
+ * @brief   Returns a word representing a critical section status.
+ *
+ * @return              The critical section status.
+ */
+#define port_get_lock_status() __port_get_irq_status()
+
+/**
+ * @brief   Determines if in a critical section.
+ *
+ * @param[in] sts       status word returned by @p port_get_lock_status()
+ * @return              The current status.
+ * @retval false        if running outside a critical section.
+ * @retval true         if running within a critical section.
+ */
+#define port_is_locked(sts) !__port_irq_enabled(sts)
+
 /*===========================================================================*/
 /* External declarations.                                                    */
 /*===========================================================================*/
@@ -620,7 +637,7 @@ extern "C" {
  *
  * @return              The interrupts status.
  */
-__STATIC_FORCEINLINE syssts_t port_get_irq_status(void) {
+__STATIC_FORCEINLINE syssts_t __port_get_irq_status(void) {
   syssts_t sts;
 
 #if CORTEX_SIMPLIFIED_PRIORITY == FALSE
@@ -640,7 +657,7 @@ __STATIC_FORCEINLINE syssts_t port_get_irq_status(void) {
  * @retval false        the word specified a disabled interrupts status.
  * @retval true         the word specified an enabled interrupts status.
  */
-__STATIC_FORCEINLINE bool port_irq_enabled(syssts_t sts) {
+__STATIC_FORCEINLINE bool __port_irq_enabled(syssts_t sts) {
 
 #if CORTEX_SIMPLIFIED_PRIORITY == FALSE
   return sts == (syssts_t)CORTEX_BASEPRI_DISABLED;

os/common/ports/templates/chcore.h

@@ -286,6 +286,23 @@ struct port_context {
 }
 #endif
 
+/**
+ * @brief   Returns a word representing a critical section status.
+ *
+ * @return              The critical section status.
+ */
+#define port_get_lock_status() 0U
+
+/**
+ * @brief   Determines if in a critical section.
+ *
+ * @param[in] sts       status word returned by @p port_get_lock_status()
+ * @return              The current status.
+ * @retval false        if running outside a critical section.
+ * @retval true         if running within a critical section.
+ */
+#define port_is_locked(sts) ((sts) != 0U)
+
 /*===========================================================================*/
 /* External declarations.                                                    */
 /*===========================================================================*/
@@ -313,32 +330,6 @@ extern "C" {
    asm module.*/
 #if !defined(_FROM_ASM_)
 
-/**
- * @brief   Returns a word encoding the current interrupts status.
- *
- * @return              The interrupts status.
- */
-static inline syssts_t port_get_irq_status(void) {
-
-  return 0;
-}
-
-/**
- * @brief   Checks the interrupt status.
- *
- * @param[in] sts       the interrupt status word
- *
- * @return              The interrupt status.
- * @retval false        the word specified a disabled interrupts status.
- * @retval true         the word specified an enabled interrupts status.
- */
-static inline bool port_irq_enabled(syssts_t sts) {
-
-  (void)sts;
-
-  return false;
-}
-
 /**
  * @brief   Determines the current execution context.
  *

os/common/startup/ARM/compilers/GCC/rules.mk

@@ -24,7 +24,7 @@ endif
 
 # Link time optimizations
 ifeq ($(USE_LTO),yes)
-  OPT += -flto
+  OPT += -flto=auto
 endif
 
 # Undefined state stack size