From owner-svn-src-all@FreeBSD.ORG Fri Jul 17 07:07:39 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FAD5106566C; Fri, 17 Jul 2009 07:07:39 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D692D8FC17; Fri, 17 Jul 2009 07:07:38 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6H77c9n057856; Fri, 17 Jul 2009 07:07:38 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6H77cfp057855; Fri, 17 Jul 2009 07:07:38 GMT (envelope-from des@svn.freebsd.org) Message-Id: <200907170707.n6H77cfp057855@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Fri, 17 Jul 2009 07:07:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195733 - in stable/7/share/man/man4: . man4.i386 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jul 2009 07:07:39 -0000 Author: des Date: Fri Jul 17 07:07:38 2009 New Revision: 195733 URL: http://svn.freebsd.org/changeset/base/195733 Log: merge r181967: delete duplicate ichwd(4) Deleted: stable/7/share/man/man4/man4.i386/ichwd.4 Modified: stable/7/share/man/man4/ (props changed) stable/7/share/man/man4/ichwd.4 stable/7/share/man/man4/man4.i386/Makefile Modified: stable/7/share/man/man4/ichwd.4 ============================================================================== --- stable/7/share/man/man4/ichwd.4 Fri Jul 17 02:28:27 2009 (r195732) +++ stable/7/share/man/man4/ichwd.4 Fri Jul 17 07:07:38 2009 (r195733) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 23, 2007 +.Dd August 20, 2008 .Dt ICHWD 4 .Os .Sh NAME @@ -50,12 +50,29 @@ The .Nm driver provides .Xr watchdog 4 -support for the watchdog interrupt timer present in -the Intel ICH motherboard chipsets. +support for the watchdog interrupt timer present on +all Intel ICH motherboard chipsets. +.Pp +The ICH WDT counts down in ticks of approximately 0.6 seconds; the +exact value depends on hardware quality and environmental factors. +Supported watchdog intervals range from 2 to 63 ticks. +.Pp +Note that on some ICH-based systems, the WDT may be present but +disabled, either in hardware or by the BIOS. +The +.Nm +driver attempts to detect this condition and will refuse to attach if +it believes the WDT is disabled. .Sh SEE ALSO .Xr watchdog 4 , .Xr watchdog 8 , -.Xr watchdogd 8 +.Xr watchdogd 8, +.Xr watchdog 9 +.Rs +.%T Using the Intel ICH Family Watchdog Timer (WDT) +.%R Intel Application Note AP-725 +.%O Document Number 292273-001 +.Re .Sh HISTORY The .Nm @@ -65,8 +82,9 @@ driver first appeared in .An -nosplit The .Nm -driver was originally written by -.An Wm. Daryl Hawkins -of Texas A&M University. +driver was written by +.An Wm. Daryl Hawkins Aq dhawkins@tamu.edu +of Texas A&M University and +.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . This manual page was written by .An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . Modified: stable/7/share/man/man4/man4.i386/Makefile ============================================================================== --- stable/7/share/man/man4/man4.i386/Makefile Fri Jul 17 02:28:27 2009 (r195732) +++ stable/7/share/man/man4/man4.i386/Makefile Fri Jul 17 07:07:38 2009 (r195733) @@ -25,7 +25,6 @@ MAN= acpi_aiboost.4 \ ex.4 \ fe.4 \ glxsb.4 \ - ichwd.4 \ ie.4 \ io.4 \ linux.4 \