From: Jamie Iles <jamie@jamieiles.com>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: LKML <linux-kernel@vger.kernel.org>,
Linux Watchdog Mailing List <linux-watchdog@vger.kernel.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: Re: [RFC] [PATCH 2/10] Generic Watchdog Timer Driver
Date: Thu, 24 Feb 2011 09:49:22 +0000 [thread overview]
Message-ID: <20110224094922.GB15118@pulham.picochip.com> (raw)
In-Reply-To: <20110223204228.GA7369@infomag.iguana.be>
On Wed, Feb 23, 2011 at 09:42:28PM +0100, Wim Van Sebroeck wrote:
> commit 79a856016f4f4314360d6efbbbc334828006a79f
> Author: Wim Van Sebroeck <wim@iguana.be>
> Date: Fri Jun 18 08:58:13 2010 +0000
>
> watchdog: WatchDog Timer Driver Core - Part 2
>
> This part add's the basic ioctl functionality to the
> WatchDog Timer Driver Core framework. The supported
> ioctl call's are:
> WDIOC_GETSUPPORT
> WDIOC_GETSTATUS
> WDIOC_GETBOOTSTATUS
>
> Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
>
> diff --git a/Documentation/watchdog/src/watchdog-with-timer-example.c b/Documentation/watchdog/src/watchdog-with-timer-example.c
> index d0b6056..ed7852a 100644
> --- a/Documentation/watchdog/src/watchdog-with-timer-example.c
> +++ b/Documentation/watchdog/src/watchdog-with-timer-example.c
> @@ -115,6 +115,10 @@ static int wdt_stop(struct watchdog_device *wdd)
> /*
> * The watchdog kernel structures
> */
> +static const struct watchdog_info wdt_info = {
> + .identity = DRV_NAME,
> +};
> +
> static const struct watchdog_ops wdt_ops = {
> .start = wdt_start,
> .stop = wdt_stop,
> @@ -123,6 +127,7 @@ static const struct watchdog_ops wdt_ops = {
>
> static struct watchdog_device wdt_dev = {
> .name = DRV_NAME,
> + .info = &wdt_info,
> .ops = &wdt_ops,
> };
>
> diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt
> index e69d1cc..9418d4c 100644
> --- a/Documentation/watchdog/watchdog-kernel-api.txt
> +++ b/Documentation/watchdog/watchdog-kernel-api.txt
> @@ -40,13 +40,19 @@ The watchdog device structure looks like this:
>
> struct watchdog_device {
> char *name;
> + const struct watchdog_info *info;
> const struct watchdog_ops *ops;
> + int bootstatus;
> long status;
> };
>
> It contains following fields:
> * name: a pointer to the (preferably unique) name of the watchdog timer device.
> +* info: a pointer to a watchdog_info structure. This structure gives some
> + additional information about the watchdog timer itself.
> * ops: a pointer to the list of watchdog operations that the watchdog supports.
> +* bootstatus: status of the device after booting (reported with watchdog
> + WDIOF_* status bits).
> * status: this field contains a number of status bits that give extra
> information about the status of the device (Like: is the device opened via
> the /dev/watchdog interface or not, ...)
> @@ -59,6 +65,7 @@ struct watchdog_ops {
> int (*stop)(struct watchdog_device *);
> /* optional operations */
> int (*ping)(struct watchdog_device *);
> + int (*status)(struct watchdog_device *);
It looks like the actual addition of .status to watchdog_ops happens in
the next patch rather than this one.
Jamie
next prev parent reply other threads:[~2011-02-24 12:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-23 20:42 Wim Van Sebroeck
2011-02-24 9:49 ` Jamie Iles [this message]
2011-02-25 9:59 ` Wim Van Sebroeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110224094922.GB15118@pulham.picochip.com \
--to=jamie@jamieiles.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®