feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(coex): fix some external coexist issue

Browse Source
This commit is contained in:
muhaidong
2025-05-07 21:30:16 +08:00
parent 7cf5dacd4a
commit a3211ab8d0
9 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_coex/lib

Submodule components/esp_coex/lib updated: f7bbb88dea...37c451f111

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

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -501,7 +501,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
static int coex_schm_process_restart_wrapper(void) static int coex_schm_process_restart_wrapper(void)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_process_restart(); return coex_schm_process_restart();
#else #else
return 0; return 0;
@ -510,7 +510,7 @@ static int coex_schm_process_restart_wrapper(void)
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int)) static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_register_callback(type, cb); return coex_schm_register_callback(type, cb);
#else #else
return 0; return 0;
@ -537,7 +537,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx) static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_get_phase_by_idx(phase_idx); return coex_schm_get_phase_by_idx(phase_idx);
#else #else
return NULL; return NULL;

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

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -509,7 +509,7 @@ static void * coex_schm_curr_phase_get_wrapper(void)
static int coex_register_start_cb_wrapper(int (* cb)(void)) static int coex_register_start_cb_wrapper(int (* cb)(void))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_register_start_cb(cb); return coex_register_start_cb(cb);
#else #else
return 0; return 0;
@ -518,7 +518,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
static int coex_schm_process_restart_wrapper(void) static int coex_schm_process_restart_wrapper(void)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_process_restart(); return coex_schm_process_restart();
#else #else
return 0; return 0;
@ -527,7 +527,7 @@ static int coex_schm_process_restart_wrapper(void)
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int)) static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_register_callback(type, cb); return coex_schm_register_callback(type, cb);
#else #else
return 0; return 0;
@ -554,7 +554,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx) static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_get_phase_by_idx(phase_idx); return coex_schm_get_phase_by_idx(phase_idx);
#else #else
return NULL; return NULL;

10
components/esp_wifi/esp32c5/esp_adapter.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -567,7 +567,7 @@ static void *coex_schm_curr_phase_get_wrapper(void)
static int coex_register_start_cb_wrapper(int (* cb)(void)) static int coex_register_start_cb_wrapper(int (* cb)(void))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_register_start_cb(cb); return coex_register_start_cb(cb);
#else #else
return 0; return 0;
@ -576,7 +576,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
static int coex_schm_process_restart_wrapper(void) static int coex_schm_process_restart_wrapper(void)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_process_restart(); return coex_schm_process_restart();
#else #else
return 0; return 0;
@ -585,7 +585,7 @@ static int coex_schm_process_restart_wrapper(void)
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int)) static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_register_callback(type, cb); return coex_schm_register_callback(type, cb);
#else #else
return 0; return 0;
@ -612,7 +612,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx) static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_get_phase_by_idx(phase_idx); return coex_schm_get_phase_by_idx(phase_idx);
#else #else
return NULL; return NULL;

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

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -498,7 +498,7 @@ static void *coex_schm_curr_phase_get_wrapper(void)
static int coex_register_start_cb_wrapper(int (* cb)(void)) static int coex_register_start_cb_wrapper(int (* cb)(void))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_register_start_cb(cb); return coex_register_start_cb(cb);
#else #else
return 0; return 0;
@ -507,7 +507,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
static int coex_schm_process_restart_wrapper(void) static int coex_schm_process_restart_wrapper(void)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_process_restart(); return coex_schm_process_restart();
#else #else
return 0; return 0;
@ -516,7 +516,7 @@ static int coex_schm_process_restart_wrapper(void)
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int)) static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_register_callback(type, cb); return coex_schm_register_callback(type, cb);
#else #else
return 0; return 0;
@ -543,7 +543,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx) static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_get_phase_by_idx(phase_idx); return coex_schm_get_phase_by_idx(phase_idx);
#else #else
return NULL; return NULL;

10
components/esp_wifi/esp32c61/esp_adapter.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -567,7 +567,7 @@ static void *coex_schm_curr_phase_get_wrapper(void)
static int coex_register_start_cb_wrapper(int (* cb)(void)) static int coex_register_start_cb_wrapper(int (* cb)(void))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_register_start_cb(cb); return coex_register_start_cb(cb);
#else #else
return 0; return 0;
@ -576,7 +576,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
static int coex_schm_process_restart_wrapper(void) static int coex_schm_process_restart_wrapper(void)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_process_restart(); return coex_schm_process_restart();
#else #else
return 0; return 0;
@ -585,7 +585,7 @@ static int coex_schm_process_restart_wrapper(void)
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int)) static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_register_callback(type, cb); return coex_schm_register_callback(type, cb);
#else #else
return 0; return 0;
@ -612,7 +612,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx) static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_get_phase_by_idx(phase_idx); return coex_schm_get_phase_by_idx(phase_idx);
#else #else
return NULL; return NULL;

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

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -546,7 +546,7 @@ static void * coex_schm_curr_phase_get_wrapper(void)
static int coex_register_start_cb_wrapper(int (* cb)(void)) static int coex_register_start_cb_wrapper(int (* cb)(void))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_EXTERNAL_COEX_ENABLE
return coex_register_start_cb(cb); return coex_register_start_cb(cb);
#else #else
return 0; return 0;
@ -555,7 +555,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
static int coex_schm_process_restart_wrapper(void) static int coex_schm_process_restart_wrapper(void)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_process_restart(); return coex_schm_process_restart();
#else #else
return 0; return 0;
@ -564,7 +564,7 @@ static int coex_schm_process_restart_wrapper(void)
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int)) static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_register_callback(type, cb); return coex_schm_register_callback(type, cb);
#else #else
return 0; return 0;
@ -591,7 +591,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx) static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_get_phase_by_idx(phase_idx); return coex_schm_get_phase_by_idx(phase_idx);
#else #else
return NULL; return NULL;

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

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -572,7 +572,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
static int coex_schm_process_restart_wrapper(void) static int coex_schm_process_restart_wrapper(void)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_process_restart(); return coex_schm_process_restart();
#else #else
return 0; return 0;
@ -581,7 +581,7 @@ static int coex_schm_process_restart_wrapper(void)
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int)) static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_register_callback(type, cb); return coex_schm_register_callback(type, cb);
#else #else
return 0; return 0;
@ -608,7 +608,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx) static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
{ {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_get_phase_by_idx(phase_idx); return coex_schm_get_phase_by_idx(phase_idx);
#else #else
return NULL; return NULL;

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 196d186afe...130d9aed0b