Remove the INTR_TYPE_* flags. The interrupt type is no longer used to
[dragonfly.git] / sys / net / i4b / layer1 / iwic / i4b_iwic_pci.c
index 2b5903a..e5cee15 100644 (file)
  *      ----------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.6.2.1 2001/08/10 14:08:40 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.5 2005/10/12 17:35:56 dillon Exp $
  *
  *      last edit-date: [Tue Jan 16 10:53:03 2001]
  *
  *---------------------------------------------------------------------------*/
 
-#include "iwic.h"
+#include "use_iwic.h"
+#include "use_pci.h"
 #include "opt_i4b.h"
-#include "pci.h"
 
 #if (NIWIC > 0) && (NPCI > 0)
 
 #include <sys/bus.h>
 #include <sys/rman.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <bus/pci/pcireg.h>
+#include <bus/pci/pcivar.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <net/i4b/include/machine/i4b_ioctl.h>
+#include <net/i4b/include/machine/i4b_trace.h>
 
-#include <i4b/include/i4b_global.h>
-#include <i4b/include/i4b_l3l4.h>
+#include "../../include/i4b_global.h"
+#include "../../include/i4b_l3l4.h"
+#include "../i4b_l1.h"
 
-#include <i4b/layer1/i4b_l1.h>
-
-#include <i4b/layer1/iwic/i4b_iwic.h>
-#include <i4b/layer1/iwic/i4b_w6692.h>
+#include "i4b_iwic.h"
+#include "i4b_w6692.h"
 
 extern struct i4b_l1mux_func iwic_l1mux_func;
 
@@ -236,9 +235,9 @@ iwic_pci_attach(device_t dev)
        sc->sc_I430state = ST_F3N;      /* Deactivated */
        sc->enabled = FALSE;
        
-       if(bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET,
+       if (bus_setup_intr(dev, sc->sc_resources.irq, 0,
                                (void(*)(void*))iwic_pci_intr,
-                               sc, &ih))
+                               sc, &ih, NULL))
        {
                printf("iwic%d: Couldn't set up irq!\n", unit);
                return(ENXIO);