Remove EISA support from adv driver. Remove references to it from man

page. Remove comment about EISA dual channel card. Remove trivial
references in advlib to avoid false positives with grep. Remove stray
MCA reference not worth a seperate commit.

4 files changed, 1 insertions, 386 deletions

diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
deleted file mode 100644
index 7adb75fec902..000000000000
--- a/sys/dev/advansys/adv_eisa.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*-
- * Device probe and attach routines for the following
- * Advanced Systems Inc. SCSI controllers:
- *
- *   Single Channel Products:
- *	ABP742 - Bus-Master EISA (240 CDB)
- *
- *   Dual Channel Products:  
- *	ABP752 - Dual Channel Bus-Master EISA (240 CDB Per Channel)
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/bus.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <dev/eisa/eisaconf.h>
-
-#include <dev/advansys/advansys.h>
-
-#define EISA_DEVICE_ID_ADVANSYS_740	0x04507400
-#define EISA_DEVICE_ID_ADVANSYS_750	0x04507500
-
-#define ADV_EISA_SLOT_OFFSET		0xc00
-#define ADV_EISA_OFFSET_CHAN1		0x30
-#define ADV_EISA_OFFSET_CHAN2		0x50
-#define ADV_EISA_IOSIZE			0x100
-
-#define ADV_EISA_ROM_BIOS_ADDR_REG	0x86
-#define ADV_EISA_IRQ_BURST_LEN_REG	0x87
-#define 	ADV_EISA_IRQ_MASK	0x07
-#define 	ADV_EISA_IRQ_10		0x00
-#define 	ADV_EISA_IRQ_11		0x01
-#define 	ADV_EISA_IRQ_12		0x02
-#define 	ADV_EISA_IRQ_14		0x04
-#define 	ADV_EISA_IRQ_15		0x05
-
-#define	ADV_EISA_MAX_DMA_ADDR   (0x07FFFFFFL)
-#define	ADV_EISA_MAX_DMA_COUNT  (0x07FFFFFFL)
-
-/* 
- * The overrun buffer shared amongst all EISA adapters.
- */
-static	void*		overrun_buf;
-static	bus_dma_tag_t	overrun_dmat;
-static	bus_dmamap_t	overrun_dmamap;
-static	bus_addr_t	overrun_physbase;
-
-static const char*
-adv_eisa_match(eisa_id_t type)
-{
-	switch (type & ~0xF) {
-	case EISA_DEVICE_ID_ADVANSYS_740:
-		return ("AdvanSys ABP-740/742 SCSI adapter");
-		break;
-	case EISA_DEVICE_ID_ADVANSYS_750:
-		return ("AdvanSys ABP-750/752 SCSI adapter");
-		break;
-	default:
-		break;
-	}
-	return (NULL);
-}
-
-static int
-adv_eisa_probe(device_t dev)
-{
-	const char *desc;
-	u_int32_t iobase;
-	u_int8_t irq;
-
-	desc = adv_eisa_match(eisa_get_id(dev));
-	if (!desc)
-		return (ENXIO);
-	device_set_desc(dev, desc);
-
-	iobase = (eisa_get_slot(dev) * EISA_SLOT_SIZE) + ADV_EISA_SLOT_OFFSET;
-
-	eisa_add_iospace(dev, iobase, ADV_EISA_IOSIZE, RESVADDR_NONE);
-	irq = inb(iobase + ADV_EISA_IRQ_BURST_LEN_REG);
-	irq &= ADV_EISA_IRQ_MASK;
-	switch (irq) {
-	case 0:
-	case 1:
-	case 2:
-	case 4:
-	case 5:
-	    break;
-	default:
-	    printf("adv at slot %d: illegal "
-		   "irq setting %d\n", eisa_get_slot(dev),
-		   irq);
-	    return ENXIO;
-	}
-	eisa_add_intr(dev, irq + 10, EISA_TRIGGER_LEVEL);
-
-	return 0;
-}
-
-/*
- * The adv_b stuff to handle twin-channel cards will not work in its current
- * incarnation.  It tries to reuse the same softc since adv_alloc() doesn't
- * actually allocate a softc.  It also tries to reuse the same unit number
- * for both sims.  This can be re-enabled if someone fixes it properly.
- */
-static int
-adv_eisa_attach(device_t dev)
-{
-	struct adv_softc *adv;
-#if 0
-	struct adv_softc *adv_b;
-#endif
-	struct resource *io;
-	struct resource *irq;
-	int rid, error;
-	void *ih;
-
-#if 0
-	adv_b = NULL;
-#endif
-
-	rid = 0;
-	io = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
-	if (!io) {
-		device_printf(dev, "No I/O space?!\n");
-		return ENOMEM;
-	}
-
-	rid = 0;
-	irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
-				     RF_SHAREABLE | RF_ACTIVE);
-	if (!irq) {
-		device_printf(dev, "No irq?!\n");
-		bus_release_resource(dev, SYS_RES_IOPORT, 0, io);
-		return ENOMEM;
-
-	}
-
-	switch (eisa_get_id(dev) & ~0xF) {
-	case EISA_DEVICE_ID_ADVANSYS_750:
-#if 0
-		adv_b = adv_alloc(dev, io, ADV_EISA_OFFSET_CHAN2);
-		if (adv_b == NULL)
-			goto bad;
-		
-		/*
-		 * Allocate a parent dmatag for all tags created
-		 * by the MI portions of the advansys driver
-		 */
-		error = bus_dma_tag_create(
-				/* parent	*/ bus_get_dma_tag(dev),
-				/* alignment	*/ 1,
-				/* boundary	*/ 0,
-				/* lowaddr	*/ ADV_EISA_MAX_DMA_ADDR,
-				/* highaddr	*/ BUS_SPACE_MAXADDR,
-				/* filter	*/ NULL,
-				/* filterarg	*/ NULL,
-				/* maxsize	*/ BUS_SPACE_MAXSIZE_32BIT,
-				/* nsegments	*/ ~0,
-				/* maxsegsz	*/ ADV_EISA_MAX_DMA_COUNT,
-				/* flags	*/ 0,
-				/* lockfunc	*/ NULL,
-				/* lockarg	*/ NULL,
-				&adv_b->parent_dmat);
- 
-		if (error != 0) {
-			device_printf(dev, "Could not allocate DMA tag - error %d\n",
-			       error);
-			adv_free(adv_b);
-			goto bad;
-		}
-
-		adv_b->init_level++;
-#endif
-
-		/* FALLTHROUGH */
-	case EISA_DEVICE_ID_ADVANSYS_740:
-		adv = adv_alloc(dev, io, ADV_EISA_OFFSET_CHAN1);
-		if (adv == NULL) {
-#if 0
-			if (adv_b != NULL)
-				adv_free(adv_b);
-#endif
-			goto bad;
-		}
-
-		/*
-		 * Allocate a parent dmatag for all tags created
-		 * by the MI portions of the advansys driver
-		 */
-		error = bus_dma_tag_create(
-				/* parent	*/ bus_get_dma_tag(dev),
-				/* alignment	*/ 1,
-				/* boundary	*/ 0,
-				/* lowaddr	*/ ADV_EISA_MAX_DMA_ADDR,
-				/* highaddr	*/ BUS_SPACE_MAXADDR,
-				/* filter	*/ NULL,
-				/* filterarg	*/ NULL,
-				/* maxsize	*/ BUS_SPACE_MAXSIZE_32BIT,
-				/* nsegments	*/ ~0,
-				/* maxsegsz	*/ ADV_EISA_MAX_DMA_COUNT,
-				/* flags	*/ 0,
-				/* lockfunc	*/ NULL,
-				/* lockarg	*/ NULL,
-				&adv->parent_dmat);
- 
-		if (error != 0) {
-			device_printf(dev, "Could not allocate DMA tag - error %d\n",
-			       error);
-			adv_free(adv);
-			goto bad;
-		}
-
-		adv->init_level++;
-		break;
-	default: 
-		printf("adveisaattach: Unknown device type!\n");
-		goto bad;
-		break;
-	}
-
-	if (overrun_buf == NULL) {
-		/* Need to allocate our overrun buffer */
-		if (bus_dma_tag_create(
-				/* parent	*/ bus_get_dma_tag(dev),
-				/* alignment	*/ 8,
-				/* boundary	*/ 0,
-				/* lowaddr	*/ ADV_EISA_MAX_DMA_ADDR,
-				/* highaddr	*/ BUS_SPACE_MAXADDR,
-				/* filter	*/ NULL,
-				/* filterarg	*/ NULL,
-				/* maxsize	*/ ADV_OVERRUN_BSIZE,
-				/* nsegments	*/ 1,
-				/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
-				/* flags	*/ 0,
-				/* lockfunc	*/ NULL,
-				/* lockarg	*/ NULL,
-				&overrun_dmat) != 0) {
-			adv_free(adv);
-			goto bad;
-       		}
-		if (bus_dmamem_alloc(overrun_dmat,
-				     &overrun_buf,
-				     BUS_DMA_NOWAIT,
-				     &overrun_dmamap) != 0) {
-			bus_dma_tag_destroy(overrun_dmat);
-			adv_free(adv);
-			goto bad;
-		}
-		/* And permanently map it in */  
-		bus_dmamap_load(overrun_dmat, overrun_dmamap,
-				overrun_buf, ADV_OVERRUN_BSIZE,
-				adv_map, &overrun_physbase,
-				/*flags*/0);
-	}
-	
-	/*
-	 * Now that we know we own the resources we need, do the 
-	 * card initialization.
-	 */
-
-	/*
-	 * Stop the chip.
-	 */
-	ADV_OUTB(adv, ADV_CHIP_CTRL, ADV_CC_HALT);
-	ADV_OUTW(adv, ADV_CHIP_STATUS, 0);
-
-	adv->chip_version = EISA_REVISION_ID(eisa_get_id(dev))
-			  + ADV_CHIP_MIN_VER_EISA - 1;
-
-	if (adv_init(adv) != 0) {
-		adv_free(adv);
-#if 0
-		if (adv_b != NULL)
-			adv_free(adv_b);
-#endif
-		goto bad;
-	}
-
-	adv->max_dma_count = ADV_EISA_MAX_DMA_COUNT;
-	adv->max_dma_addr = ADV_EISA_MAX_DMA_ADDR;
-
-#if 0
-	if (adv_b != NULL) {
-		/*
-		 * Stop the chip.
-		 */
-		ADV_OUTB(adv_b, ADV_CHIP_CTRL, ADV_CC_HALT);
-		ADV_OUTW(adv_b, ADV_CHIP_STATUS, 0);
-
-		adv_b->chip_version = EISA_REVISION_ID(eisa_get_id(dev))
-				    + ADV_CHIP_MIN_VER_EISA - 1;
-
-		if (adv_init(adv_b) != 0) {
-			adv_free(adv_b);
-		} else {
-			adv_b->max_dma_count = ADV_EISA_MAX_DMA_COUNT;
-			adv_b->max_dma_addr = ADV_EISA_MAX_DMA_ADDR;
-		}
-	}
-#endif
-
-	/*
-	 * Enable our interrupt handler.
-	 */
-	if (bus_setup_intr(dev, irq, INTR_TYPE_CAM|INTR_ENTROPY|INTR_MPSAFE, NULL,
-	    adv_intr, adv, &ih) != 0) {
-		adv_free(adv);
-		goto bad;
-	}
-
-	/* Attach sub-devices */
-	if (adv_attach(adv) != 0) {
-		adv_free(adv);
-		goto bad;
-	}
-#if 0
-	if (adv_b != NULL)
-		adv_attach(adv_b);
-#endif
-
-	return 0;
-
- bad:
-	bus_release_resource(dev, SYS_RES_IOPORT, 0, io);
-	bus_release_resource(dev, SYS_RES_IRQ, 0, irq);
-	return ENXIO;
-}
-
-static device_method_t adv_eisa_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		adv_eisa_probe),
-	DEVMETHOD(device_attach,	adv_eisa_attach),
-	{ 0, 0 }
-};
-
-static driver_t adv_eisa_driver = {
-	"adv", adv_eisa_methods, sizeof(struct adv_softc)
-};
-
-static devclass_t adv_eisa_devclass;
-DRIVER_MODULE(adv, eisa, adv_eisa_driver, adv_eisa_devclass, 0, 0);
-MODULE_DEPEND(adv, eisa, 1, 1, 1);
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index cb108f4804ae..8ca81ae55459 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -3,7 +3,6 @@
  * Product specific probe and attach routines can be found in:
  * 
  * i386/isa/adv_isa.c	ABP5140, ABP542, ABP5150, ABP842, ABP852
- * i386/eisa/adv_eisa.c	ABP742, ABP752
  * pci/adv_pci.c	ABP920, ABP930, ABP930U, ABP930UA, ABP940, ABP940U,
  *			ABP940UA, ABP950, ABP960, ABP960U, ABP960UA,
  *			ABP970, ABP970U
@@ -1378,8 +1377,6 @@ adv_attach(adv)
 
 	/*
 	 * Register the bus.
-	 *
-	 * XXX Twin Channel EISA Cards???
 	 */
 	mtx_lock(&adv->lock);
 	if (xpt_bus_register(adv->sim, adv->dev, 0) != CAM_SUCCESS) {
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 75d6884b9131..5a448e4bf9f9 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -729,7 +729,7 @@ adv_execute_scsi_queue(struct adv_softc *adv, struct adv_scsi_q *scsiq,
 			panic("adv_execute_scsi_queue: "
 			      "Queue with too many segs.");
 
-		if ((adv->type & (ADV_ISA | ADV_VL | ADV_EISA)) != 0) {
+		if ((adv->type & (ADV_ISA | ADV_VL)) != 0) {
 			int i;
 
 			for (i = 0; i < sg_entry_cnt_minus_one; i++) {
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index 6952ca960c92..9fd6d1b2665f 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -66,9 +66,7 @@ typedef enum {
 	ADV_ISA		= 0x001,
 	ADV_ISAPNP	= 0x003,
 	ADV_VL		= 0x004,
-	ADV_EISA	= 0x008,
 	ADV_PCI		= 0x010,
-	ADV_MCA		= 0x020,
 	ADV_PCMCIA	= 0x040,
 	ADV_ULTRA	= 0x100,
 	ADV_WIDE	= 0x200,
@@ -170,9 +168,6 @@ struct adv_ccb_info {
 #define		ADV_CHIP_VER_ISA_BIT     	0x30
 #define		ADV_CHIP_VER_ISAPNP_BIT  	0x20
 #define		ADV_CHIP_VER_ASYN_BUG	 	0x21
-#define		ADV_CHIP_MIN_VER_EISA 	 	0x41
-#define		ADV_CHIP_MAX_VER_EISA	 	0x47
-#define		ADV_CHIP_VER_EISA_BIT		0x40
 
 #define ADV_CONFIG_MSW				0x0004
 #define		ADV_CFG_MSW_SCSI_TARGET_ON	0x0080