Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] Documentation/watchdog update [WATCHDOG] convert AT91RM9200 watchdog to platform driver [WATCHDOG] add WDIOC_GETTIMELEFT ioctl [WATCHDOG] Pre-Timeout flags
This commit is contained in:
commit
fffcb480e4
10 changed files with 282 additions and 126 deletions
|
|
@ -28,6 +28,9 @@ struct watchdog_info {
|
|||
#define WDIOC_KEEPALIVE _IOR(WATCHDOG_IOCTL_BASE, 5, int)
|
||||
#define WDIOC_SETTIMEOUT _IOWR(WATCHDOG_IOCTL_BASE, 6, int)
|
||||
#define WDIOC_GETTIMEOUT _IOR(WATCHDOG_IOCTL_BASE, 7, int)
|
||||
#define WDIOC_SETPRETIMEOUT _IOWR(WATCHDOG_IOCTL_BASE, 8, int)
|
||||
#define WDIOC_GETPRETIMEOUT _IOR(WATCHDOG_IOCTL_BASE, 9, int)
|
||||
#define WDIOC_GETTIMELEFT _IOR(WATCHDOG_IOCTL_BASE, 10, int)
|
||||
|
||||
#define WDIOF_UNKNOWN -1 /* Unknown flag error */
|
||||
#define WDIOS_UNKNOWN -1 /* Unknown status error */
|
||||
|
|
@ -38,9 +41,10 @@ struct watchdog_info {
|
|||
#define WDIOF_EXTERN2 0x0008 /* External relay 2 */
|
||||
#define WDIOF_POWERUNDER 0x0010 /* Power bad/power fault */
|
||||
#define WDIOF_CARDRESET 0x0020 /* Card previously reset the CPU */
|
||||
#define WDIOF_POWEROVER 0x0040 /* Power over voltage */
|
||||
#define WDIOF_SETTIMEOUT 0x0080 /* Set timeout (in seconds) */
|
||||
#define WDIOF_MAGICCLOSE 0x0100 /* Supports magic close char */
|
||||
#define WDIOF_POWEROVER 0x0040 /* Power over voltage */
|
||||
#define WDIOF_SETTIMEOUT 0x0080 /* Set timeout (in seconds) */
|
||||
#define WDIOF_MAGICCLOSE 0x0100 /* Supports magic close char */
|
||||
#define WDIOF_PRETIMEOUT 0x0200 /* Pretimeout (in seconds), get/set */
|
||||
#define WDIOF_KEEPALIVEPING 0x8000 /* Keep alive ping reply */
|
||||
|
||||
#define WDIOS_DISABLECARD 0x0001 /* Turn off the watchdog timer */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue