From 47cf7abb251f4c045eac45dccb7dd1f0d69d9380 Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 11 Dec 1996 00:39:56 +0000 Subject: [PATCH] fix eisa ultrastor config --- sys/arch/i386/conf/ALL | 4 ++-- sys/arch/i386/conf/DISKLESS | 4 ++-- sys/arch/i386/conf/GENERIC | 4 ++-- sys/arch/i386/conf/LAP | 4 ++-- sys/arch/i386/conf/NETTAN | 4 ++-- sys/arch/i386/conf/TDR | 4 ++-- sys/arch/i386/conf/WALDORF | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL index fe387907f9f..ac1f5aa5f94 100644 --- a/sys/arch/i386/conf/ALL +++ b/sys/arch/i386/conf/ALL @@ -1,4 +1,4 @@ -# $OpenBSD: ALL,v 1.11 1996/10/24 23:25:03 downsj Exp $ +# $OpenBSD: ALL,v 1.12 1996/12/11 00:39:56 deraadt Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # ALL -- everything that's currently supported @@ -152,7 +152,7 @@ sea0 at isa? iomem 0xc8000 irq 5 scsibus* at sea? uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -uha2 at isa? port ? irq ? # UltraStor 24f SCSI controllers +uha* at eisa? slot ? # UltraStor 24f SCSI controllers scsibus* at uha? wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers wds1 at isa? port 0x358 irq 11 drq 5 diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 1350eece36c..eb8eb496b72 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.15 1996/10/24 23:25:06 downsj Exp $ +# $OpenBSD: DISKLESS,v 1.16 1996/12/11 00:39:58 deraadt Exp $ # $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $ # # DISKLESS -- Generic machine setup for diskless boot. @@ -130,7 +130,7 @@ mms1 at isa? port 0x238 irq 5 #scsibus* at sea? #uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers #uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha2 at isa? port ? irq ? # UltraStor 24f SCSI controllers +#uha* at eisa? slot ? # UltraStor 24f SCSI controllers #scsibus* at uha? #sd* at scsibus? target ? lun ? # SCSI disk drives #st* at scsibus? target ? lun ? # SCSI tape drives diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index bff9968430c..b71f960c4c9 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.35 1996/10/24 23:25:09 downsj Exp $ +# $OpenBSD: GENERIC,v 1.36 1996/12/11 00:39:59 deraadt Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -107,7 +107,7 @@ sea0 at isa? iomem 0xc8000 irq 5 scsibus* at sea? uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -uha2 at isa? port ? irq ? # UltraStor 24f SCSI controllers +uha* at eisa? slot ? # UltraStor 24f SCSI controllers scsibus* at uha? wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers wds1 at isa? port 0x358 irq 11 drq 5 diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP index 08066900679..e23a735a787 100644 --- a/sys/arch/i386/conf/LAP +++ b/sys/arch/i386/conf/LAP @@ -1,4 +1,4 @@ -# $OpenBSD: LAP,v 1.15 1996/12/10 23:35:05 deraadt Exp $ +# $OpenBSD: LAP,v 1.16 1996/12/11 00:40:01 deraadt Exp $ # $NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $ # # TDR -- Theo Deraadt's 486 @@ -129,7 +129,7 @@ pms0 at pckbd? irq 12 # PS/2 auxiliary port mouse #scsibus* at sea? #uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers #uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha2 at isa? port ? irq ? # UltraStor 24f SCSI controllers +#uha* at eisa? slot ? # UltraStor 24f SCSI controllers #scsibus* at uha? #sd* at scsibus? target ? lun ? # SCSI disk drives #st* at scsibus? target ? lun ? # SCSI tape drives diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN index fd7bbfc3dc1..c3e68b96426 100644 --- a/sys/arch/i386/conf/NETTAN +++ b/sys/arch/i386/conf/NETTAN @@ -1,4 +1,4 @@ -# $OpenBSD: NETTAN,v 1.16 1996/11/28 20:12:30 niklas Exp $ +# $OpenBSD: NETTAN,v 1.17 1996/12/11 00:40:03 deraadt Exp $ # # NETTAN -- Applitron Datasystem AB # @@ -128,7 +128,7 @@ scsibus0 at ahc? #scsibus* at sea? #uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers #uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha2 at isa? port ? irq ? # UltraStor 24f SCSI controllers +#uha* at eisa? slot ? # UltraStor 24f SCSI controllers #scsibus* at uha? sd0 at scsibus0 target 0 lun ? # Conner 2GB diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR index 7c68d8212e0..fdfba8825e7 100644 --- a/sys/arch/i386/conf/TDR +++ b/sys/arch/i386/conf/TDR @@ -1,4 +1,4 @@ -# $OpenBSD: TDR,v 1.19 1996/10/24 23:25:16 downsj Exp $ +# $OpenBSD: TDR,v 1.20 1996/12/11 00:40:04 deraadt Exp $ # $NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $ # # TDR -- Theo Deraadt's 486 @@ -134,7 +134,7 @@ scsibus* at bt? #scsibus* at sea? #uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers #uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha2 at isa? port ? irq ? # UltraStor 24f SCSI controllers +#uha* at eisa? slot ? # UltraStor 24f SCSI controllers #scsibus* at uha? sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives diff --git a/sys/arch/i386/conf/WALDORF b/sys/arch/i386/conf/WALDORF index ff9e6650476..0d4f4258954 100644 --- a/sys/arch/i386/conf/WALDORF +++ b/sys/arch/i386/conf/WALDORF @@ -132,7 +132,7 @@ scsibus* at aic? #scsibus* at sea? #uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers #uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha2 at isa? port ? irq ? # UltraStor 24f SCSI controllers +#uha* at eisa? slot ? # UltraStor 24f SCSI controllers #scsibus* at uha? #wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 -- 2.20.1