diff options
| author | guo <[email protected]> | 2021-08-13 20:27:08 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-08-13 20:27:08 +0800 |
| commit | d05e209440f8f6d91213d208f2fed2e9743cb78a (patch) | |
| tree | 8ca670743b59c123b488137b47fa930c95008b14 | |
| parent | b29465408aea58dc6b5e38001b300f73233679d8 (diff) | |
| parent | 18c9c505925067609c59638dce52917b8291d403 (diff) | |
Merge pull request #4938 from chenyingchun0312/master
[bsp/nrf52x] optimize drv_wdt.c
| -rw-r--r-- | bsp/nrf5x/libraries/drivers/drv_wdt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bsp/nrf5x/libraries/drivers/drv_wdt.c b/bsp/nrf5x/libraries/drivers/drv_wdt.c index 168b1b8ac5..43769b2c10 100644 --- a/bsp/nrf5x/libraries/drivers/drv_wdt.c +++ b/bsp/nrf5x/libraries/drivers/drv_wdt.c @@ -6,6 +6,7 @@ * Change Logs: * Date Author Notes * 2020-08-18 ylz0923 first version + * 2021-08-12 chenyingchun optimize wdt_control arg usage */ #include <board.h> @@ -42,7 +43,7 @@ static rt_err_t wdt_control(rt_watchdog_t *wdt, int cmd, void *arg) break; /* set watchdog timeout */ case RT_DEVICE_CTRL_WDT_SET_TIMEOUT: - nrf5x_wdt_cfg.reload_value = (rt_uint32_t)arg * 1000; + nrf5x_wdt_cfg.reload_value = (*((rt_uint32_t*)arg)) * 1000; break; case RT_DEVICE_CTRL_WDT_GET_TIMEOUT: *((rt_uint32_t*)arg) = nrf5x_wdt_cfg.reload_value; @@ -79,9 +80,10 @@ INIT_BOARD_EXPORT(rt_wdt_init); static int wdt_sample(int argc, char *argv[]) { + rt_uint32_t timeout = 2; /* 溢出时间，单位：秒*/ rt_device_t wdt = rt_device_find("wdt"); rt_device_init(wdt); - rt_device_control(wdt, RT_DEVICE_CTRL_WDT_SET_TIMEOUT, (void *)2); + rt_device_control(wdt, RT_DEVICE_CTRL_WDT_SET_TIMEOUT, &timeout); rt_device_control(wdt, RT_DEVICE_CTRL_WDT_START, RT_NULL); } MSH_CMD_EXPORT(wdt_sample, wdt sample); |