diff options
| -rw-r--r-- | share/man/man4/Makefile | 3 | ||||
| -rw-r--r-- | share/man/man4/isa.4 | 31 |
2 files changed, 17 insertions, 17 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 3bc83989db2..8098ef94381 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.485 2009/07/23 01:40:32 cnst Exp $ +# $OpenBSD: Makefile,v 1.486 2009/07/23 21:20:05 jmc Exp $ MAN= aac.4 ac97.4 acphy.4 \ acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \ @@ -70,6 +70,7 @@ MLINKS+=cardbus.4 cbb.4 MLINKS+=drm.4 inteldrm.4 drm.4 radeondrm.4 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4 MLINKS+=fpa.4 fea.4 fpa.4 fta.4 +MLINKS+=isa.4 isadma.4 MLINKS+=isapnp.4 pnp.4 MLINKS+=netintro.4 networking.4 MLINKS+=pcmcia.4 pcic.4 diff --git a/share/man/man4/isa.4 b/share/man/man4/isa.4 index 1ab1f3d0dcf..9182f62a829 100644 --- a/share/man/man4/isa.4 +++ b/share/man/man4/isa.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: isa.4,v 1.63 2009/01/23 20:32:22 mk Exp $ +.\" $OpenBSD: isa.4,v 1.64 2009/07/23 21:20:05 jmc Exp $ .\" $NetBSD: isa.4,v 1.19 2000/03/18 16:54:37 augustss Exp $ .\" .\" Copyright (c) 2000 Theo de Raadt. All rights reserved. @@ -31,17 +31,18 @@ .\" (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 $Mdocdate: January 23 2009 $ +.Dd $Mdocdate: July 23 2009 $ .Dt ISA 4 .Os .Sh NAME -.Nm isa +.Nm isa , isadma .Nd introduction to ISA bus support .Sh SYNOPSIS .Cd "# amd64 and i386" .Cd "isa* at amdpcib?" .Cd "isa0 at mainbus0" .Cd "isa0 at pcib?" +.Cd "isadma0 at isa?" .Pp .Cd "# i386" .Cd "isa0 at ichpcib?" @@ -52,25 +53,23 @@ .Cd "# alpha" .Cd "isa* at pceb?" .Cd "isa* at sio?" +.Cd "isadma0 at isa?" .Pp .Cd "# hp300" .Cd "isa* at isabr?" +.Sh DESCRIPTION +The system includes a machine-independent ISA bus subsystem +and several machine-independent ISA device drivers. .Pp Attachments are machine-dependent and depend on the bus topology and -.Tn ISA -bus interface of your system. -See -.Xr intro 4 -for your system for details. -.Sh DESCRIPTION -The system includes a machine-independent -.Tn ISA -bus subsystem and several machine-independent -.Tn ISA -device drivers. +ISA bus interface of the system. +Drivers able to use DMA attach at +.Nm isadma ; +otherwise they attach at +.Nm isa . .Pp -Note that interrupt mappings on the i386 may require that you configure -your BIOS to reserve the interrupts for these devices as "Legacy ISA". +Note that interrupt mappings on the i386 may require that the BIOS +be configured to reserve the interrupts for these devices as "Legacy ISA". If such configuration is not done, the system may use those interrupts for .Xr pci 4 |