espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

add coexist hook functions and fix bugs for coexistence

Browse Source
This commit is contained in:
wangmengyang
2021-01-25 17:12:36 +08:00
committed by bot
parent f7a8593a3b
commit 51be1af028
4 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/bt/controller/esp32c3/bt.c
View File

@@ -944,14 +944,14 @@ static void IRAM_ATTR btdm_slp_tmr_callback(void *arg)
static void coex_schm_status_bit_set_wrapper(uint32_t type, uint32_t status) static void coex_schm_status_bit_set_wrapper(uint32_t type, uint32_t status)
{ {
#if CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_schm_status_bit_set(type, status); coex_schm_status_bit_set(type, status);
#endif #endif
} }
static void coex_schm_status_bit_clear_wrapper(uint32_t type, uint32_t status) static void coex_schm_status_bit_clear_wrapper(uint32_t type, uint32_t status)
{ {
#if CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_schm_status_bit_clear(type, status); coex_schm_status_bit_clear(type, status);
#endif #endif
} }
@@ -1174,7 +1174,7 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
} }
} while (0); } while (0);
} }
#if CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_init(); coex_init();
#endif #endif
@@ -1289,7 +1289,7 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
// esp_phy_enable(); // esp_phy_enable();
#if CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_enable(); coex_enable();
#endif #endif
@@ -1331,7 +1331,7 @@ esp_err_t esp_bt_controller_disable(void)
} }
btdm_controller_disable(); btdm_controller_disable();
#if CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_disable(); coex_disable();
#endif #endif

50
components/bt/controller/esp32s3/bt.c
View File

@@ -77,7 +77,7 @@ do{\
} while(0) } while(0)
#define OSI_FUNCS_TIME_BLOCKING 0xffffffff #define OSI_FUNCS_TIME_BLOCKING 0xffffffff
#define OSI_VERSION 0x00010002 #define OSI_VERSION 0x00010005
#define OSI_MAGIC_VALUE 0xFADEBEAD #define OSI_MAGIC_VALUE 0xFADEBEAD
/* SPIRAM Configuration */ /* SPIRAM Configuration */
@@ -157,6 +157,10 @@ struct osi_funcs_t {
void (* _btdm_sleep_exit_phase1)(void); /* called from ISR */ void (* _btdm_sleep_exit_phase1)(void); /* called from ISR */
void (* _btdm_sleep_exit_phase2)(void); /* called from ISR */ void (* _btdm_sleep_exit_phase2)(void); /* called from ISR */
void (* _btdm_sleep_exit_phase3)(void); /* called from task */ void (* _btdm_sleep_exit_phase3)(void); /* called from task */
void (* _coex_wifi_sleep_set)(bool sleep);
int (* _coex_core_ble_conn_dyn_prio_get)(bool *low, bool *high);
void (* _coex_schm_status_bit_set)(uint32_t type, uint32_t status);
void (* _coex_schm_status_bit_clear)(uint32_t type, uint32_t status);
}; };
@@ -257,6 +261,9 @@ static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles);
static void btdm_sleep_enter_phase2_wrapper(void); static void btdm_sleep_enter_phase2_wrapper(void);
static void IRAM_ATTR btdm_sleep_exit_phase1_wrapper(void); static void IRAM_ATTR btdm_sleep_exit_phase1_wrapper(void);
static void btdm_sleep_exit_phase3_wrapper(void); static void btdm_sleep_exit_phase3_wrapper(void);
static void coex_wifi_sleep_set_hook(bool sleep);
static void coex_schm_status_bit_set_wrapper(uint32_t type, uint32_t status);
static void coex_schm_status_bit_clear_wrapper(uint32_t type, uint32_t status);
/* Local variable definition /* Local variable definition
*************************************************************************** ***************************************************************************
@@ -305,11 +312,10 @@ static const struct osi_funcs_t osi_funcs_ro = {
._btdm_sleep_exit_phase1 = btdm_sleep_exit_phase1_wrapper, ._btdm_sleep_exit_phase1 = btdm_sleep_exit_phase1_wrapper,
._btdm_sleep_exit_phase2 = NULL, ._btdm_sleep_exit_phase2 = NULL,
._btdm_sleep_exit_phase3 = btdm_sleep_exit_phase3_wrapper, ._btdm_sleep_exit_phase3 = btdm_sleep_exit_phase3_wrapper,
//._coex_bt_request = coex_bt_request_wrapper, ._coex_wifi_sleep_set = coex_wifi_sleep_set_hook,
//._coex_bt_release = coex_bt_release_wrapper, ._coex_core_ble_conn_dyn_prio_get = NULL,
// ._coex_register_bt_cb = coex_register_bt_cb_wrapper, ._coex_schm_status_bit_set = coex_schm_status_bit_set_wrapper,
// ._coex_bb_reset_lock = coex_bb_reset_lock_wrapper, ._coex_schm_status_bit_clear = coex_schm_status_bit_clear_wrapper,
//._coex_bb_reset_unlock = coex_bb_reset_unlock_wrapper,
}; };
static DRAM_ATTR struct osi_funcs_t *osi_funcs_p; static DRAM_ATTR struct osi_funcs_t *osi_funcs_p;
@@ -829,6 +835,20 @@ static void IRAM_ATTR btdm_slp_tmr_callback(void *arg)
} }
#endif #endif
static void coex_schm_status_bit_set_wrapper(uint32_t type, uint32_t status)
{
#if CONFIG_SW_COEXIST_ENABLE
coex_schm_status_bit_set(type, status);
#endif
}
static void coex_schm_status_bit_clear_wrapper(uint32_t type, uint32_t status)
{
#if CONFIG_SW_COEXIST_ENABLE
coex_schm_status_bit_clear(type, status);
#endif
}
bool esp_vhci_host_check_send_available(void) bool esp_vhci_host_check_send_available(void)
{ {
return API_vhci_host_check_send_available(); return API_vhci_host_check_send_available();
@@ -1087,7 +1107,7 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
// esp_phy_enable(); // esp_phy_enable();
#if CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_enable(); coex_enable();
#endif #endif
@@ -1129,7 +1149,7 @@ esp_err_t esp_bt_controller_disable(void)
} }
btdm_controller_disable(); btdm_controller_disable();
#if CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_disable(); coex_disable();
#endif #endif
@@ -1223,25 +1243,13 @@ int IRAM_ATTR esp_bt_h4tl_eif_io_event_notify(int event)
return btdm_hci_tl_io_event_post(event); return btdm_hci_tl_io_event_post(event);
} }
void force_wifi_mode(int arg)
{
}
void unforce_wifi_mode(void)
{
}
void bt_bb_init_cmplx_reg(void)
{
}
uint16_t esp_bt_get_tx_buf_num(void) uint16_t esp_bt_get_tx_buf_num(void)
{ {
return l2c_ble_link_get_tx_buf_num(); return l2c_ble_link_get_tx_buf_num();
} }
void coex_wifi_sleep_set(bool sleep) static void coex_wifi_sleep_set_hook(bool sleep)
{ {
} }
#endif /* CONFIG_BT_ENABLED */ #endif /* CONFIG_BT_ENABLED */

2
components/bt/controller/lib

Submodule components/bt/controller/lib updated: 006f49fde5...cf348db2d2

1
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@@ -653,6 +653,7 @@ PROVIDE ( ets_wdt_reset_cpu = 0x400551c0 );
PROVIDE ( ets_write_char = 0x40045454 ); PROVIDE ( ets_write_char = 0x40045454 );
PROVIDE ( ets_write_char_uart = 0x40045478 ); PROVIDE ( ets_write_char_uart = 0x40045478 );
PROVIDE ( event_empty = 0x3fcef5cc ); PROVIDE ( event_empty = 0x3fcef5cc );
PROVIDE ( lld_con_env = 0x3fcef5d8 );
PROVIDE ( fixed_tx_time = 0x3ff08d3c ); PROVIDE ( fixed_tx_time = 0x3ff08d3c );
PROVIDE ( flash2spiram_instruction_offset = 0x40052e14 ); PROVIDE ( flash2spiram_instruction_offset = 0x40052e14 );
PROVIDE ( flash2spiram_rodata_offset = 0x40052e24 ); PROVIDE ( flash2spiram_rodata_offset = 0x40052e24 );