diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 01ae92ce8de7..78805a47e432 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.249 2002/03/19 15:17:48 augustss Exp $ +# $NetBSD: Makefile,v 1.250 2002/03/24 22:29:54 bjh21 Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= acphy.4 adv.4 adw.4 agp.4 ahb.4 ahc.4 amhphy.4 an.4 aria.4 \ @@ -108,7 +108,7 @@ MLINKS+=irframe.4 irda.4 # This is a hack MLINKS+=edc.4 i386/ed.4 -SUBDIR= man4.alpha man4.amiga man4.arm26 man4.arm32 man4.atari man4.hp300 \ +SUBDIR= man4.acorn26 man4.alpha man4.amiga man4.arm32 man4.atari man4.hp300 \ man4.i386 man4.mac68k man4.macppc man4.mvme68k man4.pc532 man4.pmax \ man4.sparc man4.sun2 man4.sun3 man4.vax man4.x68k diff --git a/share/man/man4/man4.arm26/Makefile b/share/man/man4/man4.acorn26/Makefile similarity index 76% rename from share/man/man4/man4.arm26/Makefile rename to share/man/man4/man4.acorn26/Makefile index f3c0f1bdb225..cb2ef9034192 100644 --- a/share/man/man4/man4.arm26/Makefile +++ b/share/man/man4/man4.acorn26/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.1 (Berkeley) 2/12/91 -# $NetBSD: Makefile,v 1.7 2001/09/11 18:16:12 bjh21 Exp $ +# $NetBSD: Makefile,v 1.1 2002/03/24 22:29:55 bjh21 Exp $ MAN= arckbd.4 cpu.4 eca.4 eh.4 ei.4 podulebus.4 unixbp.4 diff --git a/share/man/man4/man4.arm26/arckbd.4 b/share/man/man4/man4.acorn26/arckbd.4 similarity index 96% rename from share/man/man4/man4.arm26/arckbd.4 rename to share/man/man4/man4.acorn26/arckbd.4 index bac0337178d1..76d082fd3ac6 100644 --- a/share/man/man4/man4.arm26/arckbd.4 +++ b/share/man/man4/man4.acorn26/arckbd.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: arckbd.4,v 1.4 2002/01/15 01:27:32 wiz Exp $ +.\" $NetBSD: arckbd.4,v 1.1 2002/03/24 22:29:56 bjh21 Exp $ .\" .\" Copyright (c) 2000 Ben Harris .\" All rights reserved. @@ -27,7 +27,7 @@ .\" .Dd April 1, 2000 .Os -.Dt ARCKBD 4 arm26 +.Dt ARCKBD 4 acorn26 .Sh NAME .Nm arckbd , arcwskbd , arcwsmouse .Nd Archimedes keyboard/mouse driver @@ -41,7 +41,7 @@ The .Nm driver controls the keyboard on systems supported by -.Nx Ns /arm26 +.Nx Ns /acorn26 and interfaces it to the .Nm wscons system. All communication between user programs and the diff --git a/share/man/man4/man4.arm26/cpu.4 b/share/man/man4/man4.acorn26/cpu.4 similarity index 96% rename from share/man/man4/man4.arm26/cpu.4 rename to share/man/man4/man4.acorn26/cpu.4 index 3cad5548cd83..9b13aaec0c2e 100644 --- a/share/man/man4/man4.arm26/cpu.4 +++ b/share/man/man4/man4.acorn26/cpu.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: cpu.4,v 1.7 2002/01/15 01:27:33 wiz Exp $ +.\" $NetBSD: cpu.4,v 1.1 2002/03/24 22:29:56 bjh21 Exp $ .\" .\" Copyright (c) 2000 Ben Harris. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" .Dd December 11, 2000 .Os -.Dt CPU 4 arm26 +.Dt CPU 4 acorn26 .Sh NAME .Nm cpu .Nd Device driver for CPU-specific features diff --git a/share/man/man4/man4.arm26/eca.4 b/share/man/man4/man4.acorn26/eca.4 similarity index 97% rename from share/man/man4/man4.arm26/eca.4 rename to share/man/man4/man4.acorn26/eca.4 index 53733fe653d7..acc33d9843e7 100644 --- a/share/man/man4/man4.arm26/eca.4 +++ b/share/man/man4/man4.acorn26/eca.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: eca.4,v 1.5 2002/01/21 18:02:53 wiz Exp $ +.\" $NetBSD: eca.4,v 1.1 2002/03/24 22:29:56 bjh21 Exp $ .\" .\" Copyright (c) 2001 Ben Harris .\" All rights reserved. @@ -27,7 +27,7 @@ .\" .Dd September 11, 2001 .Os -.Dt ECA 4 arm26 +.Dt ECA 4 acorn26 .Sh NAME .Nm eca .Nd Acorn Econet driver diff --git a/share/man/man4/man4.arm26/eh.4 b/share/man/man4/man4.acorn26/eh.4 similarity index 97% rename from share/man/man4/man4.arm26/eh.4 rename to share/man/man4/man4.acorn26/eh.4 index fdf69203b946..f3386022e4b7 100644 --- a/share/man/man4/man4.arm26/eh.4 +++ b/share/man/man4/man4.acorn26/eh.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: eh.4,v 1.5 2001/06/30 16:55:03 bjh21 Exp $ +.\" $NetBSD: eh.4,v 1.1 2002/03/24 22:29:56 bjh21 Exp $ .\" .\" Copyright (c) 2000 Ben Harris .\" All rights reserved. @@ -27,7 +27,7 @@ .\" .Dd December 22, 2000 .Os -.Dt EH 4 arm26 +.Dt EH 4 acorn26 .Sh NAME .Nm eh .Nd i-cubed EtherLan 100/200/500-series (EtherH) Ethernet driver diff --git a/share/man/man4/man4.arm26/ei.4 b/share/man/man4/man4.acorn26/ei.4 similarity index 96% rename from share/man/man4/man4.arm26/ei.4 rename to share/man/man4/man4.acorn26/ei.4 index 036941f0ebd2..00cab675f3f3 100644 --- a/share/man/man4/man4.arm26/ei.4 +++ b/share/man/man4/man4.acorn26/ei.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: ei.4,v 1.4 2002/01/15 01:27:58 wiz Exp $ +.\" $NetBSD: ei.4,v 1.1 2002/03/24 22:29:57 bjh21 Exp $ .\" .\" Copyright (c) 2000 Ben Harris .\" All rights reserved. @@ -27,7 +27,7 @@ .\" .Dd June 13, 2000 .Os -.Dt EI 4 arm26 +.Dt EI 4 acorn26 .Sh NAME .Nm ei .Nd Acorn diff --git a/share/man/man4/man4.acorn26/iobus.4 b/share/man/man4/man4.acorn26/iobus.4 new file mode 100644 index 000000000000..1497174b0a98 --- /dev/null +++ b/share/man/man4/man4.acorn26/iobus.4 @@ -0,0 +1,57 @@ +.\" $NetBSD: iobus.4,v 1.1 2002/03/24 22:29:57 bjh21 Exp $ +.\" +.\" Copyright (c) 2000 Ben Harris. +.\" All rights reserved. +.\" +.\" 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. +.\" 3. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. +.\" +.\" 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 April 25, 2001 +.Os +.Dt IOBUS 4 acorn26 +.Sh NAME +.Nm iobus +.Nd Device driver for the I/O bus +.Sh SYNOPSIS +.Cd iobus0 at root +.Sh DESCRIPTION +Systems supported by +.Nx Ns /acorn26 +have a 16-bit I/O bus connected to the CPU bus by bi-directional buffers +managed by the IOC. The +.Nm +driver provides support for this bus. All +.Nx Ns /acorn26 +kernels need this driver. +.Pp +On Archimedes systems, the only device attached at +.Nm +is the IOC. While MEMC podules are physically +.Nm +devices, they're logically treated as being attached to the IOC. On +machines with an IOEB, the Universal Peripheral Controller chip is also +attached at +.Nm "" . +.Sh SEE ALSO +.\" .Xr ioc 4 , +.Xr podulebus 4 +.\" .Xr upc 4 diff --git a/share/man/man4/man4.arm26/podulebus.4 b/share/man/man4/man4.acorn26/podulebus.4 similarity index 96% rename from share/man/man4/man4.arm26/podulebus.4 rename to share/man/man4/man4.acorn26/podulebus.4 index 779481894725..7faea059a789 100644 --- a/share/man/man4/man4.arm26/podulebus.4 +++ b/share/man/man4/man4.acorn26/podulebus.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: podulebus.4,v 1.7 2002/02/13 08:17:54 ross Exp $ +.\" $NetBSD: podulebus.4,v 1.1 2002/03/24 22:29:57 bjh21 Exp $ .\" .\" Copyright (c) 2000 Ben Harris .\" All rights reserved. @@ -27,7 +27,7 @@ .\" .Dd December 20, 2000 .Os -.Dt PODULEBUS 4 arm26 +.Dt PODULEBUS 4 acorn26 .Sh NAME .Nm podulebus .Nd Acorn Expansion Card bus driver @@ -97,7 +97,7 @@ i-cubed EtherLan 100-, 200- and 500-series Ethernet cards .Xr ei 4 .Sh BUGS The -.Nx Ns /arm26 +.Nx Ns /acorn26 .Nm driver is not compatible with the .Nx Ns /arm32 diff --git a/share/man/man4/man4.arm26/unixbp.4 b/share/man/man4/man4.acorn26/unixbp.4 similarity index 96% rename from share/man/man4/man4.arm26/unixbp.4 rename to share/man/man4/man4.acorn26/unixbp.4 index 5dde82a6bbbd..796a11fd1f16 100644 --- a/share/man/man4/man4.arm26/unixbp.4 +++ b/share/man/man4/man4.acorn26/unixbp.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: unixbp.4,v 1.2 2001/09/11 22:52:55 wiz Exp $ +.\" $NetBSD: unixbp.4,v 1.1 2002/03/24 22:29:58 bjh21 Exp $ .\" .\" Copyright (c) 2000 Ben Harris .\" All rights reserved. @@ -27,7 +27,7 @@ .\" .Dd December 9, 2000 .Os -.Dt UNIXBP 4 arm26 +.Dt UNIXBP 4 acorn26 .Sh NAME .Nm unixbp .Nd Unix Backplane driver diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 3d2e5daf3dd5..61b98e6fb13c 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -1,4 +1,4 @@ -.\" $NetBSD: hier.7,v 1.42 2002/03/07 14:47:04 simonb Exp $ +.\" $NetBSD: hier.7,v 1.43 2002/03/24 22:30:03 bjh21 Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -649,6 +649,8 @@ AmigaDOS file-system support; see architecture-specific support .Pp .Bl -tag -width "playstation2/" -compact +.It Sy acorn26/ +ARM2 and ARM3 based systems .It Sy acorn32/ Acorn RiscPC/A7000/NC and compatibles .It Sy algor/ @@ -663,8 +665,6 @@ PowerPC based Amiga architecture ARC specification compliant systems. .It Sy arm/ ARM processor general support -.It Sy arm26/ -ARM2 and ARM3 based systems .It Sy atari/ Atari architecture .It Sy bebox/ diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index e8409eaae0c9..774a6bb103ac 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2002/02/25 12:05:13 lukem Exp $ +# $NetBSD: Makefile,v 1.54 2002/03/24 22:30:05 bjh21 Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 MAN= compat_freebsd.8 compat_hpux.8 compat_ibcs2.8 compat_linux.8 \ @@ -15,7 +15,7 @@ MLINKS+=compat_netbsd32.8 netbsd32.8 MLINKS+=yp.8 nis.8 MLINKS+=rc.8 rc.d.8 MLINKS+=rc.8 rc.shutdown.8 -SUBDIR= man8.acorn32 man8.alpha man8.amiga man8.arc man8.arm26 man8.arm32 \ +SUBDIR= man8.acorn26 man8.acorn32 man8.alpha man8.amiga man8.arc man8.arm32 \ man8.atari man8.bebox man8.cobalt man8.dreamcast man8.evbarm \ man8.hp300 man8.hpcmips man8.hpcsh man8.i386 man8.luna68k man8.mac68k \ man8.macppc man8.mipsco man8.mmeye man8.mvme68k man8.netwinder \ diff --git a/share/man/man8/man8.arm26/MAKEDEV.8 b/share/man/man8/man8.acorn26/MAKEDEV.8 similarity index 97% rename from share/man/man8/man8.arm26/MAKEDEV.8 rename to share/man/man8/man8.acorn26/MAKEDEV.8 index 9ecd8b5dc65b..0fc8acb37fe0 100644 --- a/share/man/man8/man8.arm26/MAKEDEV.8 +++ b/share/man/man8/man8.acorn26/MAKEDEV.8 @@ -1,12 +1,12 @@ .\" *** ------------------------------------------------------------------ .\" *** This file was generated automatically -.\" *** from src/etc/etc.arm26/MAKEDEV and +.\" *** from src/etc/etc.acorn26/MAKEDEV and .\" *** src/share/man/man8/MAKEDEV.8.template .\" *** .\" *** DO NOT EDIT - any changes will be lost!!! .\" *** ------------------------------------------------------------------ .\" -.\" $NetBSD: MAKEDEV.8,v 1.10 2002/03/14 01:38:34 wiz Exp $ +.\" $NetBSD: MAKEDEV.8,v 1.1 2002/03/24 22:30:05 bjh21 Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -43,7 +43,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd April 16, 2001 -.Dt MAKEDEV 8 arm26 +.Dt MAKEDEV 8 acorn26 .Os .Sh NAME .Nm MAKEDEV @@ -76,7 +76,7 @@ is used, which can only be used for creating devices by the super-user. .Pp The special targets supported on -.Nx Ns / Ns arm26 +.Nx Ns / Ns acorn26 are: .Pp .\" @@@SPECIAL@@@ diff --git a/share/man/man8/man8.arm26/Makefile b/share/man/man8/man8.acorn26/Makefile similarity index 65% rename from share/man/man8/man8.arm26/Makefile rename to share/man/man8/man8.acorn26/Makefile index 863144a9c008..d834ca326e13 100644 --- a/share/man/man8/man8.arm26/Makefile +++ b/share/man/man8/man8.acorn26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/01/04 15:29:07 bjh21 Exp $ +# $NetBSD: Makefile,v 1.1 2002/03/24 22:30:06 bjh21 Exp $ MAN= boot26.8 MAKEDEV.8 MLINKS= boot26.8 boot.8 MAKEDEV.8 makedev.8 diff --git a/share/man/man8/man8.arm26/boot26.8 b/share/man/man8/man8.acorn26/boot26.8 similarity index 97% rename from share/man/man8/man8.arm26/boot26.8 rename to share/man/man8/man8.acorn26/boot26.8 index c6400f58a676..b685b2307aa2 100644 --- a/share/man/man8/man8.arm26/boot26.8 +++ b/share/man/man8/man8.acorn26/boot26.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot26.8,v 1.5 2002/02/13 08:18:26 ross Exp $ +.\" $NetBSD: boot26.8,v 1.1 2002/03/24 22:30:07 bjh21 Exp $ .\" .\" Copyright (c) 2000, 2001 Ben Harris .\" All rights reserved. @@ -26,12 +26,12 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd August 4, 2001 -.Dt BOOT26 8 arm26 +.Dt BOOT26 8 acorn26 .Os .Sh NAME .Nm boot26 .Nd Bootloader for -.Nx Ns /arm26 +.Nx Ns /acorn26 .Sh SYNOPSIS .Nm *boot26 .Op Fl acdqsv @@ -41,7 +41,7 @@ is a program that runs under .Tn RISC OS and launches the -.Nx Ns /arm26 +.Nx Ns /acorn26 kernel. It needs to be installed in a RISC OS filesystem and given file type FFA (Module). The kernel it is to load also needs to be stored in a @@ -130,7 +130,7 @@ S -\*[Gt] Screen memory .Ed .Pp On a machine with 32k pages (which is all -.Nx Ns /arm26 +.Nx Ns /acorn26 supports), the left half of the first line is potential screen memory, and hence not used by .Nm "" .