aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/watchdog.h
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2011-07-22 14:58:21 -0400
committerWim Van Sebroeck <wim@iguana.be>2011-07-28 04:01:11 -0400
commit014d694e5d59e4219803cd14deaae496d86e4910 (patch)
treec79d00c812b6f01fc477318cbcc003e2826f9f24 /include/linux/watchdog.h
parent234445b4e4542f3e0f216459245ab369a18adcf2 (diff)
watchdog: WatchDog Timer Driver Core - Add WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT ioctl
This part add's the WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT ioctl functionality to the WatchDog Timer Driver Core framework. Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'include/linux/watchdog.h')
-rw-r--r--include/linux/watchdog.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index db46fe89563e..9f33efe199d1 100644
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -69,6 +69,7 @@ struct watchdog_device;
69 * @stop: The routine for stopping the watchdog device. 69 * @stop: The routine for stopping the watchdog device.
70 * @ping: The routine that sends a keepalive ping to the watchdog device. 70 * @ping: The routine that sends a keepalive ping to the watchdog device.
71 * @status: The routine that shows the status of the watchdog device. 71 * @status: The routine that shows the status of the watchdog device.
72 * @set_timeout:The routine for setting the watchdog devices timeout value.
72 * 73 *
73 * The watchdog_ops structure contains a list of low-level operations 74 * The watchdog_ops structure contains a list of low-level operations
74 * that control a watchdog device. It also contains the module that owns 75 * that control a watchdog device. It also contains the module that owns
@@ -83,6 +84,7 @@ struct watchdog_ops {
83 /* optional operations */ 84 /* optional operations */
84 int (*ping)(struct watchdog_device *); 85 int (*ping)(struct watchdog_device *);
85 unsigned int (*status)(struct watchdog_device *); 86 unsigned int (*status)(struct watchdog_device *);
87 int (*set_timeout)(struct watchdog_device *, unsigned int);
86}; 88};
87 89
88/** struct watchdog_device - The structure that defines a watchdog device 90/** struct watchdog_device - The structure that defines a watchdog device
@@ -90,6 +92,7 @@ struct watchdog_ops {
90 * @info: Pointer to a watchdog_info structure. 92 * @info: Pointer to a watchdog_info structure.
91 * @ops: Pointer to the list of watchdog operations. 93 * @ops: Pointer to the list of watchdog operations.
92 * @bootstatus: Status of the watchdog device at boot. 94 * @bootstatus: Status of the watchdog device at boot.
95 * @timeout: The watchdog devices timeout value.
93 * @driver-data:Pointer to the drivers private data. 96 * @driver-data:Pointer to the drivers private data.
94 * @status: Field that contains the devices internal status bits. 97 * @status: Field that contains the devices internal status bits.
95 * 98 *
@@ -103,6 +106,7 @@ struct watchdog_device {
103 const struct watchdog_info *info; 106 const struct watchdog_info *info;
104 const struct watchdog_ops *ops; 107 const struct watchdog_ops *ops;
105 unsigned int bootstatus; 108 unsigned int bootstatus;
109 unsigned int timeout;
106 void *driver_data; 110 void *driver_data;
107 unsigned long status; 111 unsigned long status;
108/* Bit numbers for status flags */ 112/* Bit numbers for status flags */