alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-10 04:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fixed_ble_dtm_err_v5.3' into 'release/v5.3'

Browse Source 
Bugfix/fixed ble dtm err (v5.3)

See merge request espressif/esp-idf!40953
This commit is contained in:
Jiang Jiang Jian
2025-08-01 22:49:15 +08:00
parent 5a0dabc4da ecf9e8ed7e
commit 911fda0743
4 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -883,3 +883,7 @@ menu "Reserved Memory Config"
The actual reserved memory count will be the minimum value between the maximum The actual reserved memory count will be the minimum value between the maximum
connection instances and the BT_LE_CONN_RESERVED_MEMORY_COUNT. connection instances and the BT_LE_CONN_RESERVED_MEMORY_COUNT.
endmenu endmenu
config BT_LE_DTM_ENABLED
bool "Enable Direct Test Mode (DTM) feature"
default n

28
components/bt/controller/esp32c6/ble.c
View File

@@ -37,6 +37,13 @@ void sync_stack_deinitEnv(void);
int sync_stack_enable(void); int sync_stack_enable(void);
void sync_stack_disable(void); void sync_stack_disable(void);
#if CONFIG_BT_LE_DTM_ENABLED
int dtm_stack_initEnv(void);
void dtm_stack_deinitEnv(void);
int dtm_stack_enable(void);
void dtm_stack_disable(void);
#endif // CONFIG_BT_LE_DTM_ENABLED
#if CONFIG_BT_LE_ERROR_SIM_ENABLED #if CONFIG_BT_LE_ERROR_SIM_ENABLED
int conn_errorSim_initEnv(void); int conn_errorSim_initEnv(void);
void conn_errorSim_deinitEnv(void); void conn_errorSim_deinitEnv(void);
@@ -134,6 +141,12 @@ int ble_stack_initEnv(void)
return rc; return rc;
} }
#if CONFIG_BT_LE_DTM_ENABLED
rc = dtm_stack_initEnv();
if (rc) {
return rc;
}
#endif // CONFIG_BT_LE_DTM_ENABLED
return 0; return 0;
} }
@@ -145,8 +158,9 @@ void ble_stack_deinitEnv(void)
#endif // CONFIG_BT_LE_ERROR_SIM_ENABLED #endif // CONFIG_BT_LE_ERROR_SIM_ENABLED
conn_stack_deinitEnv(); conn_stack_deinitEnv();
#endif // DEFAULT_BT_LE_MAX_CONNECTIONS #endif // DEFAULT_BT_LE_MAX_CONNECTIONS
#if CONFIG_BT_LE_DTM_ENABLED
dtm_stack_deinitEnv();
#endif // CONFIG_BT_LE_DTM_ENABLED
sync_stack_deinitEnv(); sync_stack_deinitEnv();
extAdv_stack_deinitEnv(); extAdv_stack_deinitEnv();
adv_stack_deinitEnv(); adv_stack_deinitEnv();
@@ -177,6 +191,13 @@ int ble_stack_enable(void)
return rc; return rc;
} }
#if CONFIG_BT_LE_DTM_ENABLED
rc = dtm_stack_enable();
if (rc) {
return rc;
}
#endif // CONFIG_BT_LE_DTM_ENABLED
#if DEFAULT_BT_LE_MAX_CONNECTIONS #if DEFAULT_BT_LE_MAX_CONNECTIONS
rc = conn_stack_enable(); rc = conn_stack_enable();
if (rc) { if (rc) {
@@ -215,6 +236,9 @@ void ble_stack_disable(void)
#endif // CONFIG_BT_LE_ERROR_SIM_ENABLED #endif // CONFIG_BT_LE_ERROR_SIM_ENABLED
conn_stack_disable(); conn_stack_disable();
#endif // DEFAULT_BT_LE_MAX_CONNECTIONS #endif // DEFAULT_BT_LE_MAX_CONNECTIONS
#if CONFIG_BT_LE_DTM_ENABLED
dtm_stack_disable();
#endif // CONFIG_BT_LE_DTM_ENABLED
sync_stack_disable(); sync_stack_disable();
extAdv_stack_disable(); extAdv_stack_disable();
adv_stack_disable(); adv_stack_disable();

4
components/bt/controller/esp32h2/Kconfig.in
View File

@@ -887,3 +887,7 @@ menu "Reserved Memory Config"
The actual reserved memory count will be the minimum value between the maximum connection instances and The actual reserved memory count will be the minimum value between the maximum connection instances and
the BT_LE_CONN_RESERVED_MEMORY_COUNT. the BT_LE_CONN_RESERVED_MEMORY_COUNT.
endmenu endmenu
config BT_LE_DTM_ENABLED
bool "Enable Direct Test Mode (DTM) feature"
default n

26
components/bt/controller/esp32h2/ble.c
View File

@@ -37,6 +37,13 @@ void sync_stack_deinitEnv(void);
int sync_stack_enable(void); int sync_stack_enable(void);
void sync_stack_disable(void); void sync_stack_disable(void);
#if CONFIG_BT_LE_DTM_ENABLED
int dtm_stack_initEnv(void);
void dtm_stack_deinitEnv(void);
int dtm_stack_enable(void);
void dtm_stack_disable(void);
#endif // CONFIG_BT_LE_DTM_ENABLED
#if CONFIG_BT_LE_ERROR_SIM_ENABLED #if CONFIG_BT_LE_ERROR_SIM_ENABLED
int conn_errorSim_initEnv(void); int conn_errorSim_initEnv(void);
void conn_errorSim_deinitEnv(void); void conn_errorSim_deinitEnv(void);
@@ -115,6 +122,12 @@ int ble_stack_initEnv(void)
return rc; return rc;
} }
#if CONFIG_BT_LE_DTM_ENABLED
rc = dtm_stack_initEnv();
if (rc) {
return rc;
}
#endif // CONFIG_BT_LE_DTM_ENABLED
#if DEFAULT_BT_LE_MAX_CONNECTIONS #if DEFAULT_BT_LE_MAX_CONNECTIONS
rc = conn_stack_initEnv(); rc = conn_stack_initEnv();
@@ -140,6 +153,9 @@ void ble_stack_deinitEnv(void)
#endif // CONFIG_BT_LE_ERROR_SIM_ENABLED #endif // CONFIG_BT_LE_ERROR_SIM_ENABLED
conn_stack_deinitEnv(); conn_stack_deinitEnv();
#endif // DEFAULT_BT_LE_MAX_CONNECTIONS #endif // DEFAULT_BT_LE_MAX_CONNECTIONS
#if CONFIG_BT_LE_DTM_ENABLED
dtm_stack_deinitEnv();
#endif // CONFIG_BT_LE_DTM_ENABLED
sync_stack_deinitEnv(); sync_stack_deinitEnv();
extAdv_stack_deinitEnv(); extAdv_stack_deinitEnv();
adv_stack_deinitEnv(); adv_stack_deinitEnv();
@@ -170,6 +186,13 @@ int ble_stack_enable(void)
return rc; return rc;
} }
#if CONFIG_BT_LE_DTM_ENABLED
rc = dtm_stack_enable();
if (rc) {
return rc;
}
#endif // CONFIG_BT_LE_DTM_ENABLED
#if DEFAULT_BT_LE_MAX_CONNECTIONS #if DEFAULT_BT_LE_MAX_CONNECTIONS
rc = conn_stack_enable(); rc = conn_stack_enable();
if (rc) { if (rc) {
@@ -208,6 +231,9 @@ void ble_stack_disable(void)
#endif // CONFIG_BT_LE_ERROR_SIM_ENABLED #endif // CONFIG_BT_LE_ERROR_SIM_ENABLED
conn_stack_disable(); conn_stack_disable();
#endif // DEFAULT_BT_LE_MAX_CONNECTIONS #endif // DEFAULT_BT_LE_MAX_CONNECTIONS
#if CONFIG_BT_LE_DTM_ENABLED
dtm_stack_disable();
#endif // CONFIG_BT_LE_DTM_ENABLED
sync_stack_disable(); sync_stack_disable();
extAdv_stack_disable(); extAdv_stack_disable();
adv_stack_disable(); adv_stack_disable();