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

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

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

See merge request espressif/esp-idf!40140
This commit is contained in:
Jiang Jiang Jian
2025-07-08 11:46:18 +08:00
parent 105967af3f 39eaca1be1
commit 9c8d772584
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_coex/lib

Submodule components/esp_coex/lib updated: d13a28da1f...88d8c33a81

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

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -496,7 +496,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(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();
#else
return 0;
@@ -505,7 +505,7 @@ static int coex_schm_process_restart_wrapper(void)
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);
#else
return 0;

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

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -504,7 +504,7 @@ static void * coex_schm_curr_phase_get_wrapper(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);
#else
return 0;
@@ -513,7 +513,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(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();
#else
return 0;
@@ -522,7 +522,7 @@ static int coex_schm_process_restart_wrapper(void)
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);
#else
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
*/
@@ -493,7 +493,7 @@ static void *coex_schm_curr_phase_get_wrapper(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);
#else
return 0;
@@ -502,7 +502,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(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();
#else
return 0;
@@ -511,7 +511,7 @@ static int coex_schm_process_restart_wrapper(void)
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);
#else
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
*/
@@ -541,7 +541,7 @@ static void * coex_schm_curr_phase_get_wrapper(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);
#else
return 0;
@@ -550,7 +550,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
static int coex_schm_process_restart_wrapper(void)
{
#if CONFIG_SW_COEXIST_ENABLE
#if CONFIG_EXTERNAL_COEX_ENABLE
return coex_schm_process_restart();
#else
return 0;
@@ -559,7 +559,7 @@ static int coex_schm_process_restart_wrapper(void)
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);
#else
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
*/
@@ -567,7 +567,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(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();
#else
return 0;
@@ -576,7 +576,7 @@ static int coex_schm_process_restart_wrapper(void)
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);
#else
return 0;

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 725a65f642...440ddb6d11