Pre 4.0 tidy up.

Collect together the components of several drivers and export eisa from
the i386-only area (It's not, it's on some alphas too).  The code hasn't
been updated to work on the Alpha yet, but that can come later.

Repository copies were done a while ago.
Moving these now keeps them in consistant place across the 4.x series
as the newbusification progresses.

Submitted by:   mdodd

4 files changed, 0 insertions, 2717 deletions

diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c
deleted file mode 100644
index 8f8fc58..0000000
--- a/sys/pci/adv_pci.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Device probe and attach routines for the following
- * Advanced Systems Inc. SCSI controllers:
- *
- *   Connectivity Products:
- *	ABP920   - Bus-Master PCI (16 CDB)
- *	ABP930   - Bus-Master PCI (16 CDB) *
- *	ABP930U  - Bus-Master PCI Ultra (16 CDB)
- *	ABP930UA - Bus-Master PCI Ultra (16 CDB)
- *	ABP960   - Bus-Master PCI MAC/PC (16 CDB) **
- *	ABP960U  - Bus-Master PCI MAC/PC Ultra (16 CDB)
- *
- *   Single Channel Products:
- *	ABP940 - Bus-Master PCI (240 CDB)
- *	ABP940U - Bus-Master PCI Ultra (240 CDB)
- *	ABP970 - Bus-Master PCI MAC/PC (240 CDB)
- *	ABP970U - Bus-Master PCI MAC/PC Ultra (240 CDB)
- *
- *   Dual Channel Products:  
- *	ABP950 - Dual Channel Bus-Master PCI (240 CDB Per Channel)
- *
- *   Footnotes:
- *	 * This board has been sold by SIIG as the Fast SCSI Pro PCI.
- *	** This board has been sold by Iomega as a Jaz Jet PCI adapter. 
- *
- * Copyright (c) 1997 Justin Gibbs.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-
-#include <machine/bus_pio.h>
-#include <machine/bus.h>
-
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
-
-#include <dev/advansys/advansys.h>
-
-#define PCI_BASEADR0	PCI_MAP_REG_START	/* I/O Address */
-#define PCI_BASEADR1	PCI_MAP_REG_START + 4	/* Mem I/O Address */
-
-#define	PCI_DEVICE_ID_ADVANSYS_1200A	0x110010CD
-#define	PCI_DEVICE_ID_ADVANSYS_1200B	0x120010CD
-#define	PCI_DEVICE_ID_ADVANSYS_ULTRA	0x130010CD
-#define	PCI_DEVICE_REV_ADVANSYS_3150	0x02
-#define	PCI_DEVICE_REV_ADVANSYS_3050	0x03
-
-#define ADV_PCI_MAX_DMA_ADDR    (0xFFFFFFFFL)
-#define ADV_PCI_MAX_DMA_COUNT   (0xFFFFFFFFL)
-
-static const char* advpciprobe(pcici_t tag, pcidi_t type);
-static void advpciattach(pcici_t config_id, int unit);
-
-/* 
- * The overrun buffer shared amongst all PCI adapters.
- */
-static  u_int8_t*	overrun_buf;
-static	bus_dma_tag_t	overrun_dmat;
-static	bus_dmamap_t	overrun_dmamap;
-static	bus_addr_t	overrun_physbase;
-
-static struct  pci_device adv_pci_driver = {
-	"adv",
-        advpciprobe,
-        advpciattach,
-        &adv_unit,
-	NULL
-};
-
-COMPAT_PCI_DRIVER (adv_pci, adv_pci_driver);
-
-static const char*
-advpciprobe(pcici_t tag, pcidi_t type)
-{
-	int rev = pci_conf_read(tag, PCI_CLASS_REG) & 0xff;
-	switch (type) {
-	case PCI_DEVICE_ID_ADVANSYS_1200A:
-		return ("AdvanSys ASC1200A SCSI controller");
-	case PCI_DEVICE_ID_ADVANSYS_1200B:
-		return ("AdvanSys ASC1200B SCSI controller");
-	case PCI_DEVICE_ID_ADVANSYS_ULTRA:
-		if (rev == PCI_DEVICE_REV_ADVANSYS_3150)
-			return ("AdvanSys ASC3150 Ultra SCSI controller");
-		else
-			return ("AdvanSys ASC3050 Ultra SCSI controller");
-		break;
-	default:
-		break;
-	}
-	return (NULL);
-}
-
-static void
-advpciattach(pcici_t config_id, int unit)
-{
-	u_int16_t	io_port;
-	struct		adv_softc *adv;
-	u_int32_t	id;
-	u_int32_t	command;
-	int		error;
- 
-	/*
-	 * Determine the chip version.
-	 */
-	id = pci_cfgread(config_id, PCI_ID_REG, /*bytes*/4);
-	command = pci_cfgread(config_id, PCIR_COMMAND, /*bytes*/1);
-
-	/*
-	 * These cards do not allow memory mapped accesses, so we must
-	 * ensure that I/O accesses are available or we won't be able
-	 * to talk to them.
-	 */
-	if ((command & (PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN))
-	 != (PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN)) {
-		command |= PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN;
-		pci_cfgwrite(config_id, PCIR_COMMAND, command, /*bytes*/1);
-	}
-
-	/*
-	 * Early chips can't handle non-zero latency timer settings.
-	 */
-	if (id == PCI_DEVICE_ID_ADVANSYS_1200A
-	 || id == PCI_DEVICE_ID_ADVANSYS_1200B) {
-		pci_cfgwrite(config_id, PCIR_LATTIMER, /*value*/0, /*bytes*/1);
-	}
-
-
-	if (pci_map_port(config_id, PCI_BASEADR0, &io_port) == 0)
-		return;
-
-	if (adv_find_signature(I386_BUS_SPACE_IO, io_port) == 0)
-		return;
-
-	adv = adv_alloc(unit, I386_BUS_SPACE_IO, io_port);
-	if (adv == NULL)
-		return;
-
-	/* Allocate a dmatag for our transfer DMA maps */
-	/* XXX Should be a child of the PCI bus dma tag */
-	error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1,
-				   /*boundary*/0,
-				   /*lowaddr*/ADV_PCI_MAX_DMA_ADDR,
-				   /*highaddr*/BUS_SPACE_MAXADDR,
-				   /*filter*/NULL, /*filterarg*/NULL,
-				   /*maxsize*/BUS_SPACE_MAXSIZE_32BIT,
-				   /*nsegments*/BUS_SPACE_UNRESTRICTED,
-				   /*maxsegsz*/ADV_PCI_MAX_DMA_COUNT,
-				   /*flags*/0,
-				   &adv->parent_dmat);
- 
-	if (error != 0) {
-		printf("%s: Could not allocate DMA tag - error %d\n",
-		       adv_name(adv), error);
-		adv_free(adv);
-		return;
-	}
-
-	adv->init_level++;
-
-	if (overrun_buf == NULL) {
-		/* Need to allocate our overrun buffer */
-		if (bus_dma_tag_create(adv->parent_dmat,
-				       /*alignment*/8, /*boundary*/0,
-				       ADV_PCI_MAX_DMA_ADDR, BUS_SPACE_MAXADDR,
-				       /*filter*/NULL, /*filterarg*/NULL,
-				       ADV_OVERRUN_BSIZE, /*nsegments*/1,
-				       BUS_SPACE_MAXSIZE_32BIT, /*flags*/0,
-				       &overrun_dmat) != 0) {
-			bus_dma_tag_destroy(adv->parent_dmat);
-			adv_free(adv);
-			return;
-       		}
-		if (bus_dmamem_alloc(overrun_dmat,
-				     (void **)&overrun_buf,
-				     BUS_DMA_NOWAIT,
-				     &overrun_dmamap) != 0) {
-			bus_dma_tag_destroy(overrun_dmat);
-			bus_dma_tag_destroy(adv->parent_dmat);
-			adv_free(adv);
-			return;
-		}
-		/* And permanently map it in */  
-		bus_dmamap_load(overrun_dmat, overrun_dmamap,
-				overrun_buf, ADV_OVERRUN_BSIZE,
-				adv_map, &overrun_physbase,
-				/*flags*/0);
-	}
-
-	adv->overrun_physbase = overrun_physbase;
-			
-	/*
-	 * Stop the chip.
-	 */
-	ADV_OUTB(adv, ADV_CHIP_CTRL, ADV_CC_HALT);
-	ADV_OUTW(adv, ADV_CHIP_STATUS, 0);
-
-	adv->chip_version = ADV_INB(adv, ADV_NONEISA_CHIP_REVISION);
-	adv->type = ADV_PCI;
-	
-	/*
-	 * Setup active negation and signal filtering.
-	 */
-	{
-		u_int8_t extra_cfg;
-
-		if (adv->chip_version >= ADV_CHIP_VER_PCI_ULTRA_3150)
-			adv->type |= ADV_ULTRA;
-		if (adv->chip_version == ADV_CHIP_VER_PCI_ULTRA_3150)
-			extra_cfg = ADV_IFC_ACT_NEG | ADV_IFC_SLEW_RATE;
-		else if (adv->chip_version == ADV_CHIP_VER_PCI_ULTRA_3050)
-			extra_cfg = ADV_IFC_ACT_NEG | ADV_IFC_WR_EN_FILTER;
-		else
-			extra_cfg = ADV_IFC_ACT_NEG | ADV_IFC_SLEW_RATE;
-		ADV_OUTB(adv, ADV_REG_IFC, extra_cfg);
-	}
-
-	if (adv_init(adv) != 0) {
-		adv_free(adv);
-		return;
-	}
-
-	adv->max_dma_count = ADV_PCI_MAX_DMA_COUNT;
-	adv->max_dma_addr = ADV_PCI_MAX_DMA_ADDR;
-
-#if CC_DISABLE_PCI_PARITY_INT
-	{
-		u_int16_t config_msw;
-
-		config_msw = ADV_INW(adv, ADV_CONFIG_MSW);
-		config_msw &= 0xFFC0;
-		ADV_OUTW(adv, ADV_CONFIG_MSW, config_msw); 
-	}
-#endif
- 
-	if (id == PCI_DEVICE_ID_ADVANSYS_1200A
-	 || id == PCI_DEVICE_ID_ADVANSYS_1200B) {
-		adv->bug_fix_control |= ADV_BUG_FIX_IF_NOT_DWB;
-		adv->bug_fix_control |= ADV_BUG_FIX_ASYN_USE_SYN;
-		adv->fix_asyn_xfer = ~0;
-	}
-
-	if ((pci_map_int(config_id, adv_intr, (void *)adv, &cam_imask)) == 0) {
-		adv_free(adv);
-		return;
-	}
-	
-	adv_attach(adv);
-}
diff --git a/sys/pci/ahc_pci.c b/sys/pci/ahc_pci.c
deleted file mode 100644
index 6e86839..0000000
--- a/sys/pci/ahc_pci.c
+++ /dev/null
@@ -1,1860 +0,0 @@
-/*
- * Product specific probe and attach routines for:
- *      3940, 2940, aic7895, aic7890, aic7880,
- *	aic7870, aic7860 and aic7850 SCSI controllers
- *
- * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000 Justin T. Gibbs
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Where this Software is combined with software released under the terms of 
- * the GNU Public License ("GPL") and the terms of the GPL would require the 
- * combined work to also be released under the terms of the GPL, the terms
- * and conditions of this License will apply in addition to those of the
- * GPL with the exception of any terms or conditions of this License that
- * conflict with, or are expressly prohibited by, the GPL.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
-
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <machine/clock.h>
-#include <sys/rman.h>
-
-#include <cam/cam.h>
-#include <cam/cam_ccb.h>
-#include <cam/cam_sim.h>
-#include <cam/cam_xpt_sim.h>
-
-#include <cam/scsi/scsi_all.h>
-
-#include <dev/aic7xxx/aic7xxx.h>
-#include <dev/aic7xxx/93cx6.h>
-
-#include <aic7xxx_reg.h>
-
-#define AHC_PCI_IOADDR	PCIR_MAPS		/* I/O Address */
-#define AHC_PCI_MEMADDR	(PCIR_MAPS + 4)	/* Mem I/O Address */
-
-static __inline u_int64_t
-ahc_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)
-{
-	u_int64_t id;
-
-	id = subvendor
-	   | (subdevice << 16)
-	   | ((u_int64_t)vendor << 32)
-	   | ((u_int64_t)device << 48);
-
-	return (id);
-}
-
-#define ID_ALL_MASK		0xFFFFFFFFFFFFFFFFull
-#define ID_DEV_VENDOR_MASK	0xFFFFFFFF00000000ull
-#define ID_AIC7850		0x5078900400000000ull
-#define ID_AHA_2910_15_20_30C	0x5078900478509004ull
-#define ID_AIC7855		0x5578900400000000ull
-#define ID_AIC7859		0x3860900400000000ull
-#define ID_AHA_2930CU		0x3860900438699004ull
-#define ID_AIC7860		0x6078900400000000ull
-#define ID_AIC7860C		0x6078900478609004ull
-#define ID_AHA_2940AU_0		0x6178900400000000ull
-#define ID_AHA_2940AU_1		0x6178900478619004ull
-#define ID_AHA_2940AU_CN	0x2178900478219004ull
-#define ID_AHA_2930C_VAR	0x6038900438689004ull
-
-#define ID_AIC7870		0x7078900400000000ull
-#define ID_AHA_2940		0x7178900400000000ull
-#define ID_AHA_3940		0x7278900400000000ull
-#define ID_AHA_398X		0x7378900400000000ull
-#define ID_AHA_2944		0x7478900400000000ull
-#define ID_AHA_3944		0x7578900400000000ull
-
-#define ID_AIC7880		0x8078900400000000ull
-#define ID_AIC7880_B		0x8078900478809004ull
-#define ID_AHA_2940U		0x8178900400000000ull
-#define ID_AHA_3940U		0x8278900400000000ull
-#define ID_AHA_2944U		0x8478900400000000ull
-#define ID_AHA_3944U		0x8578900400000000ull
-#define ID_AHA_398XU		0x8378900400000000ull
-#define ID_AHA_4944U		0x8678900400000000ull
-#define ID_AHA_2940UB		0x8178900478819004ull
-#define ID_AHA_2930U		0x8878900478889004ull
-#define ID_AHA_2940U_PRO	0x8778900478879004ull
-#define ID_AHA_2940U_CN		0x0078900478009004ull
-
-#define ID_AIC7895		0x7895900478959004ull
-#define ID_AIC7895_RAID_PORT	0x7893900478939004ull
-#define ID_AHA_2940U_DUAL	0x7895900478919004ull
-#define ID_AHA_3940AU		0x7895900478929004ull
-#define ID_AHA_3944AU		0x7895900478949004ull
-
-#define ID_AIC7890		0x001F9005000F9005ull
-#define ID_AHA_2930U2		0x0011900501819005ull
-#define ID_AHA_2940U2B		0x00109005A1009005ull
-#define ID_AHA_2940U2_OEM	0x0010900521809005ull
-#define ID_AHA_2940U2		0x00109005A1809005ull
-#define ID_AHA_2950U2B		0x00109005E1009005ull
-
-#define ID_AIC7892		0x008F9005FFFF9005ull
-#define ID_AHA_29160		0x00809005E2A09005ull
-#define ID_AHA_29160_CPQ	0x00809005E2A00E11ull
-#define ID_AHA_29160N		0x0080900562A09005ull
-#define ID_AHA_29160B		0x00809005E2209005ull
-#define ID_AHA_19160B		0x0081900562A19005ull
-
-#define ID_AIC7896		0x005F9005FFFF9005ull
-#define ID_AHA_3950U2B_0	0x00509005FFFF9005ull
-#define ID_AHA_3950U2B_1	0x00509005F5009005ull
-#define ID_AHA_3950U2D_0	0x00519005FFFF9005ull
-#define ID_AHA_3950U2D_1	0x00519005B5009005ull
-
-#define ID_AIC7899		0x00CF9005FFFF9005ull
-#define ID_AHA_3960D		0x00C09005F6209005ull /* AKA AHA-39160 */
-#define ID_AHA_3960D_CPQ	0x00C09005F6200E11ull
-
-#define ID_AIC7810		0x1078900400000000ull
-#define ID_AIC7815		0x1578900400000000ull
-
-typedef int (ahc_device_setup_t)(device_t, char *, ahc_chip *,
-				 ahc_feature *, ahc_flag *);
-
-static ahc_device_setup_t ahc_aic7850_setup;
-static ahc_device_setup_t ahc_aic7855_setup;
-static ahc_device_setup_t ahc_aic7859_setup;
-static ahc_device_setup_t ahc_aic7860_setup;
-static ahc_device_setup_t ahc_aic7870_setup;
-static ahc_device_setup_t ahc_aha394X_setup;
-static ahc_device_setup_t ahc_aha398X_setup;
-static ahc_device_setup_t ahc_aic7880_setup;
-static ahc_device_setup_t ahc_2940Pro_setup;
-static ahc_device_setup_t ahc_aha394XU_setup;
-static ahc_device_setup_t ahc_aha398XU_setup;
-static ahc_device_setup_t ahc_aic7890_setup;
-static ahc_device_setup_t ahc_aic7892_setup;
-static ahc_device_setup_t ahc_aic7895_setup;
-static ahc_device_setup_t ahc_aic7896_setup;
-static ahc_device_setup_t ahc_aic7899_setup;
-static ahc_device_setup_t ahc_raid_setup;
-static ahc_device_setup_t ahc_aha394XX_setup;
-static ahc_device_setup_t ahc_aha398XX_setup;
-
-struct ahc_pci_identity {
-	u_int64_t		 full_id;
-	u_int64_t		 id_mask;
-	char			*name;
-	ahc_device_setup_t	*setup;
-};
-
-struct ahc_pci_identity ahc_pci_ident_table [] =
-{
-	/* aic7850 based controllers */
-	{
-		ID_AHA_2910_15_20_30C,
-		ID_ALL_MASK,
-		"Adaptec 2910/15/20/30C SCSI adapter",
-		ahc_aic7850_setup
-	},
-	/* aic7859 based controllers */
-	{
-		ID_AHA_2930CU,
-		ID_ALL_MASK,
-		"Adaptec 2930CU SCSI adapter",
-		ahc_aic7859_setup
-	},
-	/* aic7860 based controllers */
-	{
-		ID_AHA_2940AU_0 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 2940A Ultra SCSI adapter",
-		ahc_aic7860_setup
-	},
-	{
-		ID_AHA_2940AU_CN & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 2940A/CN Ultra SCSI adapter",
-		ahc_aic7860_setup
-	},
-	{
-		ID_AHA_2930C_VAR & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 2930C SCSI adapter (VAR)",
-		ahc_aic7860_setup
-	},
-	/* aic7870 based controllers */
-	{
-		ID_AHA_2940,
-		ID_ALL_MASK,
-		"Adaptec 2940 SCSI adapter",
-		ahc_aic7870_setup
-	},
-	{
-		ID_AHA_3940,
-		ID_ALL_MASK,
-		"Adaptec 3940 SCSI adapter",
-		ahc_aha394X_setup
-	},
-	{
-		ID_AHA_398X,
-		ID_ALL_MASK,
-		"Adaptec 398X SCSI RAID adapter",
-		ahc_aha398X_setup
-	},
-	{
-		ID_AHA_2944,
-		ID_ALL_MASK,
-		"Adaptec 2944 SCSI adapter",
-		ahc_aic7870_setup
-	},
-	{
-		ID_AHA_3944,
-		ID_ALL_MASK,
-		"Adaptec 3944 SCSI adapter",
-		ahc_aha394X_setup
-	},
-	/* aic7880 based controllers */
-	{
-		ID_AHA_2940U & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 2940 Ultra SCSI adapter",
-		ahc_aic7880_setup
-	},
-	{
-		ID_AHA_3940U & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 3940 Ultra SCSI adapter",
-		ahc_aha394XU_setup
-	},
-	{
-		ID_AHA_2944U & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 2944 Ultra SCSI adapter",
-		ahc_aic7880_setup
-	},
-	{
-		ID_AHA_3944U & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 3944 Ultra SCSI adapter",
-		ahc_aha394XU_setup
-	},
-	{
-		ID_AHA_398XU & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 398X Ultra SCSI RAID adapter",
-		ahc_aha398XU_setup
-	},
-	{
-		/*
-		 * XXX Don't know the slot numbers
-		 * so we can't identify channels
-		 */
-		ID_AHA_4944U & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 4944 Ultra SCSI adapter",
-		ahc_aic7880_setup
-	},
-	{
-		ID_AHA_2930U & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 2930 Ultra SCSI adapter",
-		ahc_aic7880_setup
-	},
-	{
-		ID_AHA_2940U_PRO & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 2940 Pro Ultra SCSI adapter",
-		ahc_2940Pro_setup
-	},
-	{
-		ID_AHA_2940U_CN & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec 2940/CN Ultra SCSI adapter",
-		ahc_aic7880_setup
-	},
-	/* aic7890 based controllers */
-	{
-		ID_AHA_2930U2,
-		ID_ALL_MASK,
-		"Adaptec 2930 Ultra2 SCSI adapter",
-		ahc_aic7890_setup
-	},
-	{
-		ID_AHA_2940U2B,
-		ID_ALL_MASK,
-		"Adaptec 2940B Ultra2 SCSI adapter",
-		ahc_aic7890_setup
-	},
-	{
-		ID_AHA_2940U2_OEM,
-		ID_ALL_MASK,
-		"Adaptec 2940 Ultra2 SCSI adapter (OEM)",
-		ahc_aic7890_setup
-	},
-	{
-		ID_AHA_2940U2,
-		ID_ALL_MASK,
-		"Adaptec 2940 Ultra2 SCSI adapter",
-		ahc_aic7890_setup
-	},
-	{
-		ID_AHA_2950U2B,
-		ID_ALL_MASK,
-		"Adaptec 2950 Ultra2 SCSI adapter",
-		ahc_aic7890_setup
-	},
-	/* aic7892 based controllers */
-	{
-		ID_AHA_29160,
-		ID_ALL_MASK,
-		"Adaptec 29160 Ultra160 SCSI adapter",
-		ahc_aic7892_setup
-	},
-	{
-		ID_AHA_29160_CPQ,
-		ID_ALL_MASK,
-		"Adaptec (Compaq OEM) 29160 Ultra160 SCSI adapter",
-		ahc_aic7892_setup
-	},
-	{
-		ID_AHA_29160N,
-		ID_ALL_MASK,
-		"Adaptec 29160N Ultra160 SCSI adapter",
-		ahc_aic7892_setup
-	},
-	{
-		ID_AHA_29160B,
-		ID_ALL_MASK,
-		"Adaptec 29160B Ultra160 SCSI adapter",
-		ahc_aic7892_setup
-	},
-	{
-		ID_AHA_19160B,
-		ID_ALL_MASK,
-		"Adaptec 19160B Ultra160 SCSI adapter",
-		ahc_aic7892_setup
-	},
-	/* aic7895 based controllers */	
-	{
-		ID_AHA_2940U_DUAL,
-		ID_ALL_MASK,
-		"Adaptec 2940/DUAL Ultra SCSI adapter",
-		ahc_aic7895_setup
-	},
-	{
-		ID_AHA_3940AU,
-		ID_ALL_MASK,
-		"Adaptec 3940A Ultra SCSI adapter",
-		ahc_aic7895_setup
-	},
-	{
-		ID_AHA_3944AU,
-		ID_ALL_MASK,
-		"Adaptec 3944A Ultra SCSI adapter",
-		ahc_aic7895_setup
-	},
-	/* aic7896/97 based controllers */	
-	{
-		ID_AHA_3950U2B_0,
-		ID_ALL_MASK,
-		"Adaptec 3950B Ultra2 SCSI adapter",
-		ahc_aic7896_setup
-	},
-	{
-		ID_AHA_3950U2B_1,
-		ID_ALL_MASK,
-		"Adaptec 3950B Ultra2 SCSI adapter",
-		ahc_aic7896_setup
-	},
-	{
-		ID_AHA_3950U2D_0,
-		ID_ALL_MASK,
-		"Adaptec 3950D Ultra2 SCSI adapter",
-		ahc_aic7896_setup
-	},
-	{
-		ID_AHA_3950U2D_1,
-		ID_ALL_MASK,
-		"Adaptec 3950D Ultra2 SCSI adapter",
-		ahc_aic7896_setup
-	},
-	/* aic7899 based controllers */	
-	{
-		ID_AHA_3960D,
-		ID_ALL_MASK,
-		"Adaptec 3960D Ultra160 SCSI adapter",
-		ahc_aic7899_setup
-	},
-	{
-		ID_AHA_3960D_CPQ,
-		ID_ALL_MASK,
-		"Adaptec (Compaq OEM) 3960D Ultra160 SCSI adapter",
-		ahc_aic7899_setup
-	},
-	/* Generic chip probes for devices we don't know 'exactly' */
-	{
-		ID_AIC7850 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7850 SCSI adapter",
-		ahc_aic7850_setup
-	},
-	{
-		ID_AIC7855 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7855 SCSI adapter",
-		ahc_aic7855_setup
-	},
-	{
-		ID_AIC7859 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7859 SCSI adapter",
-		ahc_aic7859_setup
-	},
-	{
-		ID_AIC7860 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7860 SCSI adapter",
-		ahc_aic7860_setup
-	},
-	{
-		ID_AIC7870 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7870 SCSI adapter",
-		ahc_aic7870_setup
-	},
-	{
-		ID_AIC7880 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7880 Ultra SCSI adapter",
-		ahc_aic7880_setup
-	},
-	{
-		ID_AIC7890 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7890/91 Ultra2 SCSI adapter",
-		ahc_aic7890_setup
-	},
-	{
-		ID_AIC7892 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7892 Ultra160 SCSI adapter",
-		ahc_aic7892_setup
-	},
-	{
-		ID_AIC7895 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7895 Ultra SCSI adapter",
-		ahc_aic7895_setup
-	},
-	{
-		ID_AIC7895_RAID_PORT & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7895 Ultra SCSI adapter (RAID PORT)",
-		ahc_aic7895_setup
-	},
-	{
-		ID_AIC7896 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7896/97 Ultra2 SCSI adapter",
-		ahc_aic7896_setup
-	},
-	{
-		ID_AIC7899 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7899 Ultra160 SCSI adapter",
-		ahc_aic7899_setup
-	},
-	{
-		ID_AIC7810 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7810 RAID memory controller",
-		ahc_raid_setup
-	},
-	{
-		ID_AIC7815 & ID_DEV_VENDOR_MASK,
-		ID_DEV_VENDOR_MASK,
-		"Adaptec aic7815 RAID memory controller",
-		ahc_raid_setup
-	}
-};
-
-static const int ahc_num_pci_devs =
-	sizeof(ahc_pci_ident_table) / sizeof(*ahc_pci_ident_table);
-		
-#define AHC_394X_SLOT_CHANNEL_A	4
-#define AHC_394X_SLOT_CHANNEL_B	5
-
-#define AHC_398X_SLOT_CHANNEL_A	4
-#define AHC_398X_SLOT_CHANNEL_B	8
-#define AHC_398X_SLOT_CHANNEL_C	12
-
-#define	DEVCONFIG		0x40
-#define		SCBSIZE32	0x00010000ul	/* aic789X only */
-#define		MPORTMODE	0x00000400ul	/* aic7870 only */
-#define		RAMPSM		0x00000200ul	/* aic7870 only */
-#define		VOLSENSE	0x00000100ul
-#define		SCBRAMSEL	0x00000080ul
-#define		MRDCEN		0x00000040ul
-#define		EXTSCBTIME	0x00000020ul	/* aic7870 only */
-#define		EXTSCBPEN	0x00000010ul	/* aic7870 only */
-#define		BERREN		0x00000008ul
-#define		DACEN		0x00000004ul
-#define		STPWLEVEL	0x00000002ul
-#define		DIFACTNEGEN	0x00000001ul	/* aic7870 only */
-
-#define	CSIZE_LATTIME		0x0c
-#define		CACHESIZE	0x0000003ful	/* only 5 bits */
-#define		LATTIME		0x0000ff00ul
-
-static struct ahc_pci_identity *ahc_find_pci_device(device_t dev);
-static int ahc_ext_scbram_present(struct ahc_softc *ahc);
-static void ahc_ext_scbram_config(struct ahc_softc *ahc, int enable,
-				  int pcheck, int fast);
-static void ahc_probe_ext_scbram(struct ahc_softc *ahc);
-static void check_extport(struct ahc_softc *ahc, u_int *sxfrctl1);
-static void configure_termination(struct ahc_softc *ahc,
-				  struct seeprom_descriptor *sd,
-				  u_int adapter_control,
-	 			  u_int *sxfrctl1);
-
-static void ahc_new_term_detect(struct ahc_softc *ahc,
-				   int *enableSEC_low,
-				   int *enableSEC_high,
-				   int *enablePRI_low,
-				   int *enablePRI_high,
-				   int *eeprom_present);
-static void aic787X_cable_detect(struct ahc_softc *ahc, int *internal50_present,
-				 int *internal68_present,
-				 int *externalcable_present,
-				 int *eeprom_present);
-static void aic785X_cable_detect(struct ahc_softc *ahc, int *internal50_present,
-				 int *externalcable_present,
-				 int *eeprom_present);
-static int acquire_seeprom(struct ahc_softc *ahc,
-			   struct seeprom_descriptor *sd);
-static void release_seeprom(struct seeprom_descriptor *sd);
-static void write_brdctl(struct ahc_softc *ahc, u_int8_t value);
-static u_int8_t read_brdctl(struct ahc_softc *ahc);
-
-static struct ahc_softc *first_398X;
-
-static int ahc_pci_probe(device_t dev);
-static int ahc_pci_attach(device_t dev);
-
-/* Exported for use in the ahc_intr routine */
-void ahc_pci_intr(struct ahc_softc *ahc);
-
-static device_method_t ahc_pci_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		ahc_pci_probe),
-	DEVMETHOD(device_attach,	ahc_pci_attach),
-	{ 0, 0 }
-};
-
-static driver_t ahc_pci_driver = {
-	"ahc",
-	ahc_pci_methods,
-	sizeof(struct ahc_softc)
-};
-
-static devclass_t ahc_devclass;
-
-DRIVER_MODULE(ahc, pci, ahc_pci_driver, ahc_devclass, 0, 0);
-
-static struct ahc_pci_identity *
-ahc_find_pci_device(device_t dev)
-{
-	u_int64_t  full_id;
-	struct	   ahc_pci_identity *entry;
-	u_int	   i;
-
-	full_id = ahc_compose_id(pci_get_device(dev),
-				 pci_get_vendor(dev),
-				 pci_get_subdevice(dev),
-				 pci_get_subvendor(dev));
-
-	for (i = 0; i < ahc_num_pci_devs; i++) {
-		entry = &ahc_pci_ident_table[i];
-		if (entry->full_id == (full_id & entry->id_mask))
-			return (entry);
-	}
-	return (NULL);
-}
-
-static int
-ahc_pci_probe(device_t dev)
-{
-	struct	   ahc_pci_identity *entry;
-
-	entry = ahc_find_pci_device(dev);
-	if (entry != NULL) {
-		device_set_desc(dev, entry->name);
-		return (0);
-	}
-	return (ENXIO);
-}
-
-static int
-ahc_pci_attach(device_t dev)
-{
-	bus_dma_tag_t	   parent_dmat;
-	struct		   ahc_pci_identity *entry;
-	struct		   resource *regs;
-	struct		   ahc_softc *ahc;
-	u_int		   command;
-	struct scb_data   *shared_scb_data;
-	ahc_chip	   ahc_t = AHC_NONE;
-	ahc_feature	   ahc_fe = AHC_FENONE;
-	ahc_flag	   ahc_f = AHC_FNONE;
-	int		   regs_type;
-	int		   regs_id;
-	u_int		   our_id = 0;
-	u_int		   sxfrctl1;
-	u_int		   scsiseq;
-	int		   error;
-	int		   zero;
-	char		   channel;
-
-	shared_scb_data = NULL;
-	command = pci_read_config(dev, PCIR_COMMAND, /*bytes*/1);
-	entry = ahc_find_pci_device(dev);
-	if (entry == NULL)
-		return (ENXIO);
-	error = entry->setup(dev, &channel, &ahc_t, &ahc_fe, &ahc_f);
-	if (error != 0)
-		return (error);
-
-	regs = NULL;
-	regs_type = 0;
-	regs_id = 0;
-#ifdef AHC_ALLOW_MEMIO
-	if ((command & PCIM_CMD_MEMEN) != 0) {
-		regs_type = SYS_RES_MEMORY;
-		regs_id = AHC_PCI_MEMADDR;
-		regs = bus_alloc_resource(dev, regs_type,
-					  &regs_id, 0, ~0, 1, RF_ACTIVE);
-	}
-#endif
-	if (regs == NULL && (command & PCI_COMMAND_IO_ENABLE) != 0) {
-		regs_type = SYS_RES_IOPORT;
-		regs_id = AHC_PCI_IOADDR;
-		regs = bus_alloc_resource(dev, regs_type,
-					  &regs_id, 0, ~0, 1, RF_ACTIVE);
-	}
- 
-	if (regs == NULL) {
-		device_printf(dev, "can't allocate register resources\n");
-		return (ENOMEM);
-	}
-
-	/* Ensure busmastering is enabled */
-	command |= PCIM_CMD_BUSMASTEREN;
-	pci_write_config(dev, PCIR_COMMAND, command, /*bytes*/1);
-
-	/* Allocate a dmatag for our SCB DMA maps */
-	/* XXX Should be a child of the PCI bus dma tag */
-	error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1,
-				   /*boundary*/0,
-				   /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
-				   /*highaddr*/BUS_SPACE_MAXADDR,
-				   /*filter*/NULL, /*filterarg*/NULL,
-				   /*maxsize*/MAXBSIZE, /*nsegments*/AHC_NSEG,
-				   /*maxsegsz*/AHC_MAXTRANSFER_SIZE,
-				   /*flags*/BUS_DMA_ALLOCNOW, &parent_dmat);
-
-	if (error != 0) {
-		printf("ahc_pci_attach: Could not allocate DMA tag "
-		       "- error %d\n", error);
-		return (ENOMEM);
-	}
-
-	/* On all PCI adapters, we allow SCB paging */
-	ahc_f |= AHC_PAGESCBS;
-	if ((ahc = ahc_alloc(dev, regs, regs_type, regs_id, parent_dmat,
-			     ahc_t|AHC_PCI, ahc_fe, ahc_f,
-			     shared_scb_data)) == NULL)
-		return (ENOMEM);
-
-	ahc->channel = channel;
-
-	/* Store our PCI bus information for use in our PCI error handler */
-	ahc->device = dev;
-	
-	/* Remeber how the card was setup in case there is no SEEPROM */
-	ahc_outb(ahc, HCNTRL, ahc->pause);
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		our_id = ahc_inb(ahc, SCSIID_ULTRA2) & OID;
-	else
-		our_id = ahc_inb(ahc, SCSIID) & OID;
-	sxfrctl1 = ahc_inb(ahc, SXFRCTL1) & STPWEN;
-	scsiseq = ahc_inb(ahc, SCSISEQ);
-
-	if (ahc_reset(ahc) != 0) {
-		/* Failed */
-		ahc_free(ahc);
-		return (ENXIO);
-	}
-
-	if ((ahc->features & AHC_DT) != 0) {
-		u_int optionmode;
-		u_int sfunct;
-
-		/* Perform ALT-Mode Setup */
-		sfunct = ahc_inb(ahc, SFUNCT) & ~ALT_MODE;
-		ahc_outb(ahc, SFUNCT, sfunct | ALT_MODE);
-		optionmode = ahc_inb(ahc, OPTIONMODE);
-		printf("OptionMode = %x\n", optionmode);
-		ahc_outb(ahc, OPTIONMODE, OPTIONMODE_DEFAULTS);
-		/* Send CRC info in target mode every 4K */
-		ahc_outb(ahc, TARGCRCCNT, 0);
-		ahc_outb(ahc, TARGCRCCNT + 1, 0x10);
-		ahc_outb(ahc, SFUNCT, sfunct);
-
-		/* Normal mode setup */
-		ahc_outb(ahc, CRCCONTROL1, CRCVALCHKEN|CRCENDCHKEN|CRCREQCHKEN
-					  |TARGCRCENDEN|TARGCRCCNTEN);
-	}
-	zero = 0;
-	ahc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &zero,
-				      0, ~0, 1, RF_ACTIVE | RF_SHAREABLE);
-	if (ahc->irq == NULL) {
-		ahc_free(ahc);
-		return (ENOMEM);
-	}
-
-	ahc->irq_res_type = SYS_RES_IRQ;
-
-	/*
-	 * Do aic7880/aic7870/aic7860/aic7850 specific initialization
-	 */
-	{
-		u_int8_t sblkctl;
-		u_int dscommand0;
-
-		dscommand0 = ahc_inb(ahc, DSCOMMAND0);
-		dscommand0 |= MPARCKEN;
-		if ((ahc->features & AHC_ULTRA2) != 0) {
-
-			/*
-			 * DPARCKEN doesn't work correctly on
-			 * some MBs so don't use it.
-			 */
-			dscommand0 &= ~(USCBSIZE32|DPARCKEN);
-			dscommand0 |= CACHETHEN;
-		}
-
-		ahc_outb(ahc, DSCOMMAND0, dscommand0);
-
-		/* See if we have an SEEPROM and perform auto-term */
-		check_extport(ahc, &sxfrctl1);
-
-		/*
-		 * Take the LED out of diagnostic mode
-		 */
-		sblkctl = ahc_inb(ahc, SBLKCTL);
-		ahc_outb(ahc, SBLKCTL, (sblkctl & ~(DIAGLEDEN|DIAGLEDON)));
-
-		/*
-		 * I don't know where this is set in the SEEPROM or by the
-		 * BIOS, so we default to 100% on Ultra or slower controllers
-		 * and 75% on ULTRA2 controllers.
-		 */
-		if ((ahc->features & AHC_ULTRA2) != 0) {
-			ahc_outb(ahc, DFF_THRSH, RD_DFTHRSH_75|WR_DFTHRSH_75);
-		} else {
-			ahc_outb(ahc, DSPCISTATUS, DFTHRSH_100);
-		}
-
-		if (ahc->flags & AHC_USEDEFAULTS) {
-			/*
-			 * PCI Adapter default setup
-			 * Should only be used if the adapter does not have
-			 * an SEEPROM.
-			 */
-			/* See if someone else set us up already */
-			if (scsiseq != 0) {
-				printf("%s: Using left over BIOS settings\n",
-					ahc_name(ahc));
-				ahc->flags &= ~AHC_USEDEFAULTS;
-			} else {
-				/*
-				 * Assume only one connector and always turn
-				 * on termination.
-				 */
- 				our_id = 0x07;
-				sxfrctl1 = STPWEN;
-			}
-			ahc_outb(ahc, SCSICONF, our_id|ENSPCHK|RESET_SCSI);
-
-			ahc->our_id = our_id;
-		}
-	}
-
-	/*
-	 * Take a look to see if we have external SRAM.
-	 * We currently do not attempt to use SRAM that is
-	 * shared among multiple controllers.
-	 */
-	ahc_probe_ext_scbram(ahc);
-
-
-	printf("%s: %s ", ahc_name(ahc),
-	       ahc_chip_names[ahc->chip & AHC_CHIPID_MASK]);
-
-	/*
-	 * Record our termination setting for the
-	 * generic initialization routine.
-	 */
-	if ((sxfrctl1 & STPWEN) != 0)
-		ahc->flags |= AHC_TERM_ENB_A;
-
-	if (ahc_init(ahc)) {
-		ahc_free(ahc);
-		return (ENOMEM);
-	}
-
-	/* XXX Crude hack - fix sometime */
-	if (ahc->flags & AHC_SHARED_SRAM) {
-		/* Only set this once we've successfully probed */
-		if (shared_scb_data == NULL)
-			first_398X = ahc;
-	}
-
-	ahc_attach(ahc);
-	return (0);
-}
-
-/*
- * Test for the presense of external sram in an
- * "unshared" configuration.
- */
-static int
-ahc_ext_scbram_present(struct ahc_softc *ahc)
-{
-	int ramps;
-	int single_user;
-	u_int32_t devconfig;
-
-	devconfig = pci_read_config(ahc->device, DEVCONFIG, /*bytes*/4);
-	single_user = (devconfig & MPORTMODE) != 0;
-
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		ramps = (ahc_inb(ahc, DSCOMMAND0) & RAMPS) != 0;
-	else if ((ahc->chip & AHC_CHIPID_MASK) >= AHC_AIC7870)
-		ramps = (devconfig & RAMPSM) != 0;
-	else
-		ramps = 0;
-
-	if (ramps && single_user)
-		return (1);
-	return (0);
-}
-
-/*
- * Enable external scbram.
- */
-static void
-ahc_ext_scbram_config(struct ahc_softc *ahc, int enable, int pcheck, int fast)
-{
-	u_int32_t devconfig;
-
-	if (ahc->features & AHC_MULTI_FUNC) {
-		/*
-		 * Set the SCB Base addr (highest address bit)
-		 * depending on which channel we are.
-		 */
-		ahc_outb(ahc, SCBBADDR, pci_get_function(ahc->device));
-	}
-
-	devconfig = pci_read_config(ahc->device, DEVCONFIG, /*bytes*/4);
-	if ((ahc->features & AHC_ULTRA2) != 0) {
-		u_int dscommand0;
-
-		dscommand0 = ahc_inb(ahc, DSCOMMAND0);
-		if (enable)
-			dscommand0 &= ~INTSCBRAMSEL;
-		else
-			dscommand0 |= INTSCBRAMSEL;
-		ahc_outb(ahc, DSCOMMAND0, dscommand0);
-	} else {
-		if (fast)
-			devconfig &= ~EXTSCBTIME;
-		else
-			devconfig |= EXTSCBTIME;
-		if (enable)
-			devconfig &= ~SCBRAMSEL;
-		else
-			devconfig |= SCBRAMSEL;
-	}
-	if (pcheck)
-		devconfig |= EXTSCBPEN;
-	else
-		devconfig &= ~EXTSCBPEN;
-
-	pci_write_config(ahc->device, DEVCONFIG, devconfig, /*bytes*/4);
-}
-
-/*
- * Take a look to see if we have external SRAM.
- * We currently do not attempt to use SRAM that is
- * shared among multiple controllers.
- */
-static void
-ahc_probe_ext_scbram(struct ahc_softc *ahc)
-{
-	int num_scbs;
-	int test_num_scbs;
-	int enable;
-	int pcheck;
-	int fast;
-
-	if (ahc_ext_scbram_present(ahc) == 0)
-		return;
-
-	/*
-	 * Probe for the best parameters to use.
-	 */
-	enable = FALSE;
-	pcheck = FALSE;
-	fast = FALSE;
-	ahc_ext_scbram_config(ahc, /*enable*/TRUE, pcheck, fast);
-	num_scbs = ahc_probe_scbs(ahc);
-	if (num_scbs == 0) {
-		/* The SRAM wasn't really present. */
-		goto done;
-	}
-	enable = TRUE;
-
-	/* Now see if we can do parity */
-	ahc_ext_scbram_config(ahc, enable, /*pcheck*/TRUE, fast);
-	num_scbs = ahc_probe_scbs(ahc);
-	if ((ahc_inb(ahc, INTSTAT) & BRKADRINT) == 0
-	 || (ahc_inb(ahc, ERROR) & MPARERR) == 0)
-		pcheck = TRUE;
-
-	/* Clear any resulting parity error */
-	ahc_outb(ahc, CLRINT, CLRPARERR);
-	ahc_outb(ahc, CLRINT, CLRBRKADRINT);
-
-	/* Now see if we can do fast timing */
-	ahc_ext_scbram_config(ahc, enable, pcheck, /*fast*/TRUE);
-	test_num_scbs = ahc_probe_scbs(ahc);
-	if (test_num_scbs == num_scbs
-	 && ((ahc_inb(ahc, INTSTAT) & BRKADRINT) == 0
-	  || (ahc_inb(ahc, ERROR) & MPARERR) == 0))
-		fast = TRUE;
-
-done:
-	/* Clear any resulting parity error */
-	ahc_outb(ahc, CLRINT, CLRPARERR);
-	ahc_outb(ahc, CLRINT, CLRBRKADRINT);
-	if (bootverbose && enable) {
-		printf("%s: External SRAM, %dns access%s\n",
-		       ahc_name(ahc), fast ? 10 : 20,
-		       pcheck ? ", parity checking enabled" : "");
-		       
-	}
-	ahc_ext_scbram_config(ahc, enable, pcheck, fast);
-}
-
-/*
- * Check the external port logic for a serial eeprom
- * and termination/cable detection contrls.
- */
-static void
-check_extport(struct ahc_softc *ahc, u_int *sxfrctl1)
-{
-	struct	  seeprom_descriptor sd;
-	struct	  seeprom_config sc;
-	u_int	  scsi_conf;
-	u_int	  adapter_control;
-	int	  have_seeprom;
-	int	  have_autoterm;
-
-	sd.sd_tag = ahc->tag;
-	sd.sd_bsh = ahc->bsh;
-	sd.sd_control_offset = SEECTL;		
-	sd.sd_status_offset = SEECTL;		
-	sd.sd_dataout_offset = SEECTL;		
-
-	/*
-	 * For some multi-channel devices, the c46 is simply too
-	 * small to work.  For the other controller types, we can
-	 * get our information from either SEEPROM type.  Set the
-	 * type to start our probe with accordingly.
-	 */
-	if (ahc->flags & AHC_LARGE_SEEPROM)
-		sd.sd_chip = C56_66;
-	else
-		sd.sd_chip = C46;
-
-	sd.sd_MS = SEEMS;
-	sd.sd_RDY = SEERDY;
-	sd.sd_CS = SEECS;
-	sd.sd_CK = SEECK;
-	sd.sd_DO = SEEDO;
-	sd.sd_DI = SEEDI;
-
-	have_seeprom = acquire_seeprom(ahc, &sd);
-	if (have_seeprom) {
-
-		if (bootverbose) 
-			printf("%s: Reading SEEPROM...", ahc_name(ahc));
-
-		for (;;) {
-			bus_size_t start_addr;
-
-			start_addr = 32 * (ahc->channel - 'A');
-
-			have_seeprom = read_seeprom(&sd, (u_int16_t *)&sc,
-						    start_addr, sizeof(sc)/2);
-
-			if (have_seeprom) {
-				/* Check checksum */
-				int i;
-				int maxaddr;
-				u_int32_t checksum;
-				u_int16_t *scarray;
-
-				maxaddr = (sizeof(sc)/2) - 1;
-				checksum = 0;
-				scarray = (u_int16_t *)&sc;
-
-				for (i = 0; i < maxaddr; i++)
-					checksum = checksum + scarray[i];
-				if (checksum == 0
-				 || (checksum & 0xFFFF) != sc.checksum) {
-					if (bootverbose && sd.sd_chip == C56_66)
-						printf ("checksum error\n");
-					have_seeprom = 0;
-				} else {
-					if (bootverbose)
-						printf("done.\n");
-					break;
-				}
-			}
-
-			if (sd.sd_chip == C56_66)
-				break;
-			sd.sd_chip = C56_66;
-		}
-	}
-
-	if (!have_seeprom) {
-		if (bootverbose)
-			printf("%s: No SEEPROM available.\n", ahc_name(ahc));
-		ahc->flags |= AHC_USEDEFAULTS;
-	} else {
-		/*
-		 * Put the data we've collected down into SRAM
-		 * where ahc_init will find it.
-		 */
-		int i;
-		int max_targ = sc.max_targets & CFMAXTARG;
-		u_int16_t discenable;
-		u_int16_t ultraenb;
-
-		discenable = 0;
-		ultraenb = 0;
-		if ((sc.adapter_control & CFULTRAEN) != 0) {
-			/*
-			 * Determine if this adapter has a "newstyle"
-			 * SEEPROM format.
-			 */
-			for (i = 0; i < max_targ; i++) {
-				if ((sc.device_flags[i] & CFSYNCHISULTRA) != 0){
-					ahc->flags |= AHC_NEWEEPROM_FMT;
-					break;
-				}
-			}
-		}
-
-		for (i = 0; i < max_targ; i++) {
-			u_int     scsirate;
-			u_int16_t target_mask;
-
-			target_mask = 0x01 << i;
-			if (sc.device_flags[i] & CFDISC)
-				discenable |= target_mask;
-			if ((ahc->flags & AHC_NEWEEPROM_FMT) != 0) {
-				if ((sc.device_flags[i] & CFSYNCHISULTRA) != 0)
-					ultraenb |= target_mask;
-			} else if ((sc.adapter_control & CFULTRAEN) != 0) {
-				ultraenb |= target_mask;
-			}
-			if ((sc.device_flags[i] & CFXFER) == 0x04
-			 && (ultraenb & target_mask) != 0) {
-				/* Treat 10MHz as a non-ultra speed */
-				sc.device_flags[i] &= ~CFXFER;
-			 	ultraenb &= ~target_mask;
-			}
-			if ((ahc->features & AHC_ULTRA2) != 0) {
-				u_int offset;
-
-				if (sc.device_flags[i] & CFSYNCH)
-					offset = MAX_OFFSET_ULTRA2;
-				else 
-					offset = 0;
-				ahc_outb(ahc, TARG_OFFSET + i, offset);
-
-				scsirate = (sc.device_flags[i] & CFXFER)
-					 | ((ultraenb & target_mask)
-					    ? 0x8 : 0x0);
-				if (sc.device_flags[i] & CFWIDEB)
-					scsirate |= WIDEXFER;
-			} else {
-				scsirate = (sc.device_flags[i] & CFXFER) << 4;
-				if (sc.device_flags[i] & CFSYNCH)
-					scsirate |= SOFS;
-				if (sc.device_flags[i] & CFWIDEB)
-					scsirate |= WIDEXFER;
-			}
-			ahc_outb(ahc, TARG_SCSIRATE + i, scsirate);
-		}
-		ahc->our_id = sc.brtime_id & CFSCSIID;
-
-		scsi_conf = (ahc->our_id & 0x7);
-		if (sc.adapter_control & CFSPARITY)
-			scsi_conf |= ENSPCHK;
-		if (sc.adapter_control & CFRESETB)
-			scsi_conf |= RESET_SCSI;
-
-		if (sc.bios_control & CFEXTEND)
-			ahc->flags |= AHC_EXTENDED_TRANS_A;
-		if (ahc->features & AHC_ULTRA
-		 && (ahc->flags & AHC_NEWEEPROM_FMT) == 0) {
-			/* Should we enable Ultra mode? */
-			if (!(sc.adapter_control & CFULTRAEN))
-				/* Treat us as a non-ultra card */
-				ultraenb = 0;
-		}
-		/* Set SCSICONF info */
-		ahc_outb(ahc, SCSICONF, scsi_conf);
-		ahc_outb(ahc, DISC_DSB, ~(discenable & 0xff));
-		ahc_outb(ahc, DISC_DSB + 1, ~((discenable >> 8) & 0xff));
-		ahc_outb(ahc, ULTRA_ENB, ultraenb & 0xff);
-		ahc_outb(ahc, ULTRA_ENB + 1, (ultraenb >> 8) & 0xff);
-	}
-
-	/*
-	 * Cards that have the external logic necessary to talk to
-	 * a SEEPROM, are almost certain to have the remaining logic
-	 * necessary for auto-termination control.  This assumption
-	 * hasn't failed yet...
-	 */
-	have_autoterm = have_seeprom;
-	if (have_seeprom)
-		adapter_control = sc.adapter_control;
-	else
-		adapter_control = CFAUTOTERM;
-
-	/*
-	 * Some low-cost chips have SEEPROM and auto-term control built
-	 * in, instead of using a GAL.  They can tell us directly
-	 * if the termination logic is enabled.
-	 */
-	if ((ahc->features & AHC_SPIOCAP) != 0) {
-		if ((ahc_inb(ahc, SPIOCAP) & SSPIOCPS) != 0)
-			have_autoterm = TRUE;
-		else
-			have_autoterm = FALSE;
-	}
-
-	if (have_autoterm)
-		configure_termination(ahc, &sd, adapter_control, sxfrctl1);
-
-	release_seeprom(&sd);
-}
-
-static void
-configure_termination(struct ahc_softc *ahc,
-		      struct seeprom_descriptor *sd,
-		      u_int adapter_control,
-		      u_int *sxfrctl1)
-{
-	u_int8_t brddat;
-	
-	brddat = 0;
-
-	/*
-	 * Update the settings in sxfrctl1 to match the
-	 * termination settings 
-	 */
-	*sxfrctl1 = 0;
-	
-	/*
-	 * SEECS must be on for the GALS to latch
-	 * the data properly.  Be sure to leave MS
-	 * on or we will release the seeprom.
-	 */
-	SEEPROM_OUTB(sd, sd->sd_MS | sd->sd_CS);
-	if ((adapter_control & CFAUTOTERM) != 0
-	 || (ahc->features & AHC_NEW_TERMCTL) != 0) {
-		int internal50_present;
-		int internal68_present;
-		int externalcable_present;
-		int eeprom_present;
-		int enableSEC_low;
-		int enableSEC_high;
-		int enablePRI_low;
-		int enablePRI_high;
-
-		enableSEC_low = 0;
-		enableSEC_high = 0;
-		enablePRI_low = 0;
-		enablePRI_high = 0;
-		if ((ahc->features & AHC_NEW_TERMCTL) != 0) {
-			ahc_new_term_detect(ahc, &enableSEC_low,
-					       &enableSEC_high,
-					       &enablePRI_low,
-					       &enablePRI_high,
-					       &eeprom_present);
-			if ((adapter_control & CFSEAUTOTERM) == 0) {
-				if (bootverbose)
-					printf("%s: Manual SE Termination\n",
-					       ahc_name(ahc));
-				enableSEC_low = (adapter_control & CFSTERM);
-				enableSEC_high = (adapter_control & CFWSTERM);
-			}
-			if ((adapter_control & CFAUTOTERM) == 0) {
-				if (bootverbose)
-					printf("%s: Manual LVD Termination\n",
-					       ahc_name(ahc));
-				enablePRI_low = enablePRI_high =
-				    (adapter_control & CFLVDSTERM);
-			}
-			/* Make the table calculations below happy */
-			internal50_present = 0;
-			internal68_present = 1;
-			externalcable_present = 1;
-		} else if ((ahc->features & AHC_SPIOCAP) != 0) {
-			aic785X_cable_detect(ahc, &internal50_present,
-					     &externalcable_present,
-					     &eeprom_present);
-		} else {
-			aic787X_cable_detect(ahc, &internal50_present,
-					     &internal68_present,
-					     &externalcable_present,
-					     &eeprom_present);
-		}
-
-		if ((ahc->features & AHC_WIDE) == 0)
-			internal68_present = 0;
-
-		if (bootverbose) {
-			if ((ahc->features & AHC_ULTRA2) == 0) {
-				printf("%s: internal 50 cable %s present, "
-				       "internal 68 cable %s present\n",
-				       ahc_name(ahc),
-				       internal50_present ? "is":"not",
-				       internal68_present ? "is":"not");
-
-				printf("%s: external cable %s present\n",
-				       ahc_name(ahc),
-				       externalcable_present ? "is":"not");
-			}
-			printf("%s: BIOS eeprom %s present\n",
-			       ahc_name(ahc), eeprom_present ? "is" : "not");
-		}
-
-		if ((ahc->flags & AHC_INT50_SPEEDFLEX) != 0) {
-			/*
-			 * The 50 pin connector is a separate bus,
-			 * so force it to always be terminated.
-			 * In the future, perform current sensing
-			 * to determine if we are in the middle of
-			 * a properly terminated bus.
-			 */
-			internal50_present = 0;
-		}
-
-		/*
-		 * Now set the termination based on what
-		 * we found.
-		 * Flash Enable = BRDDAT7
-		 * Secondary High Term Enable = BRDDAT6
-		 * Secondary Low Term Enable = BRDDAT5 (7890)
-		 * Primary High Term Enable = BRDDAT4 (7890)
-		 */
-		if ((ahc->features & AHC_ULTRA2) == 0
-		    && (internal50_present != 0)
-		    && (internal68_present != 0)
-		    && (externalcable_present != 0)) {
-			printf("%s: Illegal cable configuration!!. "
-			       "Only two connectors on the "
-			       "adapter may be used at a "
-			       "time!\n", ahc_name(ahc));
-		}
-
-		if ((ahc->features & AHC_WIDE) != 0
-		 && ((externalcable_present == 0)
-		  || (internal68_present == 0)
-		  || (enableSEC_high != 0))) {
-			brddat |= BRDDAT6;
-			if (bootverbose) {
-				if ((ahc->flags & AHC_INT50_SPEEDFLEX) != 0)
-					printf("%s: 68 pin termination "
-					       "Enabled\n", ahc_name(ahc));
-				else
-					printf("%s: %sHigh byte termination "
-					       "Enabled\n", ahc_name(ahc),
-					       enableSEC_high ? "Secondary "
-							      : "");
-			}
-		}
-
-		if (((internal50_present ? 1 : 0)
-		   + (internal68_present ? 1 : 0)
-		   + (externalcable_present ? 1 : 0)) <= 1
-		 || (enableSEC_low != 0)) {
-			if ((ahc->features & AHC_ULTRA2) != 0)
-				brddat |= BRDDAT5;
-			else
-				*sxfrctl1 |= STPWEN;
-			if (bootverbose) {
-				if ((ahc->flags & AHC_INT50_SPEEDFLEX) != 0)
-					printf("%s: 50 pin termination "
-					       "Enabled\n", ahc_name(ahc));
-				else
-					printf("%s: %sLow byte termination "
-					       "Enabled\n", ahc_name(ahc),
-					       enableSEC_low ? "Secondary "
-							     : "");
-			}
-		}
-
-		if (enablePRI_low != 0) {
-			*sxfrctl1 |= STPWEN;
-			if (bootverbose)
-				printf("%s: Primary Low Byte termination "
-				       "Enabled\n", ahc_name(ahc));
-		}
-
-		/*
-		 * Setup STPWEN before setting up the rest of
-		 * the termination per the tech note on the U160 cards.
-		 */
-		ahc_outb(ahc, SXFRCTL1, *sxfrctl1);
-
-		if (enablePRI_high != 0) {
-			brddat |= BRDDAT4;
-			if (bootverbose)
-				printf("%s: Primary High Byte "
-				       "termination Enabled\n",
-				       ahc_name(ahc));
-		}
-		
-		write_brdctl(ahc, brddat);
-
-	} else {
-		if ((adapter_control & CFSTERM) != 0) {
-			*sxfrctl1 |= STPWEN;
-
-			if (bootverbose)
-				printf("%s: %sLow byte termination Enabled\n",
-				       ahc_name(ahc),
-				       (ahc->features & AHC_ULTRA2) ? "Primary "
-								    : "");
-		}
-
-		if ((adapter_control & CFWSTERM) != 0) {
-			brddat |= BRDDAT6;
-			if (bootverbose)
-				printf("%s: %sHigh byte termination Enabled\n",
-				       ahc_name(ahc),
-				       (ahc->features & AHC_ULTRA2)
-				     ? "Secondary " : "");
-		}
-
-		/*
-		 * Setup STPWEN before setting up the rest of
-		 * the termination per the tech note on the U160 cards.
-		 */
-		ahc_outb(ahc, SXFRCTL1, *sxfrctl1);
-
-		write_brdctl(ahc, brddat);
-	}
-	SEEPROM_OUTB(sd, sd->sd_MS); /* Clear CS */
-}
-
-static void
-ahc_new_term_detect(struct ahc_softc *ahc, int *enableSEC_low,
-		    int *enableSEC_high, int *enablePRI_low,
-		    int *enablePRI_high, int *eeprom_present)
-{
-	u_int8_t brdctl;
-
-	/*
-	 * BRDDAT7 = Eeprom
-	 * BRDDAT6 = Enable Secondary High Byte termination
-	 * BRDDAT5 = Enable Secondary Low Byte termination
-	 * BRDDAT4 = Enable Primary high byte termination
-	 * BRDDAT3 = Enable Primary low byte termination
-	 */
-	brdctl = read_brdctl(ahc);
-	*eeprom_present = brdctl & BRDDAT7;
-	*enableSEC_high = (brdctl & BRDDAT6);
-	*enableSEC_low = (brdctl & BRDDAT5);
-	*enablePRI_high = (brdctl & BRDDAT4);
-	*enablePRI_low = (brdctl & BRDDAT3);
-}
-
-static void
-aic787X_cable_detect(struct ahc_softc *ahc, int *internal50_present,
-		     int *internal68_present, int *externalcable_present,
-		     int *eeprom_present)
-{
-	u_int8_t brdctl;
-
-	/*
-	 * First read the status of our cables.
-	 * Set the rom bank to 0 since the
-	 * bank setting serves as a multiplexor
-	 * for the cable detection logic.
-	 * BRDDAT5 controls the bank switch.
-	 */
-	write_brdctl(ahc, 0);
-
-	/*
-	 * Now read the state of the internal
-	 * connectors.  BRDDAT6 is INT50 and
-	 * BRDDAT7 is INT68.
-	 */
-	brdctl = read_brdctl(ahc);
-	*internal50_present = !(brdctl & BRDDAT6);
-	*internal68_present = !(brdctl & BRDDAT7);
-
-	/*
-	 * Set the rom bank to 1 and determine
-	 * the other signals.
-	 */
-	write_brdctl(ahc, BRDDAT5);
-
-	/*
-	 * Now read the state of the external
-	 * connectors.  BRDDAT6 is EXT68 and
-	 * BRDDAT7 is EPROMPS.
-	 */
-	brdctl = read_brdctl(ahc);
-	*externalcable_present = !(brdctl & BRDDAT6);
-	*eeprom_present = brdctl & BRDDAT7;
-}
-
-static void
-aic785X_cable_detect(struct ahc_softc *ahc, int *internal50_present,
-		     int *externalcable_present, int *eeprom_present)
-{
-	u_int8_t brdctl;
-
-	ahc_outb(ahc, BRDCTL, BRDRW|BRDCS);
-	ahc_outb(ahc, BRDCTL, 0);
-	brdctl = ahc_inb(ahc, BRDCTL);
-	*internal50_present = !(brdctl & BRDDAT5);
-	*externalcable_present = !(brdctl & BRDDAT6);
-
-	*eeprom_present = (ahc_inb(ahc, SPIOCAP) & EEPROM) != 0;
-}
-	
-static int
-acquire_seeprom(struct ahc_softc *ahc, struct seeprom_descriptor *sd)
-{
-	int wait;
-
-	if ((ahc->features & AHC_SPIOCAP) != 0
-	 && (ahc_inb(ahc, SPIOCAP) & SEEPROM) == 0)
-		return (0);
-
-	/*
-	 * Request access of the memory port.  When access is
-	 * granted, SEERDY will go high.  We use a 1 second
-	 * timeout which should be near 1 second more than
-	 * is needed.  Reason: after the chip reset, there
-	 * should be no contention.
-	 */
-	SEEPROM_OUTB(sd, sd->sd_MS);
-	wait = 1000;  /* 1 second timeout in msec */
-	while (--wait && ((SEEPROM_STATUS_INB(sd) & sd->sd_RDY) == 0)) {
-		DELAY(1000);  /* delay 1 msec */
-	}
-	if ((SEEPROM_STATUS_INB(sd) & sd->sd_RDY) == 0) {
-		SEEPROM_OUTB(sd, 0); 
-		return (0);
-	}
-	return(1);
-}
-
-static void
-release_seeprom(sd)
-	struct seeprom_descriptor *sd;
-{
-	/* Release access to the memory port and the serial EEPROM. */
-	SEEPROM_OUTB(sd, 0);
-}
-
-static void
-write_brdctl(ahc, value)
-	struct 	ahc_softc *ahc;
-	u_int8_t value;
-{
-	u_int8_t brdctl;
-
-	if ((ahc->chip & AHC_CHIPID_MASK) == AHC_AIC7895) {
-		brdctl = BRDSTB;
-	 	if (ahc->channel == 'B')
-			brdctl |= BRDCS;
-	} else if ((ahc->features & AHC_ULTRA2) != 0) {
-		brdctl = 0;
-	} else {
-		brdctl = BRDSTB|BRDCS;
-	}
-	ahc_outb(ahc, BRDCTL, brdctl);
-	DELAY(20);
-	brdctl |= value;
-	ahc_outb(ahc, BRDCTL, brdctl);
-	DELAY(20);
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		brdctl |= BRDSTB_ULTRA2;
-	else
-		brdctl &= ~BRDSTB;
-	ahc_outb(ahc, BRDCTL, brdctl);
-	DELAY(20);
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		brdctl = 0;
-	else
-		brdctl &= ~BRDCS;
-	ahc_outb(ahc, BRDCTL, brdctl);
-}
-
-static u_int8_t
-read_brdctl(ahc)
-	struct 	ahc_softc *ahc;
-{
-	u_int8_t brdctl;
-	u_int8_t value;
-
-	if ((ahc->chip & AHC_CHIPID_MASK) == AHC_AIC7895) {
-		brdctl = BRDRW;
-	 	if (ahc->channel == 'B')
-			brdctl |= BRDCS;
-	} else if ((ahc->features & AHC_ULTRA2) != 0) {
-		brdctl = BRDRW_ULTRA2;
-	} else {
-		brdctl = BRDRW|BRDCS;
-	}
-	ahc_outb(ahc, BRDCTL, brdctl);
-	DELAY(20);
-	value = ahc_inb(ahc, BRDCTL);
-	ahc_outb(ahc, BRDCTL, 0);
-	return (value);
-}
-
-#define	DPE	0x80
-#define SSE	0x40
-#define	RMA	0x20
-#define	RTA	0x10
-#define STA	0x08
-#define DPR	0x01
-
-void
-ahc_pci_intr(struct ahc_softc *ahc)
-{
-	u_int8_t status1;
-
-	status1 = pci_read_config(ahc->device, PCIR_STATUS + 1, /*bytes*/1);
-
-	if (status1 & DPE) {
-		printf("%s: Data Parity Error Detected during address "
-		       "or write data phase\n", ahc_name(ahc));
-	}
-	if (status1 & SSE) {
-		printf("%s: Signal System Error Detected\n", ahc_name(ahc));
-	}
-	if (status1 & RMA) {
-		printf("%s: Received a Master Abort\n", ahc_name(ahc));
-	}
-	if (status1 & RTA) {
-		printf("%s: Received a Target Abort\n", ahc_name(ahc));
-	}
-	if (status1 & STA) {
-		printf("%s: Signaled a Target Abort\n", ahc_name(ahc));
-	}
-	if (status1 & DPR) {
-		printf("%s: Data Parity Error has been reported via PERR#\n",
-		       ahc_name(ahc));
-	}
-	if ((status1 & (DPE|SSE|RMA|RTA|STA|DPR)) == 0) {
-		printf("%s: Latched PCIERR interrupt with "
-		       "no status bits set\n", ahc_name(ahc)); 
-	}
-	pci_write_config(ahc->device, PCIR_STATUS + 1, status1, /*bytes*/1);
-
-	if (status1 & (DPR|RMA|RTA)) {
-		ahc_outb(ahc, CLRINT, CLRPARERR);
-	}
-}
-
-static int
-ahc_aic7850_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = 'A';
-	*chip = AHC_AIC7850;
-	*features = AHC_AIC7850_FE;
-	return (0);
-}
-
-static int
-ahc_aic7855_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = 'A';
-	*chip = AHC_AIC7855;
-	*features = AHC_AIC7855_FE;
-	return (0);
-}
-
-static int
-ahc_aic7859_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = 'A';
-	*chip = AHC_AIC7859;
-	*features = AHC_AIC7859_FE;
-	return (0);
-}
-
-static int
-ahc_aic7860_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = 'A';
-	*chip = AHC_AIC7860;
-	*features = AHC_AIC7860_FE;
-	return (0);
-}
-
-static int
-ahc_aic7870_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = 'A';
-	*chip = AHC_AIC7870;
-	*features = AHC_AIC7870_FE;
-	return (0);
-}
-
-static int
-ahc_aha394X_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	int error;
-
-	error = ahc_aic7870_setup(dev, channel, chip, features, flags);
-	if (error == 0)
-		error = ahc_aha394XX_setup(dev, channel, chip, features, flags);
-	return (error);
-}
-
-static int
-ahc_aha398X_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	int error;
-
-	error = ahc_aic7870_setup(dev, channel, chip, features, flags);
-	if (error == 0)
-		error = ahc_aha398XX_setup(dev, channel, chip, features, flags);
-	return (error);
-}
-
-static int
-ahc_aic7880_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = 'A';
-	*chip = AHC_AIC7880;
-	*features = AHC_AIC7880_FE;
-	return (0);
-}
-
-static int
-ahc_2940Pro_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	int error;
-
-	*flags |= AHC_INT50_SPEEDFLEX;
-	error = ahc_aic7880_setup(dev, channel, chip, features, flags);
-	return (0);
-}
-
-static int
-ahc_aha394XU_setup(device_t dev, char *channel, ahc_chip *chip,
-		   ahc_feature *features, ahc_flag *flags)
-{
-	int error;
-
-	error = ahc_aic7880_setup(dev, channel, chip, features, flags);
-	if (error == 0)
-		error = ahc_aha394XX_setup(dev, channel, chip, features, flags);
-	return (error);
-}
-
-static int
-ahc_aha398XU_setup(device_t dev, char *channel, ahc_chip *chip,
-		   ahc_feature *features, ahc_flag *flags)
-{
-	int error;
-
-	error = ahc_aic7880_setup(dev, channel, chip, features, flags);
-	if (error == 0)
-		error = ahc_aha398XX_setup(dev, channel, chip, features, flags);
-	return (error);
-}
-
-static int
-ahc_aic7890_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = 'A';
-	*chip = AHC_AIC7890;
-	*features = AHC_AIC7890_FE;
-	*flags |= AHC_NEWEEPROM_FMT;
-	return (0);
-}
-
-static int
-ahc_aic7892_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = 'A';
-	*chip = AHC_AIC7892;
-	*features = AHC_AIC7892_FE;
-	*flags |= AHC_NEWEEPROM_FMT;
-	return (0);
-}
-
-static int
-ahc_aic7895_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	u_int32_t devconfig;
-
-	*channel = pci_get_function(dev) == 1 ? 'B' : 'A';
-	*chip = AHC_AIC7895;
-	/* The 'C' revision of the aic7895 has a few additional features */
-	if (pci_get_revid(dev) >= 4)
-		*features = AHC_AIC7895C_FE;
-	else
-		*features = AHC_AIC7895_FE;
-	*flags |= AHC_NEWEEPROM_FMT;
-	devconfig = pci_read_config(dev, DEVCONFIG, /*bytes*/4);
-	devconfig &= ~SCBSIZE32;
-	pci_write_config(dev, DEVCONFIG, devconfig, /*bytes*/4);
-	return (0);
-}
-
-static int
-ahc_aic7896_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = pci_get_function(dev) == 1 ? 'B' : 'A';
-	*chip = AHC_AIC7896;
-	*features = AHC_AIC7896_FE;
-	*flags |= AHC_NEWEEPROM_FMT;
-	return (0);
-}
-
-static int
-ahc_aic7899_setup(device_t dev, char *channel, ahc_chip *chip,
-		  ahc_feature *features, ahc_flag *flags)
-{
-	*channel = pci_get_function(dev) == 1 ? 'B' : 'A';
-	*chip = AHC_AIC7899;
-	*features = AHC_AIC7899_FE;
-	*flags |= AHC_NEWEEPROM_FMT;
-	return (0);
-}
-
-static int
-ahc_raid_setup(device_t dev, char *channel, ahc_chip *chip,
-	       ahc_feature *features, ahc_flag *flags)
-{
-	printf("RAID functionality unsupported\n");
-	return (ENXIO);
-}
-
-static int
-ahc_aha394XX_setup(device_t dev, char *channel, ahc_chip *chip,
-		   ahc_feature *features, ahc_flag *flags)
-{
-	switch (pci_get_slot(dev)) {
-	case AHC_394X_SLOT_CHANNEL_A:
-		*channel = 'A';
-		break;
-	case AHC_394X_SLOT_CHANNEL_B:
-		*channel = 'B';
-		break;
-	default:
-		printf("adapter at unexpected slot %d\n"
-		       "unable to map to a channel\n",
-		       pci_get_slot(dev));
-		*channel = 'A';
-	}
-	return (0);
-}
-
-static int
-ahc_aha398XX_setup(device_t dev, char *channel, ahc_chip *chip,
-		   ahc_feature *features, ahc_flag *flags)
-{
-	switch (pci_get_slot(dev)) {
-	case AHC_398X_SLOT_CHANNEL_A:
-		*channel = 'A';
-		break;
-	case AHC_398X_SLOT_CHANNEL_B:
-		*channel = 'B';
-		break;
-	case AHC_398X_SLOT_CHANNEL_C:
-		*channel = 'C';
-		break;
-	default:
-		printf("adapter at unexpected slot %d\n"
-		       "unable to map to a channel\n",
-		       pci_get_slot(dev));
-		*channel = 'A';
-	}
-	*flags |= AHC_LARGE_SEEPROM;
-	return (0);
-}
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
deleted file mode 100644
index d70628a..0000000
--- a/sys/pci/if_fpa.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/*-
- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- */
-
-/*
- * DEC PDQ FDDI Controller; code for BSD derived operating systems
- *
- *   This module supports the DEC DEFPA PCI FDDI Controller
- */
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#if defined(__bsdi__) || defined(__NetBSD__)
-#include <sys/device.h>
-#endif
-
-#include <net/if.h>
-
-#if defined(__FreeBSD__)
-#include "fpa.h"
-#include <sys/eventhandler.h>
-#include <net/ethernet.h>
-#include <net/if_arp.h>
-#include <pci/pcivar.h>
-#include <dev/pdq/pdqvar.h>
-#include <dev/pdq/pdqreg.h>
-#elif defined(__bsdi__)
-#include <i386/isa/isavar.h>
-#include <i386/isa/icu.h>
-#ifndef DRQNONE
-#define	DRQNONE		0
-#endif
-#if _BSDI_VERSION < 199401
-#define IRQSHARE	0
-#endif
-#elif defined(__NetBSD__)
-#include <dev/pci/pcivar.h>
-#include <dev/ic/pdqvar.h>
-#include <dev/ic/pdqreg.h>
-#endif /* __NetBSD__ */
-
-
-#define	DEC_VENDORID		0x1011
-#define	DEFPA_CHIPID		0x000F
-#define	PCI_VENDORID(x)		((x) & 0xFFFF)
-#define	PCI_CHIPID(x)		(((x) >> 16) & 0xFFFF)
-
-#define	DEFPA_LATENCY	0x88
-
-#define	PCI_CFLT	0x0C	/* Configuration Latency */
-#define	PCI_CBMA	0x10	/* Configuration Base Memory Address */
-#define	PCI_CBIO	0x14	/* Configuration Base I/O Address */
-
-#if defined(__FreeBSD__)
-#if NFPA < 4
-#undef NFPA
-#define NFPA	4
-#endif
-static pdq_softc_t *pdqs_pci[NFPA];
-#define	PDQ_PCI_UNIT_TO_SOFTC(unit)	(pdqs_pci[unit])
-#if BSD >= 199506
-#define	pdq_pci_ifwatchdog		NULL
-#endif
-
-#elif defined(__bsdi__)
-extern struct cfdriver fpacd;
-#define	PDQ_PCI_UNIT_TO_SOFTC(unit)	((pdq_softc_t *)fpacd.cd_devs[unit])
-
-#elif defined(__NetBSD__)
-extern struct cfattach fpa_ca;
-extern struct cfdriver fpa_cd;
-#define	PDQ_PCI_UNIT_TO_SOFTC(unit)	((pdq_softc_t *)fpa_cd.cd_devs[unit])
-#define	pdq_pci_ifwatchdog		NULL
-#endif
-
-#ifndef pdq_pci_ifwatchdog
-static ifnet_ret_t
-pdq_pci_ifwatchdog(
-    int unit)
-{
-    pdq_ifwatchdog(&PDQ_PCI_UNIT_TO_SOFTC(unit)->sc_if);
-}
-#endif
-
-#if defined(__FreeBSD__) && BSD >= 199506
-static void
-pdq_pci_ifintr(
-    void *arg)
-{
-    (void) pdq_interrupt(((pdq_softc_t *) arg)->sc_pdq);
-}
-#else
-static int
-pdq_pci_ifintr(
-    void *arg)
-{
-    pdq_softc_t * const sc = (pdq_softc_t *) arg;
-#ifdef __FreeBSD__
-    return pdq_interrupt(sc->sc_pdq);
-#elif defined(__bsdi__) || defined(__NetBSD__)
-    (void) pdq_interrupt(sc->sc_pdq);
-    return 1;
-#endif
-}
-#endif /* __FreeBSD && BSD */
-
-#if defined(__FreeBSD__)
-static void pdq_pci_shutdown(void *, int);
-
-/*
- * This is the PCI configuration support.  Since the PDQ is available
- * on both EISA and PCI boards, one must be careful in how defines the
- * PDQ in the config file.
- */
-static const char *
-pdq_pci_probe(
-    pcici_t config_id,
-    pcidi_t device_id)
-{
-    if (PCI_VENDORID(device_id) == DEC_VENDORID &&
-	    PCI_CHIPID(device_id) == DEFPA_CHIPID)
-	return "Digital DEFPA PCI FDDI Controller";
-    return NULL;
-}
-
-static void
-pdq_pci_attach(
-    pcici_t config_id,
-    int unit)
-{
-    pdq_softc_t *sc;
-    vm_offset_t va_csrs, pa_csrs;
-    pdq_uint32_t data;
-
-    if (unit == NFPA) {
-	printf("fpa%d: not configured; kernel is built for only %d device%s.\n",
-	       unit, NFPA, NFPA == 1 ? "" : "s");
-	return;
-    }
-
-    data = pci_conf_read(config_id, PCI_CFLT);
-    if ((data & 0xFF00) < (DEFPA_LATENCY << 8)) {
-	data &= ~0xFF00;
-	data |= DEFPA_LATENCY << 8;
-	pci_conf_write(config_id, PCI_CFLT, data);
-    }
-
-    sc = (pdq_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT);
-    if (sc == NULL)
-	return;
-
-    bzero(sc, sizeof(pdq_softc_t));	/* Zero out the softc*/
-    if (!pci_map_mem(config_id, PCI_CBMA, &va_csrs, &pa_csrs)) {
-	free((void *) sc, M_DEVBUF);
-	return;
-    }
-
-    sc->sc_if.if_name = "fpa";
-    sc->sc_if.if_unit = unit;
-    sc->sc_membase = (pdq_bus_memaddr_t) va_csrs;
-    sc->sc_pdq = pdq_initialize(PDQ_BUS_PCI, sc->sc_membase,
-				sc->sc_if.if_name, sc->sc_if.if_unit,
-				(void *) sc, PDQ_DEFPA);
-    if (sc->sc_pdq == NULL) {
-	free((void *) sc, M_DEVBUF);
-	return;
-    }
-    bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6);
-    pdqs_pci[unit] = sc;
-    pdq_ifattach(sc, pdq_pci_ifwatchdog);
-    pci_map_int(config_id, pdq_pci_ifintr, (void*) sc, &net_imask);
-    EVENTHANDLER_REGISTER(shutdown_post_sync, pdq_pci_shutdown, sc,
-			  SHUTDOWN_PRI_DEFAULT);
-
-}
-
-static void
-pdq_pci_shutdown(
-    void *sc,
-    int howto)
-{
-    pdq_hwreset(((pdq_softc_t *)sc)->sc_pdq);
-}
-
-static u_long pdq_pci_count;
-
-static struct pci_device fpadevice = {
-    "fpa",
-    pdq_pci_probe,
-    pdq_pci_attach,
-    &pdq_pci_count,
-    NULL
-};
-
-COMPAT_PCI_DRIVER (fpa, fpadevice);
-
-#elif defined(__bsdi__)
-
-static int
-pdq_pci_match(
-    pci_devaddr_t *pa)
-{
-    int irq;
-    int id;
-
-    id = pci_inl(pa, PCI_VENDOR_ID);
-    if (PCI_VENDORID(id) != DEC_VENDORID || PCI_CHIPID(id) != DEFPA_CHIPID)
-	return 0;
-
-    irq = pci_inl(pa, PCI_I_LINE) & 0xFF;
-    if (irq == 0 || irq >= 16)
-	return 0;
-
-    return 1;
-}
-
-int
-pdq_pci_probe(
-    struct device *parent,
-    struct cfdata *cf,
-    void *aux)
-{
-    struct isa_attach_args *ia = (struct isa_attach_args *) aux;
-    pdq_uint32_t irq, data;
-    pci_devaddr_t *pa;
-
-    pa = pci_scan(pdq_pci_match);
-    if (pa == NULL)
-	return 0;
-
-    irq = (1 << (pci_inl(pa, PCI_I_LINE) & 0xFF));
-
-    if (ia->ia_irq != IRQUNK && irq != ia->ia_irq) {
-	printf("fpa%d: error: desired IRQ of %d does not match device's actual IRQ of %d\n",
-	       cf->cf_unit,
-	       ffs(ia->ia_irq) - 1, ffs(irq) - 1);
-	return 0;
-    }
-    if (ia->ia_irq == IRQUNK) {
-	(void) isa_irqalloc(irq);
-	ia->ia_irq = irq;
-    }
-
-    /* PCI bus masters don't use host DMA channels */
-    ia->ia_drq = DRQNONE;
-
-    /* Get the memory base address; assume the BIOS set it up correctly */
-    ia->ia_maddr = (caddr_t) (pci_inl(pa, PCI_CBMA) & ~7);
-    pci_outl(pa, PCI_CBMA, 0xFFFFFFFF);
-    ia->ia_msize = ((~pci_inl(pa, PCI_CBMA)) | 7) + 1;
-    pci_outl(pa, PCI_CBMA, (int) ia->ia_maddr);
-
-    /* Disable I/O space access */
-    pci_outl(pa, PCI_COMMAND, pci_inl(pa, PCI_COMMAND) & ~1);
-    ia->ia_iobase = 0;
-    ia->ia_iosize = 0;
-
-    /* Make sure the latency timer is what the DEFPA likes */
-    data = pci_inl(pa, PCI_CFLT);
-    if ((data & 0xFF00) < (DEFPA_LATENCY << 8)) {
-	data &= ~0xFF00;
-	data |= DEFPA_LATENCY << 8;
-	pci_outl(pa, PCI_CFLT, data);
-    }
-    ia->ia_irq |= IRQSHARE;
-
-    return 1;
-}
-
-void
-pdq_pci_attach(
-    struct device *parent,
-    struct device *self,
-    void *aux)
-{
-    pdq_softc_t *sc = (pdq_softc_t *) self;
-    register struct isa_attach_args *ia = (struct isa_attach_args *) aux;
-    register struct ifnet *ifp = &sc->sc_if;
-    int i;
-
-    sc->sc_if.if_unit = sc->sc_dev.dv_unit;
-    sc->sc_if.if_name = "fpa";
-    sc->sc_if.if_flags = 0;
-    sc->sc_membase = (pdq_bus_memaddr_t) mapphys((vm_offset_t)ia->ia_maddr, ia->ia_msize);
-
-    sc->sc_pdq = pdq_initialize(PDQ_BUS_PCI, sc->sc_membase,
-				sc->sc_if.if_name, sc->sc_if.if_unit,
-				(void *) sc, PDQ_DEFPA);
-    if (sc->sc_pdq == NULL) {
-	printf("fpa%d: initialization failed\n", sc->sc_if.if_unit);
-	return;
-    }
-
-    bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6);
-
-    pdq_ifattach(sc, pdq_pci_ifwatchdog);
-
-    isa_establish(&sc->sc_id, &sc->sc_dev);
-
-    sc->sc_ih.ih_fun = pdq_pci_ifintr;
-    sc->sc_ih.ih_arg = (void *)sc;
-    intr_establish(ia->ia_irq, &sc->sc_ih, DV_NET);
-
-    sc->sc_ats.func = (void (*)(void *)) pdq_hwreset;
-    sc->sc_ats.arg = (void *) sc->sc_pdq;
-    atshutdown(&sc->sc_ats, ATSH_ADD);
-}
-
-struct cfdriver fpacd = {
-    0, "fpa", pdq_pci_probe, pdq_pci_attach,
-#if _BSDI_VERSION >= 199401
-    DV_IFNET,
-#endif
-    sizeof(pdq_softc_t)
-};
-
-#elif defined(__NetBSD__)
-
-static int
-pdq_pci_match(
-    struct device *parent,
-    void *match,
-    void *aux)
-{
-    struct pci_attach_args *pa = (struct pci_attach_args *) aux;
-
-    if (PCI_VENDORID(pa->pa_id) != DEC_VENDORID)
-	return 0;
-    if (PCI_CHIPID(pa->pa_id) == DEFPA_CHIPID)
-	return 1;
-
-    return 0;
-}
-
-static void
-pdq_pci_attach(
-    struct device * const parent,
-    struct device * const self,
-    void * const aux)
-{
-    pdq_softc_t * const sc = (pdq_softc_t *) self;
-    struct pci_attach_args * const pa = (struct pci_attach_args *) aux;
-    pdq_uint32_t data;
-    pci_intr_handle_t intrhandle;
-    const char *intrstr;
-#ifdef PDQ_IOMAPPED
-    bus_io_addr_t iobase;
-    bus_io_size_t iosize;
-#else
-    bus_mem_addr_t membase;
-    bus_mem_size_t memsize;
-#endif
-
-    data = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_CFLT);
-    if ((data & 0xFF00) < (DEFPA_LATENCY << 8)) {
-	data &= ~0xFF00;
-	data |= DEFPA_LATENCY << 8;
-	pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_CFLT, data);
-    }
-
-    sc->sc_bc = pa->pa_bc;
-    bcopy(sc->sc_dev.dv_xname, sc->sc_if.if_xname, IFNAMSIZ);
-    sc->sc_if.if_flags = 0;
-    sc->sc_if.if_softc = sc;
-
-#ifdef PDQ_IOMAPPED
-    if (pci_io_find(pa->pa_pc, pa->pa_tag, PCI_CBIO, &iobase, &iosize)
-	    || bus_io_map(pa->pa_bc, iobase, iosize, &sc->sc_iobase))
-	return;
-#else
-    if (pci_mem_find(pa->pa_pc, pa->pa_tag, PCI_CBMA, &membase, &memsize, NULL)
-	    || bus_mem_map(pa->pa_bc, membase, memsize, 0, &sc->sc_membase))
-	return;
-#endif
-
-    sc->sc_pdq = pdq_initialize(sc->sc_bc, sc->sc_membase,
-				sc->sc_if.if_xname, 0,
-				(void *) sc, PDQ_DEFPA);
-    if (sc->sc_pdq == NULL) {
-	printf("%s: initialization failed\n", sc->sc_dev.dv_xname);
-	return;
-    }
-
-    bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6);
-    pdq_ifattach(sc, pdq_pci_ifwatchdog);
-
-    if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin,
-		     pa->pa_intrline, &intrhandle)) {
-	printf("%s: couldn't map interrupt\n", self->dv_xname);
-	return;
-    }
-    intrstr = pci_intr_string(pa->pa_pc, intrhandle);
-    sc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, pdq_pci_ifintr, sc);
-    if (sc->sc_ih == NULL) {
-	printf("%s: couldn't establish interrupt", self->dv_xname);
-	if (intrstr != NULL)
-	    printf(" at %s", intrstr);
-	printf("\n");
-	return;
-    }
-
-    sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, sc->sc_pdq);
-    if (sc->sc_ats == NULL)
-	printf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname);
-    if (intrstr != NULL)
-	printf("%s: interrupting at %s\n", self->dv_xname, intrstr);
-}
-
-struct cfattach fpa_ca = {
-    sizeof(pdq_softc_t), pdq_pci_match, pdq_pci_attach
-};
-
-struct cfdriver fpa_cd = {
-    0, "fpa", DV_IFNET
-};
-
-#endif /* __NetBSD__ */
diff --git a/sys/pci/if_vx_pci.c b/sys/pci/if_vx_pci.c
deleted file mode 100644
index e4910ad..0000000
--- a/sys/pci/if_vx_pci.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 1996 Naoki Hamada <nao@tom-yam.or.jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include "vx.h"
-#if NVX > 0
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/eventhandler.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/if_arp.h>
-
-#include <pci/pcivar.h>
-
-#include <dev/vx/if_vxreg.h>
-
-static void vx_pci_shutdown(void *, int);
-static const char *vx_pci_probe(pcici_t, pcidi_t);
-static void vx_pci_attach(pcici_t, int unit);
-
-static void
-vx_pci_shutdown(
-	void *sc,
-	int howto)
-{
-   vxstop(sc); 
-   vxfree(sc);
-}
-
-static const char*
-vx_pci_probe(
-	pcici_t config_id,
-	pcidi_t device_id)
-{
-   if(device_id == 0x590010b7ul)
-      return "3COM 3C590 Etherlink III PCI";
-   if(device_id == 0x595010b7ul || device_id == 0x595110b7ul ||
-	device_id == 0x595210b7ul)
-      return "3COM 3C595 Fast Etherlink III PCI";
-	/*
-	 * The (Fast) Etherlink XL adapters are now supported by
-	 * the xl driver, which uses bus master DMA and is much
-	 * faster. (And which also supports the 3c905B.
-	 */
-#ifdef VORTEX_ETHERLINK_XL
-   if(device_id == 0x900010b7ul || device_id == 0x900110b7ul)
-      return "3COM 3C900 Etherlink XL PCI";
-   if(device_id == 0x905010b7ul || device_id == 0x905110b7ul)
-      return "3COM 3C905 Fast Etherlink XL PCI";
-#endif
-   return NULL;
-}
-
-static void
-vx_pci_attach(
-	pcici_t config_id,
-	int unit)
-{
-    struct vx_softc *sc;
-
-    if (unit >= NVX) {
-       printf("vx%d: not configured; kernel is built for only %d device%s.\n",
-          unit, NVX, NVX == 1 ? "" : "s"); 
-       return;
-    }
-
-    if ((sc = vxalloc(unit)) == NULL) {
-	return;
-    }
-
-    sc->vx_io_addr = pci_conf_read(config_id, 0x10) & 0xffffffe0;
-
-    if (vxattach(sc) == 0) {
-	return;
-    }
-
-    /* defect check for 3C590 */
-    if ((pci_conf_read(config_id, 0) >> 16) == 0x5900) {
-	GO_WINDOW(0);
-	if (vxbusyeeprom(sc))
-	    return;
-	outw(BASE + VX_W0_EEPROM_COMMAND, EEPROM_CMD_RD | EEPROM_SOFT_INFO_2);
-	if (vxbusyeeprom(sc))
-	    return;
-	if (!(inw(BASE + VX_W0_EEPROM_DATA) & NO_RX_OVN_ANOMALY)) {
-	    printf("Warning! Defective early revision adapter!\n");
-	}
-    }
-
-    /*
-     * Add shutdown hook so that DMA is disabled prior to reboot. Not
-     * doing do could allow DMA to corrupt kernel memory during the
-     * reboot before the driver initializes.
-     */
-    EVENTHANDLER_REGISTER(shutdown_post_sync, vx_pci_shutdown, sc,
-			  SHUTDOWN_PRI_DEFAULT);
-
-    pci_map_int(config_id, vxintr, (void *) sc, &net_imask);
-}
-
-static struct pci_device vxdevice = {
-    "vx",
-    vx_pci_probe,
-    vx_pci_attach,
-    &vx_count,
-    NULL
-};
-
-COMPAT_PCI_DRIVER (vx, vxdevice);
-
-#endif	/* NVX */