Due to extreme bogusness in the pci bus layer, these drivers were

forced to do slightly bogus power state manipulation.  However, this
is one of those features that is preventing further progress, so mark
them as BURN_BIRDGES like I did for the drivers in sys/dev/...

This, like the other change, are a no-op unless you have BURN_BRIDGES
in your kernel.

14 files changed, 40 insertions, 32 deletions

diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index a5207b5..2f23fd8 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -211,7 +211,9 @@ static int dc_attach		(device_t);
 static int dc_detach		(device_t);
 static int dc_suspend		(device_t);
 static int dc_resume		(device_t);
+#ifndef BURN_BRIDGES
 static void dc_acpi		(device_t);
+#endif
 static struct dc_type *dc_devtype	(device_t);
 static int dc_newbuf		(struct dc_softc *, int, struct mbuf *);
 static int dc_encap		(struct dc_softc *, struct mbuf *, u_int32_t *);
@@ -1613,6 +1615,7 @@ dc_probe(device_t dev)
 	return (ENXIO);
 }
 
+#ifndef BURN_BRIDGES
 static void
 dc_acpi(device_t dev)
 {
@@ -1639,6 +1642,7 @@ dc_acpi(device_t dev)
 		pci_write_config(dev, DC_PCI_CFIT, irq, 4);
 	}
 }
+#endif
 
 static void
 dc_apply_fixup(struct dc_softc *sc, int media)
@@ -1829,12 +1833,12 @@ dc_attach(device_t dev)
 
 	mtx_init(&sc->dc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
 	dc_acpi(dev);
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
@@ -3586,9 +3590,9 @@ dc_resume(device_t dev)
 
 	sc = device_get_softc(dev);
 	ifp = &sc->arpcom.ac_if;
-
+#ifndef BURN_BRIDGES
 	dc_acpi(dev);
-
+#endif
 	/* better way to do this? */
 	for (i = 0; i < 5; i++)
 		pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4);
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index bedf1f0..9eaad55 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -676,7 +676,7 @@ sf_attach(dev)
 
 	mtx_init(&sc->sf_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -699,7 +699,7 @@ sf_attach(dev)
 		pci_write_config(dev, SF_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, SF_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 0ffbae1..8804997 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -1210,7 +1210,7 @@ sk_attach(dev)
 
 	mtx_init(&sc->sk_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -1233,7 +1233,7 @@ sk_attach(dev)
 		pci_write_config(dev, SK_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, SK_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 2c6e933..4d08d8b 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -744,7 +744,7 @@ vr_attach(dev)
 
 	mtx_init(&sc->vr_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -767,7 +767,7 @@ vr_attach(dev)
 		pci_write_config(dev, VR_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, VR_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index a5207b5..2f23fd8 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -211,7 +211,9 @@ static int dc_attach		(device_t);
 static int dc_detach		(device_t);
 static int dc_suspend		(device_t);
 static int dc_resume		(device_t);
+#ifndef BURN_BRIDGES
 static void dc_acpi		(device_t);
+#endif
 static struct dc_type *dc_devtype	(device_t);
 static int dc_newbuf		(struct dc_softc *, int, struct mbuf *);
 static int dc_encap		(struct dc_softc *, struct mbuf *, u_int32_t *);
@@ -1613,6 +1615,7 @@ dc_probe(device_t dev)
 	return (ENXIO);
 }
 
+#ifndef BURN_BRIDGES
 static void
 dc_acpi(device_t dev)
 {
@@ -1639,6 +1642,7 @@ dc_acpi(device_t dev)
 		pci_write_config(dev, DC_PCI_CFIT, irq, 4);
 	}
 }
+#endif
 
 static void
 dc_apply_fixup(struct dc_softc *sc, int media)
@@ -1829,12 +1833,12 @@ dc_attach(device_t dev)
 
 	mtx_init(&sc->dc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
 	dc_acpi(dev);
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
@@ -3586,9 +3590,9 @@ dc_resume(device_t dev)
 
 	sc = device_get_softc(dev);
 	ifp = &sc->arpcom.ac_if;
-
+#ifndef BURN_BRIDGES
 	dc_acpi(dev);
-
+#endif
 	/* better way to do this? */
 	for (i = 0; i < 5; i++)
 		pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4);
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index 03d7fd7..cdda6e1 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -515,7 +515,7 @@ pcn_attach(dev)
 	/* Initialize our mutex. */
 	mtx_init(&sc->pcn_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -538,7 +538,7 @@ pcn_attach(dev)
 		pci_write_config(dev, PCN_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, PCN_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index b26b837..034b3ec 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -873,7 +873,7 @@ rl_attach(dev)
 
 	mtx_init(&sc->rl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -898,7 +898,7 @@ rl_attach(dev)
 		pci_write_config(dev, RL_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, RL_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index bedf1f0..9eaad55 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -676,7 +676,7 @@ sf_attach(dev)
 
 	mtx_init(&sc->sf_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -699,7 +699,7 @@ sf_attach(dev)
 		pci_write_config(dev, SF_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, SF_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index d169c98..eb51295 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -1063,7 +1063,7 @@ sis_attach(dev)
 		sc->sis_type = SIS_TYPE_83815;
 
 	sc->sis_rev = pci_read_config(dev, PCIR_REVID, 1);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -1086,7 +1086,7 @@ sis_attach(dev)
 		pci_write_config(dev, SIS_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, SIS_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 0ffbae1..8804997 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -1210,7 +1210,7 @@ sk_attach(dev)
 
 	mtx_init(&sc->sk_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -1233,7 +1233,7 @@ sk_attach(dev)
 		pci_write_config(dev, SK_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, SK_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 94efbef..daa7d59 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -929,7 +929,7 @@ ste_attach(dev)
 
 	mtx_init(&sc->ste_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -952,7 +952,7 @@ ste_attach(dev)
 		pci_write_config(dev, STE_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, STE_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 2c6e933..4d08d8b 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -744,7 +744,7 @@ vr_attach(dev)
 
 	mtx_init(&sc->vr_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -767,7 +767,7 @@ vr_attach(dev)
 		pci_write_config(dev, VR_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, VR_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 45e6d62..ab5b47c 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -829,7 +829,7 @@ wb_attach(dev)
 
 	mtx_init(&sc->wb_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-
+#ifndef BURN_BRIDGES
 	/*
 	 * Handle power management nonsense.
 	 */
@@ -853,7 +853,7 @@ wb_attach(dev)
 		pci_write_config(dev, WB_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, WB_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 060c859..bb72e2f 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -1354,7 +1354,7 @@ xl_attach(dev)
 		    XL_FLAG_INVERT_LED_PWR;
 	if (pci_get_device(dev) == TC_DEVICEID_TORNADO_10_100BT_920B)
 		sc->xl_flags |= XL_FLAG_PHYOK;
-
+#ifndef BURN_BRIDGES
 	/*
 	 * If this is a 3c905B, we have to check one extra thing.
 	 * The 905B supports power management and may be placed in
@@ -1393,7 +1393,7 @@ xl_attach(dev)
 		pci_write_config(dev, XL_PCI_LOMEM, membase, 4);
 		pci_write_config(dev, XL_PCI_INTLINE, irq, 4);
 	}
-
+#endif
 	/*
 	 * Map control/status registers.
 	 */