From fa9fb1eb6ee53ce73a6359ca3e5db72c781cdab2 Mon Sep 17 00:00:00 2001 From: deraadt Date: Sat, 4 May 1996 09:21:13 +0000 Subject: [PATCH] ie0 changes, ahe0 at eisa, and ep* at eisa --- sys/arch/i386/conf/DISKLESS | 9 +++++---- sys/arch/i386/conf/GENERIC | 13 ++++++++----- sys/arch/i386/conf/GENERICADP | 15 +++++++++------ sys/arch/i386/conf/GENERICOTHER | 9 ++++++--- sys/arch/i386/conf/INSTADP | 12 +++++++----- sys/arch/i386/conf/INSTOTHER | 6 +++--- 6 files changed, 38 insertions(+), 26 deletions(-) diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 1c962680077..62c3d8ec544 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,5 +1,5 @@ -# $OpenBSD: DISKLESS,v 1.4 1996/04/21 22:16:04 deraadt Exp $ -# $NetBSD: DISKLESS,v 1.23 1996/03/25 05:45:14 perry Exp $ +# $OpenBSD: DISKLESS,v 1.5 1996/05/04 09:21:13 deraadt Exp $ +# $NetBSD: DISKLESS,v 1.25 1996/04/25 20:14:28 scottr Exp $ # # DISKLESS -- Generic machine setup for diskless boot. # This kernel can be loaded from a bootable floppy (i.e. kernel-copy) @@ -120,7 +120,7 @@ mms1 at isa? port 0x238 irq 5 #scsibus* at aha? #ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers #scsibus* at ahb? -#aic0 at isa? port 0x340 irq 12 # Adaptec 152[02] SCSI controllers +#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers #scsibus* at aic? #bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers #bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers @@ -157,7 +157,8 @@ ed2 at isa? port 0x300 iomem 0xcc000 irq 10 #eg0 at isa? ... # 3C505 ethernet cards #el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards -ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN & 3C507 ethernet cards +ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 +ie1 at isa? port 0x300 irq 10 # EtherExpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 469abad3046..2f1eec40b89 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,5 +1,5 @@ -# $OpenBSD: GENERIC,v 1.9 1996/04/23 10:10:20 mickey Exp $ -# $NetBSD: GENERIC,v 1.40 1996/03/30 23:57:09 perry Exp $ +# $OpenBSD: GENERIC,v 1.10 1996/05/04 09:21:15 deraadt Exp $ +# $NetBSD: GENERIC,v 1.44 1996/04/25 20:14:13 scottr Exp $ # # GENERIC -- everything that's currently supported # @@ -10,6 +10,7 @@ options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation +#options VM86 # Virtual 8086 emulation # Some BIOSes don't get the size of extended memory right. If you # have a broken BIOS, uncomment the following and set the value @@ -127,9 +128,9 @@ ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers scsibus* at ahc? -ahe0 at isa? port 0x1c00 irq ? # Adaptec 284x SCSI controllers +ahe0 at eisa? slot ? # Adaptec 284x SCSI controllers scsibus* at ahe? -aic0 at isa? port 0x340 irq 12 # Adaptec 152[02] SCSI controllers +aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers scsibus* at aic? bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers @@ -170,8 +171,10 @@ ed2 at isa? port 0x300 iomem 0xcc000 irq 10 #eg0 at isa? ... # 3C505 ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards -ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN, 3C507, and Etherexpress +ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 +ie1 at isa? port 0x300 irq 10 # EtherExpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA +ep* at eisa? slot ? # 3C579 ethernet cards le* at pci? dev ? function ? # PCnet-PCI based ethernet cards de* at pci? dev ? function ? # DC21X4X-based ethernet cards ep* at pci? dev ? function ? # 3C590 ethernet cards diff --git a/sys/arch/i386/conf/GENERICADP b/sys/arch/i386/conf/GENERICADP index d8c61ab9ef8..97bbedad0ae 100644 --- a/sys/arch/i386/conf/GENERICADP +++ b/sys/arch/i386/conf/GENERICADP @@ -1,5 +1,5 @@ -# $OpenBSD: GENERICADP,v 1.7 1996/04/21 22:16:09 deraadt Exp $ -# $NetBSD: GENERICADP,v 1.16 1996/03/30 23:57:16 perry Exp $ +# $OpenBSD: GENERICADP,v 1.8 1996/05/04 09:21:15 deraadt Exp $ +# $NetBSD: GENERICADP,v 1.20 1996/04/25 20:14:16 scottr Exp $ # # GENERICADP -- everything that's currently supported, except non- # Adaptec SCSI controllers. @@ -11,6 +11,7 @@ options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation +#options VM86 # Virtual 8086 emulation # Some BIOSes don't get the size of extended memory right. If you # have a broken BIOS, uncomment the following and set the value @@ -128,10 +129,10 @@ ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers scsibus* at ahc? -ahe0 at isa? port 0x1c00 irq ? # Adaptec 284x SCSI controllers -scsibus* at ahe? -aic0 at isa? port 0x340 irq 12 # Adaptec 152[02] SCSI controllers +aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers scsibus* at aic? +ahe0 at eisa? slot ? # Adaptec 284x SCSI controllers +scsibus* at ahe? sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives @@ -156,8 +157,10 @@ ed2 at isa? port 0x300 iomem 0xcc000 irq 10 #eg0 at isa? ... # 3C505 ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards -ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN, 3C507, and Etherexpress +ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 +ie1 at isa? port 0x300 irq 10 # EtherExpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA +ep* at eisa? slot ? # 3C579 ethernet cards le* at pci? dev ? function ? # PCnet-PCI based ethernet cards de* at pci? dev ? function ? # DC21X4X-based ethernet cards ep* at pci? dev ? function ? # 3C590 ethernet cards diff --git a/sys/arch/i386/conf/GENERICOTHER b/sys/arch/i386/conf/GENERICOTHER index 5fc6586b9d0..5a643116d60 100644 --- a/sys/arch/i386/conf/GENERICOTHER +++ b/sys/arch/i386/conf/GENERICOTHER @@ -1,5 +1,5 @@ -# $OpenBSD: GENERICOTHER,v 1.6 1996/04/21 22:16:11 deraadt Exp $ -# $NetBSD: GENERICOTHER,v 1.16 1996/03/30 23:57:19 perry Exp $ +# $OpenBSD: GENERICOTHER,v 1.7 1996/05/04 09:21:16 deraadt Exp $ +# $NetBSD: GENERICOTHER,v 1.19 1996/04/25 20:14:21 scottr Exp $ # # GENERICOTHER -- everything that's currently supported, except # Adaptec SCSI controllers. @@ -11,6 +11,7 @@ options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation +#options VM86 # Virtual 8086 emulation # Some BIOSes don't get the size of extended memory right. If you # have a broken BIOS, uncomment the following and set the value @@ -160,8 +161,10 @@ ed2 at isa? port 0x300 iomem 0xcc000 irq 10 #eg0 at isa? ... # 3C505 ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards -ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN, 3C507, and Etherexpress +ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 +ie1 at isa? port 0x300 irq 10 # EtherExpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA +ep* at eisa? slot ? # 3C579 ethernet cards le* at pci? dev ? function ? # PCnet-PCI based ethernet cards de* at pci? dev ? function ? # DC21X4X-based ethernet cards ep* at pci? dev ? function ? # 3C590 ethernet cards diff --git a/sys/arch/i386/conf/INSTADP b/sys/arch/i386/conf/INSTADP index 45d7f76dc9b..40b94a666b6 100644 --- a/sys/arch/i386/conf/INSTADP +++ b/sys/arch/i386/conf/INSTADP @@ -1,5 +1,5 @@ -# $OpenBSD: INSTADP,v 1.6 1996/04/21 22:16:12 deraadt Exp $ -# $NetBSD: INSTADP,v 1.11 1996/03/25 05:45:28 perry Exp $ +# $OpenBSD: INSTADP,v 1.7 1996/05/04 09:21:17 deraadt Exp $ +# $NetBSD: INSTADP,v 1.14 1996/04/25 20:14:23 scottr Exp $ # # INSTADP -- like GENERICADP. This supports only Adaptec SCSI # adapters. This kernel is GENERICADP with lines @@ -91,9 +91,9 @@ ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers scsibus* at ahc? -ahe0 at isa? port 0x1c00 irq ? # Adaptec 284x SCSI controllers +ahe0 at eisa? slot ? # Adaptec 284x SCSI controllers scsibus* at ahe? -aic0 at isa? port 0x340 irq 12 # Adaptec 152[02] SCSI controllers +aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers scsibus* at aic? sd* at scsibus? target ? lun ? # SCSI disk drives @@ -117,8 +117,10 @@ ed2 at isa? port 0x300 iomem 0xcc000 irq 10 #eg0 at isa? ... # 3C505 ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards -ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN, 3C507, and Etherexpress +ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 +ie1 at isa? port 0x300 irq 10 # EtherExpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA +ep* at eisa? slot ? # 3C579 ethernet cards le* at pci? dev ? function ? # PCnet-PCI based ethernet cards de* at pci? dev ? function ? # DC21X4X-based ethernet cards ep* at pci? dev ? function ? # 3C590 ethernet cards diff --git a/sys/arch/i386/conf/INSTOTHER b/sys/arch/i386/conf/INSTOTHER index 48c7d44477c..305229f3c13 100644 --- a/sys/arch/i386/conf/INSTOTHER +++ b/sys/arch/i386/conf/INSTOTHER @@ -1,5 +1,5 @@ -# $OpenBSD: INSTOTHER,v 1.4 1996/04/21 22:16:14 deraadt Exp $ -# $NetBSD: INSTOTHER,v 1.11 1996/03/30 05:42:59 mycroft Exp $ +# $OpenBSD: INSTOTHER,v 1.5 1996/05/04 09:21:18 deraadt Exp $ +# $NetBSD: INSTOTHER,v 1.13 1996/04/25 20:14:26 scottr Exp $ # # INSTOTHER -- like GENERICOTHER. This supports only non-Adaptec SCSI # adapters. This kernel is GENERICOTHER with lines @@ -112,7 +112,7 @@ ed2 at isa? port 0x300 iomem 0xcc000 irq 10 #eg0 at isa? ... # 3C505 ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards -ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN, 3C507, and Etherexpress +ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA le* at pci? bus ? dev ? # PCnet-PCI based ethernet cards de* at pci? bus ? dev ? # DC21X4X-based ethernet cards -- 2.20.1