From 06349d0f45477dea9f2532fbeda212c5f2672f38 Mon Sep 17 00:00:00 2001 From: mycroft Date: Sat, 31 Aug 1996 20:39:14 +0000 Subject: [PATCH] Update for BusLogic and UltraStor changes. --- sys/arch/i386/conf/BOAT_ANCHOR | 12 ++++++------ sys/arch/i386/conf/DISKLESS | 12 ++++++------ sys/arch/i386/conf/GENERIC | 12 ++++++------ sys/arch/i386/conf/GENERICOTHER | 12 ++++++------ sys/arch/i386/conf/INSTALL | 12 ++++++------ sys/arch/i386/conf/INSTOTHER | 12 ++++++------ sys/arch/i386/conf/KICKME | 6 +++--- sys/arch/i386/conf/PAIN | 12 ++++++------ sys/arch/i386/conf/PATEK | 12 ++++++------ sys/arch/i386/conf/SUN_LAMP | 12 ++++++------ sys/arch/i386/conf/TRINITY | 12 ++++++------ 11 files changed, 63 insertions(+), 63 deletions(-) diff --git a/sys/arch/i386/conf/BOAT_ANCHOR b/sys/arch/i386/conf/BOAT_ANCHOR index 2519e602361d..ec848679a103 100644 --- a/sys/arch/i386/conf/BOAT_ANCHOR +++ b/sys/arch/i386/conf/BOAT_ANCHOR @@ -1,4 +1,4 @@ -# $NetBSD: BOAT_ANCHOR,v 1.64 1996/08/26 23:39:54 mrg Exp $ +# $NetBSD: BOAT_ANCHOR,v 1.65 1996/08/31 20:39:14 mycroft Exp $ # # BOAT_ANCHOR -- kernel for the 386-20 the gang uses for testing # @@ -124,17 +124,17 @@ com* at ast? slave ? #scsibus* at ahb? #aic0 at isa? port 0x340 irq 12 # 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 -#bt2 at isa? port ? irq ? -#scsibus* at bt? +#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha* at eisa? slot ? +#scsibus* at bha? #ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers #scsibus* at ncr? #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? #sd* at scsibus? target ? lun ? # SCSI disk drives #st* at scsibus? target ? lun ? # SCSI tape drives diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index a0386afbca59..2ca242df9412 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.27 1996/08/26 23:39:55 mrg Exp $ +# $NetBSD: DISKLESS,v 1.28 1996/08/31 20:39:16 mycroft Exp $ # # DISKLESS -- Generic machine setup for diskless boot. # This kernel can be loaded from a bootable floppy (i.e. kernel-copy) @@ -122,17 +122,17 @@ mms1 at isa? port 0x238 irq 5 #scsibus* at ahb? #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 -#bt2 at isa? port ? irq ? -#scsibus* at bt? +#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha* at eisa? slot ? +#scsibus* at bha? #ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers #scsibus* at ncr? #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? #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 6553708370e9..a0a8d2e3e686 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.52 1996/08/26 23:39:57 mrg Exp $ +# $NetBSD: GENERIC,v 1.53 1996/08/31 20:39:17 mycroft Exp $ # # GENERIC -- everything that's currently supported # @@ -134,17 +134,17 @@ ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers scsibus* at ahc? 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 -bt2 at isa? port ? irq ? -scsibus* at bt? +bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha* at eisa? slot ? +scsibus* at bha? ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers scsibus* at ncr? 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/GENERICOTHER b/sys/arch/i386/conf/GENERICOTHER index b456daa476c5..8a3befb97a1f 100644 --- a/sys/arch/i386/conf/GENERICOTHER +++ b/sys/arch/i386/conf/GENERICOTHER @@ -1,4 +1,4 @@ -# $NetBSD: GENERICOTHER,v 1.23 1996/08/26 23:40:01 mrg Exp $ +# $NetBSD: GENERICOTHER,v 1.24 1996/08/31 20:39:19 mycroft Exp $ # # GENERICOTHER -- everything that's currently supported, except # Adaptec SCSI controllers. @@ -122,17 +122,17 @@ mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse mms1 at isa? port 0x238 irq 5 #pms0 at pckbd? irq 12 # PS/2 auxiliary port mouse -bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -bt2 at isa? port ? irq ? -scsibus* at bt? +bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha* at eisa? slot ? +scsibus* at bha? ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers scsibus* at ncr? 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/INSTALL b/sys/arch/i386/conf/INSTALL index 11ec0e77e4c6..366a88dcb386 100644 --- a/sys/arch/i386/conf/INSTALL +++ b/sys/arch/i386/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.16 1996/08/26 23:40:07 mrg Exp $ +# $NetBSD: INSTALL,v 1.17 1996/08/31 20:39:20 mycroft Exp $ # # INSTOTHER -- like GENERICOTHER. This supports only non-Adaptec SCSI # adapters. This kernel is GENERICOTHER with lines @@ -84,17 +84,17 @@ lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports lpt1 at isa? port 0x278 lpt2 at isa? port 0x3bc -bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -bt2 at isa? port ? irq ? -scsibus* at bt? +bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha* at eisa? slot ? +scsibus* at bha? ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers scsibus* at ncr? 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/INSTOTHER b/sys/arch/i386/conf/INSTOTHER index 5bdc9febdb06..079570547773 100644 --- a/sys/arch/i386/conf/INSTOTHER +++ b/sys/arch/i386/conf/INSTOTHER @@ -1,4 +1,4 @@ -# $NetBSD: INSTOTHER,v 1.16 1996/08/26 23:40:07 mrg Exp $ +# $NetBSD: INSTOTHER,v 1.17 1996/08/31 20:39:20 mycroft Exp $ # # INSTOTHER -- like GENERICOTHER. This supports only non-Adaptec SCSI # adapters. This kernel is GENERICOTHER with lines @@ -84,17 +84,17 @@ lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports lpt1 at isa? port 0x278 lpt2 at isa? port 0x3bc -bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -bt2 at isa? port ? irq ? -scsibus* at bt? +bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha* at eisa? slot ? +scsibus* at bha? ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers scsibus* at ncr? 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/KICKME b/sys/arch/i386/conf/KICKME index 4d20d6c42430..cc00fb8bd15f 100644 --- a/sys/arch/i386/conf/KICKME +++ b/sys/arch/i386/conf/KICKME @@ -1,4 +1,4 @@ -# $NetBSD: KICKME,v 1.32 1996/08/26 23:40:16 mrg Exp $ +# $NetBSD: KICKME,v 1.33 1996/08/31 20:39:22 mycroft Exp $ # # KICKME -- 486Cx-33 development machine # @@ -62,8 +62,8 @@ pc0 at isa? port 0x60 irq 1 # generic PC console device com0 at isa? port 0x3f8 irq 4 # standard PC serial ports com1 at isa? port 0x2f8 irq 3 -bt0 at isa? port 0x330 irq ? drq ? # BusLogic 54x SCSI controllers -scsibus* at bt? +bha0 at isa? port 0x330 irq ? drq ? # BusLogic 54x SCSI controllers +scsibus* at bha? sd* at scsibus? target ? lun ? # SCSI disk drives #st* at scsibus? target ? lun ? # SCSI tape drives cd* at scsibus? target ? lun ? # SCSI CD-ROM drives diff --git a/sys/arch/i386/conf/PAIN b/sys/arch/i386/conf/PAIN index b7e0679e8938..43a03e796058 100644 --- a/sys/arch/i386/conf/PAIN +++ b/sys/arch/i386/conf/PAIN @@ -1,4 +1,4 @@ -# $NetBSD: PAIN,v 1.67 1996/08/26 23:40:18 mrg Exp $ +# $NetBSD: PAIN,v 1.68 1996/08/31 20:39:23 mycroft Exp $ # # PAIN -- mail server and test machine # @@ -124,17 +124,17 @@ ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? aic0 at isa? port 0x340 irq 12 # 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 -#bt2 at isa? port ? irq ? -#scsibus* at bt? +#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha* at eisa? slot ? +#scsibus* at bha? #ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers #scsibus* at ncr? #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? sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives diff --git a/sys/arch/i386/conf/PATEK b/sys/arch/i386/conf/PATEK index 712772bd1b9e..24ea94726ee1 100644 --- a/sys/arch/i386/conf/PATEK +++ b/sys/arch/i386/conf/PATEK @@ -1,4 +1,4 @@ -# $NetBSD: PATEK,v 1.38 1996/08/26 23:40:20 mrg Exp $ +# $NetBSD: PATEK,v 1.39 1996/08/31 20:39:25 mycroft Exp $ # # PATEK -- Mycroft's 486 test box # @@ -120,17 +120,17 @@ pms0 at pckbd? irq 12 # PS/2 auxiliary port mouse #scsibus* at ahb? 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 -#bt2 at isa? port ? irq ? -#scsibus* at bt? +#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha* at eisa? slot ? +#scsibus* at bha? #ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers #scsibus* at ncr? #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? sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives diff --git a/sys/arch/i386/conf/SUN_LAMP b/sys/arch/i386/conf/SUN_LAMP index 7454ba49f69c..ea5208e02eaa 100644 --- a/sys/arch/i386/conf/SUN_LAMP +++ b/sys/arch/i386/conf/SUN_LAMP @@ -1,4 +1,4 @@ -# $NetBSD: SUN_LAMP,v 1.73 1996/08/26 23:40:21 mrg Exp $ +# $NetBSD: SUN_LAMP,v 1.74 1996/08/31 20:39:26 mycroft Exp $ # # SUN_LAMP -- kernel for one of cgd's 486/50 EISA boxes... # @@ -121,17 +121,17 @@ ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? #aic0 at isa? port 0x340 irq 12 # Adaptec 152[02] SCSI controllers #scsibus* at aic? -bt0 at isa? port 0x130 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt2 at isa? port ? irq ? -scsibus* at bt? +bha0 at isa? port 0x130 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha* at eisa? slot ? +scsibus* at bha? #ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers #scsibus* at ncr? #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? sd0 at scsibus? target 0 lun 0 sd1 at scsibus? target 1 lun 0 diff --git a/sys/arch/i386/conf/TRINITY b/sys/arch/i386/conf/TRINITY index 7314a67a9be6..a546bb092d26 100644 --- a/sys/arch/i386/conf/TRINITY +++ b/sys/arch/i386/conf/TRINITY @@ -1,4 +1,4 @@ -# $NetBSD: TRINITY,v 1.71 1996/08/26 23:40:23 mrg Exp $ +# $NetBSD: TRINITY,v 1.72 1996/08/31 20:39:29 mycroft Exp $ # # TRINITY -- Mycroft's 386 box # @@ -122,17 +122,17 @@ scsibus* at aha? #scsibus* at ahb? #aic0 at isa? port 0x340 irq 12 # 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 -#bt2 at isa? port ? irq ? -scsibus* at bt? +#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha* at eisa? slot ? +scsibus* at bha? #ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers #scsibus* at ncr? #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? sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives