alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp32c2_coex_timer_clk_src' into 'master'

Browse Source 
esp_wifi: select slowclk as coex hardware timer source on esp32c2

See merge request espressif/esp-idf!19170
This commit is contained in:
Chen Jian Xing 2022-07-23 11:37:35 +08:00
commit feefe820a4
5 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@ -2195,7 +2195,7 @@ coex_schm_unlock = 0x400021a8;
coex_status_get = 0x400021ac; coex_status_get = 0x400021ac;
coex_wifi_release = 0x400021b0; coex_wifi_release = 0x400021b0;
esp_coex_ble_conn_dynamic_prio_get = 0x400021b4; esp_coex_ble_conn_dynamic_prio_get = 0x400021b4;
coex_hw_timer_tick_get = 0x400021b8; /*coex_hw_timer_tick_get = 0x400021b8;*/
/* Data (.data, .bss, .rodata) */ /* Data (.data, .bss, .rodata) */
coex_env_ptr = 0x3fcdfabc; coex_env_ptr = 0x3fcdfabc;
coex_pti_tab_ptr = 0x3fcdfab8; coex_pti_tab_ptr = 0x3fcdfab8;

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

@ -789,5 +789,7 @@ coex_adapter_funcs_t g_coex_adapter_funcs = {
._malloc_internal = malloc_internal_wrapper, ._malloc_internal = malloc_internal_wrapper,
._free = free, ._free = free,
._esp_timer_get_time = esp_timer_get_time, ._esp_timer_get_time = esp_timer_get_time,
._env_is_chip = env_is_chip_wrapper,
._slowclk_cal_get = esp_clk_slowclk_cal_get_wrapper,
._magic = COEX_ADAPTER_MAGIC, ._magic = COEX_ADAPTER_MAGIC,
}; };

20
components/esp_wifi/include/esp_coexist_adapter.h
View File

@ -1,16 +1,8 @@
// Copyright 2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef __ESP_COEXIST_ADAPTER_H__ #ifndef __ESP_COEXIST_ADAPTER_H__
#define __ESP_COEXIST_ADAPTER_H__ #define __ESP_COEXIST_ADAPTER_H__
@ -51,6 +43,8 @@ typedef struct {
void (* _timer_arm_us)(void *ptimer, uint32_t us, bool repeat); void (* _timer_arm_us)(void *ptimer, uint32_t us, bool repeat);
#endif #endif
int64_t (* _esp_timer_get_time)(void); int64_t (* _esp_timer_get_time)(void);
bool (* _env_is_chip)(void);
uint32_t (* _slowclk_cal_get)(void);
int32_t _magic; int32_t _magic;
} coex_adapter_funcs_t; } coex_adapter_funcs_t;

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 4b1daf3775bc399296482ef2760f1efe9855e6f1 Subproject commit 1cf0524060df61fc67d1f5527775cc2956050791

1
tools/ci/check_copyright_ignore.txt
View File

@ -674,7 +674,6 @@ components/esp_system/ubsan.c
components/esp_timer/test/test_esp_timer.c components/esp_timer/test/test_esp_timer.c
components/esp_timer/test/test_esp_timer_light_sleep.c components/esp_timer/test/test_esp_timer_light_sleep.c
components/esp_timer/test/test_ets_timer.c components/esp_timer/test/test_ets_timer.c
components/esp_wifi/include/esp_coexist_adapter.h
components/esp_wifi/include/esp_mesh_internal.h components/esp_wifi/include/esp_mesh_internal.h
components/esp_wifi/include/esp_private/esp_wifi_types_private.h components/esp_wifi/include/esp_private/esp_wifi_types_private.h
components/esp_wifi/include/esp_private/wifi_types.h components/esp_wifi/include/esp_private/wifi_types.h