Skip to content

Commit 7aabeae

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'bugfix/fix_some_external_coexist_issues' into 'master'
fix(coex): fix some external coexist issues Closes IDF-10526 See merge request espressif/esp-idf!38958
2 parents af1ea42 + a3211ab commit 7aabeae

File tree

9 files changed

+35
-35
lines changed

9 files changed

+35
-35
lines changed

‎components/esp_coex/lib‎

‎components/esp_wifi/esp32c2/esp_adapter.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -501,7 +501,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
501501

502502
static int coex_schm_process_restart_wrapper(void)
503503
{
504-
#if CONFIG_SW_COEXIST_ENABLE
504+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
505505
return coex_schm_process_restart();
506506
#else
507507
return 0;
@@ -510,7 +510,7 @@ static int coex_schm_process_restart_wrapper(void)
510510

511511
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
512512
{
513-
#if CONFIG_SW_COEXIST_ENABLE
513+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
514514
return coex_schm_register_callback(type, cb);
515515
#else
516516
return 0;
@@ -537,7 +537,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
537537

538538
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
539539
{
540-
#if CONFIG_SW_COEXIST_ENABLE
540+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
541541
return coex_schm_get_phase_by_idx(phase_idx);
542542
#else
543543
return NULL;

‎components/esp_wifi/esp32c3/esp_adapter.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -509,7 +509,7 @@ static void * coex_schm_curr_phase_get_wrapper(void)
509509

510510
static int coex_register_start_cb_wrapper(int (* cb)(void))
511511
{
512-
#if CONFIG_SW_COEXIST_ENABLE
512+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
513513
return coex_register_start_cb(cb);
514514
#else
515515
return 0;
@@ -518,7 +518,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
518518

519519
static int coex_schm_process_restart_wrapper(void)
520520
{
521-
#if CONFIG_SW_COEXIST_ENABLE
521+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
522522
return coex_schm_process_restart();
523523
#else
524524
return 0;
@@ -527,7 +527,7 @@ static int coex_schm_process_restart_wrapper(void)
527527

528528
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
529529
{
530-
#if CONFIG_SW_COEXIST_ENABLE
530+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
531531
return coex_schm_register_callback(type, cb);
532532
#else
533533
return 0;
@@ -554,7 +554,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
554554

555555
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
556556
{
557-
#if CONFIG_SW_COEXIST_ENABLE
557+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
558558
return coex_schm_get_phase_by_idx(phase_idx);
559559
#else
560560
return NULL;

‎components/esp_wifi/esp32c5/esp_adapter.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -567,7 +567,7 @@ static void *coex_schm_curr_phase_get_wrapper(void)
567567

568568
static int coex_register_start_cb_wrapper(int (* cb)(void))
569569
{
570-
#if CONFIG_SW_COEXIST_ENABLE
570+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
571571
return coex_register_start_cb(cb);
572572
#else
573573
return 0;
@@ -576,7 +576,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
576576

577577
static int coex_schm_process_restart_wrapper(void)
578578
{
579-
#if CONFIG_SW_COEXIST_ENABLE
579+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
580580
return coex_schm_process_restart();
581581
#else
582582
return 0;
@@ -585,7 +585,7 @@ static int coex_schm_process_restart_wrapper(void)
585585

586586
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
587587
{
588-
#if CONFIG_SW_COEXIST_ENABLE
588+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
589589
return coex_schm_register_callback(type, cb);
590590
#else
591591
return 0;
@@ -612,7 +612,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
612612

613613
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
614614
{
615-
#if CONFIG_SW_COEXIST_ENABLE
615+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
616616
return coex_schm_get_phase_by_idx(phase_idx);
617617
#else
618618
return NULL;

‎components/esp_wifi/esp32c6/esp_adapter.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -498,7 +498,7 @@ static void *coex_schm_curr_phase_get_wrapper(void)
498498

499499
static int coex_register_start_cb_wrapper(int (* cb)(void))
500500
{
501-
#if CONFIG_SW_COEXIST_ENABLE
501+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
502502
return coex_register_start_cb(cb);
503503
#else
504504
return 0;
@@ -507,7 +507,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
507507

508508
static int coex_schm_process_restart_wrapper(void)
509509
{
510-
#if CONFIG_SW_COEXIST_ENABLE
510+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
511511
return coex_schm_process_restart();
512512
#else
513513
return 0;
@@ -516,7 +516,7 @@ static int coex_schm_process_restart_wrapper(void)
516516

517517
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
518518
{
519-
#if CONFIG_SW_COEXIST_ENABLE
519+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
520520
return coex_schm_register_callback(type, cb);
521521
#else
522522
return 0;
@@ -543,7 +543,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
543543

544544
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
545545
{
546-
#if CONFIG_SW_COEXIST_ENABLE
546+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
547547
return coex_schm_get_phase_by_idx(phase_idx);
548548
#else
549549
return NULL;

‎components/esp_wifi/esp32c61/esp_adapter.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -567,7 +567,7 @@ static void *coex_schm_curr_phase_get_wrapper(void)
567567

568568
static int coex_register_start_cb_wrapper(int (* cb)(void))
569569
{
570-
#if CONFIG_SW_COEXIST_ENABLE
570+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
571571
return coex_register_start_cb(cb);
572572
#else
573573
return 0;
@@ -576,7 +576,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
576576

577577
static int coex_schm_process_restart_wrapper(void)
578578
{
579-
#if CONFIG_SW_COEXIST_ENABLE
579+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
580580
return coex_schm_process_restart();
581581
#else
582582
return 0;
@@ -585,7 +585,7 @@ static int coex_schm_process_restart_wrapper(void)
585585

586586
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
587587
{
588-
#if CONFIG_SW_COEXIST_ENABLE
588+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
589589
return coex_schm_register_callback(type, cb);
590590
#else
591591
return 0;
@@ -612,7 +612,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
612612

613613
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
614614
{
615-
#if CONFIG_SW_COEXIST_ENABLE
615+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
616616
return coex_schm_get_phase_by_idx(phase_idx);
617617
#else
618618
return NULL;

‎components/esp_wifi/esp32s2/esp_adapter.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -546,7 +546,7 @@ static void * coex_schm_curr_phase_get_wrapper(void)
546546

547547
static int coex_register_start_cb_wrapper(int (* cb)(void))
548548
{
549-
#if CONFIG_SW_COEXIST_ENABLE
549+
#if CONFIG_EXTERNAL_COEX_ENABLE
550550
return coex_register_start_cb(cb);
551551
#else
552552
return 0;
@@ -555,7 +555,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
555555

556556
static int coex_schm_process_restart_wrapper(void)
557557
{
558-
#if CONFIG_SW_COEXIST_ENABLE
558+
#if CONFIG_EXTERNAL_COEX_ENABLE
559559
return coex_schm_process_restart();
560560
#else
561561
return 0;
@@ -564,7 +564,7 @@ static int coex_schm_process_restart_wrapper(void)
564564

565565
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
566566
{
567-
#if CONFIG_SW_COEXIST_ENABLE
567+
#if CONFIG_EXTERNAL_COEX_ENABLE
568568
return coex_schm_register_callback(type, cb);
569569
#else
570570
return 0;
@@ -591,7 +591,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
591591

592592
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
593593
{
594-
#if CONFIG_SW_COEXIST_ENABLE
594+
#if CONFIG_EXTERNAL_COEX_ENABLE
595595
return coex_schm_get_phase_by_idx(phase_idx);
596596
#else
597597
return NULL;

‎components/esp_wifi/esp32s3/esp_adapter.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -572,7 +572,7 @@ static int coex_register_start_cb_wrapper(int (* cb)(void))
572572

573573
static int coex_schm_process_restart_wrapper(void)
574574
{
575-
#if CONFIG_SW_COEXIST_ENABLE
575+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
576576
return coex_schm_process_restart();
577577
#else
578578
return 0;
@@ -581,7 +581,7 @@ static int coex_schm_process_restart_wrapper(void)
581581

582582
static int coex_schm_register_cb_wrapper(int type, int(*cb)(int))
583583
{
584-
#if CONFIG_SW_COEXIST_ENABLE
584+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
585585
return coex_schm_register_callback(type, cb);
586586
#else
587587
return 0;
@@ -608,7 +608,7 @@ static uint8_t coex_schm_flexible_period_get_wrapper(void)
608608

609609
static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
610610
{
611-
#if CONFIG_SW_COEXIST_ENABLE
611+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
612612
return coex_schm_get_phase_by_idx(phase_idx);
613613
#else
614614
return NULL;

‎components/esp_wifi/lib‎

Submodule lib updated 61 files

0 commit comments

Comments
 (0)