from netbsd:

The IST_* and IPL_* constants are not bus-specific; don't treat them as such.
Change splimp -> splnet in Ethernet, ARCnet, and FDDI drivers.

4 files changed, 7 insertions, 16 deletions

diff --git a/sys/dev/pci/aic7870.c b/sys/dev/pci/aic7870.c
index e07e00a3a33..43751c34770 100644
--- a/sys/dev/pci/aic7870.c
+++ b/sys/dev/pci/aic7870.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: aic7870.c,v 1.2 1995/12/14 06:35:34 deraadt Exp $
+ *	$Id: aic7870.c,v 1.3 1995/12/27 22:06:44 deraadt Exp $
  */
 
 #include <sys/param.h>
@@ -106,5 +106,5 @@ aic7870_attach(parent, self, aux)
 
 	ahcattach(ahc);
 
-	ahc->sc_ih = pci_map_int(pa->pa_tag, PCI_IPL_BIO, ahcintr, ahc);
+	ahc->sc_ih = pci_map_int(pa->pa_tag, IPL_BIO, ahcintr, ahc);
 }
diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c
index ed19d4ee39b..6f1e243f435 100644
--- a/sys/dev/pci/if_fpa.c
+++ b/sys/dev/pci/if_fpa.c
@@ -389,7 +389,7 @@ pdq_pci_attach(
     bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6);
     pdq_ifattach(sc, pdq_pci_ifinit, pdq_pci_ifwatchdog);
 
-    sc->sc_ih = pci_map_int(pa->pa_tag, PCI_IPL_NET, pdq_pci_ifintr, sc);
+    sc->sc_ih = pci_map_int(pa->pa_tag, IPL_NET, pdq_pci_ifintr, sc);
     if (sc->sc_ih == NULL) {
 	printf("fpa%d: error: couldn't map interrupt\n",  sc->sc_if.if_unit);
 	return;
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 62546882165..7570d5b6129 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.3 1995/12/01 01:51:21 deraadt Exp $
+**  $Id: ncr.c,v 1.4 1995/12/27 22:06:47 deraadt Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
@@ -1255,7 +1255,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 
 static char ident[] =
-	"\n$Id: ncr.c,v 1.3 1995/12/01 01:51:21 deraadt Exp $\n";
+	"\n$Id: ncr.c,v 1.4 1995/12/27 22:06:47 deraadt Exp $\n";
 
 u_long	ncr_version = NCR_VERSION	* 11
 	+ (u_long) sizeof (struct ncb)	*  7
@@ -3261,7 +3261,7 @@ ncr_attach(parent, self, aux)
 	if (retval)
 		return;
 
-	np->sc_ih = pci_map_int(pa->pa_tag, PCI_IPL_BIO, ncr_intr, np);
+	np->sc_ih = pci_map_int(pa->pa_tag, IPL_BIO, ncr_intr, np);
 	if (np->sc_ih == NULL)
 		return;
 
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index a552dd0f37e..bcaa1e5ae42 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -49,15 +49,6 @@ ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
 #include <i386/pci/pci_machdep.h>
 #endif
 
-/* PCI interrupt levels; system interrupt levels for PCI bus use */
-typedef enum {
-	PCI_IPL_NONE,		/* block only the interrupt's IRQ*/
-	PCI_IPL_BIO,		/* block I/O interrupts */
-	PCI_IPL_NET,		/* network */
-	PCI_IPL_TTY,		/* terminal */
-	PCI_IPL_CLOCK,		/* clock */
-} pci_intrlevel;
-
 struct pci_attach_args {
 	int pa_bus;
 	int pa_device;
@@ -69,7 +60,7 @@ pcireg_t pci_conf_read __P((pcitag_t, int));
 void	 pci_conf_write __P((pcitag_t, int, pcireg_t));
 void	 pci_devinfo __P((pcireg_t, pcireg_t, char *, int *));
 pcitag_t pci_make_tag __P((int, int, int));
-void	*pci_map_int __P((pcitag_t, pci_intrlevel, int (*)(void *), void *));
+void	*pci_map_int __P((pcitag_t, int, int (*)(void *), void *));
 int	 pci_map_mem __P((pcitag_t, int, vm_offset_t *, vm_offset_t *));
 
 int	 pci_attach_subdev __P((struct device *, int, int));