Просмотр исходного кода

Merge branch 'bugfix/fix_disable_controller_50_feature' into 'master'

Disable controller 5.0 feature bits if host 5.0 feature is not enabled on ESP32C3  and ESP32S3

See merge request espressif/esp-idf!23307
Zhi Wei Jian 2 лет назад
Родитель
Сommit
a2b2cdadf8
1 измененных файлов с 7 добавлено и 3 удалено
  1. 7 3
      components/bt/include/esp32c3/include/esp_bt.h

+ 7 - 3
components/bt/include/esp32c3/include/esp_bt.h

@@ -157,13 +157,17 @@ typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status);
 #if defined (CONFIG_BT_BLE_50_FEATURES_SUPPORTED) || defined (CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
 #ifdef CONFIG_BT_BLE_50_FEATURES_SUPPORTED
 #define BT_CTRL_50_FEATURE_SUPPORT   (CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
-#endif
+#endif // CONFIG_BT_BLE_50_FEATURES_SUPPORTED
 #ifdef CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT
 #define BT_CTRL_50_FEATURE_SUPPORT   (CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
-#endif
+#endif // CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT
+#else
+#if defined (CONFIG_BT_BLUEDROID_ENABLED) || defined (CONFIG_BT_NIMBLE_ENABLED)
+#define BT_CTRL_50_FEATURE_SUPPORT (0)
 #else
 #define BT_CTRL_50_FEATURE_SUPPORT (1)
-#endif
+#endif // (CONFIG_BT_BLUEDROID_ENABLED) || (CONFIG_BT_NIMBLE_ENABLED)
+#endif // (CONFIG_BT_BLE_50_FEATURES_SUPPORTED) || (CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
 
 #define AGC_RECORRECT_EN       ((BT_CTRL_AGC_RECORRECT_EN << 0) | (BT_CTRL_CODED_AGC_RECORRECT <<1))