Fix Kconfig format issue and add option

components/bt/CMakeLists.txt

@@ -32,12 +32,13 @@ if(CONFIG_BT_ENABLED)
 
     list(APPEND priv_include_dirs
             common/btc/include
-            common/include)
+            common/include
+            porting/mem/
+        )
     list(APPEND include_dirs
          common/api/include/api
          common/btc/profile/esp/blufi/include
          common/btc/profile/esp/include
-         porting/mem/
         )
 
 
@@ -467,9 +468,7 @@ if(CONFIG_BT_ENABLED)
 
 
 
-    if(CONFIG_IDF_TARGET_ESP32C2 OR CONFIG_IDF_TARGET_ESP32H2)
+    if(CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT)
-
-        if(CONFIG_BT_CONTROLLER_ENABLED)
             list(APPEND srcs
                     "porting/npl/freertos/src/npl_os_freertos.c"
                     "porting/nimble/src/os_msys_init.c"
@@ -477,18 +476,17 @@ if(CONFIG_BT_ENABLED)
 
             list(APPEND include_dirs
                     porting/include
-                    porting/mem/
                     porting/nimble/include
                     porting/npl/freertos/include
                     porting/transport/include
             )
-        endif()
 
             if(CONFIG_BT_LE_HCI_INTERFACE_USE_UART)
                 list(APPEND srcs
                         "porting/transport/uart/hci_uart.c"
                     )
             endif()
+    endif()
 
 
     if(NOT (CONFIG_BT_LE_CRYPTO_STACK_MBEDTLS OR CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS))
@@ -511,7 +509,6 @@ if(CONFIG_BT_ENABLED)
                 "porting/ext/tinycrypt/src/hmac.c"
                 "porting/ext/tinycrypt/src/cbc_mode.c")
     endif()
-    endif()
 
     if(CONFIG_BT_NIMBLE_ENABLED)
 
@@ -601,7 +598,7 @@ if(CONFIG_BT_ENABLED)
                 host/nimble/port/include
             )
 
-        if(NOT((CONFIG_IDF_TARGET_ESP32C2 OR CONFIG_IDF_TARGET_ESP32H2) AND CONFIG_BT_CONTROLLER_ENABLED))
+        if(NOT CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT)
             list(APPEND srcs
                     "host/nimble/nimble/porting/nimble/src/endian.c"
                     "host/nimble/nimble/porting/nimble/src/os_mempool.c"
@@ -626,8 +623,6 @@ if(CONFIG_BT_ENABLED)
             )
         endif()
 
-
-
         list(APPEND srcs
                     "common/btc/profile/esp/blufi/nimble_host/esp_blufi.c")
 

components/bt/controller/esp32c2/Kconfig.in

@@ -81,6 +81,13 @@ menu "HCI Config"
             Set the size of uart task stack
 endmenu
 
+config BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
+    bool
+    default y
+    help
+        Enable NPL porting for controller.
+
+
 menuconfig BT_LE_50_FEATURE_SUPPORT
     bool "Enable BLE 5 feature"
     depends on !BT_NIMBLE_ENABLED
@@ -114,8 +121,7 @@ if BT_LE_EXT_ADV
     config BT_LE_MAX_EXT_ADV_INSTANCES
         int "Maximum number of extended advertising instances."
         range 0 4
-        default 1 if BT_LE_EXT_ADV
+        default 1
-        default 0
         depends on BT_LE_EXT_ADV
         help
             Change this option to set maximum number of extended advertising
@@ -126,8 +132,7 @@ if BT_LE_EXT_ADV
     config BT_LE_EXT_ADV_MAX_SIZE
         int "Maximum length of the advertising data."
         range 0 1650
-        default 1650 if BT_LE_EXT_ADV
+        default 1650
-        default 0
         depends on BT_LE_EXT_ADV
         help
             Defines the length of the extended adv data. The value should not
@@ -165,7 +170,7 @@ config BT_LE_MAX_PERIODIC_ADVERTISER_LIST
     int "Maximum number of periodic advertiser list"
     depends on BT_LE_50_FEATURE_SUPPORT && !BT_NIMBLE_ENABLED
     range 1 5
-    default 5 if BT_LE_50_FEATURE_SUPPORT
+    default 5
     help
         Set this option to set the upper limit for number of periodic advertiser list.
 
@@ -357,7 +362,7 @@ endchoice
 
 config BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF
     int
-    default 0 if !BT_NIMBLE_ENABLED
+    depends on !BT_NIMBLE_ENABLED
     default 1 if BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EN
     default 0 if BT_LE_COEX_PHY_CODED_TX_RX_TLIM_DIS
 

components/bt/controller/esp32h2/Kconfig.in

@@ -81,6 +81,13 @@ menu "HCI Config"
             Set the size of uart task stack
 endmenu
 
+config BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
+    bool
+    default y
+    help
+        Enable NPL porting for controller.
+
+
 menuconfig BT_LE_50_FEATURE_SUPPORT
     bool "Enable BLE 5 feature"
     depends on !BT_NIMBLE_ENABLED
@@ -114,8 +121,7 @@ if BT_LE_EXT_ADV
     config BT_LE_MAX_EXT_ADV_INSTANCES
         int "Maximum number of extended advertising instances."
         range 0 4
-        default 1 if BT_LE_EXT_ADV
+        default 1
-        default 0
         depends on BT_LE_EXT_ADV
         help
             Change this option to set maximum number of extended advertising
@@ -126,8 +132,7 @@ if BT_LE_EXT_ADV
     config BT_LE_EXT_ADV_MAX_SIZE
         int "Maximum length of the advertising data."
         range 0 1650
-        default 1650 if BT_LE_EXT_ADV
+        default 1650
-        default 0
         depends on BT_LE_EXT_ADV
         help
             Defines the length of the extended adv data. The value should not
@@ -165,7 +170,7 @@ config BT_LE_MAX_PERIODIC_ADVERTISER_LIST
     int "Maximum number of periodic advertiser list"
     depends on BT_LE_50_FEATURE_SUPPORT && !BT_NIMBLE_ENABLED
     range 1 5
-    default 5 if BT_LE_50_FEATURE_SUPPORT
+    default 5
     help
         Set this option to set the upper limit for number of periodic advertiser list.
 
@@ -357,7 +362,7 @@ endchoice
 
 config BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF
     int
-    default 0 if !BT_NIMBLE_ENABLED
+    depends on !BT_NIMBLE_ENABLED
     default 1 if BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EN
     default 0 if BT_LE_COEX_PHY_CODED_TX_RX_TLIM_DIS
 

components/bt/porting/nimble/include/nimble/nimble_port.h

@@ -20,6 +20,7 @@
 #ifndef _NIMBLE_PORT_H
 #define _NIMBLE_PORT_H
 
+#include "esp_err.h"
 #include "nimble/nimble_npl.h"
 
 #define NIMBLE_CORE (CONFIG_BT_NIMBLE_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BT_NIMBLE_PINNED_TO_CORE : tskNO_AFFINITY)
@@ -42,7 +43,6 @@ int nimble_port_stop(void);
 
 struct ble_npl_eventq *nimble_port_get_dflt_eventq(void);
 
-struct ble_hs_cfg;
 esp_err_t esp_nimble_init();
 esp_err_t esp_nimble_enable(void *host_task);