Module Name: src
Committed By: uebayasi
Date: Tue Nov 9 06:03:26 UTC 2010
Modified Files:
src/share/man/man4 [uebayasi-xip]: Makefile acpi.4 pciide.4
Added Files:
src/share/man/man4 [uebayasi-xip]: schide.4
Log Message:
Sync with HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.516.2.3 -r1.516.2.4 src/share/man/man4/Makefile
cvs rdiff -u -r1.50.2.3 -r1.50.2.4 src/share/man/man4/acpi.4
cvs rdiff -u -r1.63 -r1.63.2.1 src/share/man/man4/pciide.4
cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/schide.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.516.2.3 src/share/man/man4/Makefile:1.516.2.4
--- src/share/man/man4/Makefile:1.516.2.3 Sat Nov 6 08:05:44 2010
+++ src/share/man/man4/Makefile Tue Nov 9 06:03:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.516.2.3 2010/11/06 08:05:44 uebayasi Exp $
+# $NetBSD: Makefile,v 1.516.2.4 2010/11/09 06:03:26 uebayasi Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -49,7 +49,7 @@
qe.4 qec.4 qsphy.4 \
raid.4 ral.4 ray.4 rcons.4 re.4 rgephy.4 rlphy.4 rnd.4 route.4 \
rs5c372rtc.4 rtk.4 rtw.4 rum.4 \
- satalink.4 sbus.4 scc.4 scsi.4 sd.4 se.4 seeprom.4 sem.4 \
+ satalink.4 sbus.4 scc.4 schide.4 scsi.4 sd.4 se.4 seeprom.4 sem.4 \
ses.4 sf.4 sfb.4 sgsmix.4 shb.4 \
shpcic.4 siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \
sm.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \
Index: src/share/man/man4/acpi.4
diff -u src/share/man/man4/acpi.4:1.50.2.3 src/share/man/man4/acpi.4:1.50.2.4
--- src/share/man/man4/acpi.4:1.50.2.3 Sat Nov 6 08:05:44 2010
+++ src/share/man/man4/acpi.4 Tue Nov 9 06:03:26 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: acpi.4,v 1.50.2.3 2010/11/06 08:05:44 uebayasi Exp $
+.\" $NetBSD: acpi.4,v 1.50.2.4 2010/11/09 06:03:26 uebayasi Exp $
.\"
.\" Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 24, 2010
+.Dd November 7, 2010
.Dt ACPI 4
.Os
.Sh NAME
@@ -241,6 +241,8 @@
NS8250-, NS16450-, and NS16550-based serial ports.
.It Xr fdc 4
Floppy disk controllers.
+.It Xr fujitsu 4
+Fujitsu brightness, pointer, and hotkeys.
.It Xr hpet 4
High Precision Event Timer
.Pq Tn HPET .
Index: src/share/man/man4/pciide.4
diff -u src/share/man/man4/pciide.4:1.63 src/share/man/man4/pciide.4:1.63.2.1
--- src/share/man/man4/pciide.4:1.63 Mon Oct 19 18:41:09 2009
+++ src/share/man/man4/pciide.4 Tue Nov 9 06:03:26 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: pciide.4,v 1.63 2009/10/19 18:41:09 bouyer Exp $
+.\" $NetBSD: pciide.4,v 1.63.2.1 2010/11/09 06:03:26 uebayasi Exp $
.\"
.\" Copyright (c) 1998,2003 Manuel Bouyer.
.\"
@@ -22,7 +22,7 @@
.\" INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 29, 2008
+.Dd November 7, 2010
.Dt PCIIDE 4
.Os
.Sh NAME
@@ -74,6 +74,9 @@
Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH5/ICH6) IDE Controllers:
.Xr piixide 4
.It
+Intel SCH IDE Controllers:
+.Xr schide 4
+.It
NVIDIA nForce/nForce2 IDE Controllers:
.Xr viaide 4
.It
@@ -138,6 +141,7 @@
.Xr piixide 4 ,
.Xr pnpbios 4 ,
.Xr satalink 4 ,
+.Xr schide 4 ,
.Xr siisata 4 ,
.Xr siside 4 ,
.Xr slide 4 ,
Added files:
Index: src/share/man/man4/schide.4
diff -u /dev/null src/share/man/man4/schide.4:1.2.2.2
--- /dev/null Tue Nov 9 06:03:26 2010
+++ src/share/man/man4/schide.4 Tue Nov 9 06:03:26 2010
@@ -0,0 +1,47 @@
+.\" $NetBSD: schide.4,v 1.2.2.2 2010/11/09 06:03:26 uebayasi Exp $
+.\"
+.\" Copyright (c) 2003 Manuel Bouyer.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd November 7, 2010
+.Dt SCHIDE 4
+.Os
+.Sh NAME
+.Nm schide
+.Nd Intel SCH IDE disk controllers driver
+.Sh SYNOPSIS
+.Cd "schide* at pci? dev ? function ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the Intel SCH IDE controllers and provides the interface
+with the hardware for the
+.Xr ata 4
+driver.
+.Sh SEE ALSO
+.Xr ata 4 ,
+.Xr atapi 4 ,
+.Xr intro 4 ,
+.Xr pci 4 ,
+.Xr pciide 4 ,
+.Xr wd 4 ,
+.Xr wdc 4
