fixup review comments

Author: kilograham

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

@@ -535,7 +535,7 @@ static inline void dma_channel_start(uint channel) {
  *\endcode
  *
  * \if rp2350_specific
- * RP2350 only: Due to errata RP12350-E5 (see the RP2350 datasheet for further detail), it is necessary to clear the enable bit of
+ * RP2350 only: Due to errata RP2350-E5 (see the RP2350 datasheet for further detail), it is necessary to clear the enable bit of
  * the aborted channel and any chained channels prior to the abort to prevent re-triggering.
  * \endif
  *

src/rp2_common/hardware_pio/include/hardware/pio.h

@@ -215,6 +215,10 @@ static_assert(DREQ_PIO0_TX2 == DREQ_PIO0_TX0 + 2, "");
 static_assert(DREQ_PIO0_TX3 == DREQ_PIO0_TX0 + 3, "");
 static_assert(DREQ_PIO0_RX0 == DREQ_PIO0_TX0 + NUM_PIO_STATE_MACHINES, "");
 static_assert(DREQ_PIO1_RX0 == DREQ_PIO1_TX0 + NUM_PIO_STATE_MACHINES, "");
+#if NUM_PIOS > 2
+static_assert(DREQ_PIO2_TX0 == DREQ_PIO1_RX0 + NUM_PIO_STATE_MACHINES, "");
+static_assert(DREQ_PIO2_RX0 == DREQ_PIO2_TX0 + NUM_PIO_STATE_MACHINES, "");
+#endif
 #define PIO_DREQ_NUM(pio, sm, is_tx) ((sm) + (((is_tx) ? 0 : NUM_PIO_STATE_MACHINES) + PIO_NUM(pio) * (DREQ_PIO1_TX0 - DREQ_PIO0_TX0)))
 #endif
 

src/rp2_common/pico_double/include/pico/double.h

@@ -21,7 +21,7 @@ extern "C" {
 * \brief Optimized double-precision floating point functions
 *
 * An application can take control of the floating point routines used in the application over and above what is provided by the compiler,
-* by depending on the pico_double library. A user might want to do this
+* by depending on the pico_double library. A user might want to do this:
 *
 * 1. To use optimized software implementations provided by the RP2-series device's bootrom or the SDK
 * 2. To use optimized combined software/hardware implementations utilizing custom RP2-series hardware for acceleration
@@ -52,14 +52,14 @@ extern "C" {
 * floating point implementation; they are however usually fine for the majority of cases
 * \endif
 *
-* On Arm, (replacement) optimized implementations are provided for the following compiler built-ins when
-* and math library functions when using `pico_dobule_pico`:
+* On Arm, (replacement) optimized implementations are provided for the following compiler built-ins
+* and math library functions when using `pico_double_pico`:
 *
 * - basic arithmetic:
 *
 *   __aeabi_dadd, __aeabi_ddiv, __aeabi_dmul, __aeabi_drsub, __aeabi_dsub
 *
-* - comparison: (except `pico_double_pico_vfp`)
+* - comparison:
 *
 *   __aeabi_cfcmpeq, __aeabi_cfrcmple, __aeabi_cfcmple, __aeabi_dcmpeq, __aeabi_dcmplt, __aeabi_dcmple, __aeabi_dcmpge, __aeabi_dcmpgt, __aeabi_dcmpun
 *
@@ -113,24 +113,24 @@ extern "C" {
 *
 *       fix2double, ufix2double, fix642double, ufix642double
 *
-*     note: on `pico_double_vfp` the 32-bit functions are curretly _only_ provided as C macros and must use a compile
+*     note: on `pico_double_vfp` the 32-bit functions are currently _only_ provided as C macros and must use a compile
 *     time constant between 1 and 32 for the fixed point position
 *
 *   - double -> (u)fix (round towards zero):
 *
 *       double2fix_z, double2ufix_z, double2fix64_z, double2ufix64_z
 *
-*     note: on `pico_double_vfp` the 32-bit functions are curretly _only_ provided as C macros and must use a compile
+*     note: on `pico_double_vfp` the 32-bit functions are currently _only_ provided as C macros and must use a compile
 *     time constant between 1 and 32 for the fixed point position
 *
 *   - double -> (u)fix (round towards -infinity):
 *
 *       double2fix, double2ufix, double2fix64, double2ufix64
 *
-*     note: on `pico_double_vfp` the 32-bit functions are curretly _only_ provided as C macros and must use a compile
+*     note: on `pico_double_vfp` the 32-bit functions are currently _only_ provided as C macros and must use a compile
 *     time constant between 1 and 32 for the fixed point position
 *
-* - Even faster methods versions of divide and square-root that do not round correctly:
+* - Even faster versions of divide and square-root functions that do not round correctly:
 *
 *   ddiv_fast, sqrt_fast (these do not round correctly)
 *
@@ -185,7 +185,7 @@ double powint(double x, int y);
 double ddiv_fast(double n, double d);
 double sqrt_fast(double f);
 double fma_fast(double x, double y, double z); // this is not fused
-double mla(double x, double y, double z); // another name for fma_flast
+double mla(double x, double y, double z); // another name for fma_fast
 #endif
 
 #endif

src/rp2_common/pico_float/include/pico/float.h

@@ -51,17 +51,17 @@ extern "C" {
 *
 * 1. `pico_float_pico_vfp` - this library leaves basic C single-precision floating point operations to the compiler
 * which can use inlined VFP (Arm FPU) code. Custom optimized versions of trigonometric and scientific functions are provided.
-* no DCP (RP2350 Double co-processor) instructions are used.
+* No DCP (RP2350 Double co-processor) instructions are used.
 * 2. `pico_float_pico_dcp` - this library prevents the compiler injecting inlined VFP code, and also implements
-* all single-precision floating point operations in optimized DCP or M33 code. This option is not as fast
-* as pico_float_pico_vfp, however allows floating point operations without enabling the floating point co-processor
+* all single-precision floating point operations in optimized DCP or M33 code. This option is not quite as fast
+* as pico_float_pico_vfp, however it allows floating point operations without enabling the floating point co-processor
 * on the CPU; this can be beneficial in certain circumstances, e.g. where leaving stack in tasks or interrupts
 * for the floating point state is undesirable.
 *
-* Note: `pico_float_pico` is equivalent ot `pico_flot_pico_vfp` on RP2350, as this is the most sensible default
+* Note: `pico_float_pico` is equivalent to `pico_float_pico_vfp` on RP2350, as this is the most sensible default
 * \endif
 *
-* On Arm, (replacement) optimized implementations are provided for the following compiler built-ins when
+* On Arm, (replacement) optimized implementations are provided for the following compiler built-ins
 * and math library functions when using `_pico` variants of `pico_float`:
 *
 * - basic arithmetic: (except `pico_float_pico_vfp`)
@@ -104,13 +104,13 @@ extern "C" {
 *
 *     int2float, uint2float, int642float, uint642float
 *
-*     note: on `pico_float_vfp` the 32-bit functions are also provided as C macros since they map to inline VFP code
+*     note: on `pico_float_pico_vfp` the 32-bit functions are also provided as C macros since they map to inline VFP code
 *
 *   - (u)float -> int (round towards zero):
 *
 *     float2int_z, float2uint_z, float2int64_z, float2uint64_z
 *
-*     note: on `pico_float_vfp` the 32-bit functions are also provided as C macros since they map to inline VFP code
+*     note: on `pico_float_pico_vfp` the 32-bit functions are also provided as C macros since they map to inline VFP code
 *
 *   - (u)float -> int (round towards -infinity):
 *
@@ -126,17 +126,17 @@ extern "C" {
 *
 *       float2fix_z, float2ufix_z, float2fix64_z, float2ufix64_z
 *
-*     note: on `pico_float_vfp` the 32-bit functions are also provided as C macros since they can map to inline VFP code
+*     note: on `pico_float_pico_vfp` the 32-bit functions are also provided as C macros since they can map to inline VFP code
 *     when the number of fractional bits is a compile time constant between 1 and 32
 *
 *   - float -> (u)fix (round towards -infinity):
 *
 *       float2fix, float2ufix, float2fix64, float2ufix64
 *
-*     note: on `pico_float_vfp` the 32-bit functions are also provided as C macros since they can map to inline VFP code
+*     note: on `pico_float_pico_vfp` the 32-bit functions are also provided as C macros since they can map to inline VFP code
 *     when the number of fractional bits is a compile time constant between 1 and 32
 *
-* - Even faster methods versions of divide and square-root that do not round correctly: (`pico_float_pico_dcp` only)
+* - Even faster versions of divide and square-root functions that do not round correctly: (`pico_float_pico_dcp` only)
 *
 *   fdiv_fast, sqrtf_fast
 *
@@ -276,12 +276,12 @@ uint64_t float2ufix64(float f, int e);
 #define _float2ufix_inline(f, e) _float2ufix_z_inline((f), (e))
 #endif
 
-#if LIB_PIC_FLOAT_PICO_VFP
+#if LIB_PICO_FLOAT_PICO_VFP
 // may as well provide inline macros for VFP
-#define int2float(int32_t i) ((float)(i))
-#define uint2float(uint32_t i) ((float)(i))
-#define float2int_z(float f) ((int32_t)(f))
-#define float2uint_z(float f) ((uint32_t)(f))
+#define int2float(i) ((float)(int32_t)(i))
+#define uint2float(i) ((float)(uint32_t)(i))
+#define float2int_z(f) ((int32_t)(f))
+#define float2uint_z(f) ((uint32_t)(f))
 #endif
 
 #endif

test/pico_float_test/CMakeLists.txt

@@ -84,10 +84,8 @@ endif()
 
 set(FLOAT_TYPES compiler)
 set(DOUBLE_TYPES compiler)
-#if (PICO_RP2040)
-    list(APPEND FLOAT_TYPES pico)
-    list(APPEND DOUBLE_TYPES pico)
-#endif()
+list(APPEND FLOAT_TYPES pico)
+list(APPEND DOUBLE_TYPES pico)
 if (PICO_RP2350)
     if (NOT PICO_RISCV)
         list(APPEND FLOAT_TYPES pico_vfp pico_dcp)