From d62930223ea5c9bbd25e1bca2573ec20105e7218 Mon Sep 17 00:00:00 2001 From: wuzhenghui Date: Wed, 18 Jun 2025 22:18:17 +0800 Subject: [PATCH] change(hal): simplify some enable/disable function in pau_ll --- components/hal/esp32c5/include/hal/pau_ll.h | 20 ++++-------- components/hal/esp32c5/pau_hal.c | 4 +-- components/hal/esp32c6/include/hal/pau_ll.h | 20 +++--------- components/hal/esp32c6/pau_hal.c | 4 +-- components/hal/esp32c61/include/hal/pau_ll.h | 20 +++--------- components/hal/esp32c61/pau_hal.c | 4 +-- components/hal/esp32h2/include/hal/pau_ll.h | 20 +++--------- components/hal/esp32h2/pau_hal.c | 10 +++--- components/hal/esp32h21/include/hal/pau_ll.h | 20 ++++-------- components/hal/esp32h21/pau_hal.c | 4 +-- components/hal/esp32h4/include/hal/gdma_ll.h | 4 ++- components/hal/esp32h4/include/hal/pau_ll.h | 32 ++++++-------------- components/hal/esp32h4/pau_hal.c | 4 +-- components/hal/esp32p4/include/hal/pau_ll.h | 18 +++-------- components/hal/esp32p4/pau_hal.c | 4 +-- 15 files changed, 60 insertions(+), 128 deletions(-) diff --git a/components/hal/esp32c5/include/hal/pau_ll.h b/components/hal/esp32c5/include/hal/pau_ll.h index a4fe85b4d0..f6117925c3 100644 --- a/components/hal/esp32c5/include/hal/pau_ll.h +++ b/components/hal/esp32c5/include/hal/pau_ll.h @@ -14,8 +14,10 @@ #include "soc/pau_reg.h" #include "soc/pau_struct.h" #include "soc/pcr_struct.h" +#include "soc/lp_aon_struct.h" #include "hal/pau_types.h" #include "hal/assert.h" +#include "hal/misc.h" #ifdef __cplusplus extern "C" { @@ -47,14 +49,9 @@ static inline void pau_ll_set_regdma_entry_link_backup_direction(pau_dev_t *dev, dev->regdma_conf.to_mem = to_mem ? 1 : 0; } -static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev, bool enable) { - dev->regdma_conf.start = 1; -} - -static inline void pau_ll_set_regdma_entry_link_backup_start_disable(pau_dev_t *dev) -{ - dev->regdma_conf.start = 0; + dev->regdma_conf.start = enable; } static inline void pau_ll_set_regdma_select_wifimac_link(pau_dev_t *dev) @@ -107,14 +104,9 @@ static inline uint32_t pau_ll_get_regdma_intr_status(pau_dev_t *dev) return dev->int_st.val; } -static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev, bool enable) { - dev->int_ena.done_int_ena = 1; -} - -static inline void pau_ll_set_regdma_backup_done_intr_disable(pau_dev_t *dev) -{ - dev->int_ena.done_int_ena = 0; + dev->int_ena.done_int_ena = enable; } static inline void pau_ll_set_regdma_backup_error_intr_enable(pau_dev_t *dev) diff --git a/components/hal/esp32c5/pau_hal.c b/components/hal/esp32c5/pau_hal.c index bb4562752a..55460068c4 100644 --- a/components/hal/esp32c5/pau_hal.c +++ b/components/hal/esp32c5/pau_hal.c @@ -43,14 +43,14 @@ void IRAM_ATTR pau_hal_start_regdma_extra_link(pau_hal_context_t *hal, bool back */ pau_ll_select_regdma_entry_link(hal->dev, 3); pau_ll_set_regdma_entry_link_backup_direction(hal->dev, backup_or_restore); - pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, true); while (!(pau_ll_get_regdma_intr_raw_signal(hal->dev) & PAU_DONE_INT_RAW)); } void IRAM_ATTR pau_hal_stop_regdma_extra_link(pau_hal_context_t *hal) { - pau_ll_set_regdma_entry_link_backup_start_disable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, false); pau_ll_select_regdma_entry_link(hal->dev, 0); /* restore link select to default */ pau_ll_clear_regdma_backup_done_intr_state(hal->dev); } diff --git a/components/hal/esp32c6/include/hal/pau_ll.h b/components/hal/esp32c6/include/hal/pau_ll.h index 035826ceb7..d8b36b90e2 100644 --- a/components/hal/esp32c6/include/hal/pau_ll.h +++ b/components/hal/esp32c6/include/hal/pau_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -47,14 +47,9 @@ static inline void pau_ll_set_regdma_entry_link_backup_direction(pau_dev_t *dev, dev->regdma_conf.to_mem = to_mem ? 1 : 0; } -static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev, bool enable) { - dev->regdma_conf.start = 1; -} - -static inline void pau_ll_set_regdma_entry_link_backup_start_disable(pau_dev_t *dev) -{ - dev->regdma_conf.start = 0; + dev->regdma_conf.start = enable; } static inline void pau_ll_set_regdma_select_wifimac_link(pau_dev_t *dev) @@ -132,14 +127,9 @@ static inline uint32_t pau_ll_get_regdma_intr_status(pau_dev_t *dev) return dev->int_st.val; } -static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev, bool enable) { - dev->int_ena.done_int_ena = 1; -} - -static inline void pau_ll_set_regdma_backup_done_intr_disable(pau_dev_t *dev) -{ - dev->int_ena.done_int_ena = 0; + dev->int_ena.done_int_ena = enable; } static inline void pau_ll_set_regdma_backup_error_intr_enable(pau_dev_t *dev, bool enable) diff --git a/components/hal/esp32c6/pau_hal.c b/components/hal/esp32c6/pau_hal.c index 765e6e36e2..ac9e4a0759 100644 --- a/components/hal/esp32c6/pau_hal.c +++ b/components/hal/esp32c6/pau_hal.c @@ -46,14 +46,14 @@ void IRAM_ATTR pau_hal_start_regdma_extra_link(pau_hal_context_t *hal, bool back */ pau_ll_select_regdma_entry_link(hal->dev, 3); pau_ll_set_regdma_entry_link_backup_direction(hal->dev, backup_or_restore); - pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, true); while (!(pau_ll_get_regdma_intr_raw_signal(hal->dev) & PAU_DONE_INT_RAW)); } void IRAM_ATTR pau_hal_stop_regdma_extra_link(pau_hal_context_t *hal) { - pau_ll_set_regdma_entry_link_backup_start_disable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, false); pau_ll_select_regdma_entry_link(hal->dev, 0); /* restore link select to default */ pau_ll_clear_regdma_backup_done_intr_state(hal->dev); } diff --git a/components/hal/esp32c61/include/hal/pau_ll.h b/components/hal/esp32c61/include/hal/pau_ll.h index 5e24beae25..e68d17fce0 100644 --- a/components/hal/esp32c61/include/hal/pau_ll.h +++ b/components/hal/esp32c61/include/hal/pau_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -47,14 +47,9 @@ static inline void pau_ll_set_regdma_entry_link_backup_direction(pau_dev_t *dev, dev->regdma_conf.to_mem = to_mem ? 1 : 0; } -static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev, bool enable) { - dev->regdma_conf.start = 1; -} - -static inline void pau_ll_set_regdma_entry_link_backup_start_disable(pau_dev_t *dev) -{ - dev->regdma_conf.start = 0; + dev->regdma_conf.start = enable; } static inline void pau_ll_set_regdma_select_wifimac_link(pau_dev_t *dev) @@ -132,14 +127,9 @@ static inline uint32_t pau_ll_get_regdma_intr_status(pau_dev_t *dev) return dev->int_st.val; } -static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev, bool enable) { - dev->int_ena.done_int_ena = 1; -} - -static inline void pau_ll_set_regdma_backup_done_intr_disable(pau_dev_t *dev) -{ - dev->int_ena.done_int_ena = 0; + dev->int_ena.done_int_ena = enable; } static inline void pau_ll_set_regdma_backup_error_intr_enable(pau_dev_t *dev, bool enable) diff --git a/components/hal/esp32c61/pau_hal.c b/components/hal/esp32c61/pau_hal.c index 335188cc5a..69e5323b99 100644 --- a/components/hal/esp32c61/pau_hal.c +++ b/components/hal/esp32c61/pau_hal.c @@ -46,14 +46,14 @@ void IRAM_ATTR pau_hal_start_regdma_extra_link(pau_hal_context_t *hal, bool back */ pau_ll_select_regdma_entry_link(hal->dev, 3); pau_ll_set_regdma_entry_link_backup_direction(hal->dev, backup_or_restore); - pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, true); while (!(pau_ll_get_regdma_intr_raw_signal(hal->dev) & PAU_DONE_INT_RAW)); } void IRAM_ATTR pau_hal_stop_regdma_extra_link(pau_hal_context_t *hal) { - pau_ll_set_regdma_entry_link_backup_start_disable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, false); pau_ll_select_regdma_entry_link(hal->dev, 0); /* restore link select to default */ pau_ll_clear_regdma_backup_done_intr_state(hal->dev); } diff --git a/components/hal/esp32h2/include/hal/pau_ll.h b/components/hal/esp32h2/include/hal/pau_ll.h index 8135b69a05..355e17352e 100644 --- a/components/hal/esp32h2/include/hal/pau_ll.h +++ b/components/hal/esp32h2/include/hal/pau_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -47,14 +47,9 @@ static inline __attribute__((always_inline)) void pau_ll_set_regdma_entry_link_b dev->regdma_conf.to_mem = to_mem ? 1 : 0; } -static inline __attribute__((always_inline)) void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev) +static inline __attribute__((always_inline)) void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev, bool enable) { - dev->regdma_conf.start = 1; -} - -static inline __attribute__((always_inline)) void pau_ll_set_regdma_entry_link_backup_start_disable(pau_dev_t *dev) -{ - dev->regdma_conf.start = 0; + dev->regdma_conf.start = enable; } static inline __attribute__((always_inline)) void pau_ll_set_regdma_link0_addr(pau_dev_t *dev, void *link_addr) @@ -102,14 +97,9 @@ static inline __attribute__((always_inline)) uint32_t pau_ll_get_regdma_intr_sta return dev->int_st.val; } -static inline __attribute__((always_inline)) void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev) +static inline __attribute__((always_inline)) void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev, bool enable) { - dev->int_ena.done_int_ena = 1; -} - -static inline __attribute__((always_inline)) void pau_ll_set_regdma_backup_done_intr_disable(pau_dev_t *dev) -{ - dev->int_ena.done_int_ena = 0; + dev->int_ena.done_int_ena = enable; } static inline void pau_ll_set_regdma_backup_error_intr_enable(pau_dev_t *dev, bool enable) diff --git a/components/hal/esp32h2/pau_hal.c b/components/hal/esp32h2/pau_hal.c index b123cd41af..03adbe1851 100644 --- a/components/hal/esp32h2/pau_hal.c +++ b/components/hal/esp32h2/pau_hal.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 */ @@ -24,14 +24,14 @@ void IRAM_ATTR pau_hal_start_regdma_system_link(pau_hal_context_t *hal, bool bac pau_ll_select_regdma_entry_link(hal->dev, 0); pau_ll_set_regdma_entry_link_backup_direction(hal->dev, backup_or_restore); - pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, true); while (!(pau_ll_get_regdma_intr_raw_signal(hal->dev) & PAU_DONE_INT_RAW)); } void IRAM_ATTR pau_hal_stop_regdma_system_link(pau_hal_context_t *hal) { - pau_ll_set_regdma_entry_link_backup_start_disable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, false); pau_ll_select_regdma_entry_link(hal->dev, 0); /* restore link select to default */ pau_ll_clear_regdma_backup_done_intr_state(hal->dev); } @@ -64,14 +64,14 @@ void IRAM_ATTR pau_hal_start_regdma_extra_link(pau_hal_context_t *hal, bool back */ pau_ll_select_regdma_entry_link(hal->dev, 3); pau_ll_set_regdma_entry_link_backup_direction(hal->dev, backup_or_restore); - pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, true); while (!(pau_ll_get_regdma_intr_raw_signal(hal->dev) & PAU_DONE_INT_RAW)); } void IRAM_ATTR pau_hal_stop_regdma_extra_link(pau_hal_context_t *hal) { - pau_ll_set_regdma_entry_link_backup_start_disable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, false); pau_ll_select_regdma_entry_link(hal->dev, 0); /* restore link select to default */ pau_ll_clear_regdma_backup_done_intr_state(hal->dev); } diff --git a/components/hal/esp32h21/include/hal/pau_ll.h b/components/hal/esp32h21/include/hal/pau_ll.h index b4f4e02628..895cecfe99 100644 --- a/components/hal/esp32h21/include/hal/pau_ll.h +++ b/components/hal/esp32h21/include/hal/pau_ll.h @@ -14,8 +14,10 @@ #include "soc/pau_reg.h" #include "soc/pau_struct.h" #include "soc/pcr_struct.h" +#include "soc/lp_aon_struct.h" #include "hal/pau_types.h" #include "hal/assert.h" +#include "hal/misc.h" #ifdef __cplusplus extern "C" { @@ -47,14 +49,9 @@ static inline void pau_ll_set_regdma_entry_link_backup_direction(pau_dev_t *dev, dev->regdma_conf.to_mem = to_mem ? 1 : 0; } -static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev, bool enable) { - dev->regdma_conf.start = 1; -} - -static inline void pau_ll_set_regdma_entry_link_backup_start_disable(pau_dev_t *dev) -{ - dev->regdma_conf.start = 0; + dev->regdma_conf.start = enable; } static inline void pau_ll_set_regdma_select_wifimac_link(pau_dev_t *dev) @@ -107,14 +104,9 @@ static inline uint32_t pau_ll_get_regdma_intr_status(pau_dev_t *dev) return dev->int_st.val; } -static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev, bool enable) { - dev->int_ena.done_int_ena = 1; -} - -static inline void pau_ll_set_regdma_backup_done_intr_disable(pau_dev_t *dev) -{ - dev->int_ena.done_int_ena = 0; + dev->int_ena.done_int_ena = enable; } static inline void pau_ll_set_regdma_backup_error_intr_enable(pau_dev_t *dev) diff --git a/components/hal/esp32h21/pau_hal.c b/components/hal/esp32h21/pau_hal.c index ba1ff7feac..d5b28fa086 100644 --- a/components/hal/esp32h21/pau_hal.c +++ b/components/hal/esp32h21/pau_hal.c @@ -47,14 +47,14 @@ void IRAM_ATTR pau_hal_start_regdma_extra_link(pau_hal_context_t *hal, bool back */ pau_ll_select_regdma_entry_link(hal->dev, 3); pau_ll_set_regdma_entry_link_backup_direction(hal->dev, backup_or_restore); - pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, true); while (!(pau_ll_get_regdma_intr_raw_signal(hal->dev) & PAU_DONE_INT_RAW)); } void IRAM_ATTR pau_hal_stop_regdma_extra_link(pau_hal_context_t *hal) { - pau_ll_set_regdma_entry_link_backup_start_disable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, false); pau_ll_select_regdma_entry_link(hal->dev, 0); /* restore link select to default */ pau_ll_clear_regdma_backup_done_intr_state(hal->dev); } diff --git a/components/hal/esp32h4/include/hal/gdma_ll.h b/components/hal/esp32h4/include/hal/gdma_ll.h index 5c7ca2ad77..ad24af8a45 100644 --- a/components/hal/esp32h4/include/hal/gdma_ll.h +++ b/components/hal/esp32h4/include/hal/gdma_ll.h @@ -25,13 +25,15 @@ static inline void gdma_ll_enable_bus_clock(int group_id, bool enable) /** * @brief Reset the DMA module */ -static inline void gdma_ll_reset_register(int group_id) +static inline void _gdma_ll_reset_register(int group_id) { (void)group_id; PCR.gdma_conf.gdma_rst_en = 1; PCR.gdma_conf.gdma_rst_en = 0; } +#define gdma_ll_reset_register(...) _gdma_ll_reset_register(__VA_ARGS__) + #ifdef __cplusplus } #endif diff --git a/components/hal/esp32h4/include/hal/pau_ll.h b/components/hal/esp32h4/include/hal/pau_ll.h index 27d4364ff0..2aee1df282 100644 --- a/components/hal/esp32h4/include/hal/pau_ll.h +++ b/components/hal/esp32h4/include/hal/pau_ll.h @@ -14,10 +14,11 @@ #include "soc/pau_reg.h" #include "soc/pau_struct.h" #include "soc/pcr_struct.h" -#include "hal/pau_types.h" -#include "hal/assert.h" #include "soc/lp_aon_struct.h" #include "soc/lp_aon_reg.h" +#include "hal/pau_types.h" +#include "hal/assert.h" +#include "hal/misc.h" #ifdef __cplusplus extern "C" { @@ -49,14 +50,9 @@ static inline void pau_ll_set_regdma_entry_link_backup_direction(pau_dev_t *dev, dev->regdma_conf.to_mem = to_mem ? 1 : 0; } -static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev, bool enable) { - dev->regdma_conf.start = 1; -} - -static inline void pau_ll_set_regdma_entry_link_backup_start_disable(pau_dev_t *dev) -{ - dev->regdma_conf.start = 0; + dev->regdma_conf.start = enable; } static inline void pau_ll_set_regdma_link0_addr(pau_dev_t *dev, void *link_addr) @@ -118,24 +114,14 @@ static inline uint32_t pau_ll_get_regdma_intr_status(pau_dev_t *dev) return dev->int_st.val; } -static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev, bool enable) { - dev->int_ena.done_int_ena = 1; + dev->int_ena.done_int_ena = enable; } -static inline void pau_ll_set_regdma_backup_done_intr_disable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_backup_error_intr_enable(pau_dev_t *dev, bool enable) { - dev->int_ena.done_int_ena = 0; -} - -static inline void pau_ll_set_regdma_backup_error_intr_enable(pau_dev_t *dev) -{ - dev->int_ena.error_int_ena = 1; -} - -static inline void pau_ll_set_regdma_backup_error_intr_disable(pau_dev_t *dev) -{ - dev->int_ena.error_int_ena = 0; + dev->int_ena.error_int_ena = enable; } static inline void pau_ll_clear_regdma_backup_done_intr_state(pau_dev_t *dev) diff --git a/components/hal/esp32h4/pau_hal.c b/components/hal/esp32h4/pau_hal.c index 3f94115839..e14160d601 100644 --- a/components/hal/esp32h4/pau_hal.c +++ b/components/hal/esp32h4/pau_hal.c @@ -28,14 +28,14 @@ void IRAM_ATTR pau_hal_start_regdma_extra_link(pau_hal_context_t *hal, bool back */ pau_ll_select_regdma_entry_link(hal->dev, 3); pau_ll_set_regdma_entry_link_backup_direction(hal->dev, backup_or_restore); - pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, true); while (!(pau_ll_get_regdma_intr_raw_signal(hal->dev) & PAU_DONE_INT_RAW)); } void IRAM_ATTR pau_hal_stop_regdma_extra_link(pau_hal_context_t *hal) { - pau_ll_set_regdma_entry_link_backup_start_disable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, false); pau_ll_select_regdma_entry_link(hal->dev, 0); /* restore link select to default */ pau_ll_clear_regdma_backup_done_intr_state(hal->dev); } diff --git a/components/hal/esp32p4/include/hal/pau_ll.h b/components/hal/esp32p4/include/hal/pau_ll.h index 0521756d8e..f2d5266b2c 100644 --- a/components/hal/esp32p4/include/hal/pau_ll.h +++ b/components/hal/esp32p4/include/hal/pau_ll.h @@ -55,14 +55,9 @@ static inline void pau_ll_set_regdma_entry_link_backup_direction(pau_dev_t *dev, dev->regdma_conf.to_mem = to_mem ? 1 : 0; } -static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_entry_link_backup_start_enable(pau_dev_t *dev, bool enable) { - dev->regdma_conf.start = 1; -} - -static inline void pau_ll_set_regdma_entry_link_backup_start_disable(pau_dev_t *dev) -{ - dev->regdma_conf.start = 0; + dev->regdma_conf.start = enable; } static inline void pau_ll_set_regdma_select_wifimac_link(pau_dev_t *dev) @@ -140,14 +135,9 @@ static inline uint32_t pau_ll_get_regdma_intr_status(pau_dev_t *dev) return dev->int_st.val; } -static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev) +static inline void pau_ll_set_regdma_backup_done_intr_enable(pau_dev_t *dev, bool enable) { - dev->int_ena.done_int_ena = 1; -} - -static inline void pau_ll_set_regdma_backup_done_intr_disable(pau_dev_t *dev) -{ - dev->int_ena.done_int_ena = 0; + dev->int_ena.done_int_ena = enable; } static inline void pau_ll_set_regdma_backup_error_intr_enable(pau_dev_t *dev, bool enable) diff --git a/components/hal/esp32p4/pau_hal.c b/components/hal/esp32p4/pau_hal.c index ebf58c180f..963e6e7228 100644 --- a/components/hal/esp32p4/pau_hal.c +++ b/components/hal/esp32p4/pau_hal.c @@ -51,14 +51,14 @@ void IRAM_ATTR pau_hal_start_regdma_extra_link(pau_hal_context_t *hal, bool back */ pau_ll_select_regdma_entry_link(hal->dev, 3); pau_ll_set_regdma_entry_link_backup_direction(hal->dev, backup_or_restore); - pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, true); while (!(pau_ll_get_regdma_intr_raw_signal(hal->dev) & PAU_DONE_INT_RAW)); } void IRAM_ATTR pau_hal_stop_regdma_extra_link(pau_hal_context_t *hal) { - pau_ll_set_regdma_entry_link_backup_start_disable(hal->dev); + pau_ll_set_regdma_entry_link_backup_start_enable(hal->dev, false); pau_ll_select_regdma_entry_link(hal->dev, 3); /* restore link select to default */ pau_ll_clear_regdma_backup_done_intr_state(hal->dev); }