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

coex: fix unused macro on esp32h2

Browse Source
This commit is contained in:
zhangwenxu 2023-03-20 12:07:03 +08:00
parent bb9200acec
commit 2f952f308f
8 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_coex/esp32c6/esp_coex_adapter.c
View File

@ -156,7 +156,6 @@ coex_adapter_funcs_t g_coex_adapter_funcs = {
._free = free, ._free = free,
._esp_timer_get_time = esp_timer_get_time, ._esp_timer_get_time = esp_timer_get_time,
._env_is_chip = esp_coex_common_env_is_chip_wrapper, ._env_is_chip = esp_coex_common_env_is_chip_wrapper,
._slowclk_cal_get = esp_coex_common_clk_slowclk_cal_get_wrapper,
._timer_disarm = esp_coex_common_timer_disarm_wrapper, ._timer_disarm = esp_coex_common_timer_disarm_wrapper,
._timer_done = esp_coex_common_timer_done_wrapper, ._timer_done = esp_coex_common_timer_done_wrapper,
._timer_setfn = esp_coex_common_timer_setfn_wrapper, ._timer_setfn = esp_coex_common_timer_setfn_wrapper,

9
components/esp_coex/esp32h2/esp_coex_adapter.c
View File

@ -117,14 +117,6 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b
ets_timer_arm_us(ptimer, us, repeat); ets_timer_arm_us(ptimer, us, repeat);
} }
uint32_t esp_coex_common_clk_slowclk_cal_get_wrapper(void)
{
/* The bit width of WiFi light sleep clock calibration is 12 while the one of
* system is 19. It should shift 19 - 12 = 7.
*/
return (esp_clk_slowclk_cal_get() >> (RTC_CLK_CAL_FRACT - SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH));
}
void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size) void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)
{ {
return heap_caps_malloc(size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL); return heap_caps_malloc(size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
@ -156,7 +148,6 @@ coex_adapter_funcs_t g_coex_adapter_funcs = {
._free = free, ._free = free,
._esp_timer_get_time = esp_timer_get_time, ._esp_timer_get_time = esp_timer_get_time,
._env_is_chip = esp_coex_common_env_is_chip_wrapper, ._env_is_chip = esp_coex_common_env_is_chip_wrapper,
._slowclk_cal_get = esp_coex_common_clk_slowclk_cal_get_wrapper,
._timer_disarm = esp_coex_common_timer_disarm_wrapper, ._timer_disarm = esp_coex_common_timer_disarm_wrapper,
._timer_done = esp_coex_common_timer_done_wrapper, ._timer_done = esp_coex_common_timer_done_wrapper,
._timer_setfn = esp_coex_common_timer_setfn_wrapper, ._timer_setfn = esp_coex_common_timer_setfn_wrapper,

3
components/esp_coex/include/esp_coexist_adapter.h
View File

@ -38,7 +38,10 @@ typedef struct {
void (* _free)(void *p); void (* _free)(void *p);
int64_t (* _esp_timer_get_time)(void); int64_t (* _esp_timer_get_time)(void);
bool (* _env_is_chip)(void); bool (* _env_is_chip)(void);
#if CONFIG_IDF_TARGET_ESP32C2
// this function is only used on esp32c2
uint32_t (* _slowclk_cal_get)(void); uint32_t (* _slowclk_cal_get)(void);
#endif
void (* _timer_disarm)(void *timer); void (* _timer_disarm)(void *timer);
void (* _timer_done)(void *ptimer); void (* _timer_done)(void *ptimer);
void (* _timer_setfn)(void *ptimer, void *pfunction, void *parg); void (* _timer_setfn)(void *ptimer, void *pfunction, void *parg);

2
components/esp_coex/lib

@ -1 +1 @@
Subproject commit 67ba5893b088d02a9902e1af275102c8f9dbed24 Subproject commit 125056ce875d4c0898c5cbe51b6ee12537000924

4
components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
View File

@ -1031,10 +1031,6 @@ config SOC_PHY_DIG_REGS_MEM_SIZE
int int
default 21 default 21
config SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH
int
default 12
config SOC_PM_SUPPORT_WIFI_WAKEUP config SOC_PM_SUPPORT_WIFI_WAKEUP
bool bool
default y default y

4
components/soc/esp32h2/include/soc/soc_caps.h
View File

@ -442,10 +442,6 @@
/*--------------- PHY REGISTER AND MEMORY SIZE CAPS --------------------------*/ /*--------------- PHY REGISTER AND MEMORY SIZE CAPS --------------------------*/
#define SOC_PHY_DIG_REGS_MEM_SIZE (21*4) #define SOC_PHY_DIG_REGS_MEM_SIZE (21*4)
// TODO: IDF-5679 (Copy from esp32c6, need check)
/*--------------- WIFI LIGHT SLEEP CLOCK WIDTH CAPS --------------------------*/
#define SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH (12)
// TODO: IDF-6270 (Copy from esp32c6, need check) // TODO: IDF-6270 (Copy from esp32c6, need check)
/*-------------------------- Power Management CAPS ----------------------------*/ /*-------------------------- Power Management CAPS ----------------------------*/
#define SOC_PM_SUPPORT_WIFI_WAKEUP (1) #define SOC_PM_SUPPORT_WIFI_WAKEUP (1)

4
components/soc/esp32h4/include/soc/Kconfig.soc_caps.in
View File

@ -231,10 +231,6 @@ config SOC_APB_BACKUP_DMA
bool bool
default y default y
config SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH
int
default 12
config SOC_BROWNOUT_RESET_SUPPORTED config SOC_BROWNOUT_RESET_SUPPORTED
bool bool
default y default y

3
components/soc/esp32h4/include/soc/soc_caps.h
View File

@ -110,9 +110,6 @@
/*-------------------------- APB BACKUP DMA CAPS -------------------------------*/ /*-------------------------- APB BACKUP DMA CAPS -------------------------------*/
#define SOC_APB_BACKUP_DMA (1) #define SOC_APB_BACKUP_DMA (1)
/*--------------- WIFI LIGHT SLEEP CLOCK WIDTH CAPS --------------------------*/
#define SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH (12)
/*-------------------------- BROWNOUT CAPS -----------------------------------*/ /*-------------------------- BROWNOUT CAPS -----------------------------------*/
#define SOC_BROWNOUT_RESET_SUPPORTED 1 #define SOC_BROWNOUT_RESET_SUPPORTED 1