diff --git a/components/esp_coex/lib b/components/esp_coex/lib index f7bbb88dea..37c451f111 160000 --- a/components/esp_coex/lib +++ b/components/esp_coex/lib @@ -1 +1 @@ -Subproject commit f7bbb88dea56cab91005c2587e0f6d9ac6c2e1ed +Subproject commit 37c451f1115c3b86633ff3d28b4590821da65c24 diff --git a/components/esp_wifi/esp32c2/esp_adapter.c b/components/esp_wifi/esp32c2/esp_adapter.c index 00cbf66040..febfadaaea 100644 --- a/components/esp_wifi/esp32c2/esp_adapter.c +++ b/components/esp_wifi/esp32c2/esp_adapter.c @@ -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 */ @@ -501,7 +501,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; @@ -510,7 +510,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; @@ -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) { -#if CONFIG_SW_COEXIST_ENABLE +#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE return coex_schm_get_phase_by_idx(phase_idx); #else return NULL; diff --git a/components/esp_wifi/esp32c3/esp_adapter.c b/components/esp_wifi/esp32c3/esp_adapter.c index 4fc7a1158d..6c61907afd 100644 --- a/components/esp_wifi/esp32c3/esp_adapter.c +++ b/components/esp_wifi/esp32c3/esp_adapter.c @@ -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 */ @@ -509,7 +509,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; @@ -518,7 +518,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; @@ -527,7 +527,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; @@ -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) { -#if CONFIG_SW_COEXIST_ENABLE +#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE return coex_schm_get_phase_by_idx(phase_idx); #else return NULL; diff --git a/components/esp_wifi/esp32c5/esp_adapter.c b/components/esp_wifi/esp32c5/esp_adapter.c index c3264c6e1e..157ead0c8e 100644 --- a/components/esp_wifi/esp32c5/esp_adapter.c +++ b/components/esp_wifi/esp32c5/esp_adapter.c @@ -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 */ @@ -567,7 +567,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; @@ -576,7 +576,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; @@ -585,7 +585,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; @@ -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) { -#if CONFIG_SW_COEXIST_ENABLE +#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE return coex_schm_get_phase_by_idx(phase_idx); #else return NULL; diff --git a/components/esp_wifi/esp32c6/esp_adapter.c b/components/esp_wifi/esp32c6/esp_adapter.c index de9f0c7aa3..07c46725f9 100644 --- a/components/esp_wifi/esp32c6/esp_adapter.c +++ b/components/esp_wifi/esp32c6/esp_adapter.c @@ -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 */ @@ -498,7 +498,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; @@ -507,7 +507,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; @@ -516,7 +516,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; @@ -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) { -#if CONFIG_SW_COEXIST_ENABLE +#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE return coex_schm_get_phase_by_idx(phase_idx); #else return NULL; diff --git a/components/esp_wifi/esp32c61/esp_adapter.c b/components/esp_wifi/esp32c61/esp_adapter.c index 14e94d78a0..9f8555c76c 100644 --- a/components/esp_wifi/esp32c61/esp_adapter.c +++ b/components/esp_wifi/esp32c61/esp_adapter.c @@ -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 */ @@ -567,7 +567,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; @@ -576,7 +576,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; @@ -585,7 +585,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; @@ -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) { -#if CONFIG_SW_COEXIST_ENABLE +#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE return coex_schm_get_phase_by_idx(phase_idx); #else return NULL; diff --git a/components/esp_wifi/esp32s2/esp_adapter.c b/components/esp_wifi/esp32s2/esp_adapter.c index 9ff54c3ef0..08949ef932 100644 --- a/components/esp_wifi/esp32s2/esp_adapter.c +++ b/components/esp_wifi/esp32s2/esp_adapter.c @@ -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 */ @@ -546,7 +546,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; @@ -555,7 +555,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; @@ -564,7 +564,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; @@ -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) { -#if CONFIG_SW_COEXIST_ENABLE +#if CONFIG_EXTERNAL_COEX_ENABLE return coex_schm_get_phase_by_idx(phase_idx); #else return NULL; diff --git a/components/esp_wifi/esp32s3/esp_adapter.c b/components/esp_wifi/esp32s3/esp_adapter.c index 40db5be231..805a3ad8ec 100644 --- a/components/esp_wifi/esp32s3/esp_adapter.c +++ b/components/esp_wifi/esp32s3/esp_adapter.c @@ -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 */ @@ -572,7 +572,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; @@ -581,7 +581,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; @@ -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) { -#if CONFIG_SW_COEXIST_ENABLE +#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE return coex_schm_get_phase_by_idx(phase_idx); #else return NULL; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 196d186afe..130d9aed0b 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 196d186afeabb49dbeb1b80e3238f7434755b19a +Subproject commit 130d9aed0bcfd487fb4c96301e58cd7a9a7aaa30