diff --git a/targets/TARGET_NUVOTON/TARGET_M451/watchdog_api.c b/targets/TARGET_NUVOTON/TARGET_M451/watchdog_api.c index 308a577812..af1e864c15 100644 --- a/targets/TARGET_NUVOTON/TARGET_M451/watchdog_api.c +++ b/targets/TARGET_NUVOTON/TARGET_M451/watchdog_api.c @@ -21,11 +21,30 @@ #include "cmsis.h" -/* Micro seconds per second */ -#define NU_US_PER_SEC 1000000 +/* Define WDT clock source in target configuration option */ +#ifndef MBED_CONF_TARGET_WDT_CLKSRC_SEL +#define MBED_CONF_TARGET_WDT_CLKSRC_SEL LIRC +#endif + +/* WDT clock source definition */ +#define NU_INTERN_WDT_CLKSRC_LXT 1 +#define NU_INTERN_WDT_CLKSRC_LIRC 2 + +/* WDT clock source selection */ +#define NU_INTERN_WDT_CLKSRC_SEL__(SEL) NU_INTERN_WDT_CLKSRC_##SEL +#define NU_INTERN_WDT_CLKSRC_SEL_(SEL) NU_INTERN_WDT_CLKSRC_SEL__(SEL) +#define NU_INTERN_WDT_CLKSRC_SEL NU_INTERN_WDT_CLKSRC_SEL_(MBED_CONF_TARGET_WDT_CLKSRC_SEL) /* Watchdog clock per second */ +#if NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LXT +#define NU_WDTCLK_PER_SEC (__LXT) +#define NU_WDTCLK_PER_SEC_MAX (__LXT) +#define NU_WDTCLK_PER_SEC_MIN (__LXT) +#elif NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LIRC #define NU_WDTCLK_PER_SEC (__LIRC) +#define NU_WDTCLK_PER_SEC_MAX ((uint32_t) ((__LIRC) * 1.5f)) +#define NU_WDTCLK_PER_SEC_MIN ((uint32_t) ((__LIRC) * 0.5f)) +#endif /* Convert watchdog clock to nearest ms */ #define NU_WDTCLK2MS(WDTCLK) (((WDTCLK) * 1000 + ((NU_WDTCLK_PER_SEC) / 2)) / (NU_WDTCLK_PER_SEC)) @@ -84,7 +103,11 @@ watchdog_status_t hal_watchdog_init(const watchdog_config_t *config) CLK_EnableModuleClock(WDT_MODULE); /* Select IP clock source */ +#if NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LXT + CLK_SetModuleClock(WDT_MODULE, CLK_CLKSEL1_WDTSEL_LXT, 0); +#elif NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LIRC CLK_SetModuleClock(WDT_MODULE, CLK_CLKSEL1_WDTSEL_LIRC, 0); +#endif /* Set up IP interrupt */ NVIC_SetVector(WDT_IRQn, (uint32_t) WDT_IRQHandler); @@ -129,9 +152,10 @@ watchdog_features_t hal_watchdog_get_platform_features(void) wdt_feat.update_config = 1; /* Support stopping watchdog timer */ wdt_feat.disable_watchdog = 1; - /* Accuracy of watchdog timer */ - wdt_feat.clock_typical_frequency = 10000; - wdt_feat.clock_max_frequency = 15000; + /* Typical frequency of not calibrated watchdog clock in Hz */ + wdt_feat.clock_typical_frequency = NU_WDTCLK_PER_SEC; + /* Maximum frequency of not calibrated watchdog clock in Hz */ + wdt_feat.clock_max_frequency = NU_WDTCLK_PER_SEC_MAX; return wdt_feat; } diff --git a/targets/TARGET_NUVOTON/TARGET_M480/watchdog_api.c b/targets/TARGET_NUVOTON/TARGET_M480/watchdog_api.c index ce729b8147..f85a6d5d19 100644 --- a/targets/TARGET_NUVOTON/TARGET_M480/watchdog_api.c +++ b/targets/TARGET_NUVOTON/TARGET_M480/watchdog_api.c @@ -22,11 +22,30 @@ #include "cmsis.h" -/* Micro seconds per second */ -#define NU_US_PER_SEC 1000000 +/* Define WDT clock source in target configuration option */ +#ifndef MBED_CONF_TARGET_WDT_CLKSRC_SEL +#define MBED_CONF_TARGET_WDT_CLKSRC_SEL LIRC +#endif + +/* WDT clock source definition */ +#define NU_INTERN_WDT_CLKSRC_LXT 1 +#define NU_INTERN_WDT_CLKSRC_LIRC 2 + +/* WDT clock source selection */ +#define NU_INTERN_WDT_CLKSRC_SEL__(SEL) NU_INTERN_WDT_CLKSRC_##SEL +#define NU_INTERN_WDT_CLKSRC_SEL_(SEL) NU_INTERN_WDT_CLKSRC_SEL__(SEL) +#define NU_INTERN_WDT_CLKSRC_SEL NU_INTERN_WDT_CLKSRC_SEL_(MBED_CONF_TARGET_WDT_CLKSRC_SEL) /* Watchdog clock per second */ +#if NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LXT +#define NU_WDTCLK_PER_SEC (__LXT) +#define NU_WDTCLK_PER_SEC_MAX (__LXT) +#define NU_WDTCLK_PER_SEC_MIN (__LXT) +#elif NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LIRC #define NU_WDTCLK_PER_SEC (__LIRC) +#define NU_WDTCLK_PER_SEC_MAX ((uint32_t) ((__LIRC) * 2.0f)) +#define NU_WDTCLK_PER_SEC_MIN ((uint32_t) ((__LIRC) * 0.5f)) +#endif /* Convert watchdog clock to nearest ms */ #define NU_WDTCLK2MS(WDTCLK) (((WDTCLK) * 1000 + ((NU_WDTCLK_PER_SEC) / 2)) / (NU_WDTCLK_PER_SEC)) @@ -85,7 +104,11 @@ watchdog_status_t hal_watchdog_init(const watchdog_config_t *config) CLK_EnableModuleClock(WDT_MODULE); /* Select IP clock source */ +#if NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LXT + CLK_SetModuleClock(WDT_MODULE, CLK_CLKSEL1_WDTSEL_LXT, 0); +#elif NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LIRC CLK_SetModuleClock(WDT_MODULE, CLK_CLKSEL1_WDTSEL_LIRC, 0); +#endif /* Set up IP interrupt */ NVIC_SetVector(WDT_IRQn, (uint32_t) WDT_IRQHandler); @@ -130,10 +153,10 @@ watchdog_features_t hal_watchdog_get_platform_features(void) wdt_feat.update_config = 1; /* Support stopping watchdog timer */ wdt_feat.disable_watchdog = 1; - /* Accuracy of watchdog timer */ - wdt_feat.clock_typical_frequency = 10000; - wdt_feat.clock_max_frequency = 15000; - + /* Typical frequency of not calibrated watchdog clock in Hz */ + wdt_feat.clock_typical_frequency = NU_WDTCLK_PER_SEC; + /* Maximum frequency of not calibrated watchdog clock in Hz */ + wdt_feat.clock_max_frequency = NU_WDTCLK_PER_SEC_MAX; return wdt_feat; } diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/watchdog_api.c b/targets/TARGET_NUVOTON/TARGET_NANO100/watchdog_api.c index 907657888a..c0bc933cca 100644 --- a/targets/TARGET_NUVOTON/TARGET_NANO100/watchdog_api.c +++ b/targets/TARGET_NUVOTON/TARGET_NANO100/watchdog_api.c @@ -20,11 +20,31 @@ #include "cmsis.h" -/* Micro seconds per second */ -#define NU_US_PER_SEC 1000000 +/* Define WDT clock source in target configuration option */ +#ifndef MBED_CONF_TARGET_WDT_CLKSRC_SEL +#define MBED_CONF_TARGET_WDT_CLKSRC_SEL LIRC +#endif + +/* WDT clock source definition */ +#define NU_INTERN_WDT_CLKSRC_LXT 1 +/* Not support LIRC clocked WDT */ +//#define NU_INTERN_WDT_CLKSRC_LIRC 2 + +/* WDT clock source selection */ +#define NU_INTERN_WDT_CLKSRC_SEL__(SEL) NU_INTERN_WDT_CLKSRC_##SEL +#define NU_INTERN_WDT_CLKSRC_SEL_(SEL) NU_INTERN_WDT_CLKSRC_SEL__(SEL) +#define NU_INTERN_WDT_CLKSRC_SEL NU_INTERN_WDT_CLKSRC_SEL_(MBED_CONF_TARGET_WDT_CLKSRC_SEL) /* Watchdog clock per second */ +#if NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LXT +#define NU_WDTCLK_PER_SEC (__LXT) +#define NU_WDTCLK_PER_SEC_MAX (__LXT) +#define NU_WDTCLK_PER_SEC_MIN (__LXT) +#elif NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LIRC #define NU_WDTCLK_PER_SEC (__LIRC) +#define NU_WDTCLK_PER_SEC_MAX ((uint32_t) ((__LIRC) * 1.5f)) +#define NU_WDTCLK_PER_SEC_MIN ((uint32_t) ((__LIRC) * 0.5f)) +#endif /* Convert watchdog clock to nearest ms */ #define NU_WDTCLK2MS(WDTCLK) (((WDTCLK) * 1000 + ((NU_WDTCLK_PER_SEC) / 2)) / (NU_WDTCLK_PER_SEC)) @@ -134,9 +154,10 @@ watchdog_features_t hal_watchdog_get_platform_features(void) wdt_feat.update_config = 1; /* Support stopping watchdog timer */ wdt_feat.disable_watchdog = 1; - /* Accuracy of watchdog timer */ - wdt_feat.clock_typical_frequency = 10000; - wdt_feat.clock_max_frequency = 15000; + /* Typical frequency of not calibrated watchdog clock in Hz */ + wdt_feat.clock_typical_frequency = NU_WDTCLK_PER_SEC; + /* Maximum frequency of not calibrated watchdog clock in Hz */ + wdt_feat.clock_max_frequency = NU_WDTCLK_PER_SEC_MAX; return wdt_feat; } diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/watchdog_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/watchdog_api.c index aa4f4e130b..529cd73244 100644 --- a/targets/TARGET_NUVOTON/TARGET_NUC472/watchdog_api.c +++ b/targets/TARGET_NUVOTON/TARGET_NUC472/watchdog_api.c @@ -20,11 +20,30 @@ #include "cmsis.h" -/* Micro seconds per second */ -#define NU_US_PER_SEC 1000000 +/* Define WDT clock source in target configuration option */ +#ifndef MBED_CONF_TARGET_WDT_CLKSRC_SEL +#define MBED_CONF_TARGET_WDT_CLKSRC_SEL LIRC +#endif + +/* WDT clock source definition */ +#define NU_INTERN_WDT_CLKSRC_LXT 1 +#define NU_INTERN_WDT_CLKSRC_LIRC 2 + +/* WDT clock source selection */ +#define NU_INTERN_WDT_CLKSRC_SEL__(SEL) NU_INTERN_WDT_CLKSRC_##SEL +#define NU_INTERN_WDT_CLKSRC_SEL_(SEL) NU_INTERN_WDT_CLKSRC_SEL__(SEL) +#define NU_INTERN_WDT_CLKSRC_SEL NU_INTERN_WDT_CLKSRC_SEL_(MBED_CONF_TARGET_WDT_CLKSRC_SEL) /* Watchdog clock per second */ +#if NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LXT +#define NU_WDTCLK_PER_SEC (__LXT) +#define NU_WDTCLK_PER_SEC_MAX (__LXT) +#define NU_WDTCLK_PER_SEC_MIN (__LXT) +#elif NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LIRC #define NU_WDTCLK_PER_SEC (__LIRC) +#define NU_WDTCLK_PER_SEC_MAX ((uint32_t) ((__LIRC) * 1.4f)) +#define NU_WDTCLK_PER_SEC_MIN ((uint32_t) ((__LIRC) * 0.6f)) +#endif /* Convert watchdog clock to nearest ms */ #define NU_WDTCLK2MS(WDTCLK) (((WDTCLK) * 1000 + ((NU_WDTCLK_PER_SEC) / 2)) / (NU_WDTCLK_PER_SEC)) @@ -83,7 +102,11 @@ watchdog_status_t hal_watchdog_init(const watchdog_config_t *config) CLK_EnableModuleClock(WDT_MODULE); /* Select IP clock source */ +#if NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LXT + CLK_SetModuleClock(WDT_MODULE, CLK_CLKSEL1_WDTSEL_LXT, 0); +#elif NU_INTERN_WDT_CLKSRC_SEL == NU_INTERN_WDT_CLKSRC_LIRC CLK_SetModuleClock(WDT_MODULE, CLK_CLKSEL1_WDTSEL_LIRC, 0); +#endif /* Set up IP interrupt */ NVIC_SetVector(WDT_IRQn, (uint32_t) WDT_IRQHandler); @@ -128,9 +151,10 @@ watchdog_features_t hal_watchdog_get_platform_features(void) wdt_feat.update_config = 1; /* Support stopping watchdog timer */ wdt_feat.disable_watchdog = 1; - /* Accuracy of watchdog timer */ - wdt_feat.clock_typical_frequency = 10000; - wdt_feat.clock_max_frequency = 14000; + /* Typical frequency of not calibrated watchdog clock in Hz */ + wdt_feat.clock_typical_frequency = NU_WDTCLK_PER_SEC; + /* Maximum frequency of not calibrated watchdog clock in Hz */ + wdt_feat.clock_max_frequency = NU_WDTCLK_PER_SEC_MAX; return wdt_feat; }