simplicity_sdk: Patch generic macros

Certain instances of CONCAT() and MAX() conflict between SiSDK
and Zephyr. Add a SL_ prefix to the SiSDK variants.

Signed-off-by: Aksel Skauge Mellbye <[email protected]>

Author: asmellby

simplicity_sdk/platform/common/inc/sl_common.h

@@ -73,12 +73,12 @@ extern "C" {
  ******************************************************************************/
 
 /** @brief Macros to concatenate. */
-#define _CONCAT_2(first, second)                          first ## second
-#define SL_CONCAT_PASTER_2(first, second)                 _CONCAT_2(first, second)                ///< sl concat paster 2.
-#define _CONCAT_3(first, second, third)                   first ## second ## third
-#define SL_CONCAT_PASTER_3(first, second, third)          _CONCAT_3(first, second, third)         ///< sl concat paster 3.
-#define _CONCAT_4(first, second, third, fourth)           first ## second ## third ## fourth
-#define SL_CONCAT_PASTER_4(first, second, third, fourth)  _CONCAT_4(first, second, third, fourth) ///< sl concat paster 4.
+#define _SL_CONCAT_2(first, second)                       first ## second
+#define SL_CONCAT_PASTER_2(first, second)                 _SL_CONCAT_2(first, second)                ///< sl concat paster 2.
+#define _SL_CONCAT_3(first, second, third)                first ## second ## third
+#define SL_CONCAT_PASTER_3(first, second, third)          _SL_CONCAT_3(first, second, third)         ///< sl concat paster 3.
+#define _SL_CONCAT_4(first, second, third, fourth)        first ## second ## third ## fourth
+#define SL_CONCAT_PASTER_4(first, second, third, fourth)  _SL_CONCAT_4(first, second, third, fourth) ///< sl concat paster 4.
 
 /** @brief Round n up to closest interval of i. */
 #define SL_CEILING(n, i)   ((((n) + (i) - 1U) / (i)) * (i))

simplicity_sdk/platform/radio/rail_lib/plugin/pa-conversions/pa_conversions_efr32.c

@@ -43,7 +43,7 @@
 #include "pa_conversions_efr32.h"
 #include "rail.h"
 
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define _SL_MAX(a, b) ((a) > (b) ? (a) : (b))
 
 static RAIL_TxPowerCurvesConfigAlt_t powerCurvesState;
 
@@ -319,7 +319,7 @@ RAIL_TxPowerLevel_t RAIL_ConvertDbmToRaw(RAIL_Handle_t railHandle,
   if ((mode < sizeof(supportedPaIndices))
       && (supportedPaIndices[mode] < RAIL_NUM_PA)) {
     RAIL_PaDescriptor_t const *modeInfo = &powerCurvesState.curves[supportedPaIndices[mode]];
-    uint32_t minPowerLevel = MAX(modeInfo->min, PA_CONVERSION_MINIMUM_PWRLVL);
+    uint32_t minPowerLevel = _SL_MAX(modeInfo->min, PA_CONVERSION_MINIMUM_PWRLVL);
 #if RAIL_SUPPORTS_DBM_POWERSETTING_MAPPING_TABLE
     if (modeInfo->algorithm == RAIL_PA_ALGORITHM_DBM_POWERSETTING_MAPPING_TABLE) {
       RAIL_TxPower_t minPower = modeInfo->minPowerDbm;
@@ -472,7 +472,7 @@ RAIL_TxPower_t RAIL_ConvertRawToDbm(RAIL_Handle_t railHandle,
       }
 
       // We 1-index low power PA power levels, but of course arrays are 0 indexed
-      powerLevel -= MAX(modeInfo->min, PA_CONVERSION_MINIMUM_PWRLVL);
+      powerLevel -= _SL_MAX(modeInfo->min, PA_CONVERSION_MINIMUM_PWRLVL);
 
       //If the index calculation above underflowed, then provide the lowest array index.
       if (powerLevel > (modeInfo->max - modeInfo->min)) {