diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig index 6d535f9bc7..5674d2989c 100644 --- a/arch/xtensa/src/esp32/Kconfig +++ b/arch/xtensa/src/esp32/Kconfig @@ -226,7 +226,7 @@ config ESP32_MWDT1 config ESP32_RWDT bool "RTC Watchdog Timer" default n - select ESP32_WTD + select ESP32_WDT ---help--- Includes RWDT. This watchdog timer is from the RTC module. When it is selected, if the developer sets it to reset on expiration diff --git a/arch/xtensa/src/esp32/Make.defs b/arch/xtensa/src/esp32/Make.defs index 5073745d18..a6d5e0138a 100644 --- a/arch/xtensa/src/esp32/Make.defs +++ b/arch/xtensa/src/esp32/Make.defs @@ -163,9 +163,9 @@ CHIP_CSRCS += esp32_partition.c endif ifeq ($(CONFIG_ESP32_WDT),y) -CHIP_CSRCS += esp32_wtd.c +CHIP_CSRCS += esp32_wdt.c ifeq ($(CONFIG_WATCHDOG),y) -CHIP_CSRCS += esp32_wtd_lowerhalf.c +CHIP_CSRCS += esp32_wdt_lowerhalf.c endif endif diff --git a/arch/xtensa/src/esp32/esp32_wtd.c b/arch/xtensa/src/esp32/esp32_wdt.c similarity index 67% rename from arch/xtensa/src/esp32/esp32_wtd.c rename to arch/xtensa/src/esp32/esp32_wdt.c index 0a38cc4a31..b794b4caa0 100644 --- a/arch/xtensa/src/esp32/esp32_wtd.c +++ b/arch/xtensa/src/esp32/esp32_wdt.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/esp32_wtd.c + * arch/xtensa/src/esp32/esp32_wdt.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -28,7 +28,7 @@ #include "xtensa.h" #include "hardware/esp32_tim.h" #include "hardware/esp32_rtccntl.h" -#include "esp32_wtd.h" +#include "esp32_wdt.h" #include "esp32_cpuint.h" #include "esp32_rtc.h" @@ -45,126 +45,126 @@ * Private Types ****************************************************************************/ -struct esp32_wtd_priv_s +struct esp32_wdt_priv_s { - FAR struct esp32_wtd_ops_s *ops; - uint32_t base; /* WTD register base address */ + FAR struct esp32_wdt_ops_s *ops; + uint32_t base; /* WDT register base address */ uint8_t periph; /* Peripheral ID */ uint8_t irq; /* Interrupt ID */ - int cpuint; /* CPU interrupt assigned to this wtd */ - bool inuse; /* Flag indicating if this wtd is in use */ + int cpuint; /* CPU interrupt assigned to this wdt */ + bool inuse; /* Flag indicating if this wdt is in use */ }; /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -/* WTD registers access *****************************************************/ +/* WDT registers access *****************************************************/ -static void esp32_wtd_putreg(FAR struct esp32_wtd_dev_s *dev, +static void esp32_wdt_putreg(FAR struct esp32_wdt_dev_s *dev, uint32_t offset, uint32_t value); -static void esp32_wtd_modifyreg32(FAR struct esp32_wtd_dev_s *dev, +static void esp32_wdt_modifyreg32(FAR struct esp32_wdt_dev_s *dev, uint32_t offset, uint32_t clearbits, uint32_t setbits); -static uint32_t esp32_wtd_getreg(FAR struct esp32_wtd_dev_s *dev, +static uint32_t esp32_wdt_getreg(FAR struct esp32_wdt_dev_s *dev, uint32_t offset); -/* WTD operations ***********************************************************/ +/* WDT operations ***********************************************************/ -static int esp32_wtd_start(FAR struct esp32_wtd_dev_s *dev); -static int esp32_wtd_stop(FAR struct esp32_wtd_dev_s *dev); -static int esp32_wtd_enablewp(FAR struct esp32_wtd_dev_s *dev); -static int esp32_wtd_disablewp(FAR struct esp32_wtd_dev_s *dev); -static int esp32_wtd_pre(FAR struct esp32_wtd_dev_s *dev, uint16_t value); -static int esp32_wtd_settimeout(FAR struct esp32_wtd_dev_s *dev, +static int esp32_wdt_start(FAR struct esp32_wdt_dev_s *dev); +static int esp32_wdt_stop(FAR struct esp32_wdt_dev_s *dev); +static int esp32_wdt_enablewp(FAR struct esp32_wdt_dev_s *dev); +static int esp32_wdt_disablewp(FAR struct esp32_wdt_dev_s *dev); +static int esp32_wdt_pre(FAR struct esp32_wdt_dev_s *dev, uint16_t value); +static int esp32_wdt_settimeout(FAR struct esp32_wdt_dev_s *dev, uint32_t value, uint8_t stage); -static int esp32_wtd_feed_dog(FAR struct esp32_wtd_dev_s *dev); -static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, +static int esp32_wdt_feed_dog(FAR struct esp32_wdt_dev_s *dev); +static int esp32_wdt_set_stg_conf(FAR struct esp32_wdt_dev_s *dev, uint8_t stage, uint8_t conf); -static uint16_t esp32_rtc_clk(FAR struct esp32_wtd_dev_s *dev); -static int esp32_wtd_setisr(FAR struct esp32_wtd_dev_s *dev, xcpt_t handler, +static uint16_t esp32_rtc_clk(FAR struct esp32_wdt_dev_s *dev); +static int esp32_wdt_setisr(FAR struct esp32_wdt_dev_s *dev, xcpt_t handler, FAR void * arg); -static int esp32_wtd_enableint(FAR struct esp32_wtd_dev_s *dev); -static int esp32_wtd_disableint(FAR struct esp32_wtd_dev_s *dev); -static int esp32_wtd_ackint(FAR struct esp32_wtd_dev_s *dev); +static int esp32_wdt_enableint(FAR struct esp32_wdt_dev_s *dev); +static int esp32_wdt_disableint(FAR struct esp32_wdt_dev_s *dev); +static int esp32_wdt_ackint(FAR struct esp32_wdt_dev_s *dev); /**************************************************************************** * Private Data ****************************************************************************/ -/* ESP32 WTD ops */ +/* ESP32 WDT ops */ -struct esp32_wtd_ops_s esp32_mwtd_ops = +struct esp32_wdt_ops_s esp32_mwdt_ops = { - .start = esp32_wtd_start, - .stop = esp32_wtd_stop, - .enablewp = esp32_wtd_enablewp, - .disablewp = esp32_wtd_disablewp, - .pre = esp32_wtd_pre, - .settimeout = esp32_wtd_settimeout, - .feed = esp32_wtd_feed_dog, - .stg_conf = esp32_wtd_set_stg_conf, + .start = esp32_wdt_start, + .stop = esp32_wdt_stop, + .enablewp = esp32_wdt_enablewp, + .disablewp = esp32_wdt_disablewp, + .pre = esp32_wdt_pre, + .settimeout = esp32_wdt_settimeout, + .feed = esp32_wdt_feed_dog, + .stg_conf = esp32_wdt_set_stg_conf, .rtc_clk = NULL, - .setisr = esp32_wtd_setisr, - .enableint = esp32_wtd_enableint, - .disableint = esp32_wtd_disableint, - .ackint = esp32_wtd_ackint, + .setisr = esp32_wdt_setisr, + .enableint = esp32_wdt_enableint, + .disableint = esp32_wdt_disableint, + .ackint = esp32_wdt_ackint, }; -struct esp32_wtd_ops_s esp32_rwtd_ops = +struct esp32_wdt_ops_s esp32_rwdt_ops = { - .start = esp32_wtd_start, - .stop = esp32_wtd_stop, - .enablewp = esp32_wtd_enablewp, - .disablewp = esp32_wtd_disablewp, + .start = esp32_wdt_start, + .stop = esp32_wdt_stop, + .enablewp = esp32_wdt_enablewp, + .disablewp = esp32_wdt_disablewp, .pre = NULL, - .settimeout = esp32_wtd_settimeout, - .feed = esp32_wtd_feed_dog, - .stg_conf = esp32_wtd_set_stg_conf, + .settimeout = esp32_wdt_settimeout, + .feed = esp32_wdt_feed_dog, + .stg_conf = esp32_wdt_set_stg_conf, .rtc_clk = esp32_rtc_clk, - .setisr = esp32_wtd_setisr, - .enableint = esp32_wtd_enableint, - .disableint = esp32_wtd_disableint, - .ackint = esp32_wtd_ackint, + .setisr = esp32_wdt_setisr, + .enableint = esp32_wdt_enableint, + .disableint = esp32_wdt_disableint, + .ackint = esp32_wdt_ackint, }; #ifdef CONFIG_ESP32_MWDT0 -struct esp32_wtd_priv_s g_esp32_mwtd0_priv = +struct esp32_wdt_priv_s g_esp32_mwdt0_priv = { - .ops = &esp32_mwtd_ops, + .ops = &esp32_mwdt_ops, .base = TIMG_WDTCONFIG0_REG(0), .periph = ESP32_PERIPH_TG_WDT_LEVEL, /* Peripheral ID */ .irq = ESP32_IRQ_TG_WDT_LEVEL, /* Interrupt ID */ - .cpuint = -ENOMEM, /* CPU interrupt assigned to this wtd */ + .cpuint = -ENOMEM, /* CPU interrupt assigned to this wdt */ .inuse = false, }; #endif #ifdef CONFIG_ESP32_MWDT1 -struct esp32_wtd_priv_s g_esp32_mwtd1_priv = +struct esp32_wdt_priv_s g_esp32_mwdt1_priv = { - .ops = &esp32_mwtd_ops, + .ops = &esp32_mwdt_ops, .base = TIMG_WDTCONFIG0_REG(1), .periph = ESP32_PERIPH_TG1_WDT_LEVEL, /* Peripheral ID */ .irq = ESP32_IRQ_TG1_WDT_LEVEL, /* Interrupt ID */ - .cpuint = -ENOMEM, /* CPU interrupt assigned to this wtd */ + .cpuint = -ENOMEM, /* CPU interrupt assigned to this wdt */ .inuse = false, }; #endif #ifdef CONFIG_ESP32_RWDT -struct esp32_wtd_priv_s g_esp32_rwtd_priv = +struct esp32_wdt_priv_s g_esp32_rwdt_priv = { - .ops = &esp32_rwtd_ops, + .ops = &esp32_rwdt_ops, .base = RTC_CNTL_OPTIONS0_REG, .periph = ESP32_PERIPH_RTC_CORE, /* Peripheral ID */ .irq = ESP32_IRQ_RTC_CORE, /* Interrupt ID */ - .cpuint = -ENOMEM, /* CPU interrupt assigned to this wtd */ + .cpuint = -ENOMEM, /* CPU interrupt assigned to this wdt */ .inuse = false, }; #endif @@ -174,89 +174,89 @@ struct esp32_wtd_priv_s g_esp32_rwtd_priv = ****************************************************************************/ /**************************************************************************** - * Name: esp32_wtd_putreg + * Name: esp32_wdt_putreg * * Description: * Put a 32-bit register value by offset * ****************************************************************************/ -static void esp32_wtd_putreg(FAR struct esp32_wtd_dev_s *dev, +static void esp32_wdt_putreg(FAR struct esp32_wdt_dev_s *dev, uint32_t offset, uint32_t value) { DEBUGASSERT(dev); - putreg32(value, ((struct esp32_wtd_priv_s *)dev)->base + offset); + putreg32(value, ((struct esp32_wdt_priv_s *)dev)->base + offset); } /**************************************************************************** - * Name: esp32_wtd_modifyreg32 + * Name: esp32_wdt_modifyreg32 * * Description: * Modify a reg of 32 bits * ****************************************************************************/ -static void esp32_wtd_modifyreg32(FAR struct esp32_wtd_dev_s *dev, +static void esp32_wdt_modifyreg32(FAR struct esp32_wdt_dev_s *dev, uint32_t offset, uint32_t clearbits, uint32_t setbits) { DEBUGASSERT(dev); - modifyreg32(((struct esp32_wtd_priv_s *)dev)->base + offset, + modifyreg32(((struct esp32_wdt_priv_s *)dev)->base + offset, clearbits, setbits); } /**************************************************************************** - * Name: esp32_wtd_getreg + * Name: esp32_wdt_getreg * * Description: * Get a 32-bit register value by offset * ****************************************************************************/ -static uint32_t esp32_wtd_getreg(FAR struct esp32_wtd_dev_s *dev, +static uint32_t esp32_wdt_getreg(FAR struct esp32_wdt_dev_s *dev, uint32_t offset) { DEBUGASSERT(dev); - return getreg32(((struct esp32_wtd_priv_s *)dev)->base + offset); + return getreg32(((struct esp32_wdt_priv_s *)dev)->base + offset); } /**************************************************************************** - * Name: esp32_wtd_start + * Name: esp32_wdt_start * * Description: * Releases the counter * ****************************************************************************/ -static int esp32_wtd_start(FAR struct esp32_wtd_dev_s *dev) +static int esp32_wdt_start(FAR struct esp32_wdt_dev_s *dev) { DEBUGASSERT(dev); /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_modifyreg32(dev, RWDT_CONFIG0_OFFSET, 0, RTC_CNTL_WDT_EN); + esp32_wdt_modifyreg32(dev, RWDT_CONFIG0_OFFSET, 0, RTC_CNTL_WDT_EN); } /* If it is a MWDT */ else { - esp32_wtd_modifyreg32(dev, MWDT_CONFIG0_OFFSET, 0, TIMG_WDT_EN); + esp32_wdt_modifyreg32(dev, MWDT_CONFIG0_OFFSET, 0, TIMG_WDT_EN); } return OK; } /**************************************************************************** - * Name: esp32_wtd_set_stg_conf + * Name: esp32_wdt_set_stg_conf * * Description: * It configures the action to be triggered by a stage on expiration. @@ -269,7 +269,7 @@ static int esp32_wtd_start(FAR struct esp32_wtd_dev_s *dev) * ****************************************************************************/ -static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, +static int esp32_wdt_set_stg_conf(FAR struct esp32_wdt_dev_s *dev, uint8_t stage, uint8_t conf) { int ret = OK; @@ -282,11 +282,11 @@ static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, { /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { mask = (uint32_t)conf << RTC_CNTL_WDT_STG0_S; - esp32_wtd_modifyreg32(dev, RWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, RWDT_CONFIG0_OFFSET, RTC_CNTL_WDT_STG0_M, mask); } @@ -295,7 +295,7 @@ static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, else { mask = (uint32_t)conf << TIMG_WDT_STG0_S; - esp32_wtd_modifyreg32(dev, MWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, MWDT_CONFIG0_OFFSET, TIMG_WDT_STG0_M, mask); } break; @@ -305,11 +305,11 @@ static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, { /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { mask = (uint32_t)conf << RTC_CNTL_WDT_STG1_S; - esp32_wtd_modifyreg32(dev, RWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, RWDT_CONFIG0_OFFSET, RTC_CNTL_WDT_STG1_M, mask); } @@ -318,7 +318,7 @@ static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, else { mask = (uint32_t)conf << TIMG_WDT_STG1_S; - esp32_wtd_modifyreg32(dev, MWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, MWDT_CONFIG0_OFFSET, TIMG_WDT_STG1_M, mask); } break; @@ -328,11 +328,11 @@ static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, { /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { mask = (uint32_t)conf << RTC_CNTL_WDT_STG2_S; - esp32_wtd_modifyreg32(dev, RWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, RWDT_CONFIG0_OFFSET, RTC_CNTL_WDT_STG2_M, mask); } @@ -341,7 +341,7 @@ static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, else { mask = (uint32_t)conf << TIMG_WDT_STG2_S; - esp32_wtd_modifyreg32(dev, MWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, MWDT_CONFIG0_OFFSET, TIMG_WDT_STG2_M, mask); } break; @@ -351,11 +351,11 @@ static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, { /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { mask = (uint32_t)conf << RTC_CNTL_WDT_STG3_S; - esp32_wtd_modifyreg32(dev, RWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, RWDT_CONFIG0_OFFSET, RTC_CNTL_WDT_STG3_M, mask); } @@ -364,7 +364,7 @@ static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, else { mask = (uint32_t)conf << TIMG_WDT_STG3_S; - esp32_wtd_modifyreg32(dev, MWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, MWDT_CONFIG0_OFFSET, TIMG_WDT_STG3_M, mask); } break; @@ -383,36 +383,36 @@ static int esp32_wtd_set_stg_conf(FAR struct esp32_wtd_dev_s *dev, } /**************************************************************************** - * Name: esp32_wtd_stop + * Name: esp32_wdt_stop * * Description: * Disables the watchdog * ****************************************************************************/ -static int esp32_wtd_stop(FAR struct esp32_wtd_dev_s *dev) +static int esp32_wdt_stop(FAR struct esp32_wdt_dev_s *dev) { DEBUGASSERT(dev); /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_modifyreg32(dev, RWDT_CONFIG0_OFFSET, RTC_CNTL_WDT_EN, 0); + esp32_wdt_modifyreg32(dev, RWDT_CONFIG0_OFFSET, RTC_CNTL_WDT_EN, 0); } /* If it is a MWDT */ else { - esp32_wtd_modifyreg32(dev, MWDT_CONFIG0_OFFSET, TIMG_WDT_EN, 0); + esp32_wdt_modifyreg32(dev, MWDT_CONFIG0_OFFSET, TIMG_WDT_EN, 0); } return OK; } /**************************************************************************** - * Name: esp32_wtd_enablewp + * Name: esp32_wdt_enablewp * * Description: * Enables write protection (WP) on registers against accidental writing. @@ -423,29 +423,29 @@ static int esp32_wtd_stop(FAR struct esp32_wtd_dev_s *dev) * ****************************************************************************/ -static int esp32_wtd_enablewp(FAR struct esp32_wtd_dev_s *dev) +static int esp32_wdt_enablewp(FAR struct esp32_wdt_dev_s *dev) { DEBUGASSERT(dev); /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_putreg(dev, RWDT_WP_REG, 0); + esp32_wdt_putreg(dev, RWDT_WP_REG, 0); } /* If it is a MWDT */ else { - esp32_wtd_putreg(dev, MWDT_WP_REG, 0); + esp32_wdt_putreg(dev, MWDT_WP_REG, 0); } return OK; } /**************************************************************************** - * Name: esp32_wtd_disablewp + * Name: esp32_wdt_disablewp * * Description: * Disables write protection (WP) on registers against accidental writing. @@ -456,29 +456,29 @@ static int esp32_wtd_enablewp(FAR struct esp32_wtd_dev_s *dev) * ****************************************************************************/ -static int esp32_wtd_disablewp(FAR struct esp32_wtd_dev_s *dev) +static int esp32_wdt_disablewp(FAR struct esp32_wdt_dev_s *dev) { DEBUGASSERT(dev); /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_putreg(dev, RWDT_WP_REG, WRITE_PROTECTION_KEY); + esp32_wdt_putreg(dev, RWDT_WP_REG, WRITE_PROTECTION_KEY); } /* If it is a MWDT */ else { - esp32_wtd_putreg(dev, MWDT_WP_REG, WRITE_PROTECTION_KEY); + esp32_wdt_putreg(dev, MWDT_WP_REG, WRITE_PROTECTION_KEY); } return OK; } /**************************************************************************** - * Name: esp32_wtd_pre + * Name: esp32_wdt_pre * * Description: * Sets a prescale value. The MWDT clock period is 12.5 ns * value (pre). @@ -487,13 +487,13 @@ static int esp32_wtd_disablewp(FAR struct esp32_wtd_dev_s *dev) * ****************************************************************************/ -static int esp32_wtd_pre(FAR struct esp32_wtd_dev_s *dev, uint16_t pre) +static int esp32_wdt_pre(FAR struct esp32_wdt_dev_s *dev, uint16_t pre) { uint32_t mask = (uint32_t)pre << TIMG_WDT_CLK_PRESCALE_S; DEBUGASSERT(dev); - esp32_wtd_modifyreg32(dev, MWDT_CLK_PRESCALE_OFFSET, + esp32_wdt_modifyreg32(dev, MWDT_CLK_PRESCALE_OFFSET, TIMG_WDT_CLK_PRESCALE_M, mask); return OK; @@ -508,7 +508,7 @@ static int esp32_wtd_pre(FAR struct esp32_wtd_dev_s *dev, uint16_t pre) * ****************************************************************************/ -static uint16_t esp32_rtc_clk(FAR struct esp32_wtd_dev_s *dev) +static uint16_t esp32_rtc_clk(FAR struct esp32_wdt_dev_s *dev) { enum esp32_rtc_slow_freq_e slow_clk_rtc; uint32_t period_13q19; @@ -542,14 +542,14 @@ static uint16_t esp32_rtc_clk(FAR struct esp32_wtd_dev_s *dev) } /**************************************************************************** - * Name: esp32_wtd_settimeout + * Name: esp32_wdt_settimeout * * Description: * Sets the wdt timeout. * ****************************************************************************/ -static int esp32_wtd_settimeout(FAR struct esp32_wtd_dev_s *dev, +static int esp32_wdt_settimeout(FAR struct esp32_wdt_dev_s *dev, uint32_t value, uint8_t stage) { int ret = OK; @@ -561,17 +561,17 @@ static int esp32_wtd_settimeout(FAR struct esp32_wtd_dev_s *dev, { /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_putreg(dev, RWDT_STAGE0_TIMEOUT_OFFSET, value); + esp32_wdt_putreg(dev, RWDT_STAGE0_TIMEOUT_OFFSET, value); } /* If it is a MWDT */ else { - esp32_wtd_putreg(dev, MWDT_STAGE0_TIMEOUT_OFFSET, value); + esp32_wdt_putreg(dev, MWDT_STAGE0_TIMEOUT_OFFSET, value); } break; } @@ -580,17 +580,17 @@ static int esp32_wtd_settimeout(FAR struct esp32_wtd_dev_s *dev, { /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_putreg(dev, RWDT_STAGE1_TIMEOUT_OFFSET, value); + esp32_wdt_putreg(dev, RWDT_STAGE1_TIMEOUT_OFFSET, value); } /* If it is a MWDT */ else { - esp32_wtd_putreg(dev, MWDT_STAGE1_TIMEOUT_OFFSET, value); + esp32_wdt_putreg(dev, MWDT_STAGE1_TIMEOUT_OFFSET, value); } break; } @@ -599,17 +599,17 @@ static int esp32_wtd_settimeout(FAR struct esp32_wtd_dev_s *dev, { /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_putreg(dev, RWDT_STAGE2_TIMEOUT_OFFSET, value); + esp32_wdt_putreg(dev, RWDT_STAGE2_TIMEOUT_OFFSET, value); } /* If it is a MWDT */ else { - esp32_wtd_putreg(dev, MWDT_STAGE2_TIMEOUT_OFFSET, value); + esp32_wdt_putreg(dev, MWDT_STAGE2_TIMEOUT_OFFSET, value); } break; } @@ -618,17 +618,17 @@ static int esp32_wtd_settimeout(FAR struct esp32_wtd_dev_s *dev, { /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_putreg(dev, RWDT_STAGE3_TIMEOUT_OFFSET, value); + esp32_wdt_putreg(dev, RWDT_STAGE3_TIMEOUT_OFFSET, value); } /* If it is a MWDT */ else { - esp32_wtd_putreg(dev, MWDT_STAGE3_TIMEOUT_OFFSET, value); + esp32_wdt_putreg(dev, MWDT_STAGE3_TIMEOUT_OFFSET, value); } break; } @@ -646,7 +646,7 @@ static int esp32_wtd_settimeout(FAR struct esp32_wtd_dev_s *dev, } /**************************************************************************** - * Name: esp32_wtd_feed_dog + * Name: esp32_wdt_feed_dog * * Description: * Feeds the dog. When software feeds the watchdog timer, it returns to @@ -654,29 +654,29 @@ static int esp32_wtd_settimeout(FAR struct esp32_wtd_dev_s *dev, * ****************************************************************************/ -static int esp32_wtd_feed_dog(FAR struct esp32_wtd_dev_s *dev) +static int esp32_wdt_feed_dog(FAR struct esp32_wdt_dev_s *dev) { DEBUGASSERT(dev); /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_putreg(dev, RWDT_FEED_OFFSET , FEED_DOG); + esp32_wdt_putreg(dev, RWDT_FEED_OFFSET , FEED_DOG); } /* If it is a MWDT */ else { - esp32_wtd_putreg(dev, MWDT_FEED_OFFSET , FEED_DOG); + esp32_wdt_putreg(dev, MWDT_FEED_OFFSET , FEED_DOG); } return OK; } /**************************************************************************** - * Name: esp32_wtd_setisr + * Name: esp32_wdt_setisr * * Description: * Allocates a Level CPU Interrupt, connects the peripheral source to this @@ -685,16 +685,16 @@ static int esp32_wtd_feed_dog(FAR struct esp32_wtd_dev_s *dev) * ****************************************************************************/ -static int esp32_wtd_setisr(FAR struct esp32_wtd_dev_s *dev, xcpt_t handler, +static int esp32_wdt_setisr(FAR struct esp32_wdt_dev_s *dev, xcpt_t handler, FAR void *arg) { - FAR struct esp32_wtd_priv_s *wtd = NULL; + FAR struct esp32_wdt_priv_s *wdt = NULL; int ret = OK; uint8_t cpu; DEBUGASSERT(dev); - wtd = (FAR struct esp32_wtd_priv_s *)dev; + wdt = (FAR struct esp32_wdt_priv_s *)dev; /* Disable interrupt when callback is removed */ @@ -702,17 +702,17 @@ static int esp32_wtd_setisr(FAR struct esp32_wtd_dev_s *dev, xcpt_t handler, { /* If a CPU Interrupt was previously allocated, then deallocate it */ - if (wtd->cpuint >= 0) + if (wdt->cpuint >= 0) { /* Disable CPU Interrupt, free a previously allocated * CPU Interrupt */ - up_disable_irq(wtd->cpuint); + up_disable_irq(wdt->cpuint); cpu = up_cpu_index(); - esp32_detach_peripheral(cpu, wtd->periph, wtd->cpuint); - esp32_free_cpuint(wtd->cpuint); - irq_detach(wtd->irq); + esp32_detach_peripheral(cpu, wdt->periph, wdt->cpuint); + esp32_free_cpuint(wdt->cpuint); + irq_detach(wdt->irq); } ret = OK; @@ -725,40 +725,40 @@ static int esp32_wtd_setisr(FAR struct esp32_wtd_dev_s *dev, xcpt_t handler, { /* Verify the available CPU Interrupt */ - wtd->cpuint = esp32_alloc_levelint(1); - if (wtd->cpuint < 0) + wdt->cpuint = esp32_alloc_levelint(1); + if (wdt->cpuint < 0) { tmrerr("ERROR: No CPU Interrupt available"); - ret = wtd->cpuint; + ret = wdt->cpuint; goto errout; } /* Disable the provided CPU Interrupt to configure it */ - up_disable_irq(wtd->cpuint); + up_disable_irq(wdt->cpuint); /* Attach a peripheral interrupt to the available CPU interrupt in * the current core */ cpu = up_cpu_index(); - esp32_attach_peripheral(cpu, wtd->periph, wtd->cpuint); + esp32_attach_peripheral(cpu, wdt->periph, wdt->cpuint); /* Associate an IRQ Number (from the WDT) to an ISR */ - ret = irq_attach(wtd->irq, handler, arg); + ret = irq_attach(wdt->irq, handler, arg); if (ret != OK) { - esp32_detach_peripheral(cpu, wtd->periph, wtd->cpuint); - esp32_free_cpuint(wtd->cpuint); + esp32_detach_peripheral(cpu, wdt->periph, wdt->cpuint); + esp32_free_cpuint(wdt->cpuint); tmrerr("ERROR: Failed to associate an IRQ Number"); goto errout; } /* Enable the CPU Interrupt that is linked to the wdt */ - up_enable_irq(wtd->cpuint); + up_enable_irq(wdt->cpuint); } errout: @@ -766,14 +766,14 @@ errout: } /**************************************************************************** - * Name: esp32_wtd_enableint + * Name: esp32_wdt_enableint * * Description: * Enables a Level Interrupt at timeout. * ****************************************************************************/ -static int esp32_wtd_enableint(FAR struct esp32_wtd_dev_s *dev) +static int esp32_wdt_enableint(FAR struct esp32_wdt_dev_s *dev) { DEBUGASSERT(dev); @@ -781,16 +781,16 @@ static int esp32_wtd_enableint(FAR struct esp32_wtd_dev_s *dev) /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { /* Level Interrupt */ - esp32_wtd_modifyreg32(dev, RWDT_CONFIG0_OFFSET, 0, + esp32_wdt_modifyreg32(dev, RWDT_CONFIG0_OFFSET, 0, RTC_CNTL_WDT_LEVEL_INT_EN); /* Enable Interrupt */ - esp32_wtd_modifyreg32(dev, RWDT_INT_ENA_REG_OFFSET, 0, + esp32_wdt_modifyreg32(dev, RWDT_INT_ENA_REG_OFFSET, 0, RTC_CNTL_WDT_INT_ENA); } @@ -800,12 +800,12 @@ static int esp32_wtd_enableint(FAR struct esp32_wtd_dev_s *dev) { /* Level Interrupt */ - esp32_wtd_modifyreg32(dev, MWDT_CONFIG0_OFFSET, 0, + esp32_wdt_modifyreg32(dev, MWDT_CONFIG0_OFFSET, 0, TIMG_WDT_LEVEL_INT_EN); /* Enable Interrupt */ - esp32_wtd_modifyreg32(dev, MWDT_INT_ENA_REG_OFFSET, 0, + esp32_wdt_modifyreg32(dev, MWDT_INT_ENA_REG_OFFSET, 0, TIMG_WDT_INT_ENA); } @@ -813,29 +813,29 @@ static int esp32_wtd_enableint(FAR struct esp32_wtd_dev_s *dev) } /**************************************************************************** - * Name: esp32_wtd_disableint + * Name: esp32_wdt_disableint * * Description: * Disables a Level Interrupt at timeout. * ****************************************************************************/ -static int esp32_wtd_disableint(FAR struct esp32_wtd_dev_s *dev) +static int esp32_wdt_disableint(FAR struct esp32_wdt_dev_s *dev) { DEBUGASSERT(dev); /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { /* Level Interrupt */ - esp32_wtd_modifyreg32(dev, RWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, RWDT_CONFIG0_OFFSET, RTC_CNTL_WDT_LEVEL_INT_EN, 0); /* Enable Interrupt */ - esp32_wtd_modifyreg32(dev, RWDT_INT_ENA_REG_OFFSET, + esp32_wdt_modifyreg32(dev, RWDT_INT_ENA_REG_OFFSET, RTC_CNTL_WDT_INT_ENA, 0); } @@ -845,12 +845,12 @@ static int esp32_wtd_disableint(FAR struct esp32_wtd_dev_s *dev) { /* Level Interrupt */ - esp32_wtd_modifyreg32(dev, MWDT_CONFIG0_OFFSET, + esp32_wdt_modifyreg32(dev, MWDT_CONFIG0_OFFSET, TIMG_WDT_LEVEL_INT_EN, 0); /* Enable Interrupt */ - esp32_wtd_modifyreg32(dev, MWDT_INT_ENA_REG_OFFSET, + esp32_wdt_modifyreg32(dev, MWDT_INT_ENA_REG_OFFSET, TIMG_WDT_INT_ENA, 0); } @@ -858,29 +858,29 @@ static int esp32_wtd_disableint(FAR struct esp32_wtd_dev_s *dev) } /**************************************************************************** - * Name: esp32_wtd_ackint + * Name: esp32_wdt_ackint * * Description: * Acknowledges an interrupt * ****************************************************************************/ -static int esp32_wtd_ackint(FAR struct esp32_wtd_dev_s *dev) +static int esp32_wdt_ackint(FAR struct esp32_wdt_dev_s *dev) { DEBUGASSERT(dev); /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - esp32_wtd_putreg(dev, RWDT_INT_CLR_REG_OFFSET, RTC_CNTL_WDT_INT_CLR); + esp32_wdt_putreg(dev, RWDT_INT_CLR_REG_OFFSET, RTC_CNTL_WDT_INT_CLR); } /* If it is a MWDT */ else { - esp32_wtd_putreg(dev, MWDT_INT_CLR_REG_OFFSET, TIMG_WDT_INT_CLR); + esp32_wdt_putreg(dev, MWDT_INT_CLR_REG_OFFSET, TIMG_WDT_INT_CLR); } return OK; @@ -891,16 +891,16 @@ static int esp32_wtd_ackint(FAR struct esp32_wtd_dev_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: esp32_wtd_init + * Name: esp32_wdt_init * * Description: * Initialize WDT device * ****************************************************************************/ -FAR struct esp32_wtd_dev_s *esp32_wtd_init(uint8_t wdt_id) +FAR struct esp32_wdt_dev_s *esp32_wdt_init(uint8_t wdt_id) { - FAR struct esp32_wtd_priv_s *wtd = NULL; + FAR struct esp32_wdt_priv_s *wdt = NULL; /* Get wdt instance */ @@ -909,7 +909,7 @@ FAR struct esp32_wtd_dev_s *esp32_wtd_init(uint8_t wdt_id) #ifdef CONFIG_ESP32_MWDT0 case 0: { - wtd = &g_esp32_mwtd0_priv; + wdt = &g_esp32_mwdt0_priv; break; } @@ -917,7 +917,7 @@ FAR struct esp32_wtd_dev_s *esp32_wtd_init(uint8_t wdt_id) #ifdef CONFIG_ESP32_MWDT1 case 1: { - wtd = &g_esp32_mwtd1_priv; + wdt = &g_esp32_mwdt1_priv; break; } @@ -925,7 +925,7 @@ FAR struct esp32_wtd_dev_s *esp32_wtd_init(uint8_t wdt_id) #ifdef CONFIG_ESP32_RWDT case 2: { - wtd = &g_esp32_rwtd_priv; + wdt = &g_esp32_rwdt_priv; break; } @@ -941,43 +941,43 @@ FAR struct esp32_wtd_dev_s *esp32_wtd_init(uint8_t wdt_id) * Otherwise, inform it has been used. */ - if (wtd->inuse == true) + if (wdt->inuse == true) { tmrerr("ERROR: WDT %d is already in use\n", wdt_id); - wtd = NULL; + wdt = NULL; } else { - wtd->inuse = true; + wdt->inuse = true; } errout: - return (FAR struct esp32_wtd_dev_s *)wtd; + return (FAR struct esp32_wdt_dev_s *)wdt; } /**************************************************************************** - * Name: esp32_wtd_deinit + * Name: esp32_wdt_deinit * * Description: * Deinit WDT device * ****************************************************************************/ -int esp32_wtd_deinit(FAR struct esp32_wtd_dev_s *dev) +int esp32_wdt_deinit(FAR struct esp32_wdt_dev_s *dev) { - FAR struct esp32_wtd_priv_s *wtd = NULL; + FAR struct esp32_wdt_priv_s *wdt = NULL; DEBUGASSERT(dev); - wtd = (FAR struct esp32_wtd_priv_s *)dev; + wdt = (FAR struct esp32_wdt_priv_s *)dev; - wtd->inuse = false; + wdt->inuse = false; return OK; } /**************************************************************************** - * Name: esp32_wtd_is_running + * Name: esp32_wdt_is_running * * Description: * Checks if the wdt was already turned on. For example, RTC may has been @@ -985,17 +985,17 @@ int esp32_wtd_deinit(FAR struct esp32_wtd_dev_s *dev) * ****************************************************************************/ -bool esp32_wtd_is_running(FAR struct esp32_wtd_dev_s *dev) +bool esp32_wdt_is_running(FAR struct esp32_wdt_dev_s *dev) { uint32_t status = 0; DEBUGASSERT(dev); /* If it is a RWDT */ - if (((struct esp32_wtd_priv_s *)dev)->base == + if (((struct esp32_wdt_priv_s *)dev)->base == RTC_CNTL_OPTIONS0_REG) { - status = esp32_wtd_getreg(dev, RWDT_CONFIG0_OFFSET); + status = esp32_wdt_getreg(dev, RWDT_CONFIG0_OFFSET); if (status & RTC_CNTL_WDT_EN) { return true; @@ -1006,7 +1006,7 @@ bool esp32_wtd_is_running(FAR struct esp32_wtd_dev_s *dev) else { - status = esp32_wtd_getreg(dev, MWDT_CONFIG0_OFFSET); + status = esp32_wdt_getreg(dev, MWDT_CONFIG0_OFFSET); if (status & TIMG_WDT_EN) { return true; diff --git a/arch/xtensa/src/esp32/esp32_wtd.h b/arch/xtensa/src/esp32/esp32_wdt.h similarity index 51% rename from arch/xtensa/src/esp32/esp32_wtd.h rename to arch/xtensa/src/esp32/esp32_wdt.h index 01b08c1372..01719f8c84 100644 --- a/arch/xtensa/src/esp32/esp32_wtd.h +++ b/arch/xtensa/src/esp32/esp32_wdt.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/esp32_wtd.h + * arch/xtensa/src/esp32/esp32_wdt.h * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_WTD_H -#define __ARCH_XTENSA_SRC_ESP32_ESP32_WTD_H +#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_WDT_H +#define __ARCH_XTENSA_SRC_ESP32_ESP32_WDT_H /**************************************************************************** * Included Files @@ -37,69 +37,69 @@ /* Helpers ******************************************************************/ -#define ESP32_WTD_START(d) ((d)->ops->start(d)) -#define ESP32_WTD_STOP(d) ((d)->ops->stop(d)) -#define ESP32_WTD_LOCK(d) ((d)->ops->enablewp(d)) -#define ESP32_WTD_UNLOCK(d) ((d)->ops->disablewp(d)) -#define ESP32_WTD_PRE(d, v) ((d)->ops->pre(d, v)) -#define ESP32_WTD_STO(d, v, s) ((d)->ops->settimeout(d, v, s)) -#define ESP32_WTD_FEED(d) ((d)->ops->feed(d)) -#define ESP32_WTD_STG_CONF(d, s, c) ((d)->ops->stg_conf(d, s, c)) +#define ESP32_WDT_START(d) ((d)->ops->start(d)) +#define ESP32_WDT_STOP(d) ((d)->ops->stop(d)) +#define ESP32_WDT_LOCK(d) ((d)->ops->enablewp(d)) +#define ESP32_WDT_UNLOCK(d) ((d)->ops->disablewp(d)) +#define ESP32_WDT_PRE(d, v) ((d)->ops->pre(d, v)) +#define ESP32_WDT_STO(d, v, s) ((d)->ops->settimeout(d, v, s)) +#define ESP32_WDT_FEED(d) ((d)->ops->feed(d)) +#define ESP32_WDT_STG_CONF(d, s, c) ((d)->ops->stg_conf(d, s, c)) #define ESP32_RWDT_CLK(d) ((d)->ops->rtc_clk(d)) -#define ESP32_WTD_SETISR(d, hnd, arg) ((d)->ops->setisr(d, hnd, arg)) -#define ESP32_WTD_ENABLEINT(d) ((d)->ops->enableint(d)) -#define ESP32_WTD_DISABLEINT(d) ((d)->ops->disableint(d)) -#define ESP32_WTD_ACKINT(d) ((d)->ops->ackint(d)) +#define ESP32_WDT_SETISR(d, hnd, arg) ((d)->ops->setisr(d, hnd, arg)) +#define ESP32_WDT_ENABLEINT(d) ((d)->ops->enableint(d)) +#define ESP32_WDT_DISABLEINT(d) ((d)->ops->disableint(d)) +#define ESP32_WDT_ACKINT(d) ((d)->ops->ackint(d)) /**************************************************************************** * Public Types ****************************************************************************/ -/* ESP32 WTD device */ +/* ESP32 WDT device */ -struct esp32_wtd_dev_s +struct esp32_wdt_dev_s { - struct esp32_wtd_ops_s *ops; + struct esp32_wdt_ops_s *ops; }; -/* ESP32 WTD ops */ +/* ESP32 WDT ops */ -/* This is a struct containing the pointers to the wtd operations */ +/* This is a struct containing the pointers to the wdt operations */ -struct esp32_wtd_ops_s +struct esp32_wdt_ops_s { - /* WTD tasks */ + /* WDT tasks */ - CODE int (*start)(FAR struct esp32_wtd_dev_s *dev); - CODE int (*stop)(FAR struct esp32_wtd_dev_s *dev); + CODE int (*start)(FAR struct esp32_wdt_dev_s *dev); + CODE int (*stop)(FAR struct esp32_wdt_dev_s *dev); - /* WTD configuration */ + /* WDT configuration */ - CODE int (*enablewp)(FAR struct esp32_wtd_dev_s *dev); - CODE int (*disablewp)(FAR struct esp32_wtd_dev_s *dev); - CODE int (*pre)(FAR struct esp32_wtd_dev_s *dev, uint16_t value); - CODE int (*settimeout)(FAR struct esp32_wtd_dev_s *dev, + CODE int (*enablewp)(FAR struct esp32_wdt_dev_s *dev); + CODE int (*disablewp)(FAR struct esp32_wdt_dev_s *dev); + CODE int (*pre)(FAR struct esp32_wdt_dev_s *dev, uint16_t value); + CODE int (*settimeout)(FAR struct esp32_wdt_dev_s *dev, uint32_t value, uint8_t stage); - CODE int (*feed)(FAR struct esp32_wtd_dev_s *dev); - CODE int (*stg_conf)(FAR struct esp32_wtd_dev_s *dev, + CODE int (*feed)(FAR struct esp32_wdt_dev_s *dev); + CODE int (*stg_conf)(FAR struct esp32_wdt_dev_s *dev, uint8_t stage, uint8_t conf); - CODE uint16_t (*rtc_clk)(FAR struct esp32_wtd_dev_s *dev); + CODE uint16_t (*rtc_clk)(FAR struct esp32_wdt_dev_s *dev); - /* WTD interrupts */ + /* WDT interrupts */ - CODE int (*setisr)(FAR struct esp32_wtd_dev_s *dev, xcpt_t handler, + CODE int (*setisr)(FAR struct esp32_wdt_dev_s *dev, xcpt_t handler, FAR void * arg); - CODE int (*enableint)(FAR struct esp32_wtd_dev_s *dev); - CODE int (*disableint)(FAR struct esp32_wtd_dev_s *dev); - CODE int (*ackint)(FAR struct esp32_wtd_dev_s *dev); + CODE int (*enableint)(FAR struct esp32_wdt_dev_s *dev); + CODE int (*disableint)(FAR struct esp32_wdt_dev_s *dev); + CODE int (*ackint)(FAR struct esp32_wdt_dev_s *dev); }; /**************************************************************************** * Public Function Prototypes ****************************************************************************/ -FAR struct esp32_wtd_dev_s *esp32_wtd_init(uint8_t wdt_id); -int esp32_wtd_deinit(FAR struct esp32_wtd_dev_s *dev); -bool esp32_wtd_is_running(FAR struct esp32_wtd_dev_s *dev); +FAR struct esp32_wdt_dev_s *esp32_wdt_init(uint8_t wdt_id); +int esp32_wdt_deinit(FAR struct esp32_wdt_dev_s *dev); +bool esp32_wdt_is_running(FAR struct esp32_wdt_dev_s *dev); -#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_WTD_H */ +#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_WDT_H */ diff --git a/arch/xtensa/src/esp32/esp32_wtd_lowerhalf.c b/arch/xtensa/src/esp32/esp32_wdt_lowerhalf.c similarity index 79% rename from arch/xtensa/src/esp32/esp32_wtd_lowerhalf.c rename to arch/xtensa/src/esp32/esp32_wdt_lowerhalf.c index 4da217e8a1..090a1e0dd7 100644 --- a/arch/xtensa/src/esp32/esp32_wtd_lowerhalf.c +++ b/arch/xtensa/src/esp32/esp32_wdt_lowerhalf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/esp32/esp32_wtd_lowerhalf.c + * arch/arm/src/esp32/esp32_wdt_lowerhalf.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -35,8 +35,8 @@ #include "xtensa.h" #include "hardware/esp32_soc.h" -#include "esp32_wtd.h" -#include "esp32_wtd_lowerhalf.h" +#include "esp32_wdt.h" +#include "esp32_wdt_lowerhalf.h" /**************************************************************************** * Pre-processor Definitions @@ -69,10 +69,10 @@ * well-known watchdog_lowerhalf_s structure. */ -struct esp32_wtd_lowerhalf_s +struct esp32_wdt_lowerhalf_s { FAR const struct watchdog_ops_s *ops; /* Lower half operations */ - FAR struct esp32_wtd_dev_s *wtd; /* esp32 watchdog driver */ + FAR struct esp32_wdt_dev_s *wdt; /* esp32 watchdog driver */ uint32_t timeout; /* The current timeout */ enum wdt_peripherals peripheral; /* Indicates if it is from RTC or Timer Module */ uint32_t lastreset; /* The last reset time */ @@ -91,14 +91,14 @@ static int esp32_wdt_handler(int irq, FAR void *context, FAR void *arg); /* "Lower half" driver methods **********************************************/ -static int esp32_wtd_start(FAR struct watchdog_lowerhalf_s *lower); -static int esp32_wtd_stop(FAR struct watchdog_lowerhalf_s *lower); -static int esp32_wtd_keepalive(FAR struct watchdog_lowerhalf_s *lower); -static int esp32_wtd_getstatus(FAR struct watchdog_lowerhalf_s *lower, +static int esp32_wdt_start(FAR struct watchdog_lowerhalf_s *lower); +static int esp32_wdt_stop(FAR struct watchdog_lowerhalf_s *lower); +static int esp32_wdt_keepalive(FAR struct watchdog_lowerhalf_s *lower); +static int esp32_wdt_getstatus(FAR struct watchdog_lowerhalf_s *lower, FAR struct watchdog_status_s *status); -static int esp32_wtd_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int esp32_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower, uint32_t timeout); -static xcpt_t esp32_wtd_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t esp32_wdt_capture(FAR struct watchdog_lowerhalf_s *lower, xcpt_t handler); /**************************************************************************** @@ -109,19 +109,19 @@ static xcpt_t esp32_wtd_capture(FAR struct watchdog_lowerhalf_s *lower, static const struct watchdog_ops_s g_esp32_wdg_ops = { - .start = esp32_wtd_start, - .stop = esp32_wtd_stop, - .keepalive = esp32_wtd_keepalive, - .getstatus = esp32_wtd_getstatus, - .settimeout = esp32_wtd_settimeout, - .capture = esp32_wtd_capture, + .start = esp32_wdt_start, + .stop = esp32_wdt_stop, + .keepalive = esp32_wdt_keepalive, + .getstatus = esp32_wdt_getstatus, + .settimeout = esp32_wdt_settimeout, + .capture = esp32_wdt_capture, .ioctl = NULL, }; #ifdef CONFIG_ESP32_MWDT0 /* MWDT0 lower-half */ -static struct esp32_wtd_lowerhalf_s g_esp32_mwdt0_lowerhalf = +static struct esp32_wdt_lowerhalf_s g_esp32_mwdt0_lowerhalf = { .ops = &g_esp32_wdg_ops, }; @@ -130,7 +130,7 @@ static struct esp32_wtd_lowerhalf_s g_esp32_mwdt0_lowerhalf = #ifdef CONFIG_ESP32_MWDT1 /* MWDT1 lower-half */ -static struct esp32_wtd_lowerhalf_s g_esp32_mwdt1_lowerhalf = +static struct esp32_wdt_lowerhalf_s g_esp32_mwdt1_lowerhalf = { .ops = &g_esp32_wdg_ops, }; @@ -139,14 +139,14 @@ static struct esp32_wtd_lowerhalf_s g_esp32_mwdt1_lowerhalf = #ifdef CONFIG_ESP32_RWDT /* RWDT lower-half */ -static struct esp32_wtd_lowerhalf_s g_esp32_rwdt_lowerhalf = +static struct esp32_wdt_lowerhalf_s g_esp32_rwdt_lowerhalf = { .ops = &g_esp32_wdg_ops, }; #endif /**************************************************************************** - * Name: esp32_wtd_start + * Name: esp32_wdt_start * * Description: * Start the watchdog timer, register a callback if there is one and @@ -162,10 +162,10 @@ static struct esp32_wtd_lowerhalf_s g_esp32_rwdt_lowerhalf = * ****************************************************************************/ -static int esp32_wtd_start(FAR struct watchdog_lowerhalf_s *lower) +static int esp32_wdt_start(FAR struct watchdog_lowerhalf_s *lower) { - FAR struct esp32_wtd_lowerhalf_s *priv = - (FAR struct esp32_wtd_lowerhalf_s *)lower; + FAR struct esp32_wdt_lowerhalf_s *priv = + (FAR struct esp32_wdt_lowerhalf_s *)lower; int ret = OK; irqstate_t flags; @@ -188,7 +188,7 @@ static int esp32_wtd_start(FAR struct watchdog_lowerhalf_s *lower) /* Unlock WDT */ - ESP32_WTD_UNLOCK(priv->wtd); + ESP32_WDT_UNLOCK(priv->wdt); /* No User Handler */ @@ -198,11 +198,11 @@ static int esp32_wtd_start(FAR struct watchdog_lowerhalf_s *lower) if (priv->peripheral == TIMER) { - ESP32_WTD_STG_CONF(priv->wtd, STAGE_0, RESET_SYSTEM_TIMER); + ESP32_WDT_STG_CONF(priv->wdt, STAGE_0, RESET_SYSTEM_TIMER); } else { - ESP32_WTD_STG_CONF(priv->wtd, STAGE_0, RESET_SYSTEM_RTC); + ESP32_WDT_STG_CONF(priv->wdt, STAGE_0, RESET_SYSTEM_RTC); } } @@ -212,30 +212,30 @@ static int esp32_wtd_start(FAR struct watchdog_lowerhalf_s *lower) { /* Then configure it to call the user handler on wdt expiration */ - ESP32_WTD_STG_CONF(priv->wtd, STAGE_0, INTERRUPT_ON_TIMEOUT); + ESP32_WDT_STG_CONF(priv->wdt, STAGE_0, INTERRUPT_ON_TIMEOUT); /* Set the lower half handler and enable interrupt */ flags = enter_critical_section(); - ESP32_WTD_SETISR(priv->wtd, esp32_wdt_handler, priv); + ESP32_WDT_SETISR(priv->wdt, esp32_wdt_handler, priv); leave_critical_section(flags); - ESP32_WTD_ENABLEINT(priv->wtd); + ESP32_WDT_ENABLEINT(priv->wdt); } flags = enter_critical_section(); priv->lastreset = clock_systime_ticks(); - ESP32_WTD_START(priv->wtd); + ESP32_WDT_START(priv->wdt); leave_critical_section(flags); /* Lock it again */ - ESP32_WTD_LOCK(priv->wtd); + ESP32_WDT_LOCK(priv->wdt); } errout: return ret; } /**************************************************************************** - * Name: esp32_wtd_stop + * Name: esp32_wdt_stop * * Description: * Stop the watchdog timer. In case a callback was previously configured, @@ -247,33 +247,33 @@ static int esp32_wtd_start(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int esp32_wtd_stop(FAR struct watchdog_lowerhalf_s *lower) +static int esp32_wdt_stop(FAR struct watchdog_lowerhalf_s *lower) { - FAR struct esp32_wtd_lowerhalf_s *priv = - (FAR struct esp32_wtd_lowerhalf_s *)lower; + FAR struct esp32_wdt_lowerhalf_s *priv = + (FAR struct esp32_wdt_lowerhalf_s *)lower; irqstate_t flags; /* Unlock WDT */ - ESP32_WTD_UNLOCK(priv->wtd); + ESP32_WDT_UNLOCK(priv->wdt); /* Disable the WDT */ - ESP32_WTD_STOP(priv->wtd); + ESP32_WDT_STOP(priv->wdt); /* In case there is some callback registered, disable and deallocate */ if (priv->handler != NULL) { - ESP32_WTD_DISABLEINT(priv->wtd); + ESP32_WDT_DISABLEINT(priv->wdt); flags = enter_critical_section(); - ESP32_WTD_SETISR(priv->wtd, NULL, NULL); + ESP32_WDT_SETISR(priv->wdt, NULL, NULL); leave_critical_section(flags); } /* Lock it again */ - ESP32_WTD_LOCK(priv->wtd); + ESP32_WDT_LOCK(priv->wdt); priv->started = false; @@ -281,7 +281,7 @@ static int esp32_wtd_stop(FAR struct watchdog_lowerhalf_s *lower) } /**************************************************************************** - * Name: esp32_wtd_keepalive + * Name: esp32_wdt_keepalive * * Description: * Reset the watchdog timer, prevent any @@ -295,34 +295,34 @@ static int esp32_wtd_stop(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int esp32_wtd_keepalive(FAR struct watchdog_lowerhalf_s *lower) +static int esp32_wdt_keepalive(FAR struct watchdog_lowerhalf_s *lower) { - FAR struct esp32_wtd_lowerhalf_s *priv = - (FAR struct esp32_wtd_lowerhalf_s *)lower; + FAR struct esp32_wdt_lowerhalf_s *priv = + (FAR struct esp32_wdt_lowerhalf_s *)lower; irqstate_t flags; wdinfo("Entry\n"); /* Unlock */ - ESP32_WTD_UNLOCK(priv->wtd); + ESP32_WDT_UNLOCK(priv->wdt); /* Feed the dog and updates the lastreset variable */ flags = enter_critical_section(); priv->lastreset = clock_systime_ticks(); - ESP32_WTD_FEED(priv->wtd); + ESP32_WDT_FEED(priv->wdt); leave_critical_section(flags); /* Lock */ - ESP32_WTD_LOCK(priv->wtd); + ESP32_WDT_LOCK(priv->wdt); return OK; } /**************************************************************************** - * Name: esp32_wtd_getstatus + * Name: esp32_wdt_getstatus * * Description: * Get the current watchdog timer status @@ -334,11 +334,11 @@ static int esp32_wtd_keepalive(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int esp32_wtd_getstatus(FAR struct watchdog_lowerhalf_s *lower, +static int esp32_wdt_getstatus(FAR struct watchdog_lowerhalf_s *lower, FAR struct watchdog_status_s *status) { - FAR struct esp32_wtd_lowerhalf_s *priv = - (FAR struct esp32_wtd_lowerhalf_s *)lower; + FAR struct esp32_wdt_lowerhalf_s *priv = + (FAR struct esp32_wdt_lowerhalf_s *)lower; uint32_t ticks; uint32_t elapsed; @@ -388,7 +388,7 @@ static int esp32_wtd_getstatus(FAR struct watchdog_lowerhalf_s *lower, } /**************************************************************************** - * Name: esp32_wtd_settimeout + * Name: esp32_wdt_settimeout * * Description: * Set a new timeout value (and reset the watchdog timer) @@ -403,11 +403,11 @@ static int esp32_wtd_getstatus(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int esp32_wtd_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int esp32_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower, uint32_t timeout) { - FAR struct esp32_wtd_lowerhalf_s *priv = - (FAR struct esp32_wtd_lowerhalf_s *)lower; + FAR struct esp32_wdt_lowerhalf_s *priv = + (FAR struct esp32_wdt_lowerhalf_s *)lower; uint16_t rtc_cycles = 0; uint32_t rtc_ms_max = 0; @@ -416,7 +416,7 @@ static int esp32_wtd_settimeout(FAR struct watchdog_lowerhalf_s *lower, /* Unlock WDT */ - ESP32_WTD_UNLOCK(priv->wtd); + ESP32_WDT_UNLOCK(priv->wdt); /* Write the timeout value */ @@ -437,7 +437,7 @@ static int esp32_wtd_settimeout(FAR struct watchdog_lowerhalf_s *lower, else { timeout = timeout*MS_CYCLES_TIMER; - ESP32_WTD_STO(priv->wtd, timeout, STAGE_0); + ESP32_WDT_STO(priv->wdt, timeout, STAGE_0); } } @@ -445,7 +445,7 @@ static int esp32_wtd_settimeout(FAR struct watchdog_lowerhalf_s *lower, else { - rtc_cycles = ESP32_RWDT_CLK(priv->wtd); + rtc_cycles = ESP32_RWDT_CLK(priv->wdt); rtc_ms_max = (uint32_t)(FULL_STAGE / rtc_cycles); /* Is this timeout a valid value for RTC WDT? */ @@ -459,23 +459,23 @@ static int esp32_wtd_settimeout(FAR struct watchdog_lowerhalf_s *lower, else { timeout = timeout*rtc_cycles; - ESP32_WTD_STO(priv->wtd, timeout, STAGE_0); + ESP32_WDT_STO(priv->wdt, timeout, STAGE_0); } } /* Reset the wdt */ - ESP32_WTD_FEED(priv->wtd); + ESP32_WDT_FEED(priv->wdt); /* Lock it again */ - ESP32_WTD_LOCK(priv->wtd); + ESP32_WDT_LOCK(priv->wdt); return OK; } /**************************************************************************** - * Name: esp32_wtd_capture + * Name: esp32_wdt_capture * * Description: * Don't reset on watchdog timer timeout; instead, call this user provider @@ -496,11 +496,11 @@ static int esp32_wtd_settimeout(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static xcpt_t esp32_wtd_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t esp32_wdt_capture(FAR struct watchdog_lowerhalf_s *lower, xcpt_t handler) { - FAR struct esp32_wtd_lowerhalf_s *priv = - (FAR struct esp32_wtd_lowerhalf_s *)lower; + FAR struct esp32_wdt_lowerhalf_s *priv = + (FAR struct esp32_wdt_lowerhalf_s *)lower; irqstate_t flags; xcpt_t oldhandler; @@ -511,7 +511,7 @@ static xcpt_t esp32_wtd_capture(FAR struct watchdog_lowerhalf_s *lower, oldhandler = priv->handler; - ESP32_WTD_UNLOCK(priv->wtd); + ESP32_WDT_UNLOCK(priv->wdt); flags = enter_critical_section(); @@ -532,7 +532,7 @@ static xcpt_t esp32_wtd_capture(FAR struct watchdog_lowerhalf_s *lower, if (oldhandler != NULL) { - ESP32_WTD_SETISR(priv->wtd, NULL, NULL); + ESP32_WDT_SETISR(priv->wdt, NULL, NULL); } else { @@ -540,36 +540,36 @@ static xcpt_t esp32_wtd_capture(FAR struct watchdog_lowerhalf_s *lower, * then change to interrupt. */ - ESP32_WTD_STG_CONF(priv->wtd, STAGE_0, INTERRUPT_ON_TIMEOUT); + ESP32_WDT_STG_CONF(priv->wdt, STAGE_0, INTERRUPT_ON_TIMEOUT); } /* Set the lower half handler and enable interrupt */ - ESP32_WTD_SETISR(priv->wtd, esp32_wdt_handler, priv); - ESP32_WTD_ENABLEINT(priv->wtd); + ESP32_WDT_SETISR(priv->wdt, esp32_wdt_handler, priv); + ESP32_WDT_ENABLEINT(priv->wdt); } /* In case the user wants to disable the callback */ else { - ESP32_WTD_DISABLEINT(priv->wtd); - ESP32_WTD_SETISR(priv->wtd, NULL, NULL); + ESP32_WDT_DISABLEINT(priv->wdt); + ESP32_WDT_SETISR(priv->wdt, NULL, NULL); /* Then configure it to reset on wdt expiration */ if (priv->peripheral == TIMER) { - ESP32_WTD_STG_CONF(priv->wtd, STAGE_0, RESET_SYSTEM_TIMER); + ESP32_WDT_STG_CONF(priv->wdt, STAGE_0, RESET_SYSTEM_TIMER); } else { - ESP32_WTD_STG_CONF(priv->wtd, STAGE_0, RESET_SYSTEM_RTC); + ESP32_WDT_STG_CONF(priv->wdt, STAGE_0, RESET_SYSTEM_RTC); } } leave_critical_section(flags); - ESP32_WTD_LOCK(priv->wtd); + ESP32_WDT_LOCK(priv->wdt); return oldhandler; } @@ -577,9 +577,9 @@ static xcpt_t esp32_wtd_capture(FAR struct watchdog_lowerhalf_s *lower, static int esp32_wdt_handler(int irq, FAR void *context, FAR void *arg) { - FAR struct esp32_wtd_lowerhalf_s *priv = arg; + FAR struct esp32_wdt_lowerhalf_s *priv = arg; - ESP32_WTD_UNLOCK(priv->wtd); + ESP32_WDT_UNLOCK(priv->wdt); /* Updates last reset var and feed the dog to reload the counter and * to allow the application to continue executing. @@ -587,14 +587,14 @@ static int esp32_wdt_handler(int irq, FAR void *context, FAR void *arg) #ifdef CONFIG_DEBUG_WATCHDOG priv->lastreset = clock_systime_ticks(); #endif - ESP32_WTD_FEED(priv->wtd); + ESP32_WDT_FEED(priv->wdt); /* Run the user callback */ priv->handler(irq, context, priv->upper); - ESP32_WTD_ACKINT(priv->wtd); /* Clear the Interrupt */ - ESP32_WTD_LOCK(priv->wtd); + ESP32_WDT_ACKINT(priv->wdt); /* Clear the Interrupt */ + ESP32_WDT_LOCK(priv->wdt); return OK; } @@ -604,7 +604,7 @@ static int esp32_wdt_handler(int irq, FAR void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: esp32_wtd_initialize + * Name: esp32_wdt_initialize * * Description: * Initialize the WDT watchdog timer. The watchdog timer is initialized @@ -621,9 +621,9 @@ static int esp32_wdt_handler(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -int esp32_wtd_initialize(FAR const char *devpath, uint8_t wdt) +int esp32_wdt_initialize(FAR const char *devpath, uint8_t wdt) { - struct esp32_wtd_lowerhalf_s *lower = NULL; + struct esp32_wdt_lowerhalf_s *lower = NULL; int ret = OK; DEBUGASSERT(devpath); @@ -668,17 +668,17 @@ int esp32_wtd_initialize(FAR const char *devpath, uint8_t wdt) lower->handler = NULL; lower->timeout = 0; - lower->wtd = esp32_wtd_init(wdt); + lower->wdt = esp32_wdt_init(wdt); - if (lower->wtd == NULL) + if (lower->wdt == NULL) { ret = -EINVAL; goto errout; } - lower->started = esp32_wtd_is_running(lower->wtd); + lower->started = esp32_wdt_is_running(lower->wdt); - ESP32_WTD_UNLOCK(lower->wtd); + ESP32_WDT_UNLOCK(lower->wdt); /* If it is a Main System Watchdog Timer configure the Prescale to * have a 500us period. @@ -686,10 +686,10 @@ int esp32_wtd_initialize(FAR const char *devpath, uint8_t wdt) if (lower->peripheral == TIMER) { - ESP32_WTD_PRE(lower->wtd, PRE_VALUE); + ESP32_WDT_PRE(lower->wdt, PRE_VALUE); } - ESP32_WTD_LOCK(lower->wtd); + ESP32_WDT_LOCK(lower->wdt); /* Register the watchdog driver as /dev/watchdogX. If the registration goes * right the returned value from watchdog_register is a pointer to diff --git a/arch/xtensa/src/esp32/esp32_wtd_lowerhalf.h b/arch/xtensa/src/esp32/esp32_wdt_lowerhalf.h similarity index 86% rename from arch/xtensa/src/esp32/esp32_wtd_lowerhalf.h rename to arch/xtensa/src/esp32/esp32_wdt_lowerhalf.h index 517788c355..eec1db9ceb 100644 --- a/arch/xtensa/src/esp32/esp32_wtd_lowerhalf.h +++ b/arch/xtensa/src/esp32/esp32_wdt_lowerhalf.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/esp32_wtd_lowerhalf.h + * arch/xtensa/src/esp32/esp32_wdt_lowerhalf.h * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_WTD_LOWERHALF_H -#define __ARCH_XTENSA_SRC_ESP32_ESP32_WTD_LOWERHALF_H +#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_WDT_LOWERHALF_H +#define __ARCH_XTENSA_SRC_ESP32_ESP32_WDT_LOWERHALF_H /**************************************************************************** * Included Files @@ -47,6 +47,6 @@ enum wdt_peripherals * Name: esp32_timer_initialize ****************************************************************************/ -int esp32_wtd_initialize(FAR const char *devpath, uint8_t timer); +int esp32_wdt_initialize(FAR const char *devpath, uint8_t timer); -#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_WTD_LOWERHALF_H */ +#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_WDT_LOWERHALF_H */ diff --git a/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h b/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h index bca54d1d15..04281634c2 100644 --- a/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h +++ b/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h @@ -37,7 +37,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* WTD defines */ +/* WDT defines */ /* Offset relative to each wathdog timer instance memory base */ diff --git a/arch/xtensa/src/esp32/hardware/esp32_tim.h b/arch/xtensa/src/esp32/hardware/esp32_tim.h index 7deb8db6a7..4f8b0fc75c 100644 --- a/arch/xtensa/src/esp32/hardware/esp32_tim.h +++ b/arch/xtensa/src/esp32/hardware/esp32_tim.h @@ -48,7 +48,7 @@ #define TIM1_INT_ENA_OFFSET 0x0074 #define LOW_32_MASK 0xffffffff -/* WTD defines */ +/* WDT defines */ #define WRITE_PROTECTION_KEY 0x050d83aa1 diff --git a/boards/xtensa/esp32/common/src/esp32_board_wdt.c b/boards/xtensa/esp32/common/src/esp32_board_wdt.c index 57e8338497..ea423c1cc3 100644 --- a/boards/xtensa/esp32/common/src/esp32_board_wdt.c +++ b/boards/xtensa/esp32/common/src/esp32_board_wdt.c @@ -27,7 +27,7 @@ #include #include -#include "esp32_wtd_lowerhalf.h" +#include "esp32_wdt_lowerhalf.h" #include "esp32_board_wdt.h" /**************************************************************************** @@ -67,7 +67,7 @@ int board_wdt_init(void) int ret = OK; #ifdef CONFIG_ESP32_MWDT0 - ret = esp32_wtd_initialize("/dev/watchdog0", ESP32_MWDT0); + ret = esp32_wdt_initialize("/dev/watchdog0", ESP32_MWDT0); if (ret < 0) { syslog(LOG_ERR, @@ -78,7 +78,7 @@ int board_wdt_init(void) #endif #ifdef CONFIG_ESP32_MWDT1 - ret = esp32_wtd_initialize("/dev/watchdog1", ESP32_MWDT1); + ret = esp32_wdt_initialize("/dev/watchdog1", ESP32_MWDT1); if (ret < 0) { syslog(LOG_ERR, @@ -89,7 +89,7 @@ int board_wdt_init(void) #endif #ifdef CONFIG_ESP32_RWDT - ret = esp32_wtd_initialize("/dev/watchdog2", ESP32_RWDT); + ret = esp32_wdt_initialize("/dev/watchdog2", ESP32_RWDT); if (ret < 0) { syslog(LOG_ERR,