alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-19 14:26:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

coex: apply new coex_schm_callback

Browse Source
This commit is contained in:
liuning 2023-02-17 16:20:46 +08:00 committed by BOT
parent 1661694e0b
commit b3a040aa98
9 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/bt/controller/esp32/bt.c
View File

@ -225,7 +225,7 @@ extern int coex_bt_release(uint32_t event);
extern int coex_register_bt_cb(coex_func_cb_t cb);
extern uint32_t coex_bb_reset_lock(void);
extern void coex_bb_reset_unlock(uint32_t restore);
extern int coex_schm_register_callback(int type, void *callback);
extern int coex_schm_register_callback(coex_schm_callback_type_t type, void *callback);
extern void coex_schm_status_bit_clear(uint32_t type, uint32_t status);
extern void coex_schm_status_bit_set(uint32_t type, uint32_t status);
extern uint32_t coex_schm_interval_get(void);
@ -1168,7 +1168,6 @@ static void IRAM_ATTR coex_bb_reset_unlock_wrapper(uint32_t restore)
static int coex_schm_register_btdm_callback_wrapper(void *callback)
{
#if CONFIG_SW_COEXIST_ENABLE
#define COEX_SCHM_CALLBACK_TYPE_BT 0x1
return coex_schm_register_callback(COEX_SCHM_CALLBACK_TYPE_BT, callback);
#else
return 0;

8
components/esp_coex/include/esp_coexist_internal.h
View File

@ -22,6 +22,12 @@ typedef enum {
COEX_PREFER_NUM,
} coex_prefer_t;
typedef enum {
COEX_SCHM_CALLBACK_TYPE_WIFI = 0,
COEX_SCHM_CALLBACK_TYPE_BT,
COEX_SCHM_CALLBACK_TYPE_I154,
} coex_schm_callback_type_t;
typedef void (* coex_func_cb_t)(uint32_t event, int sched_cnt);
typedef esp_err_t (* coex_set_lpclk_source_callback_t)(void);
@ -230,7 +236,7 @@ int coex_schm_process_restart(void);
* @param callback : callback
* @return : 0 - success, other - failed
*/
int coex_schm_register_callback(int type, void *callback);
int coex_schm_register_callback(coex_schm_callback_type_t type, void *callback);
/**
* @brief Register coexistence adapter functions.

2
components/esp_wifi/esp32/esp_adapter.c
View File

@ -573,7 +573,7 @@ static int coex_schm_process_restart_wrapper(void)
#endif
}
static int coex_schm_register_cb_wrapper(int type, void(*cb)(int))
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{
#if CONFIG_SW_COEXIST_ENABLE
return coex_schm_register_callback(type, cb);

2
components/esp_wifi/esp32c2/esp_adapter.c
View File

@ -556,7 +556,7 @@ static int coex_schm_process_restart_wrapper(void)
#endif
}
static int coex_schm_register_cb_wrapper(int type, void(*cb)(int))
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{
#if CONFIG_SW_COEXIST_ENABLE
return coex_schm_register_callback(type, cb);

2
components/esp_wifi/esp32c3/esp_adapter.c
View File

@ -581,7 +581,7 @@ static int coex_schm_process_restart_wrapper(void)
#endif
}
static int coex_schm_register_cb_wrapper(int type, void(*cb)(int))
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{
#if CONFIG_SW_COEXIST_ENABLE
return coex_schm_register_callback(type, cb);

2
components/esp_wifi/esp32c6/esp_adapter.c
View File

@ -554,7 +554,7 @@ static int coex_schm_process_restart_wrapper(void)
#endif
}
static int coex_schm_register_cb_wrapper(int type, void(*cb)(int))
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{
#if CONFIG_SW_COEXIST_ENABLE
return coex_schm_register_callback(type, cb);

2
components/esp_wifi/esp32s2/esp_adapter.c
View File

@ -608,7 +608,7 @@ static int coex_schm_process_restart_wrapper(void)
#endif
}
static int coex_schm_register_cb_wrapper(int type, void(*cb)(int))
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{
#if CONFIG_SW_COEXIST_ENABLE
return coex_schm_register_callback(type, cb);

2
components/esp_wifi/esp32s3/esp_adapter.c
View File

@ -630,7 +630,7 @@ static int coex_schm_process_restart_wrapper(void)
#endif
}
static int coex_schm_register_cb_wrapper(int type, void(*cb)(int))
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{
#if CONFIG_SW_COEXIST_ENABLE
return coex_schm_register_callback(type, cb);

2
components/esp_wifi/include/esp_private/wifi_os_adapter.h
View File

@ -150,7 +150,7 @@ typedef struct {
void (* _sleep_retention_entries_destroy)(int);
#endif
int (* _coex_schm_process_restart)(void);
int (* _coex_schm_register_cb)(int, void (* cb)(int));
int (* _coex_schm_register_cb)(int, int (* cb)(int));
int32_t _magic;
} wifi_osi_funcs_t;