Merge branch 'bugfix/esp_bt_wifi_bt_power_api_v5.4' into 'release/v5.4'

fix(bt): Move esp_wifi_bt_power_domain_on/off to esp_phy_init.h(v5.4)

See merge request espressif/esp-idf!34626
This commit is contained in:
Jiang Jiang Jian 2024-11-20 16:27:01 +08:00
commit a09d5747e1
7 changed files with 38 additions and 24 deletions

View File

@ -639,20 +639,6 @@ esp_err_t esp_bt_sleep_disable(void);
*/
esp_err_t esp_ble_scan_dupilcate_list_flush(void);
/**
* @brief Power on Bluetooth Wi-Fi power domain
*
* @note This function is not recommended to use due to potential risk.
*/
void esp_wifi_bt_power_domain_on(void);
/**
* @brief Power off Bluetooth Wi-Fi power domain
*
* @note This function is not recommended to use due to potential risk.
*/
void esp_wifi_bt_power_domain_off(void);
#ifdef __cplusplus
}
#endif

View File

@ -726,16 +726,6 @@ void esp_bt_controller_wakeup_request(void);
*/
int esp_bt_h4tl_eif_io_event_notify(int event);
/**
* @brief bt Wi-Fi power domain power on
*/
void esp_wifi_bt_power_domain_on(void);
/**
* @brief bt Wi-Fi power domain power off
*/
void esp_wifi_bt_power_domain_off(void);
/**
* @brief Get the Bluetooth module sleep clock source.
*

View File

@ -304,6 +304,16 @@ esp_err_t phy_query_used_time(uint64_t *used_time, esp_phy_modem_t modem);
esp_err_t phy_clear_used_time(esp_phy_modem_t modem);
#endif
/**
* @brief Power on Bluetooth Wi-Fi power domain
*/
void esp_wifi_bt_power_domain_on(void);
/**
* @brief Power off Bluetooth Wi-Fi power domain
*/
void esp_wifi_bt_power_domain_off(void);
#ifdef __cplusplus
}
#endif

View File

@ -12,3 +12,8 @@ Bluedroid
- :component_file:`/bt/host/bluedroid/api/include/api/esp_sdp_api.h`
- Field ``user2_ptr_len`` and ``user2_ptr`` is deprecated in structure ``esp_bluetooth_sdp_hdr_overlay_t``, since they are not used in SDP record creation or searching.
Bluetooth Common APIs
---------------------
.. include:: ./bt_common.rst

View File

@ -0,0 +1,9 @@
.. only:: esp32
- :component_file:`/bt/include/esp32/include/esp_bt.h`
.. only:: esp32c3 or esp32s3
- :component_file:`/bt/include/esp32c3/include/esp_bt.h`
- Move the declarations of ``esp_wifi_bt_power_domain_on`` and ``esp_wifi_bt_power_domain_off`` from ``esp_bt.h`` to ``esp_phy_init.h``, since they belong to component ``esp_phy`` and are not expected to be used by customer.

View File

@ -12,3 +12,8 @@ Bluedroid
- :component_file:`/bt/host/bluedroid/api/include/api/esp_sdp_api.h`
- 结构体 ``esp_bluetooth_sdp_hdr_overlay_t`` 中的字段 ``user2_ptr_len````user2_ptr`` 被弃用,因为 SDP 的 API 或者事件中不会用到该字段。
Bluetooth Common APIs
---------------------
.. include:: ./bt_common.rst

View File

@ -0,0 +1,9 @@
.. only:: esp32
- :component_file:`/bt/include/esp32/include/esp_bt.h`
.. only:: esp32c3 or esp32s3
- :component_file:`/bt/include/esp32c3/include/esp_bt.h`
- 将 ``esp_wifi_bt_power_domain_on````esp_wifi_bt_power_domain_off`` 的声明从 ``esp_bt.h`` 移至 ``esp_phy_init.h`` 因为它们属于组件 ``esp_phy`` 并且不希望被客户使用。