espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/s3_compile_error' into 'release/v4.3'

Browse Source 
bt: Fixed compilation errors for ESP32S3(v4.3)

See merge request espressif/esp-idf!23957
This commit is contained in:
Jiang Jiang Jian
2023-06-01 19:42:30 +08:00
parent 65c877a63e 674593177c
commit fabd11b320
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/bt/include/esp32s3/include/esp_bt.h
View File

@ -448,26 +448,6 @@ void esp_bt_controller_wakeup_request(void);
*/
int esp_bt_h4tl_eif_io_event_notify(int event);
<<<<<<< HEAD
=======
/**
* @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 Register application callback function to Wi-Fi low power clock module.
*
* @param callback : Wi-Fi set low power clock callback function
*/
void esp_wifi_set_lpclk_register_callback(esp_set_lpclk_source_callback_t callback);
>>>>>>> 8f0c559c03... make bluetooth and wifi use the same low power clock
#ifdef __cplusplus
}
#endif