watchdog: enable it before setting timeout

function                                             old     new   delta
watchdog_main                                        239     259     +20
static.enable                                          -       4      +4
This commit is contained in:
Denis Vlasenko 2009-04-20 09:26:17 +00:00
parent 8c64e033c0
commit e41fdbc279

View File

@ -59,13 +59,20 @@ int watchdog_main(int argc, char **argv)
/* WDIOC_SETTIMEOUT takes seconds, not milliseconds */ /* WDIOC_SETTIMEOUT takes seconds, not milliseconds */
htimer_duration = htimer_duration / 1000; htimer_duration = htimer_duration / 1000;
#ifndef WDIOC_SETTIMEOUT #ifndef WDIOC_SETTIMEOUT
#error WDIOC_SETTIMEOUT is not defined, cannot compile watchdog applet # error WDIOC_SETTIMEOUT is not defined, cannot compile watchdog applet
#else #else
# if defined WDIOC_SETOPTIONS && defined WDIOS_ENABLECARD
{
static const int enable = WDIOS_ENABLECARD;
ioctl_or_warn(3, WDIOC_SETOPTIONS, (void*) &enable);
}
# endif
ioctl_or_warn(3, WDIOC_SETTIMEOUT, &htimer_duration); ioctl_or_warn(3, WDIOC_SETTIMEOUT, &htimer_duration);
#endif #endif
#if 0 #if 0
ioctl_or_warn(3, WDIOC_GETTIMEOUT, &htimer_duration); ioctl_or_warn(3, WDIOC_GETTIMEOUT, &htimer_duration);
printf("watchdog: SW timer is %dms, HW timer is %dms\n", printf("watchdog: SW timer is %dms, HW timer is %ds\n",
stimer_duration, htimer_duration * 1000); stimer_duration, htimer_duration * 1000);
#endif #endif