alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/compilation_issue_on_disabling_security_v5.2' into 'release/v5.2'

Browse Source 
fix(nimble): Fixed compilation issues on disabling security (v5.2)

See merge request espressif/esp-idf!29697
This commit is contained in:
Rahul Tank 2024-03-20 16:00:48 +08:00
commit ec7e307a18
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/bt/host/nimble/Kconfig.in
View File

@ -633,8 +633,9 @@ config BT_NIMBLE_PERIODIC_ADV_ENH
menuconfig BT_NIMBLE_GATT_CACHING menuconfig BT_NIMBLE_GATT_CACHING
bool "Enable GATT caching" bool "Enable GATT caching"
depends on BT_NIMBLE_ENABLED && BT_NIMBLE_50_FEATURE_SUPPORT depends on BT_NIMBLE_ENABLED && BT_NIMBLE_50_FEATURE_SUPPORT
select BT_NIMBLE_DYNAMIC_SERVICE
help help
Enable GATT caching Enable GATT caching
config BT_NIMBLE_GATT_CACHING_MAX_CONNS config BT_NIMBLE_GATT_CACHING_MAX_CONNS
int "Maximum connections to be cached" int "Maximum connections to be cached"
depends on BT_NIMBLE_GATT_CACHING depends on BT_NIMBLE_GATT_CACHING

2
components/bt/host/nimble/nimble

@ -1 +1 @@
Subproject commit 299279a46795a6de44c2683cae6f85e0c68cb551 Subproject commit c0dd77a8355dd82d0bc1b501e6d118a91eb14df1

29
components/bt/host/nimble/port/include/esp_nimble_cfg.h
View File

@ -133,10 +133,31 @@
#define MYNEWT_VAL_BLE_GATT_CACHING (0) #define MYNEWT_VAL_BLE_GATT_CACHING (0)
#else #else
#define MYNEWT_VAL_BLE_GATT_CACHING (CONFIG_BT_NIMBLE_GATT_CACHING) #define MYNEWT_VAL_BLE_GATT_CACHING (CONFIG_BT_NIMBLE_GATT_CACHING)
#ifdef CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CONNS
#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CONNS (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CONNS) #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CONNS (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CONNS)
#else
#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CONNS (0)
#endif
#ifdef CONFIG_BT_NIMBLE_GATT_CACHING_MAX_SVCS
#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_SVCS (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_SVCS) #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_SVCS (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_SVCS)
#else
#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_SVCS (0)
#endif
#ifdef CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CHRS
#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CHRS (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CHRS) #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CHRS (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CHRS)
#else
#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CHRS (0)
#endif
#ifdef CONFIG_BT_NIMBLE_GATT_CACHING_MAX_DSCS
#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_DSCS (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_DSCS) #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_DSCS (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_DSCS)
#else
#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_DSCS (0)
#endif
#endif #endif
#ifndef CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES #ifndef CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES
@ -487,7 +508,11 @@
/*** @apache-mynewt-nimble/nimble/host */ /*** @apache-mynewt-nimble/nimble/host */
#ifndef MYNEWT_VAL_BLE_DYNAMIC_SERVICE #ifndef MYNEWT_VAL_BLE_DYNAMIC_SERVICE
#ifdef CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
#define MYNEWT_VAL_BLE_DYNAMIC_SERVICE CONFIG_BT_NIMBLE_DYNAMIC_SERVICE #define MYNEWT_VAL_BLE_DYNAMIC_SERVICE CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
#else
#define MYNEWT_VAL_BLE_DYNAMIC_SERVICE (0)
#endif
#endif #endif
#ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU
@ -848,7 +873,11 @@
#ifndef MYNEWT_VAL_BLE_SM_SC_LVL #ifndef MYNEWT_VAL_BLE_SM_SC_LVL
#ifdef CONFIG_BT_NIMBLE_SM_SC_LVL
#define MYNEWT_VAL_BLE_SM_SC_LVL CONFIG_BT_NIMBLE_SM_SC_LVL #define MYNEWT_VAL_BLE_SM_SC_LVL CONFIG_BT_NIMBLE_SM_SC_LVL
#else
#define MYNEWT_VAL_BLE_SM_SC_LVL (0)
#endif
#endif #endif
#ifndef MYNEWT_VAL_BLE_SM_SC_ONLY #ifndef MYNEWT_VAL_BLE_SM_SC_ONLY