Subject: Re: port-amd64/36350 (Many man pages missing on amd64)
To: None <port-amd64-maintainer@netbsd.org, gnats-admin@netbsd.org,>
From: Joerg Niendorf <jn_netbsd@iinet.net.au>
List: netbsd-bugs
Date: 09/11/2007 12:10:03
The following reply was made to PR port-amd64/36350; it has been noted by GNATS.
From: Joerg Niendorf <jn_netbsd@iinet.net.au>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: port-amd64/36350 (Many man pages missing on amd64)
Date: Tue, 11 Sep 2007 22:06:07 +1000
I have already discussed the below patches with Christos via PM. He
asked me to send them here so that other people have a chance to review
and comment on them.
The basic idea is to create a new category "x86" for those man pages that
would be practically identical on amd64 and i386. Man pages common to
these two machine types could then be added to man4.x86/ and man8.x86/
directories and could be used to build man pages for both amd64 and i386
by setting MANSUBDIR as follows:
MANSUBDIR= /amd64
MANSUBDIR+=/i386
bsd.man.mk does _not_ support this at the moment, but a few simple
changes could add this functionality. This would make man pages (which
are currently missing) available on amd64 while preventing a duplication
of files.
Any comments?
Cheers,
Joerg
PS: The intro.4 patch contains a major update for that man page.
Index: bsd.man.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.man.mk,v
retrieving revision 1.96
diff -b -u -r1.96 bsd.man.mk
--- bsd.man.mk 11 Sep 2006 22:24:09 -0000 1.96
+++ bsd.man.mk 9 Sep 2007 11:02:20 -0000
@@ -72,8 +72,9 @@
cat ${.IMPSRC} ${MANCOMPRESS} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
.endif # !empty(MANSUFFIX)
+.for MACHINESUBDIR in ${MANSUBDIR:Unone}
.for F in ${MANPAGES:S/${MANSUFFIX}$//:O:u}
-_F:= ${DESTDIR}${MANDIR}/man${F:T:E}${MANSUBDIR}/${F}${MANSUFFIX}
+_F:= ${DESTDIR}${MANDIR}/man${F:T:E}${MACHINESUBDIR:S/^none$//}/${F}${MANSUFFIX}
.if ${MKUPDATE} == "no"
${_F}! ${F}${MANSUFFIX} __installpage # install rule
@@ -89,13 +90,15 @@
manpages:: ${_F}
.PRECIOUS: ${_F} # keep if install fails
-.endfor
+.endfor # endfor F
+.endfor # endfor MACHINESUBDIR
manlinks:: # link install
+.for MACHINESUBDIR in ${MANSUBDIR:Unone}
.for _src _dst in ${MLINKS}
-_l:=${DESTDIR}${MANDIR}/man${_src:T:E}${MANSUBDIR}/${_src}${MANSUFFIX}
-_t:=${DESTDIR}${MANDIR}/man${_dst:T:E}${MANSUBDIR}/${_dst}${MANSUFFIX}
+_l:=${DESTDIR}${MANDIR}/man${_src:T:E}${MACHINESUBDIR:S/^none$//}/${_src}${MANSUFFIX}
+_t:=${DESTDIR}${MANDIR}/man${_dst:T:E}${MACHINESUBDIR:S/^none$//}/${_dst}${MANSUFFIX}
# Handle case conflicts carefully, when _dst occurs
# more than once after case flattening
@@ -107,7 +110,8 @@
manlinks:: ${_t}
.PRECIOUS: ${_t}
-.endfor
+.endfor # endfor _src _dst
+.endfor # endfor MACHINESUBDIR
.endif # ${MKMAN} != "no"
##### Build and install rules (plaintext pages)
@@ -133,8 +137,9 @@
> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
.endif
+.for MACHINESUBDIR in ${MANSUBDIR:Unone}
.for F in ${CATPAGES:S/${MANSUFFIX}$//:O:u}
-_F:= ${DESTDIR}${MANDIR}/${F:T:E}${MANSUBDIR}/${F:R}.0${MANSUFFIX}
+_F:= ${DESTDIR}${MANDIR}/${F:T:E}${MACHINESUBDIR:S/^none$//}/${F:R}.0${MANSUFFIX}
.if ${MKUPDATE} == "no"
${_F}! ${F}${MANSUFFIX} __installpage # install rule
@@ -150,13 +155,16 @@
catpages:: ${_F}
.PRECIOUS: ${_F} # keep if install fails
-.endfor
+.endfor # endfor F
+.endfor # endfor MACHINESUBDIR
+
catlinks:: # link install
+.for MACHINESUBDIR in ${MANSUBDIR:Unone}
.for _src _dst in ${MLINKS}
-_l:=${DESTDIR}${MANDIR}/cat${_src:T:E}${MANSUBDIR}/${_src:R}.0${MANSUFFIX}
-_t:=${DESTDIR}${MANDIR}/cat${_dst:T:E}${MANSUBDIR}/${_dst:R}.0${MANSUFFIX}
+_l:=${DESTDIR}${MANDIR}/cat${_src:T:E}${MACHINESUBDIR:S/^none$//}/${_src:R}.0${MANSUFFIX}
+_t:=${DESTDIR}${MANDIR}/cat${_dst:T:E}${MACHINESUBDIR:S/^none$//}/${_dst:R}.0${MANSUFFIX}
# Handle case conflicts carefully, when _dst occurs
# more than once after case flattening
@@ -168,7 +176,8 @@
catlinks:: ${_t}
.PRECIOUS: ${_t}
-.endfor
+.endfor # endfor _src _dst
+.endfor # endfor MACHINESUBDIR
.endif # (${MKCATPAGES} != "no") && (${MKMAN} != "no")
##### Build and install rules (HTML pages)
@@ -187,9 +196,10 @@
${TOOL_ROFF_HTML} ${.IMPSRC} > ${.TARGET}.tmp && \
mv ${.TARGET}.tmp ${.TARGET}
+.for MACHINESUBDIR in ${MANSUBDIR:Unone}
.for F in ${HTMLPAGES:O:u}
# construct installed path
-_F:= ${HTMLDIR}/${F:T:E}${MANSUBDIR}/${F:R:S-/index$-/x&-}.html
+_F:= ${HTMLDIR}/${F:T:E}${MACHINESUBDIR:S/^none$//}/${F:R:S-/index$-/x&-}.html
.if ${MKUPDATE} == "no"
${_F}! ${F} __installpage # install rule
@@ -205,7 +215,8 @@
htmlpages:: ${_F}
.PRECIOUS: ${_F} # keep if install fails
-.endfor
+.endfor # endfor F
+.endfor # endfor MACHINESUBDIR
cleanhtml: .PHONY
rm -f ${HTMLPAGES}
Index: mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/base/mi,v
retrieving revision 1.720
diff -b -u -r1.720 mi
--- mi 9 Aug 2007 22:01:25 -0000 1.720
+++ mi 9 Sep 2007 11:07:02 -0000
@@ -2598,6 +2598,7 @@
./usr/share/man/cat4/acorn26 base-man-share
./usr/share/man/cat4/acorn32 base-man-share
./usr/share/man/cat4/alpha base-man-share
+./usr/share/man/cat4/amd64 base-man-share
./usr/share/man/cat4/amiga base-man-share
./usr/share/man/cat4/arc base-man-share
./usr/share/man/cat4/arm26 base-obsolete obsolete
@@ -2716,6 +2717,7 @@
./usr/share/man/html4/acorn26 base-man-share
./usr/share/man/html4/acorn32 base-man-share
./usr/share/man/html4/alpha base-man-share
+./usr/share/man/html4/amd64 base-man-share
./usr/share/man/html4/amiga base-man-share
./usr/share/man/html4/arc base-man-share
./usr/share/man/html4/arm26 base-obsolete obsolete
@@ -2835,6 +2837,7 @@
./usr/share/man/man4/acorn26 base-man-share
./usr/share/man/man4/acorn32 base-man-share
./usr/share/man/man4/alpha base-man-share
+./usr/share/man/man4/amd64 base-man-share
./usr/share/man/man4/amiga base-man-share
./usr/share/man/man4/arc base-man-share
./usr/share/man/man4/arm26 base-obsolete obsolete
Index: mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/man/mi,v
retrieving revision 1.1023
diff -b -u -r1.1023 mi
--- mi 3 Sep 2007 18:02:17 -0000 1.1023
+++ mi 9 Sep 2007 11:08:59 -0000
@@ -617,6 +617,12 @@
./usr/share/man/cat4/alpha/tsp.0 man-sys-catman .cat
./usr/share/man/cat4/alpha/ttwoga.0 man-sys-catman .cat
./usr/share/man/cat4/alpha/ttwopci.0 man-sys-catman .cat
+./usr/share/man/cat4/amd64/autoconf.0 man-sys-catman .cat
+./usr/share/man/cat4/amd64/cons.0 man-sys-catman .cat
+./usr/share/man/cat4/amd64/console.0 man-sys-catman .cat
+./usr/share/man/cat4/amd64/fdc.0 man-sys-catman .cat
+./usr/share/man/cat4/amd64/intro.0 man-sys-catman .cat
+./usr/share/man/cat4/amd64/lpt.0 man-sys-catman .cat
./usr/share/man/cat4/amdpm.0 man-sys-catman .cat
./usr/share/man/cat4/amhphy.0 man-sys-catman .cat
./usr/share/man/cat4/amiga/afsc.0 man-sys-catman .cat
@@ -1803,7 +1809,10 @@
./usr/share/man/cat8/altqd.0 man-router-catman .cat
./usr/share/man/cat8/amd.0 man-amd-catman .cat
./usr/share/man/cat8/amd64/MAKEDEV.0 man-obsolete obsolete
+./usr/share/man/cat8/amd64/bootselect.0 man-sys-catman .cat
./usr/share/man/cat8/amd64/makedev.0 man-obsolete obsolete
+./usr/share/man/cat8/amd64/mbr.0 man-sys-catman .cat
+./usr/share/man/cat8/amd64/pxeboot.0 man-sys-catman .cat
./usr/share/man/cat8/amiga/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/amiga/binpatch.0 man-sysutil-catman .cat
./usr/share/man/cat8/amiga/boot.0 man-sys-catman .cat
@@ -3102,6 +3111,12 @@
./usr/share/man/man4/alpha/tsp.4 man-sys-man .man
./usr/share/man/man4/alpha/ttwoga.4 man-sys-man .man
./usr/share/man/man4/alpha/ttwopci.4 man-sys-man .man
+./usr/share/man/man4/amd64/autoconf.4 man-sys-man .man
+./usr/share/man/man4/amd64/cons.4 man-sys-man .man
+./usr/share/man/man4/amd64/console.4 man-sys-man .man
+./usr/share/man/man4/amd64/fdc.4 man-sys-man .man
+./usr/share/man/man4/amd64/intro.4 man-sys-man .man
+./usr/share/man/man4/amd64/lpt.4 man-sys-man .man
./usr/share/man/man4/amdpm.4 man-sys-man .man
./usr/share/man/man4/amhphy.4 man-sys-man .man
./usr/share/man/man4/amiga/afsc.4 man-sys-man .man
@@ -4287,7 +4302,10 @@
./usr/share/man/man8/altqd.8 man-router-man .man
./usr/share/man/man8/amd.8 man-amd-man .man
./usr/share/man/man8/amd64/MAKEDEV.8 man-obsolete obsolete
+./usr/share/man/man8/amd64/bootselect.8 man-sys-man .man
./usr/share/man/man8/amd64/makedev.8 man-obsolete obsolete
+./usr/share/man/man8/amd64/mbr.8 man-sys-man .man
+./usr/share/man/man8/amd64/pxeboot.8 man-sys-man .man
./usr/share/man/man8/amiga/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/amiga/binpatch.8 man-sysutil-man .man
./usr/share/man/man8/amiga/boot.8 man-sys-man .man
Index: NetBSD.dist
===================================================================
RCS file: /cvsroot/src/etc/mtree/NetBSD.dist,v
retrieving revision 1.340
diff -b -u -r1.340 NetBSD.dist
--- NetBSD.dist 9 Jun 2007 11:20:56 -0000 1.340
+++ NetBSD.dist 9 Sep 2007 11:10:51 -0000
@@ -716,6 +716,7 @@
./usr/share/man/cat4/acorn26
./usr/share/man/cat4/acorn32
./usr/share/man/cat4/alpha
+./usr/share/man/cat4/amd64
./usr/share/man/cat4/amiga
./usr/share/man/cat4/arc
./usr/share/man/cat4/atari
@@ -751,6 +752,7 @@
./usr/share/man/cat8/acorn32
./usr/share/man/cat8/algor
./usr/share/man/cat8/alpha
+./usr/share/man/cat8/amd64
./usr/share/man/cat8/amiga
./usr/share/man/cat8/arc
./usr/share/man/cat8/atari
@@ -797,7 +799,6 @@
./usr/share/man/cat8/sun3
./usr/share/man/cat8/vax
./usr/share/man/cat8/x68k
-./usr/share/man/cat8/amd64
./usr/share/man/cat9
./usr/share/man/cat9/acorn26
./usr/share/man/cat9/alpha
@@ -823,6 +824,7 @@
./usr/share/man/man4/acorn26
./usr/share/man/man4/acorn32
./usr/share/man/man4/alpha
+./usr/share/man/man4/amd64
./usr/share/man/man4/amiga
./usr/share/man/man4/arc
./usr/share/man/man4/atari
@@ -858,6 +860,7 @@
./usr/share/man/man8/acorn32
./usr/share/man/man8/algor
./usr/share/man/man8/alpha
+./usr/share/man/man8/amd64
./usr/share/man/man8/amiga
./usr/share/man/man8/arc
./usr/share/man/man8/atari
@@ -904,7 +907,6 @@
./usr/share/man/man8/sun3
./usr/share/man/man8/vax
./usr/share/man/man8/x68k
-./usr/share/man/man8/amd64
./usr/share/man/man9
./usr/share/man/man9/acorn26
./usr/share/man/man9/alpha
@@ -930,6 +932,7 @@
./usr/share/man/html4/acorn26
./usr/share/man/html4/acorn32
./usr/share/man/html4/alpha
+./usr/share/man/html4/amd64
./usr/share/man/html4/amiga
./usr/share/man/html4/arc
./usr/share/man/html4/atari
@@ -965,6 +968,7 @@
./usr/share/man/html8/acorn32
./usr/share/man/html8/algor
./usr/share/man/html8/alpha
+./usr/share/man/html8/amd64
./usr/share/man/html8/amiga
./usr/share/man/html8/arc
./usr/share/man/html8/atari
@@ -1011,7 +1015,6 @@
./usr/share/man/html8/sun3
./usr/share/man/html8/vax
./usr/share/man/html8/x68k
-./usr/share/man/html8/amd64
./usr/share/man/html9
./usr/share/man/html9/acorn26
./usr/share/man/html9/alpha
Index: Makefile
===================================================================
RCS file: /cvsroot/src/share/man/man4/Makefile,v
retrieving revision 1.440
diff -b -u -r1.440 Makefile
--- Makefile 3 Sep 2007 18:02:16 -0000 1.440
+++ Makefile 9 Sep 2007 11:14:53 -0000
@@ -175,7 +175,8 @@
man4.dreamcast man4.evbarm man4.evbmips man4.hp300 man4.hp700 \
man4.hpcarm man4.hpcmips man4.hpcsh man4.i386 man4.mac68k \
man4.macppc man4.mvme68k man4.pc532 man4.pmax man4.pmppc man4.prep \
- man4.sgimips man4.sparc man4.sparc64 man4.sun2 man4.sun3 man4.vax man4.x68k
+ man4.sgimips man4.sparc man4.sparc64 man4.sun2 man4.sun3 man4.vax \
+ man4.x68k man4.x86
.include <bsd.man.mk>
.include <bsd.subdir.mk>
Index: man4.i386/Makefile
===================================================================
RCS file: /cvsroot/src/share/man/man4/man4.i386/Makefile,v
retrieving revision 1.67
diff -b -u -r1.67 Makefile
--- man4.i386/Makefile 27 Jun 2007 23:02:53 -0000 1.67
+++ man4.i386/Makefile 9 Sep 2007 11:14:54 -0000
@@ -1,16 +1,13 @@
# $NetBSD: Makefile,v 1.67 2007/06/27 23:02:53 xtraeme Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
-MAN= apm.4 autoconf.4 \
- cmos.4 console.4 \
- elansc.4 fdc.4 \
+MAN= apm.4 cmos.4 elansc.4 \
gcscide.4 geodewdog.4 geodecntr.4 glxsb.4 gscpcib.4 \
- intro.4 io.4 lms.4 lpt.4 mem.4 mms.4 npx.4 ndis.4 \
- pcibios.4 pnpbios.4 sony.4 spic.4 vald.4 \
- vesafb.4
+ io.4 lms.4 mem.4 mms.4 npx.4 ndis.4 \
+ pcibios.4 pnpbios.4 sony.4 spic.4 vald.4 vesafb.4
MLINKS= mem.4 kmem.4
MLINKS+=pcibios.4 PCIBIOS.4
-MLINKS+=console.4 cons.4
+
MANSUBDIR=/i386
.include <bsd.man.mk>
Index: Makefile
===================================================================
RCS file: /cvsroot/src/share/man/man8/Makefile,v
retrieving revision 1.90
diff -b -u -r1.90 Makefile
--- Makefile 21 Apr 2007 18:41:49 -0000 1.90
+++ Makefile 9 Sep 2007 11:20:01 -0000
@@ -25,7 +25,7 @@
man8.hpcmips man8.hpcsh man8.i386 man8.mac68k man8.macppc \
man8.mvme68k man8.next68k man8.pmax man8.pmppc man8.prep \
man8.sgimips man8.sparc man8.sparc64 man8.sun2 man8.sun3 \
- man8.vax man8.x68k
+ man8.vax man8.x68k man8.x86
# create MAKEDEV.8 from ../../etc/MAKEDEV.tmpl
makedevs:
Index: man8.i386/Makefile
===================================================================
RCS file: /cvsroot/src/share/man/man8/man8.i386/Makefile,v
retrieving revision 1.18
diff -b -u -r1.18 Makefile
--- man8.i386/Makefile 3 Feb 2006 11:08:23 -0000 1.18
+++ man8.i386/Makefile 9 Sep 2007 11:20:01 -0000
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.18 2006/02/03 11:08:23 jmmv Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
-MAN= boot.8 dosboot.8 boot_console.8 multiboot.8 w95boot.8 pxeboot.8 mbr.8
-MLINKS= mbr.8 bootselect.8
+MAN= boot.8 dosboot.8 boot_console.8 multiboot.8 w95boot.8
+
MANSUBDIR=/i386
.include <bsd.man.mk>
Index: doc-common
===================================================================
RCS file: /cvsroot/src/gnu/dist/groff/tmac/doc-common,v
retrieving revision 1.8
diff -b -u -r1.8 doc-common
--- doc-common 6 Feb 2006 18:25:49 -0000 1.8
+++ doc-common 9 Sep 2007 11:22:28 -0000
@@ -312,7 +312,7 @@
.ds doc-volume-as-tahoe tahoe
.ds doc-volume-as-vax vax
.ds doc-volume-as-x68k x68k
-.ds doc-volume-as-x86_64 x86_64
+.ds doc-volume-as-x86 x86
.
.de Dt
. \" reset default arguments
New man4.x86/Makefile:
----------------------
# $NetBSD$
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= autoconf.4 console.4 fdc.4 intro.4 lpt.4
MLINKS= console.4 cons.4
MANSUBDIR= /amd64
MANSUBDIR+=/i386
.include <bsd.man.mk>
New man8.x86/Makefile:
----------------------
# $NetBSD$
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= mbr.8 pxeboot.8
MLINKS= mbr.8 bootselect.8
MANSUBDIR= /amd64
MANSUBDIR+=/i386
.include <bsd.man.mk>
Patches for man pages:
----------------------
--- autoconf.4.orig 2007-09-08 15:03:50.000000000 +1000
+++ autoconf.4.x86 2007-09-09 20:15:40.000000000 +1000
@@ -32,8 +32,8 @@
.\"
.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
.\"
-.Dd February 20, 1994
-.Dt AUTOCONF 4 i386
+.Dd September 9, 2007
+.Dt AUTOCONF 4 x86
.Os
.Sh NAME
.Nm autoconf
--- console.4.orig 2007-09-08 15:04:11.000000000 +1000
+++ console.4.x86 2007-09-09 20:15:40.000000000 +1000
@@ -1,11 +1,11 @@
.\" $NetBSD: console.4,v 1.10 2006/09/06 16:47:00 rpaulo Exp $
.\"
-.Dd September 6, 2006
+.Dd September 9, 2007
.Os
-.Dt CONS 4 i386
+.Dt CONS 4 x86
.Sh NAME
.Nm console
-.Nd i386 console interface
+.Nd amd64 / i386 console interface
.Sh SYNOPSIS
.Cd options CONSDEVNAME=string
.Cd options CONADDR=integer
@@ -89,8 +89,9 @@
by the bootloader.
.El
.Sh FILES
-.Bl -tag -width /dev/console
+.Bl -tag -width /sys/arch/amd64/conf/CONFIG -compact
.It Pa /dev/console
+.It Pa /sys/arch/amd64/conf/CONFIG
.It Pa /sys/arch/i386/conf/CONFIG
.El
.Sh EXAMPLES
--- fdc.4.orig 2007-09-08 15:04:22.000000000 +1000
+++ fdc.4.x86 2007-09-09 20:15:40.000000000 +1000
@@ -34,8 +34,8 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd November 28, 1996
-.Dt FDC 4 i386
+.Dd September 9, 2007
+.Dt FDC 4 x86
.Os
.Sh NAME
.Nm fdc
@@ -44,6 +44,7 @@
.Cd "fdc0 at isa? port 0x3f0 irq 6 drq 2"
.Cd "fdc* at acpi?"
.Cd "fdc* at pnpbios? index ?"
+(i386 only)
.Cd "fd* at fdc? drive ?"
.Sh DESCRIPTION
The
--- lpt.4.orig 2007-09-08 15:04:49.000000000 +1000
+++ lpt.4.x86 2007-09-09 20:15:40.000000000 +1000
@@ -32,8 +32,8 @@
.\"
.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
.\"
-.Dd August 6, 1993
-.Dt LPT 4 i386
+.Dd September 9, 2007
+.Dt LPT 4 x86
.Os
.Sh NAME
.Nm lpt
@@ -45,7 +45,9 @@
.Cd "lpt1 at isa? port" \&"IO_LPT2\&"
.Cd "lpt* at acpi?"
.Cd "lpt* at ofisa?"
+(i386 only)
.Cd "lpt* at pnpbios? index ?"
+(i386 only)
.Cd "lpt* at puc? port ?"
.Sh DESCRIPTION
This driver provides access to parallel ports. The bits in the minor
--- mbr.8.orig 2007-09-08 15:06:51.000000000 +1000
+++ mbr.8.x86 2007-09-09 20:36:37.000000000 +1000
@@ -1,6 +1,6 @@
.\" $NetBSD: mbr.8,v 1.2 2003/07/16 12:06:07 wiz Exp $
-.Dd April 30, 2003
-.Dt MBR 8 i386
+.Dd September 9, 2007
+.Dt MBR 8 x86
.Os
.Sh NAME
.Nm mbr ,
--- pxeboot.8.orig 2007-09-08 15:07:02.000000000 +1000
+++ pxeboot.8.x86 2007-09-09 20:36:37.000000000 +1000
@@ -24,12 +24,12 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd November 12, 2005
+.Dd September 9, 2007
.Os
-.Dt PXEBOOT 8 i386
+.Dt PXEBOOT 8 x86
.Sh NAME
.Nm pxeboot
-.Nd network boot NetBSD/i386 through a PXE BIOS extension
+.Nd network boot NetBSD/amd64,i386 through a PXE BIOS extension
.Sh DESCRIPTION
.Nm
is a
--- intro.4.orig 2007-09-08 15:04:35.000000000 +1000
+++ intro.4.x86 2007-09-09 20:15:40.000000000 +1000
@@ -33,12 +33,12 @@
.\"
.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
.\"
-.Dd April 3, 2001
-.Dt INTRO 4 i386
+.Dd September 9, 2007
+.Dt INTRO 4 x86
.Os
.Sh NAME
.Nm intro
-.Nd introduction to i386 special files and hardware support
+.Nd introduction to amd64 / i386 special files and hardware support
.Sh DESCRIPTION
This section describes the special files, related driver functions,
and networking support
@@ -66,8 +66,8 @@
The networking support is introduced in
.Xr netintro 4 .
.Sh DEVICE SUPPORT
-This section describes the hardware supported on the i386
-(PC-clone) platform.
+This section describes the hardware supported on the amd64 and i386
+(PC-clone) platforms.
Software support for these devices comes in two forms. A hardware
device may be supported with a character or block
.Em device driver ,
@@ -102,7 +102,7 @@
.\"
.Pp
Standard builtin devices:
-.Bl -tag -width speaker -offset indent -compact
+.Bl -tag -width acardide -offset indent -compact
.\"
.\"
.\"
@@ -112,23 +112,21 @@
.It lpt
Parallel port device interface
.It fdc
-Standard NEC 765 floppy disk controller.
+Standard NEC 765 floppy disk controller
.It mca
-MCA I/O bus.
+MCA I/O bus (i386 only)
.It mem
Main memory interface
.It npx
-Numeric Processing Extension coprocessor and emulator
+Numeric Processing Extension coprocessor and emulator (i386 only)
.It pci
-PCI I/O bus.
+PCI I/O bus
.It eisa
-EISA I/O bus, either as main bus or via PCI-EISA bridge.
+EISA I/O bus, either as main bus or via PCI-EISA bridge
.It isa
-ISA bus and ISA devices, either as main bus or via PCI-ISA bridge.
-.It isa
-isa I/O bus.
+ISA I/O bus and ISA devices, either as main bus or via PCI-ISA bridge
.It isapnp
-``bus'' for ISA devices with PnP support.
+``bus'' for ISA devices with PnP support (i386 only)
.It speaker
console speaker device interface
.El
@@ -136,8 +134,24 @@
.\"
.\"
.Pp
-PCMCIA devices are supported through the
-.Xr pcmcia 4
+Console devices using AGP, EISA, ISA, PCI or PCIe video adaptors and
+standard AT, Bluetooth, PS/2 or USB keyboards are supported by the
+machine independent
+.Xr wscons 4
+console driver.
+.\"
+.\"
+.\"
+.Pp
+USB devices are supported through the
+.Xr usb 4
+bus and associated device drivers.
+.\"
+.\"
+.\"
+.Pp
+IEEE1394 devices are supported through the
+.Xr fwohci 4
bus and associated device drivers.
.\"
.\"
@@ -150,134 +164,329 @@
.\"
.\"
.Pp
-USB devices are supported through the
-.Xr usb 4
+PCMCIA devices are supported through the
+.Xr pcmcia 4
bus and associated device drivers.
.\"
.\"
.\"
.Pp
-Console devices using ISA, EISA, or PCI video adaptors and standard
-AT or PS/2 keyboards are supported by the machine independent
-.Xr wscons 4
-console driver.
+PCI IDE controllers:
+.Bl -tag -width acardide -offset indent -compact
+.It pciide
+GENERIC pciide driver
+.It acardide
+Acard IDE controllers
+.It aceride
+Acer Lab IDE controllers
+.It ahcisata
+AHCI SATA controllers
+.It artsata
+Intel i31244 SATA controller
+.It cmdide
+CMD tech IDE controllers
+.It cypide
+Cypress IDE controllers
+.It gcscide
+AMD CS5535 Companion IDE controllers (i386 only)
+.It geodeide
+AMD Geode IDE controllers (i386 only)
+.It hptide
+Triones/HighPoint IDE controllers
+.It iteide
+IT Express IDE controllers
+.It ixpide
+ATI IXP IDE controllers
+.It jmide
+JMicron PCI-e PATA/SATA controllers
+.It optiide
+Opti IDE controllers
+.It piixide
+Intel IDE controllers
+.It pdcide
+Promise IDE controllers
+.It pdcsata
+Promise SATA150 controllers
+.It rccide
+ServerWorks IDE controllers (i386 only)
+.It satalink
+SiI SATALink controllers
+.It siside
+SiS IDE controllers
+.It slide
+Symphony Labs IDE controllers
+.It svwsata
+ServerWorks SATA controllers
+.It stpcide
+STMicro STPC IDE controllers (i386 only)
+.It viaide
+VIA/AMD/Nvidia IDE controllers
+.It wdc
+Standard ISA Western Digital type hard drives controllers (MFM, RLL, ESDI and
+IDE)
+.El
.\"
.\"
.\"
.Pp
-Disk, tape and SCSI devices:
-.Bl -tag -width speaker -offset indent -compact
-.It aha
-Adaptec 154x ISA SCSI adapter boards.
-.It ahb
-Adaptec 1742 EISA SCSI adapter boards.
+PCI SCSI controllers:
+.Bl -tag -width acardide -offset indent -compact
+.It adv
+AdvanSys 1200[A,B], 9xx[U,UA] SCSI
+.It adw
+AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
.It ahc
-Adaptec 274x, 284x, 2940 and 3940 VL/EISA/PCI SCSI adapter boards.
-.It aic
-Adaptec AIC-6260, Adaptec AIC-6360, Adaptec 152x, and SoundBlaster SCSI boards.
+Adaptec [23]94x, aic78x0 SCSI
+.It ahd
+Adaptec aic790x SCSI
.It bha
-Buslogic BT-445 (ISA), BT-74x (EISA), and BT-9[45][68] (PCI) SCSI boards.
-.It mcd
-Mitsumi CD-ROM drives.
-.It ncr
-Symbios (formerly NCR) PCI SCSI adapter boards.
-.It pciide
-PCI IDE controllers.
-.It sea
-Seagate/Future Domain SCSI cards. ST01/02, Future Domain TMC-885, and
-Future Domain TMC-950.
-.It uha
-Ultrastor ISA and EISA SCSI adapter cards. Ultrastore 14f, Ultrastore 34f,
-and Ultrastore 24f.
-.It wdc
-Standard ISA Western Digital type hard drives controllers. MFM, RLL, ESDI, and
-IDE.
-.It wt
-Wangtek and compatible ISA controllers for QIC-02 and QIC-36 tapes.
+BusLogic 9xx SCSI
+.It dpt
+DPT SmartCache/SmartRAID
+.It esiop
+Symbios 53c875 and newer SCSI
+.It iha
+Initio INIC-940/950 SCSI
+.It isp
+Qlogic ISP [12]0x0 SCSI/FibreChannel
+.It mfi
+LSI MegaRAID SAS
+.It mly
+Mylex AcceleRAID and eXtremeRAID
+.It mpt
+LSILogic 9x9 and 53c1030
+.It njs
+Workbit NinjaSCSI-32 (i386 only)
+.It pcscp
+AMD 53c974 PCscsi-PCI SCSI
+.It siop
+Symbios 53c8xx SCSI
+.It trm
+Tekram DC-395U/UW/F, DC-315/U SCSI
+.El
+.\"
+.\"
+.\"
+.Pp
+RAID controllers:
+.Bl -tag -width acardide -offset indent -compact
+.It aac
+Adaptec AAC family
+.It amr
+AMI/LSI Logic MegaRAID
+.It cac
+Compaq EISA / PCI array controllers
+.It ciss
+HP Smart Array controllers
+.It icp
+ICP-Vortex GDT & Intel RAID
+.It mlx
+Mylex DAC960 & DEC SWXCR family
+.It twa
+3ware Escalade 9xxx RAID controllers
+.It twe
+3ware Escalade RAID controllers
.El
.\"
.\"
.\"
.Pp
Network interfaces:
-.Bl -tag -width speaker -offset indent -compact
-.It de
-Ethernet driver for dc21040, dc21042, and dc21140-based 10Mbit and 100Mbit
-PCI Ethernet adaptors, including DE-430, DE-450 DE-500, SMC EtherPower,
-and Znyx.
-.It fea, fpa
-FDDI driver for Digital DEFEA (EISA) and DEFPA FDDI adaptors.
-.It ed
-Western Digital/SMC 80x3 and Ultra, 3Com 3c503, and Novell NE1000 and 2000
-Ethernet interface
-.It eg
-3Com 3c505 Ethernet board.
-.It el
-3Com 3c501 Ethernet board.
+.Bl -tag -width acardide -offset indent -compact
+.It an
+Aironet PC4500/PC4800 (802.11)
+.It ath
+Atheros 5210/5211/5212 802.11
+.It atw
+ADMtek ADM8211 (802.11) (i386 only)
+.It bce
+Broadcom 440x 10/100 Ethernet
+.It bge
+Broadcom 570x gigabit Ethernet
+.It bnx
+Broadcom NetXtremeII gigabit Ethernet
+.It dge
+Intel 82597 10GbE LR
+.It en
+ENI/Adaptec ATM
.It ep
-3Com EtherLink III (3c5x9) Ethernet interface
-.It ie
-Ethernet driver for the AT\*[Am]T StarLAN 10, EN100, StarLan Fiber, and 3Com 3c507.
-.It iy
-Ethernet driver for the ISA Intel EtherExpress PR0/10 adaptor.
+3Com 3c59x
+.It epic
+SMC EPIC/100 Ethernet
+.It esh
+Essential HIPPI card
+.It ex
+3Com 90x[BC]
+.It fea
+DEC DEFEA FDDI (EISA) (i386 only)
+.It fpa
+DEC DEFPA FDDI (PCI)
+.It fxp
+Intel EtherExpress PRO 10+/100B
+.It gsip
+NS83820 Gigabit Ethernet
+.It hme
+Sun Microelectronics STP2002-STQ
+.It ipw
+Intel PRO/Wireless 2100 (i386 only)
+.It iwi
+Intel PRO/Wireless 2200BG (i386 only)
.It le
-Ethernet driver for BICC Isolan, Novell NE2100, Digital DEPCA cards,
-and PCnet-PCI cards.
+PCnet-PCI Ethernet
+.It lmc
+Lan Media Corp SSI/HSSI/DS3
+.It msk/mskc
+Marvell Yukon 2 Gigabit Ethernet
+.It mtd
+Myson MTD803 3-in-1 Ethernet
+.It ndis
+Experimental - NDIS Network Driver (i386 only)
+.It ne
+NE2000-compatible Ethernet
+.It nfe
+NVIDIA nForce Ethernet
+.It ntwoc
+Riscom/N2 PCI Sync Serial
+.It pcn
+AMD PCnet-PCI Ethernet
+.It ral
+Ralink Technology RT25x0 802.11a/b/g
+.It re
+Realtek 8139C+/8169/8169S/8110S
+.It rtk
+Realtek 8129/8139
+.It rtw
+Realtek 8180L (802.11) (i386 only)
+.It sf
+Adaptec AIC-6915 Ethernet
+.It sip
+SiS 900/DP83815 Ethernet
+.It sk/skc
+SysKonnect SK9821 Gigabit Ethernet
+.It ste
+Sundance ST-201 Ethernet
+.It stge
+Sundance/Tamarack TC9021 Gigabit
+.It ti
+Alteon ACEnic gigabit Ethernet
.It tl
-Ethernet driver for ThunderLAN-based Ethernet adaptor.
+ThunderLAN-based Ethernet
+.It tlp
+DECchip 21x4x and clones
+.It txp
+3com 3cr990 (i386 only)
+.It vge
+VIATech VT612X Gigabit Ethernet
+.It vr
+VIA Rhine Fast Ethernet
+.It wi
+Intersil Prism Mini-PCI (802.11b)
+.It wm
+Intel 82543/82544 gigabit
+.It wpi
+Intel PRO/Wireless 3945ABG
+.It xge
+Neterion (S2io) Xframe-I 10GbE
.El
.\"
.\"
.\"
.Pp
Serial communication cards:
-.Bl -tag -width speaker -offset indent -compact
+.Bl -tag -width acardide -offset indent -compact
.It ast
-multiplexing serial communications card first made by AST.
+multiplexing serial communications card first made by AST (i386 only)
.It boca
Boca BB100[48] and BB2016 multiplexing serial communications cards.
NS8250-, NS16450-, and NS16550-based asynchronous serial
communications device interface, or internal modems that provide
-a serial-chip compatible interface.
+a serial-chip compatible interface. (i386 only)
.It cy
Cyclades Cyclom-4Y, -8Y, and -16Y asynchronous serial communications
device interface
+.It cz
+Cyclades-Z series multi-port serial adapter device driver
.It rtfps
-a multiplexing serial communications card derived from IBM PC/RT hardware.
+a multiplexing serial communications card derived from IBM PC/RT hardware
.El
.\"
.\"
.\"
-Sound cards:
-.Bl -tag -width speaker -offset indent -compact
+.Pp
+Audio devices:
+.Bl -tag -width acardide -offset indent -compact
+.It auacer
+ALi M5455 integrated AC'97 Audio (i386 only)
+.It auich
+Intel ICH integrated AC'97 Audio
+.It auixp
+ATI IXP AC'97 Audio
+.It autri
+Trident 4DWAVE based AC'97 Audio
+.It auvia
+VIA AC'97 audio
+.It azalia
+High Definition Audio
+.It clcs
+Cirrus Logic CS4280
+.It clct
+Cirrus Logic CS4281
+.It cmpci
+C-Media CMI8338/8738
+.It eap
+Ensoniq AudioPCI
+.It emuxki
+Creative SBLive! and PCI512
+.It esa
+ESS Allegro-1 / Maestro-3 PCI Audio
+.It esm
+ESS Maestro-1/2/2e PCI Audio Accelerator
+.It eso
+ESS Solo-1 PCI AudioDrive
+.It ess
+ESS Tech ES1887, ES1888, ES888 audio (i386 only)
+.It fms
+Forte Media FM801
.It gus
-Gravis Ultrasound non-PnP soundcards.
+Gravis Ultra Sound (i386 only)
.It guspnp
-Gravis Ultrasound PnP soundcards.
+Gravis Ultra Sound PnP audio (i386 only)
+.It neo
+NeoMagic 256 AC'97 Audio
.It pas
-ProAudio Spectrum soundcards.
-.It pss
-Personal Sound System-compatible soundcards, including
-Cardinal Digital SoundPro 16 and Orchid Soundwave 32.
+ProAudio Spectrum (i386 only)
.It sb
-Soundblaster, Soundblaster 16, and Soundblaster Pro soundcards.
+SoundBlaster-compatible audio (i386 only)
+.It sv
+S3 SonicVibes
.It wss
-Windows Sound System-compatible sound cards based on the ad1848 chip.
+Windows Sound System-compatible sound cards
+.It yds
+Yamaha DS-1 PCI Audio
+.It ym
+Yamaha OPL3-SA[23] audio (i386 only)
.El
.\"
.\"
.\"
.Pp
Mouse and pointer devices:
-.Bl -tag -width speaker -offset indent -compact
-.It joy
-joystick game adaptor
+.Bl -tag -width acardide -offset indent -compact
+.It wsmouse
+generic mouse support in
+.Xr wscons 4
+.It btms
+Bluetooth mouse support for wsmouse
+.It pms
+PS/2 mouse support for wsmouse
+.It ums
+USB mouse support for wsmouse
.It lms
-Logitech-style bus mouse device interface
+Logitech-style bus mouse device interface (i386 only)
.It mms
-Microsoft-style bus mouse device interface
-.It pms
-PS/2 auxiliary port mouse device interface
+Microsoft-style bus mouse device interface (i386 only)
+.It joy
+joystick game adaptor
.El
.Pp
Serial mice can be configured on any supported serial port.
@@ -288,7 +497,15 @@
.Sh SEE ALSO
.Xr config 1 ,
.Xr autoconf 4 ,
-.Xr netintro 4
+.Xr cardbus 4 ,
+.Xr fwohci 4 ,
+.Xr netintro 4 ,
+.Xr pciide 4 ,
+.Xr pcmcia 4 ,
+.Xr scsi 4 ,
+.Xr usb 4 ,
+.Xr wscons 4 ,
+.Xr wsmouse 4
.Sh HISTORY
The
.Tn i386