From b84e866a1894cbf96db3ed42302e19d3d90a5761 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 3 Jul 2003 21:39:53 +0000
Subject: 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.
---
 sys/dev/dc/if_dc.c | 12 ++++++++----
 sys/dev/sf/if_sf.c |  4 ++--
 sys/dev/sk/if_sk.c |  4 ++--
 sys/dev/vr/if_vr.c |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index a5207b519669d..2f23fd8e29bdf 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 bedf1f00c08c6..9eaad552c0ab6 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 0ffbae18b833a..88049975c03b4 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 2c6e933757080..4d08d8b56f218 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.
 	 */
-- 
cgit v1.3