svn commit: [26165] trunk/busybox/miscutils

[vda at busybox.net]

Author: vda
Date: 2009-04-20 09:26:17 +0000 (Mon, 20 Apr 2009)
New Revision: 26165

Log:
watchdog: enable it before setting timeout

function                                             old     new   delta
watchdog_main                                        239     259     +20
static.enable                                          -       4      +4



Modified:
   trunk/busybox/miscutils/watchdog.c


Changeset:
Modified: trunk/busybox/miscutils/watchdog.c
===================================================================
--- trunk/busybox/miscutils/watchdog.c	2009-04-20 00:34:01 UTC (rev 26164)
+++ trunk/busybox/miscutils/watchdog.c	2009-04-20 09:26:17 UTC (rev 26165)
@@ -59,13 +59,20 @@
 	/* WDIOC_SETTIMEOUT takes seconds, not milliseconds */
 	htimer_duration = htimer_duration / 1000;
 #ifndef WDIOC_SETTIMEOUT
-#error WDIOC_SETTIMEOUT is not defined, cannot compile watchdog applet
+# error WDIOC_SETTIMEOUT is not defined, cannot compile watchdog applet
 #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);
 #endif
+
 #if 0
 	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);
 #endif