Skip to content

Commit a09d574

Browse files
author
Jiang Jiang Jian
committed
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
2 parents 4cc82c7 + 91c2390 commit a09d574

File tree

7 files changed

+38
-24
lines changed

7 files changed

+38
-24
lines changed

components/bt/include/esp32/include/esp_bt.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -639,20 +639,6 @@ esp_err_t esp_bt_sleep_disable(void);
639639
*/
640640
esp_err_t esp_ble_scan_dupilcate_list_flush(void);
641641

642-
/**
643-
* @brief Power on Bluetooth Wi-Fi power domain
644-
*
645-
* @note This function is not recommended to use due to potential risk.
646-
*/
647-
void esp_wifi_bt_power_domain_on(void);
648-
649-
/**
650-
* @brief Power off Bluetooth Wi-Fi power domain
651-
*
652-
* @note This function is not recommended to use due to potential risk.
653-
*/
654-
void esp_wifi_bt_power_domain_off(void);
655-
656642
#ifdef __cplusplus
657643
}
658644
#endif

components/bt/include/esp32c3/include/esp_bt.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -726,16 +726,6 @@ void esp_bt_controller_wakeup_request(void);
726726
*/
727727
int esp_bt_h4tl_eif_io_event_notify(int event);
728728

729-
/**
730-
* @brief bt Wi-Fi power domain power on
731-
*/
732-
void esp_wifi_bt_power_domain_on(void);
733-
734-
/**
735-
* @brief bt Wi-Fi power domain power off
736-
*/
737-
void esp_wifi_bt_power_domain_off(void);
738-
739729
/**
740730
* @brief Get the Bluetooth module sleep clock source.
741731
*

components/esp_phy/include/esp_phy_init.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,16 @@ esp_err_t phy_query_used_time(uint64_t *used_time, esp_phy_modem_t modem);
304304
esp_err_t phy_clear_used_time(esp_phy_modem_t modem);
305305
#endif
306306

307+
/**
308+
* @brief Power on Bluetooth Wi-Fi power domain
309+
*/
310+
void esp_wifi_bt_power_domain_on(void);
311+
312+
/**
313+
* @brief Power off Bluetooth Wi-Fi power domain
314+
*/
315+
void esp_wifi_bt_power_domain_off(void);
316+
307317
#ifdef __cplusplus
308318
}
309319
#endif

docs/en/migration-guides/release-5.x/5.4/bluetooth-classic.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ Bluedroid
1212
- :component_file:`/bt/host/bluedroid/api/include/api/esp_sdp_api.h`
1313

1414
- 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.
15+
16+
Bluetooth Common APIs
17+
---------------------
18+
19+
.. include:: ./bt_common.rst
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.. only:: esp32
2+
3+
- :component_file:`/bt/include/esp32/include/esp_bt.h`
4+
5+
.. only:: esp32c3 or esp32s3
6+
7+
- :component_file:`/bt/include/esp32c3/include/esp_bt.h`
8+
9+
- 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.

docs/zh_CN/migration-guides/release-5.x/5.4/bluetooth-classic.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ Bluedroid
1212
- :component_file:`/bt/host/bluedroid/api/include/api/esp_sdp_api.h`
1313

1414
- 结构体 ``esp_bluetooth_sdp_hdr_overlay_t`` 中的字段 ``user2_ptr_len`` 和 ``user2_ptr`` 被弃用,因为 SDP 的 API 或者事件中不会用到该字段。
15+
16+
Bluetooth Common APIs
17+
---------------------
18+
19+
.. include:: ./bt_common.rst
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.. only:: esp32
2+
3+
- :component_file:`/bt/include/esp32/include/esp_bt.h`
4+
5+
.. only:: esp32c3 or esp32s3
6+
7+
- :component_file:`/bt/include/esp32c3/include/esp_bt.h`
8+
9+
- 将 ``esp_wifi_bt_power_domain_on`` 和 ``esp_wifi_bt_power_domain_off`` 的声明从 ``esp_bt.h`` 移至 ``esp_phy_init.h`` , 因为它们属于组件 ``esp_phy`` 并且不希望被客户使用。

0 commit comments

Comments
 (0)