Merge branch 'bugfix/btdm_config_msbc_v4.0' into 'release/v4.0'

components/bt: Disable Wide Bond Speech when SCO data path is PCM

See merge request espressif/esp-idf!5979

components/bt/host/bluedroid/Kconfig.in

@@ -88,6 +88,14 @@ choice BT_HFP_AUDIO_DATA_PATH
         bool "HCI"
 endchoice
 
+config BT_HFP_WBS_ENABLE
+    bool "Wide Band Speech"
+    depends on BT_HFP_AUDIO_DATA_PATH_HCI
+    default y
+    help
+        This enables Wide Band Speech. Should disable it when SCO data path is PCM.
+        Otherwise there will be no data transmited via GPIOs.
+
 config BT_SSP_ENABLED
     bool "Secure Simple Pairing"
     depends on BT_CLASSIC_ENABLED

components/bt/host/bluedroid/bta/hf_client/bta_hf_client_main.c

@@ -232,7 +232,11 @@ const tBTA_HF_CLIENT_ST_TBL bta_hf_client_st_tbl[] = {
     bta_hf_client_st_closing
 };
 
+#if BTM_WBS_INCLUDED
 const char *bta_hf_client_version = "1.6";
+#else
+const char *bta_hf_client_version = "1.5";
+#endif
 
 /* HF Client control block */
 #if BTA_DYNAMIC_MEMORY == FALSE

components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h

@@ -171,6 +171,12 @@
 #define UC_BT_HFP_AUDIO_DATA_PATH_HCI           FALSE
 #endif
 
+//Wide Band Speech
+#ifdef CONFIG_BT_HFP_WBS_ENABLE
+#define UC_BT_HFP_WBS_ENABLE                    CONFIG_BT_HFP_WBS_ENABLE
+#else
+#define UC_BT_HFP_WBS_ENABLE                    FALSE
+#endif
 
 /**********************************************************
  * Memory reference

components/bt/host/bluedroid/common/include/common/bt_target.h

@@ -591,7 +591,7 @@
 
 /* Includes WBS if TRUE */
 #ifndef BTM_WBS_INCLUDED
-#define BTM_WBS_INCLUDED            FALSE       /* TRUE includes WBS code */
+#define BTM_WBS_INCLUDED                UC_BT_HFP_WBS_ENABLE    /* TRUE includes WBS code */
 #endif
 
 /*  This is used to work around a controller bug that doesn't like Disconnect