From 3caed03f1967bf8dce8538bde32da448348f47ba Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Fri, 4 Oct 1996 02:51:26 +0000 Subject: ahc on eisa, netbsd --- sys/arch/i386/conf/ALL | 5 +++-- sys/arch/i386/conf/BABY | 5 +++-- sys/arch/i386/conf/GENERIC | 5 +++-- sys/arch/i386/conf/INST | 5 +++-- sys/arch/i386/conf/WALDORF | 4 +++- sys/arch/i386/conf/files.i386 | 7 ++++++- 6 files changed, 21 insertions(+), 10 deletions(-) (limited to 'sys/arch/i386/conf') diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL index 78b2792cd12..23d79681eb1 100644 --- a/sys/arch/i386/conf/ALL +++ b/sys/arch/i386/conf/ALL @@ -1,4 +1,4 @@ -# $OpenBSD: ALL,v 1.9 1996/09/20 06:45:04 deraadt Exp $ +# $OpenBSD: ALL,v 1.10 1996/10/04 02:51:08 deraadt Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # ALL -- everything that's currently supported @@ -140,8 +140,9 @@ aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers scsibus* at aha? ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? +ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers +ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers -ahc* at eisa? slot ? scsibus* at ahc? aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers scsibus* at aic? diff --git a/sys/arch/i386/conf/BABY b/sys/arch/i386/conf/BABY index 099b31560ca..29faf27816d 100644 --- a/sys/arch/i386/conf/BABY +++ b/sys/arch/i386/conf/BABY @@ -1,4 +1,4 @@ -# $OpenBSD: BABY,v 1.10 1996/09/29 11:45:46 deraadt Exp $ +# $OpenBSD: BABY,v 1.11 1996/10/04 02:51:10 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -132,8 +132,9 @@ aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers scsibus* at aha? ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? +ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers +ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers -ahc* at eisa? slot ? scsibus* at ahc? aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers scsibus* at aic? diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 8dc48312890..f7d9726ec1e 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.33 1996/09/02 02:34:09 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.34 1996/10/04 02:51:12 deraadt Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -95,8 +95,9 @@ aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers scsibus* at aha? ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? +ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers +ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers -ahc* at eisa? slot ? scsibus* at ahc? aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers scsibus* at aic? diff --git a/sys/arch/i386/conf/INST b/sys/arch/i386/conf/INST index be22cd1a9fd..63415a15eb9 100644 --- a/sys/arch/i386/conf/INST +++ b/sys/arch/i386/conf/INST @@ -1,4 +1,4 @@ -# $OpenBSD: INST,v 1.13 1996/10/01 20:25:28 deraadt Exp $ +# $OpenBSD: INST,v 1.14 1996/10/04 02:51:13 deraadt Exp $ # $NetBSD: INSTADP,v 1.17 1996/05/20 03:32:19 thorpej Exp $ # # Install kernels no longer support X. @@ -105,8 +105,9 @@ aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers scsibus* at aha? ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? +ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers +ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers -ahc* at eisa? slot ? # Adaptec 284x SCSI controllers scsibus* at ahc? aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers scsibus* at aic? diff --git a/sys/arch/i386/conf/WALDORF b/sys/arch/i386/conf/WALDORF index 59b18a69a12..38926697547 100644 --- a/sys/arch/i386/conf/WALDORF +++ b/sys/arch/i386/conf/WALDORF @@ -115,7 +115,9 @@ aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers scsibus* at aha? #ahb0 at isa? port ? irq ? # Adaptec 174[024] SCSI controllers #scsibus* at ahb? -#ahc* at pci? bus ? dev ? # Adaptec 2940 SCSI controllers +#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers +#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers +#ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers #scsibus* at ahc? aic0 at isa? port 0x340 irq 12 # Adaptec 152[02] SCSI controllers scsibus* at aic? diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 9a8d0f0a19e..be97ef19615 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.26 1996/09/12 07:48:44 mickey Exp $ +# $OpenBSD: files.i386,v 1.27 1996/10/04 02:51:16 deraadt Exp $ # $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $ # # new style config file for i386 architecture @@ -171,6 +171,11 @@ device joy attach joy at isa file arch/i386/isa/joy.c joy needs-flag +# Adaptec AHA-284x VL SCSI controllers +# device declaration in sys/conf/files +attach ahc at isa with ahc_isa +file arch/i386/isa/ahc_isa.c ahc_isa + # Pentium performance counters pseudo-device pctr file arch/i386/i386/pctr.c pctr needs-flag -- cgit v1.2.3