take too. patch ahs to screw up once in a while

2 files changed, 3 insertions, 219 deletions

diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 16b736e65f8..e494add4b30 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isp_pci.c,v 1.31 2003/02/28 15:26:23 mickey Exp $	*/
+/*	$OpenBSD: isp_pci.c,v 1.32 2003/02/28 15:36:39 mickey Exp $	*/
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  *
@@ -323,11 +323,6 @@ isp_pci_probe(struct device *parent, void *match, void *aux)
 {
         struct pci_attach_args *pa = aux;
 
-	/* those are raid puppies */
-	if (PCI_VENDOR(pci_conf_read(pa->pa_pc, pa->pa_tag,
-	    PCI_SUBSYS_ID_REG)) == PCI_VENDOR_AMI)
-		return (0);
-
         switch (pa->pa_id) {
 #ifndef	ISP_DISABLE_1020_SUPPORT
 	case PCI_QLOGIC_ISP:
@@ -621,9 +616,6 @@ isp_pci_attach(struct device *parent, struct device *self, void *aux)
 	if (IS_23XX(isp)) {
 		isp->isp_touched = 1;
 	}
-	if (IS_23XX(isp)) {
-		isp->isp_touched = 1;
-	}
 	data |= PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_INVALIDATE_ENABLE;
 
 	/*
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 2a896263c2e..e3b6dfaf493 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcivar.h,v 1.28 2003/02/28 15:26:23 mickey Exp $	*/
+/*	$OpenBSD: pcivar.h,v 1.29 2003/02/28 15:36:39 mickey Exp $	*/
 /*	$NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $	*/
 
 /*
@@ -54,7 +54,7 @@ struct pcibus_attach_args;
 /*
  * Machine-dependent definitions.
  */
-#if (__alpha__ + __atari__ + __i386__ + __arc__ + __powerpc__ + __galileo__ + __sparc64__ + __hppa__!= 1)
+#if (__alpha__ + __atari__ + __i386__ + __arc__ + __powerpc__ + __galileo__ + __sparc64__ != 1)
 ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
 #endif
 #if __alpha__
@@ -75,214 +75,6 @@ ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
 #if __galileo__
 #include <galileo/pci/pci_machdep.h>
 #endif
-#if __hppa__
-#include <hppa/include/pci_machdep.h>
-#endif
-#if __sparc64__
-#include <sparc64/include/pci_machdep.h>
-#endif
-
-/*
- * PCI bus attach arguments.
- */
-struct pcibus_attach_args {
-	char	*pba_busname;		/* XXX should be common */
-	bus_space_tag_t pba_iot;	/* pci i/o space tag */
-	bus_space_tag_t pba_memt;	/* pci mem space tag */
-	bus_dma_tag_t pba_dmat;		/* DMA tag */
-	pci_chipset_tag_t pba_pc;
-
-	int		pba_bus;	/* PCI bus number */
-
-	/*
-	 * Interrupt swizzling information.  These fields
-	 * are only used by secondary busses.
-	 */
-	u_int		pba_intrswiz;	/* how to swizzle pins */
-	pcitag_t	pba_intrtag;	/* intr. appears to come from here */
-};
-
-/*
- * PCI device attach arguments.
- */
-struct pci_attach_args {
-	bus_space_tag_t pa_iot;		/* pci i/o space tag */
-	bus_space_tag_t pa_memt;	/* pci mem space tag */
-	bus_dma_tag_t pa_dmat;		/* DMA tag */
-	pci_chipset_tag_t pa_pc;
-	int		pa_flags;	/* flags; see below */
-
-	u_int		pa_device;
-	u_int           pa_bus;
-	u_int		pa_function;
-	pcitag_t	pa_tag;
-	pcireg_t	pa_id, pa_class;
-
-	/*
-	 * Interrupt information.
-	 *
-	 * "Intrline" is used on systems whose firmware puts
-	 * the right routing data into the line register in
-	 * configuration space.  The rest are used on systems
-	 * that do not.
-	 */
-	u_int		pa_intrswiz;	/* how to swizzle pins if ppb */
-	pcitag_t	pa_intrtag;	/* intr. appears to come from here */
-	pci_intr_pin_t	pa_intrpin;	/* intr. appears on this pin */
-	pci_intr_line_t	pa_intrline;	/* intr. routing information */
-};
-
-/*
- * Flags given in the bus and device attachment args.
- *
- * OpenBSD doesn't actually use them yet -- csapuntz@cvs.openbsd.org
- */
-#define	PCI_FLAGS_IO_ENABLED	0x01		/* I/O space is enabled */
-#define	PCI_FLAGS_MEM_ENABLED	0x02		/* memory space is enabled */
-
-/*
- *
- */
-struct pci_quirkdata {
-	pci_vendor_id_t		vendor;		/* Vendor ID */
-	pci_product_id_t	product;	/* Product ID */
-	int			quirks;		/* quirks; see below */
-};
-#define	PCI_QUIRK_MULTIFUNCTION		0x00000001
-
-/*
- * Locators devices that attach to 'pcibus', as specified to config.
- */
-#define	pcibuscf_bus		cf_loc[0]
-#define	PCIBUS_UNK_BUS		-1		/* wildcarded 'bus' */
-
-/*
- * Locators for PCI devices, as specified to config.
- */
-#define	pcicf_dev		cf_loc[0]
-#define	PCI_UNK_DEV		-1		/* wildcarded 'dev' */
-
-#define	pcicf_function		cf_loc[1]
-#define	PCI_UNK_FUNCTION	-1		/* wildcarded 'function' */
-
-/*
- * Configuration space access and utility functions.  (Note that most,
- * e.g. make_tag, conf_read, conf_write are declared by pci_machdep.h.)
- */
-pcireg_t pci_mapreg_type(pci_chipset_tag_t, pcitag_t, int);
-int	pci_mapreg_info(pci_chipset_tag_t, pcitag_t, int, pcireg_t,
-	    bus_addr_t *, bus_size_t *, int *);
-int	pci_mapreg_map(struct pci_attach_args *, int, pcireg_t, int,
-	    bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *,
-	    bus_size_t *, bus_size_t);
-
-
-int	pci_io_find(pci_chipset_tag_t, pcitag_t, int, bus_addr_t *,
-	    bus_size_t *);
-int	pci_mem_find(pci_chipset_tag_t, pcitag_t, int, bus_addr_t *,
-	    bus_size_t *, int *);
-
-int pci_get_capability(pci_chipset_tag_t, pcitag_t, int,
-			    int *, pcireg_t *);
-
-struct pci_matchid {
-	pci_vendor_id_t		pm_vid;
-	pci_product_id_t	pm_pid;
-};
-
-int pci_matchbyid(struct pci_attach_args *, const struct pci_matchid *, int);
-
-/*
- * Helper functions for autoconfiguration.
- */
-const char *pci_findvendor(pcireg_t);
-void	pci_devinfo(pcireg_t, pcireg_t, int, char *);
-void	set_pci_isa_bridge_callback(void (*)(void *), void *);
-const struct pci_quirkdata *
-	pci_lookup_quirkdata(pci_vendor_id_t, pci_product_id_t);
-void	pciagp_set_pchb(struct pci_attach_args *);
-
-#endif /* _DEV_PCI_PCIVAR_H_ */
-/*	$OpenBSD: pcivar.h,v 1.28 2003/02/28 15:26:23 mickey Exp $	*/
-/*	$NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
- * Copyright (c) 1994 Charles Hannum.  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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Charles Hannum.
- * 4. 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 ``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.
- */
-
-#ifndef _DEV_PCI_PCIVAR_H_
-#define	_DEV_PCI_PCIVAR_H_
-
-/*
- * Definitions for PCI autoconfiguration.
- *
- * This file describes types and functions which are used for PCI
- * configuration.  Some of this information is machine-specific, and is
- * provided by pci_machdep.h.
- */
-
-#include <machine/bus.h>
-#include <dev/pci/pcireg.h>
-
-/*
- * Structures and definitions needed by the machine-dependent header.
- */
-typedef u_int32_t pcireg_t;		/* configuration space register XXX */
-struct pcibus_attach_args;
-
-/*
- * Machine-dependent definitions.
- */
-#if (__alpha__ + __atari__ + __i386__ + __arc__ + __powerpc__ + __galileo__ + __sparc64__ + __hppa__!= 1)
-ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
-#endif
-#if __alpha__
-#include <alpha/pci/pci_machdep.h>
-#endif
-#if __atari__
-#include <atari/pci/pci_machdep.h>
-#endif
-#if __i386__
-#include <i386/pci/pci_machdep.h>
-#endif
-#if __arc__
-#include <arc/pci/pci_machdep.h>
-#endif
-#if __powerpc__
-#include <powerpc/pci/pci_machdep.h>
-#endif
-#if __galileo__
-#include <galileo/pci/pci_machdep.h>
-#endif
-#if __hppa__
-#include <hppa/include/pci_machdep.h>
-#endif
 #if __sparc64__
 #include <sparc64/include/pci_machdep.h>
 #endif