summaryrefslogtreecommitdiffstats
path: root/sys/dev/dc
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2003-07-03 21:39:53 +0000
committerimp <imp@FreeBSD.org>2003-07-03 21:39:53 +0000
commitb317207ba0c6509d4ede3b4b873325d84f73849f (patch)
tree1587c5775f176c6f1f8b37826df28b5c76fd2abc /sys/dev/dc
parent0fb991ffcad4bd095e03c9396d3c47ed7016eb40 (diff)
downloadFreeBSD-src-b317207ba0c6509d4ede3b4b873325d84f73849f.zip
FreeBSD-src-b317207ba0c6509d4ede3b4b873325d84f73849f.tar.gz
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.
Diffstat (limited to 'sys/dev/dc')
-rw-r--r--sys/dev/dc/if_dc.c12
1 files changed, 8 insertions, 4 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);
OpenPOWER on IntegriCloud