libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2847 from balanceTWK/master_wdt 

[bsp][stm32] update drv_wdt.c
This commit is contained in:
Bernard Xiong 2019-07-12 19:03:52 +08:00 committed by GitHub
parent 34fa16cb70 7cca808705
commit fe556e6332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
bsp/stm32/libraries/HAL_Drivers/drv_wdt.c
View File

@ -16,25 +16,17 @@
#define LOG_TAG "drv.wdt" #define LOG_TAG "drv.wdt"
#include <drv_log.h> #include <drv_log.h>
static IWDG_HandleTypeDef hiwdg; struct stm32_wdt_obj
{
IWDG_HandleTypeDef hiwdg;
rt_uint16_t is_start;
};
static struct stm32_wdt_obj stm32_wdt;
static struct rt_watchdog_ops ops; static struct rt_watchdog_ops ops;
static rt_watchdog_t watchdog; static rt_watchdog_t watchdog;
static rt_err_t wdt_init(rt_watchdog_t *wdt) static rt_err_t wdt_init(rt_watchdog_t *wdt)
{ {
hiwdg.Instance = IWDG;
hiwdg.Init.Prescaler = IWDG_PRESCALER_256;
hiwdg.Init.Reload = 0x00000FFF;
#if defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F7)
hiwdg.Init.Window = 0x00000FFF;
#endif
if (HAL_IWDG_Init(&hiwdg) != HAL_OK)
{
LOG_E("wdt init failed.");
return -RT_ERROR;
}
return RT_EOK; return RT_EOK;
} }
@ -44,38 +36,44 @@ static rt_err_t wdt_control(rt_watchdog_t *wdt, int cmd, void *arg)
{ {
/* feed the watchdog */ /* feed the watchdog */
case RT_DEVICE_CTRL_WDT_KEEPALIVE: case RT_DEVICE_CTRL_WDT_KEEPALIVE:
HAL_IWDG_Refresh(&hiwdg); if(HAL_IWDG_Refresh(&stm32_wdt.hiwdg) != HAL_OK)
{
LOG_E("watch dog keepalive fail.");
}
break; break;
/* set watchdog timeout */ /* set watchdog timeout */
case RT_DEVICE_CTRL_WDT_SET_TIMEOUT: case RT_DEVICE_CTRL_WDT_SET_TIMEOUT:
#if defined(LSI_VALUE) #if defined(LSI_VALUE)
if(LSI_VALUE) if(LSI_VALUE)
{ {
hiwdg.Init.Reload = (*((rt_uint32_t*)arg)) * LSI_VALUE / 256 ; stm32_wdt.hiwdg.Init.Reload = (*((rt_uint32_t*)arg)) * LSI_VALUE / 256 ;
} }
else else
{ {
LOG_E("Please define the value of LSI_VALUE!"); LOG_E("Please define the value of LSI_VALUE!");
} }
if(stm32_wdt.hiwdg.Init.Reload > 0xFFF)
{
LOG_E("wdg set timeout parameter too large, please less than %ds",0xFFF * 256 / LSI_VALUE);
return -RT_EINVAL;
}
#else #else
#error "Please define the value of LSI_VALUE!" #error "Please define the value of LSI_VALUE!"
#endif #endif
if(hiwdg.Init.Reload > 0xFFF) if(stm32_wdt.is_start)
{ {
LOG_E("wdg set timeout parameter too large."); if (HAL_IWDG_Init(&stm32_wdt.hiwdg) != HAL_OK)
return -RT_EINVAL; {
} LOG_E("wdg set timeout failed.");
if (HAL_IWDG_Init(&hiwdg) != HAL_OK) return -RT_ERROR;
{ }
LOG_E("wdg set timeout failed.");
return -RT_ERROR;
} }
break; break;
case RT_DEVICE_CTRL_WDT_GET_TIMEOUT: case RT_DEVICE_CTRL_WDT_GET_TIMEOUT:
#if defined(LSI_VALUE) #if defined(LSI_VALUE)
if(LSI_VALUE) if(LSI_VALUE)
{ {
(*((rt_uint32_t*)arg)) = hiwdg.Init.Reload * 256 / LSI_VALUE; (*((rt_uint32_t*)arg)) = stm32_wdt.hiwdg.Init.Reload * 256 / LSI_VALUE;
} }
else else
{ {
@ -85,6 +83,13 @@ static rt_err_t wdt_control(rt_watchdog_t *wdt, int cmd, void *arg)
#error "Please define the value of LSI_VALUE!" #error "Please define the value of LSI_VALUE!"
#endif #endif
break; break;
case RT_DEVICE_CTRL_WDT_START:
if (HAL_IWDG_Init(&stm32_wdt.hiwdg) != HAL_OK)
{
LOG_E("wdt start failed.");
return -RT_ERROR;
}
stm32_wdt.is_start = 1;
default: default:
return -RT_ERROR; return -RT_ERROR;
} }
@ -93,6 +98,15 @@ static rt_err_t wdt_control(rt_watchdog_t *wdt, int cmd, void *arg)
int rt_wdt_init(void) int rt_wdt_init(void)
{ {
stm32_wdt.hiwdg.Instance = IWDG;
stm32_wdt.hiwdg.Init.Prescaler = IWDG_PRESCALER_256;
stm32_wdt.hiwdg.Init.Reload = 0x00000FFF;
#if defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F7)
stm32_wdt.hiwdg.Init.Window = 0x00000FFF;
#endif
stm32_wdt.is_start = 0;
ops.init = &wdt_init; ops.init = &wdt_init;
ops.control = &wdt_control; ops.control = &wdt_control;
watchdog.ops = &ops; watchdog.ops = &ops;