espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 11:44:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

change(ble): added option for msys buffer source

Browse Source
This commit is contained in:
cjin
2023-10-25 16:08:16 +08:00
committed by luomanruo
parent caaf3fbe69
commit 20ca1c0dfa
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/bt/controller/esp32c6/Kconfig.in
View File

@@ -212,6 +212,15 @@ menu "Memory Settings"
help help
Dynamic memory size of block 2 Dynamic memory size of block 2
config BT_LE_MSYS_BUF_FROM_HEAP
bool "Get Msys Mbuf from heap"
default y
depends on BT_LE_MSYS_INIT_IN_CONTROLLER
help
This option sets the source of the shared msys mbuf memory between
the Host and the Controller. Allocate the memory from the heap if
this option is sets, from the mempool otherwise.
config BT_LE_ACL_BUF_COUNT config BT_LE_ACL_BUF_COUNT
int "ACL Buffer count" int "ACL Buffer count"
default 10 default 10
@@ -539,5 +548,5 @@ config BT_LE_SCAN_DUPL_CACHE_REFRESH_PERIOD
again. again.
config BT_LE_MSYS_INIT_IN_CONTROLLER config BT_LE_MSYS_INIT_IN_CONTROLLER
bool bool "Msys Mbuf Init in Controller"
default y default y

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

@@ -276,6 +276,15 @@ menu "Memory Settings"
help help
Dynamic memory size of block 2 Dynamic memory size of block 2
config BT_NIMBLE_MSYS_BUF_FROM_HEAP
bool "Get Msys Mbuf from heap"
default y
depends on BT_LE_MSYS_INIT_IN_CONTROLLER
help
This option sets the source of the shared msys mbuf memory between
the Host and the Controller. Allocate the memory from the heap if
this option is sets, from the mempool otherwise.
config BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT config BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT
int "ACL Buffer count" int "ACL Buffer count"
depends on BT_NIMBLE_ENABLED depends on BT_NIMBLE_ENABLED

16
components/bt/porting/nimble/src/os_msys_init.c
View File

@@ -30,6 +30,11 @@ static STAILQ_HEAD(, os_mbuf_pool) g_msys_pool_list =
#define OS_MSYS_1_SANITY_MIN_COUNT MYNEWT_VAL(MSYS_1_SANITY_MIN_COUNT) #define OS_MSYS_1_SANITY_MIN_COUNT MYNEWT_VAL(MSYS_1_SANITY_MIN_COUNT)
#define OS_MSYS_2_SANITY_MIN_COUNT MYNEWT_VAL(MSYS_2_SANITY_MIN_COUNT) #define OS_MSYS_2_SANITY_MIN_COUNT MYNEWT_VAL(MSYS_2_SANITY_MIN_COUNT)
#if CONFIG_BT_NIMBLE_MSYS_BUF_FROM_HEAP
#define OS_MSYS_BLOCK_FROM_HEAP (1)
#else
#define OS_MSYS_BLOCK_FROM_HEAP (0)
#endif // CONFIG_BT_NIMBLE_MSYS_BUF_FROM_HEAP
#else #else
#define OS_MSYS_1_BLOCK_COUNT CONFIG_BT_LE_MSYS_1_BLOCK_COUNT #define OS_MSYS_1_BLOCK_COUNT CONFIG_BT_LE_MSYS_1_BLOCK_COUNT
#define OS_MSYS_1_BLOCK_SIZE CONFIG_BT_LE_MSYS_1_BLOCK_SIZE #define OS_MSYS_1_BLOCK_SIZE CONFIG_BT_LE_MSYS_1_BLOCK_SIZE
@@ -38,6 +43,12 @@ static STAILQ_HEAD(, os_mbuf_pool) g_msys_pool_list =
#define OS_MSYS_1_SANITY_MIN_COUNT 0 #define OS_MSYS_1_SANITY_MIN_COUNT 0
#define OS_MSYS_2_SANITY_MIN_COUNT 0 #define OS_MSYS_2_SANITY_MIN_COUNT 0
#if CONFIG_BT_LE_MSYS_BUF_FROM_HEAP
#define OS_MSYS_BLOCK_FROM_HEAP (1)
#else
#define OS_MSYS_BLOCK_FROM_HEAP (0)
#endif // CONFIG_BT_LE_MSYS_BUF_FROM_HEAP
#endif #endif
@@ -71,7 +82,7 @@ static struct os_mempool os_msys_init_2_mempool;
#endif #endif
#if CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER #if CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER
extern int esp_ble_msys_init(uint16_t msys_size1, uint16_t msys_size2, uint16_t msys_cnt1, uint16_t msys_cnt2); extern int esp_ble_msys_init(uint16_t msys_size1, uint16_t msys_size2, uint16_t msys_cnt1, uint16_t msys_cnt2, uint8_t from_heap);
extern void esp_ble_msys_deinit(void); extern void esp_ble_msys_deinit(void);
int os_msys_init(void) int os_msys_init(void)
@@ -79,7 +90,8 @@ int os_msys_init(void)
return esp_ble_msys_init(SYSINIT_MSYS_1_MEMBLOCK_SIZE, return esp_ble_msys_init(SYSINIT_MSYS_1_MEMBLOCK_SIZE,
SYSINIT_MSYS_2_MEMBLOCK_SIZE, SYSINIT_MSYS_2_MEMBLOCK_SIZE,
OS_MSYS_1_BLOCK_COUNT, OS_MSYS_1_BLOCK_COUNT,
OS_MSYS_2_BLOCK_COUNT); OS_MSYS_2_BLOCK_COUNT,
OS_MSYS_BLOCK_FROM_HEAP);
} }
void os_msys_deinit(void) void os_msys_deinit(void)