Merge da964fa63c into 8fcd44a171

If the compiler in use offers __sev(), __wfe(), or __wfi(), forward
declare them to be sure they're available for use.

src/host/hardware_sync/include/hardware/sync.h

@@ -109,8 +109,6 @@ extern "C" {
 
 void __sev();
 
-void __wev();
-
 void __wfi();
 
 void __wfe();

src/host/hardware_sync/sync_core0_only.c

@@ -93,23 +93,44 @@ void PICO_WEAK_FUNCTION_IMPL_NAME(spin_unlock)(spin_lock_t *lock, uint32_t saved
     spin_unlock_unsafe(lock);
 }
 
-PICO_WEAK_FUNCTION_DEF(__sev)
+// These are defined on ARM hosts, but don't do what we want for the host
+// since this is a simulated build.
+
+#if PICO_C_COMPILER_IS_GNU || !__has_builtin(__sev)
+#define __sev_c __sev
+#else
+#pragma redefine_extname __sev_c __sev
+#endif
+
+#if PICO_C_COMPILER_IS_GNU || !__has_builtin(__wfi)
+#define __wfi_c __wfi
+#else
+#pragma redefine_extname __wfi_c __wfi
+#endif
+
+#if PICO_C_COMPILER_IS_GNU || !__has_builtin(__wfe)
+#define __wfe_c __wfe
+#else
+#pragma redefine_extname __wfe_c __wfe
+#endif
+
+PICO_WEAK_FUNCTION_DEF(__sev_c)
 
 volatile bool event_fired;
 
-void PICO_WEAK_FUNCTION_IMPL_NAME(__sev)() {
+void PICO_WEAK_FUNCTION_IMPL_NAME(__sev_c)() {
     event_fired = true;
 }
 
-PICO_WEAK_FUNCTION_DEF(__wfi)
+PICO_WEAK_FUNCTION_DEF(__wfi_c)
 
-void PICO_WEAK_FUNCTION_IMPL_NAME(__wfi)() {
+void PICO_WEAK_FUNCTION_IMPL_NAME(__wfi_c)() {
     panic("Can't wait on irq for host core0 only implementation");
 }
 
-PICO_WEAK_FUNCTION_DEF(__wfe)
+PICO_WEAK_FUNCTION_DEF(__wfe_c)
 
-void PICO_WEAK_FUNCTION_IMPL_NAME(__wfe)() {
+void PICO_WEAK_FUNCTION_IMPL_NAME(__wfe_c)() {
     while (!event_fired) tight_loop_contents();
 }
 
@@ -146,4 +167,4 @@ int PICO_WEAK_FUNCTION_IMPL_NAME(spin_lock_claim_unused)(bool required) {
 PICO_WEAK_FUNCTION_DEF(spin_lock_num)
 uint PICO_WEAK_FUNCTION_IMPL_NAME(spin_lock_num)(spin_lock_t *lock) {
     return 0;
-}
+}

src/rp2_common/hardware_dma/include/hardware/dma.h

@@ -556,6 +556,7 @@ static inline uint32_t dma_encode_transfer_count(uint transfer_count) {
  */
 static inline uint32_t dma_encode_transfer_count_with_self_trigger(uint transfer_count) {
 #if PICO_RP2040
+    (void)transfer_count;
     panic_unsupported();
 #else
     return dma_encode_transfer_count(transfer_count) | (DMA_CH0_TRANS_COUNT_MODE_VALUE_TRIGGER_SELF << DMA_CH0_TRANS_COUNT_MODE_LSB);

src/rp2_common/hardware_sync/include/hardware/sync.h

@@ -94,6 +94,9 @@ __force_inline static void __sev(void) {
     pico_default_asm_volatile ("sev");
 #endif
 }
+#else
+// Forward declare so we don't have to #include <arm_acle.h>.
+void __sev(void);
 #endif
 
 /*! \brief Insert a WFE instruction in to the code path.
@@ -110,6 +113,9 @@ __force_inline static void __wfe(void) {
     pico_default_asm_volatile ("wfe");
 #endif
 }
+#else
+// Forward declare so we don't have to #include <arm_acle.h>.
+void __wfe(void);
 #endif
 
 /*! \brief Insert a WFI instruction in to the code path.
@@ -121,6 +127,9 @@ __force_inline static void __wfe(void) {
 __force_inline static void __wfi(void) {
     pico_default_asm_volatile("wfi");
 }
+#else
+// Forward declare so we don't have to #include <arm_acle.h>.
+void __wfi(void);
 #endif
 
 /*! \brief Insert a DMB instruction in to the code path.

src/rp2_common/pico_multicore/multicore.c

@@ -370,7 +370,7 @@ static bool multicore_doorbell_claim_under_lock(uint doorbell_num, uint core_mas
                                               (is_bit_claimed(doorbell_claimed[1], doorbell_num + 1u) << 1));
     if (claimed_cores_for_doorbell & core_mask) {
         if (required) {
-            panic( "Multicoore doorbell %d already claimed on core mask 0x%x; requested core mask 0x%x\n",
+            panic( "Multicore doorbell %d already claimed on core mask 0x%x; requested core mask 0x%x\n",
                    claimed_cores_for_doorbell, core_mask);
         }
         return false;

src/rp2_common/pico_printf/printf.c

@@ -99,6 +99,7 @@
 #define FLAGS_LONG_LONG (1U <<  9U)
 #define FLAGS_PRECISION (1U << 10U)
 #define FLAGS_ADAPT_EXP (1U << 11U)
+#define FLAGS_TRIM_ZERO (1U << 12U)
 
 // import float.h for DBL_MAX
 #if PICO_PRINTF_SUPPORT_FLOAT
@@ -360,7 +361,7 @@ static size_t _ftoa(out_fct_type out, char *buffer, size_t idx, size_t maxlen, d
     }
     // limit precision to 9, cause a prec >= 10 can lead to overflow errors
     while ((len < PICO_PRINTF_FTOA_BUFFER_SIZE) && (prec > 9U)) {
-        buf[len++] = '0';
+        if (!(flags & FLAGS_TRIM_ZERO)) buf[len++] = '0';
         prec--;
     }
 
@@ -391,21 +392,30 @@ static size_t _ftoa(out_fct_type out, char *buffer, size_t idx, size_t maxlen, d
         }
     } else {
         unsigned int count = prec;
+        bool nonzero = false;
         // now do fractional part, as an unsigned number
         while (len < PICO_PRINTF_FTOA_BUFFER_SIZE) {
             --count;
-            buf[len++] = (char) (48U + (frac % 10U));
+            char digit = (frac % 10U);
+            // only print the digit if trimming isn't desired,
+            // a non-zero digit has already been printed, or it's non-zero
+            if (!(flags & FLAGS_TRIM_ZERO) || nonzero || digit != 0) {
+                buf[len++] = (char) (48U + digit);
+                nonzero = true;
+            }
             if (!(frac /= 10U)) {
                 break;
             }
         }
-        // add extra 0s
-        while ((len < PICO_PRINTF_FTOA_BUFFER_SIZE) && (count-- > 0U)) {
-            buf[len++] = '0';
-        }
-        if (len < PICO_PRINTF_FTOA_BUFFER_SIZE) {
-            // add decimal
-            buf[len++] = '.';
+        if (!(flags & FLAGS_TRIM_ZERO) || nonzero) {
+            // add extra 0s
+            while ((len < PICO_PRINTF_FTOA_BUFFER_SIZE) && (count-- > 0U)) {
+                buf[len++] = '0';
+            }
+            if (len < PICO_PRINTF_FTOA_BUFFER_SIZE) {
+                // add decimal
+                buf[len++] = '.';
+            }
         }
     }
 
@@ -777,7 +787,7 @@ static int _vsnprintf(out_fct_type out, char *buffer, const size_t maxlen, const
             case 'g':
             case 'G':
 #if PICO_PRINTF_SUPPORT_FLOAT && PICO_PRINTF_SUPPORT_EXPONENTIAL
-                if ((*format == 'g') || (*format == 'G')) flags |= FLAGS_ADAPT_EXP;
+                if ((*format == 'g') || (*format == 'G')) flags |= FLAGS_ADAPT_EXP | FLAGS_TRIM_ZERO;
                 if ((*format == 'E') || (*format == 'G')) flags |= FLAGS_UPPERCASE;
                 idx = _etoa(out, buffer, idx, maxlen, va_arg(va, double), precision, width, flags);
 #else

src/rp2_common/pico_status_led/status_led.c

@@ -80,7 +80,8 @@ bool colored_status_led_set_state(bool led_on) {
     if (colored_status_led_supported()) {
 #if COLORED_STATUS_LED_USING_WS2812_PIO
         success = true;
-        if (led_on && !colored_status_led_on) {
+        if (led_on) {
+            // Turn the LED "on" even if it was already on, as the color might have changed
             success = set_ws2812(colored_status_led_on_color);
         } else if (!led_on && colored_status_led_on) {
             success = set_ws2812(0);