From owner-freebsd-current@FreeBSD.ORG  Tue Dec 12 07:50:21 2006
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@freebsd.org
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 707BD16A50A
	for <freebsd-current@freebsd.org>; Tue, 12 Dec 2006 07:50:21 +0000 (UTC)
	(envelope-from nick@van-laarhoven.org)
Received: from smtp-1.orange.nl (smtp-1.orange.nl [193.252.22.241])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1E7A743DBC
	for <freebsd-current@freebsd.org>; Tue, 12 Dec 2006 07:48:37 +0000 (GMT)
	(envelope-from nick@van-laarhoven.org)
Received: from uitsmijter.van-laarhoven.org (ap-zvhz-13f05.adsl.wanadoo.nl
	[81.69.93.5])
	by mwinf6006.orange.nl (SMTP Server) with ESMTP id 1F3167000081
	for <freebsd-current@freebsd.org>; Tue, 12 Dec 2006 08:49:55 +0100 (CET)
X-ME-UUID: 20061212074956127.1F3167000081@mwinf6006.orange.nl
Received: (qmail 78962 invoked from network); 12 Dec 2006 07:49:55 -0000
Received: from 10.66.0.143 by uitsmijter.van-laarhoven.org (envelope-from
	<nick@van-laarhoven.org>, uid 82) with qmail-scanner-1.25 
	(clamdscan: 0.88.4/2187. f-prot: 4.6.6/3.16.14. spamassassin: 3.1.7. 
	Clear:RC:1(10.66.0.143):. 
	Processed in 0.389399 secs); 12 Dec 2006 07:49:55 -0000
X-Qmail-Scanner-Mail-From: nick@van-laarhoven.org via
	uitsmijter.van-laarhoven.org
X-Qmail-Scanner: 1.25 (Clear:RC:1(10.66.0.143):. Processed in 0.389399 secs)
Received: from unknown (HELO van-laarhoven.org) (nick@10.66.0.143)
	by uitsmijter.van-laarhoven.org with SMTP; 12 Dec 2006 07:49:55 -0000
Received: (nullmailer pid 1308 invoked by uid 1001);
	Tue, 12 Dec 2006 07:49:53 -0000
Date: Tue, 12 Dec 2006 08:49:53 +0100 (CET)
From: Nick Hibma <nick@van-laarhoven.org>
X-X-Sender: nick@localhost
To: John Baldwin <jhb@freebsd.org>
In-Reply-To: <200612111608.06677.jhb@freebsd.org>
Message-ID: <20061212084536.M1171@localhost>
References: <20061210110419.H42195@localhost>
	<200612111608.06677.jhb@freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: freebsd-current@freebsd.org
Subject: Re: Slight interface change on the watchdog fido
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Dec 2006 07:50:21 -0000

> It would be nice to not lose the comments.  Might also be nice to reduce the
> diff (so it doesn't have to reindent everything) by just adding a simple test
> after masking off WD_INTERVAL like so:
>
> 	if (cmd == 0 || cmd >= 64) {
> 		ipmi_set_watchdog(sc, 0);
> 		return;
> 	}

The code path pretty much requires the

 	if (cmd > 0 && valid(cmd) {
 		wd(set);
 		*error = 0;
 	} else if (wd(active)) {
 		wd(disable);
 	}

due to the way *error was defined.

I've added back the comments that were more than trivial.

Nick