Make PHY options configurable without extended advertising.

Author: h2zero

cores/nRF5/nimble_config/ext_nimble_config.h

@@ -12,6 +12,28 @@
 #error No supported mcu config specified
 #endif
 
+#ifndef CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY
+#ifdef NRF51
+#define CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY 0
+#else
+#define CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY 1
+#endif
+#endif
+
+#ifndef CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY
+#define CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY MYNEWT_VAL_MCU_TARGET__nRF52833 || \
+MYNEWT_VAL_MCU_TARGET__nRF52840 || MYNEWT_VAL_MCU_TARGET__nRF52820 || MYNEWT_VAL_MCU_TARGET__nRF52811 || \
+MYNEWT_VAL_MCU_TARGET__nRF5340_NET
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY
+#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
+#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY)
+#endif
+
 /* NimBLE 1.5 Updated config */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG (MYNEWT_VAL_BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG)

cores/nRF5/nimble_config/nrf51_nimconfig.h

@@ -251,14 +251,6 @@
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_EXT_SCAN_FILT (0)
 #endif
 
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (0)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (0)
-#endif
-
 /* Overridden by @apache-mynewt-nimble/nimble/controller (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 (1)

cores/nRF5/nimble_config/nrf52810_nimconfig.h

@@ -268,14 +268,6 @@
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_EXT_SCAN_FILT (0)
 #endif
 
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (MYNEWT_VAL_BLE_EXT_ADV)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (0)
-#endif
-
 /* Overridden by @apache-mynewt-nimble/nimble/controller (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 (1)

cores/nRF5/nimble_config/nrf52832_nimconfig.h

@@ -268,14 +268,6 @@
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_EXT_SCAN_FILT (0)
 #endif
 
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (MYNEWT_VAL_BLE_EXT_ADV)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (0)
-#endif
-
 /* Overridden by @apache-mynewt-nimble/nimble/controller (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 (1)

cores/nRF5/nimble_config/nrf52833_nimconfig.h

@@ -268,14 +268,6 @@
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_EXT_SCAN_FILT (0)
 #endif
 
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (MYNEWT_VAL_BLE_EXT_ADV)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (MYNEWT_VAL_BLE_EXT_ADV)
-#endif
-
 /* Overridden by @apache-mynewt-nimble/nimble/controller (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 (1)

cores/nRF5/nimble_config/nrf52840_nimconfig.h

@@ -268,14 +268,6 @@
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_EXT_SCAN_FILT (0)
 #endif
 
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (MYNEWT_VAL_BLE_EXT_ADV)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (MYNEWT_VAL_BLE_EXT_ADV)
-#endif
-
 /* Overridden by @apache-mynewt-nimble/nimble/controller (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 (1)