mirror of
https://github.com/espressif/esp-idf.git
synced 2026-08-18 06:35:35 +03:00
Merge branch 'change/ble_update_lib_20260127_v5.4' into 'release/v5.4'
change(ble): [AUTO_MR] 20260127 - Update ESP BLE Controller Lib (v5.4) See merge request espressif/esp-idf!45676
This commit is contained in:
@@ -1000,3 +1000,12 @@ config BT_LE_CTRL_DL_ITVL_PHY_SYNC_EN
|
||||
When this option is enabled, the Controller automatically initiates a data length update
|
||||
Using the appropriate data length parameters
|
||||
When a PHY update or a connection interval update occurs.
|
||||
|
||||
config BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
bool "Reduce adv enable-to-air latency (READ DOCS FIRST) (EXPERIMENTAL)"
|
||||
default n
|
||||
help
|
||||
Reduce the latency between issuing the advertising enable command
|
||||
and the actual on-air transmission by executing the advertising TX
|
||||
path from IRAM.
|
||||
Note: Enabling this option increases IRAM usage.
|
||||
|
||||
@@ -80,6 +80,13 @@ int pawrSync_stack_enable(void);
|
||||
void pawrSync_stack_disable(void);
|
||||
#endif // DEFAULT_BT_LE_PAWR_SUPPORTED
|
||||
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
int advFastTx_stack_initEnv(void);
|
||||
void advFastTx_stack_deinitEnv(void);
|
||||
int advFastTx_stack_enable(void);
|
||||
void advFastTx_stack_disable(void);
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
|
||||
#if (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
|
||||
void adv_stack_enableClearLegacyAdvVsCmd(bool en);
|
||||
void scan_stack_enableAdvFlowCtrlVsCmd(bool en);
|
||||
@@ -211,12 +218,20 @@ int ble_stack_initEnv(void)
|
||||
return rc;
|
||||
}
|
||||
#endif // DEFAULT_BT_LE_PAWR_SUPPORTED
|
||||
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
rc = advFastTx_stack_initEnv();
|
||||
if (rc) {
|
||||
return rc;
|
||||
}
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ble_stack_deinitEnv(void)
|
||||
{
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
advFastTx_stack_deinitEnv();
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#if DEFAULT_BT_LE_PAWR_SUPPORTED
|
||||
pawrSync_stack_deinitEnv();
|
||||
pawrBcast_stack_deinitEnv();
|
||||
@@ -302,7 +317,12 @@ int ble_stack_enable(void)
|
||||
return rc;
|
||||
}
|
||||
#endif // DEFAULT_BT_LE_PAWR_SUPPORTED
|
||||
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
rc = advFastTx_stack_enable();
|
||||
if (rc) {
|
||||
return rc;
|
||||
}
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#if (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
|
||||
ble_stack_enableVsCmds(true);
|
||||
ble_stack_enableVsEvents(true);
|
||||
@@ -321,6 +341,9 @@ void ble_stack_disable(void)
|
||||
ble_stack_enableVsEvents(false);
|
||||
ble_stack_enableVsCmds(false);
|
||||
#endif // (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
advFastTx_stack_disable();
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#if DEFAULT_BT_LE_PAWR_SUPPORTED
|
||||
pawrSync_stack_disable();
|
||||
pawrBcast_stack_disable();
|
||||
|
||||
@@ -301,6 +301,20 @@ extern "C" {
|
||||
#define DEFAULT_BT_LE_HCI_UART_PARITY (0)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#define DEFAULT_BT_LE_CTRL_ENH_MEM_RESV_ADV (1<<0)
|
||||
#else
|
||||
#define DEFAULT_BT_LE_CTRL_ENH_MEM_RESV_ADV (0)
|
||||
#endif
|
||||
|
||||
#define DEFAULT_BT_LE_CTRL_ENH_MEM_RESV_FLAGS DEFAULT_BT_LE_CTRL_ENH_MEM_RESV_ADV
|
||||
|
||||
#ifdef CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#define DEFAULT_BT_LE_CTRL_RXBUF_MEM_RESV CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#else
|
||||
#define DEFAULT_BT_LE_CTRL_RXBUF_MEM_RESV (0)
|
||||
#endif
|
||||
|
||||
/* Unchanged configuration */
|
||||
|
||||
#define BLE_LL_CTRL_PROC_TIMEOUT_MS_N (40000) /* ms */
|
||||
|
||||
@@ -1004,3 +1004,12 @@ config BT_LE_CTRL_DL_ITVL_PHY_SYNC_EN
|
||||
When this option is enabled, the Controller automatically initiates a data length update
|
||||
Using the appropriate data length parameters
|
||||
When a PHY update or a connection interval update occurs.
|
||||
|
||||
config BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
bool "Reduce adv enable-to-air latency (READ DOCS FIRST) (EXPERIMENTAL)"
|
||||
default n
|
||||
help
|
||||
Reduce the latency between issuing the advertising enable command
|
||||
and the actual on-air transmission by executing the advertising TX
|
||||
path from IRAM.
|
||||
Note: Enabling this option increases IRAM usage.
|
||||
|
||||
@@ -75,6 +75,13 @@ int conn_errorSim_enable(void);
|
||||
void conn_errorSim_disable(void);
|
||||
#endif // CONFIG_BT_LE_ERROR_SIM_ENABLED
|
||||
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
int advFastTx_stack_initEnv(void);
|
||||
void advFastTx_stack_deinitEnv(void);
|
||||
int advFastTx_stack_enable(void);
|
||||
void advFastTx_stack_disable(void);
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
|
||||
#if (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
|
||||
void adv_stack_enableClearLegacyAdvVsCmd(bool en);
|
||||
void scan_stack_enableAdvFlowCtrlVsCmd(bool en);
|
||||
@@ -113,6 +120,12 @@ void ble_stack_enableVsCmds(bool en)
|
||||
log_stack_enableLogsRelatedVsCmd(en);
|
||||
hci_stack_enableSetVsEvtMaskVsCmd(en);
|
||||
winWiden_stack_enableSetConstPeerScaVsCmd(en);
|
||||
#if DEFAULT_BT_SCAN_ALLOW_ENH_ADI_FILTER
|
||||
scan_stack_enableSetScanADIOnlyFilterVsCmd(en);
|
||||
#endif // DEFAULT_BT_SCAN_ALLOW_ENH_ADI_FILTER
|
||||
#if DEFAULT_BT_ADV_SEND_CONSTANT_DID
|
||||
extAdv_stack_setExtAdvConstantDidVsCmd(en);
|
||||
#endif // DEFAULT_BT_ADV_SEND_CONSTANT_DID
|
||||
}
|
||||
|
||||
void ble_stack_enableVsEvents(bool en)
|
||||
@@ -198,12 +211,20 @@ int ble_stack_initEnv(void)
|
||||
return rc;
|
||||
}
|
||||
#endif // DEFAULT_BT_LE_PAWR_SUPPORTED
|
||||
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
rc = advFastTx_stack_initEnv();
|
||||
if (rc) {
|
||||
return rc;
|
||||
}
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ble_stack_deinitEnv(void)
|
||||
{
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
advFastTx_stack_deinitEnv();
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#if DEFAULT_BT_LE_PAWR_SUPPORTED
|
||||
pawrSync_stack_deinitEnv();
|
||||
pawrBcast_stack_deinitEnv();
|
||||
@@ -289,7 +310,12 @@ int ble_stack_enable(void)
|
||||
return rc;
|
||||
}
|
||||
#endif // DEFAULT_BT_LE_PAWR_SUPPORTED
|
||||
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
rc = advFastTx_stack_enable();
|
||||
if (rc) {
|
||||
return rc;
|
||||
}
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#if (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
|
||||
ble_stack_enableVsCmds(true);
|
||||
ble_stack_enableVsEvents(true);
|
||||
@@ -308,6 +334,9 @@ void ble_stack_disable(void)
|
||||
ble_stack_enableVsEvents(false);
|
||||
ble_stack_enableVsCmds(false);
|
||||
#endif // (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
|
||||
#if CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
advFastTx_stack_disable();
|
||||
#endif // CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#if DEFAULT_BT_LE_PAWR_SUPPORTED
|
||||
pawrSync_stack_disable();
|
||||
pawrBcast_stack_disable();
|
||||
|
||||
@@ -300,6 +300,20 @@ extern "C" {
|
||||
#define DEFAULT_BT_LE_HCI_UART_PARITY (0)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#define DEFAULT_BT_LE_CTRL_ENH_MEM_RESV_ADV (1<<0)
|
||||
#else
|
||||
#define DEFAULT_BT_LE_CTRL_ENH_MEM_RESV_ADV (0)
|
||||
#endif
|
||||
|
||||
#define DEFAULT_BT_LE_CTRL_ENH_MEM_RESV_FLAGS DEFAULT_BT_LE_CTRL_ENH_MEM_RESV_ADV
|
||||
|
||||
#ifdef CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#define DEFAULT_BT_LE_CTRL_RXBUF_MEM_RESV CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN
|
||||
#else
|
||||
#define DEFAULT_BT_LE_CTRL_RXBUF_MEM_RESV (0)
|
||||
#endif
|
||||
|
||||
/* Unchanged configuration */
|
||||
|
||||
#define BLE_LL_CTRL_PROC_TIMEOUT_MS_N (40000) /* ms */
|
||||
|
||||
Submodule components/bt/controller/lib_esp32c6/esp32c6-bt-lib updated: d8b5341796...9d05fc931a
Reference in New Issue
Block a user