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

Merge branch 'bugfix/fix_some_external_coexist_issues_v5.3' into 'release/v5.3'

Browse Source 
fix(coex): fix some external coexist issue(Backport v5.3)

See merge request espressif/esp-idf!40016
This commit is contained in:
Jiang Jiang Jian
2025-06-23 19:55:18 +08:00
parent 96b3442c6d f6c0f937bd
commit 4baebdcdc0
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_coex/lib

Submodule components/esp_coex/lib updated: 6a9220f605...9a7578fd39

6
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;

8
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;

8
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
*/ */
@@ -522,7 +522,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;
@@ -531,7 +531,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;
@@ -540,7 +540,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;

8
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;

8
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;

6
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;

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: dcb4721549...18b5d5b3b2