diff --git a/components/bt/include/esp32/include/esp_bt.h b/components/bt/include/esp32/include/esp_bt.h index 43c475e7e6..74d41aa9be 100644 --- a/components/bt/include/esp32/include/esp_bt.h +++ b/components/bt/include/esp32/include/esp_bt.h @@ -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 diff --git a/components/bt/include/esp32c3/include/esp_bt.h b/components/bt/include/esp32c3/include/esp_bt.h index 1cd79be902..c2031e5b1b 100644 --- a/components/bt/include/esp32c3/include/esp_bt.h +++ b/components/bt/include/esp32c3/include/esp_bt.h @@ -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. * diff --git a/components/esp_phy/include/esp_phy_init.h b/components/esp_phy/include/esp_phy_init.h index 2e194f707b..c41e970c5a 100644 --- a/components/esp_phy/include/esp_phy_init.h +++ b/components/esp_phy/include/esp_phy_init.h @@ -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 diff --git a/docs/en/migration-guides/release-5.x/5.4/bluetooth-classic.rst b/docs/en/migration-guides/release-5.x/5.4/bluetooth-classic.rst index df2202b973..281c56ffe4 100644 --- a/docs/en/migration-guides/release-5.x/5.4/bluetooth-classic.rst +++ b/docs/en/migration-guides/release-5.x/5.4/bluetooth-classic.rst @@ -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 diff --git a/docs/en/migration-guides/release-5.x/5.4/bt_common.rst b/docs/en/migration-guides/release-5.x/5.4/bt_common.rst new file mode 100644 index 0000000000..32d4e17537 --- /dev/null +++ b/docs/en/migration-guides/release-5.x/5.4/bt_common.rst @@ -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. diff --git a/docs/zh_CN/migration-guides/release-5.x/5.4/bluetooth-classic.rst b/docs/zh_CN/migration-guides/release-5.x/5.4/bluetooth-classic.rst index 6249c0bd29..1caabf7608 100644 --- a/docs/zh_CN/migration-guides/release-5.x/5.4/bluetooth-classic.rst +++ b/docs/zh_CN/migration-guides/release-5.x/5.4/bluetooth-classic.rst @@ -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 diff --git a/docs/zh_CN/migration-guides/release-5.x/5.4/bt_common.rst b/docs/zh_CN/migration-guides/release-5.x/5.4/bt_common.rst new file mode 100644 index 0000000000..bf0584646a --- /dev/null +++ b/docs/zh_CN/migration-guides/release-5.x/5.4/bt_common.rst @@ -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`` 并且不希望被客户使用。