diff options
| author | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 1999-07-25 04:38:27 +0000 |
|---|---|---|
| committer | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 1999-07-25 04:38:27 +0000 |
| commit | 5ece25a2d714f31181d1552993f7bc35879db30a (patch) | |
| tree | 93253630bd4bf62d416b11d59a882769cd0f149f /sys/arch/i386/conf | |
| parent | 9fbf80ba152078dc1215f9769342aa84fa304d4c (diff) | |
Enable new ATA/ATAPISCSI functionality as default.
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 23 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 22 |
2 files changed, 33 insertions, 12 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 1221345a45e..0241386e034 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.115 1999/07/24 22:33:24 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.116 1999/07/25 04:38:26 csapuntz Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -149,15 +149,26 @@ fd* at fdc? drive ? #mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives -wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE controllers -wdc1 at isa? port 0x170 irq 15 -wd* at wdc? drive ? +# IDE controllers +pciide* at pci ? dev ? function ? flags 0x0000 -atapibus* at wdc? -acd* at atapibus? drive? +wdc0 at isa? port 0x1f0 irq 14 flags 0x00 +wdc1 at isa? port 0x170 irq 15 flags 0x00 +wdc* at pcmcia? function ? +wdc* at isapnp? + +# IDE hard drives +wd* at wdc? channel ? drive ? flags 0x0000 +wd* at pciide? channel ? drive ? flags 0x0000 + +# ATAPI<->SCSI +atapiscsi* at wdc? channel ? +atapiscsi* at pciide? channel ? +scsibus* at atapiscsi? wt0 at isa? port 0x308 irq 5 drq 1 # Archive and Wangtek QIC tape drives +# Networking devices we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet we1 at isa? port 0x300 iomem 0xcc000 irq 10 # we* at isapnp? diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 659146d4028..d5c1f8ab611 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.64 1999/05/23 20:49:39 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.65 1999/07/25 04:38:26 csapuntz Exp $ # from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp # # Install kernels no longer support X. @@ -151,12 +151,22 @@ fd* at fdc? drive ? #mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives -wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE controllers -wdc1 at isa? port 0x170 irq 15 -wd* at wdc? drive ? +# IDE controllers +pciide* at pci ? dev ? function ? flags 0x0000 -atapibus* at wdc? -acd* at atapibus? drive? +wdc0 at isa? port 0x1f0 irq 14 flags 0x00 +wdc1 at isa? port 0x170 irq 15 flags 0x00 +wdc* at pcmcia? function ? +wdc* at isapnp? + +# IDE hard drives +wd* at wdc? channel ? drive ? flags 0x0000 +wd* at pciide? channel ? drive ? flags 0x0000 + +# ATAPI<->SCSI +atapiscsi* at wdc? channel ? +atapiscsi* at pciide? channel ? +scsibus* at atapiscsi? #wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes |