diff options
author | n_hibma <n_hibma@FreeBSD.org> | 2006-12-15 21:44:49 +0000 |
---|---|---|
committer | n_hibma <n_hibma@FreeBSD.org> | 2006-12-15 21:44:49 +0000 |
commit | c98f016084f145e9f139ad1dfbc2cf59f8188f5e (patch) | |
tree | 787bbfce7ce18dfa578e01e209a342d73f933983 /sys/dev/ichwd | |
parent | 705f242eca7e1a52b43a762cced4eaa8de4c0818 (diff) | |
download | FreeBSD-src-c98f016084f145e9f139ad1dfbc2cf59f8188f5e.zip FreeBSD-src-c98f016084f145e9f139ad1dfbc2cf59f8188f5e.tar.gz |
Align the interfaces for the various watchdogs and make the interface
behave as expected.
Also:
- Return an error if WD_PASSIVE is passed in to the ioctl as only
WD_ACTIVE is implemented at the moment. See sys/watchdog.h for an
explanation of the difference between WD_ACTIVE and WD_PASSIVE.
- Remove the I_HAVE_TOTALLY_LOST_MY_SENSE_OF_HUMOR define. If you've
lost your sense of humor, than don't add a define.
Specific changes:
i80321_wdog.c
Don't roll your own passive watchdog tickle as this would defeat the
purpose of an active (userland) watchdog tickle.
ichwd.c / ipmi.c:
WD_ACTIVE means active patting of the watchdog by a userland process,
not whether the watchdog is active. See sys/watchdog.h.
kern_clock.c:
(software watchdog) Remove a check for WD_ACTIVE as this does not make
sense here. This reverts r1.181.
Diffstat (limited to 'sys/dev/ichwd')
-rw-r--r-- | sys/dev/ichwd/ichwd.c | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c index 8ddeb8c..f878d39 100644 --- a/sys/dev/ichwd/ichwd.c +++ b/sys/dev/ichwd/ichwd.c @@ -178,38 +178,22 @@ ichwd_event(void *arg, unsigned int cmd, int *error) struct ichwd_softc *sc = arg; unsigned int timeout; + /* convert from power-of-two-ns to WDT ticks */ + cmd &= WD_INTERVAL; + timeout = ((uint64_t)1 << cmd) / ICHWD_TICK; + if (cmd > 0 && cmd <= 63 + && timeout >= ICHWD_MIN_TIMEOUT && timeout <= ICHWD_MAX_TIMEOUT) { + if (timeout != sc->timeout) + ichwd_tmr_set(sc, timeout); - /* disable / enable */ - if (!(cmd & WD_ACTIVE)) { + ichwd_tmr_reload(sc); + *error = 0; + } else { if (sc->active) ichwd_tmr_disable(sc); - *error = 0; - return; - } - if (!sc->active) - ichwd_tmr_enable(sc); - - cmd &= WD_INTERVAL; - /* convert from power-of-to-ns to WDT ticks */ - if (cmd >= 64) { - *error = EINVAL; - return; - } - timeout = ((uint64_t)1 << cmd) / ICHWD_TICK; - if (timeout < ICHWD_MIN_TIMEOUT || timeout > ICHWD_MAX_TIMEOUT) { - *error = EINVAL; - return; + if (cmd > 0) + *error = EINVAL; } - - /* set new initial value */ - if (timeout != sc->timeout) - ichwd_tmr_set(sc, timeout); - - /* reload */ - ichwd_tmr_reload(sc); - - *error = 0; - return; } static unsigned int pmbase = 0; @@ -332,8 +316,6 @@ ichwd_detach(device_t dev) { struct ichwd_softc *sc; - device_printf(dev, "detaching\n"); - sc = device_get_softc(dev); /* halt the watchdog timer */ |