michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: task_wdt: improve device usage

Browse source 
When no hardware device is available, set WDT_NODE to DT_INVALID_NODE.
Also switch to a single initializer using DEVICE_DT_GET_OR_NULL so that
we can constify the pointer.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-08-22 12:18:40 +02:00 • committed by Carles Cufí
commit aa0a7dfa92
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
samples/subsys/task_wdt/src/main.c
View file

@ -37,6 +37,8 @@
#define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nxp_kinetis_wdog32)
#elif DT_HAS_COMPAT_STATUS_OKAY(microchip_xec_watchdog)
#define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(microchip_xec_watchdog)
#else
#define WDT_NODE DT_INVALID_NODE
#endif
static void task_wdt_callback(int channel_id, void *user_data)
@ -59,18 +61,12 @@ static void task_wdt_callback(int channel_id, void *user_data)
void main(void)
{
int ret;
#ifdef WDT_NODE
const struct device *hw_wdt_dev = DEVICE_DT_GET(WDT_NODE);
#else
const struct device *hw_wdt_dev = NULL;
#endif
const struct device *const hw_wdt_dev = DEVICE_DT_GET_OR_NULL(WDT_NODE);
printk("Task watchdog sample application.\n");
if (!device_is_ready(hw_wdt_dev)) {
printk("Hardware watchdog %s is not ready; ignoring it.\n",
hw_wdt_dev->name);
hw_wdt_dev = NULL;
printk("Hardware watchdog not ready; ignoring it.\n");
}
ret = task_wdt_init(hw_wdt_dev);