Update the ed driver to probe and attach under a NEWCARD kernel (I was

using a cardbus based system with pccbb providing the pcic interface).
Something isn't quite right.. when the driver allocates and activates
its resources, the IO space that was requested reads as all zeros (versus
the original 0xff's as it normally is when there is no device responding).

Also, deactivate the resources before releasing them.  OLDCARD doesn't
seem to care but NEWCARD/CARDBUS get rather unhappy if you release
a resource that hasn't been deactivated yet.

Make pcic_p.c only compile with oldcard kernels.

1 files changed, 6 insertions, 0 deletions

diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 72fb2ef..a1222b4 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -1590,16 +1590,22 @@ ed_release_resources(dev)
 	struct ed_softc *sc = device_get_softc(dev);
 
 	if (sc->port_res) {
+		bus_deactivate_resource(dev, SYS_RES_IOPORT,
+				     sc->port_rid, sc->port_res);
 		bus_release_resource(dev, SYS_RES_IOPORT,
 				     sc->port_rid, sc->port_res);
 		sc->port_res = 0;
 	}
 	if (sc->mem_res) {
+		bus_deactivate_resource(dev, SYS_RES_MEMORY,
+				     sc->mem_rid, sc->mem_res);
 		bus_release_resource(dev, SYS_RES_MEMORY,
 				     sc->mem_rid, sc->mem_res);
 		sc->mem_res = 0;
 	}
 	if (sc->irq_res) {
+		bus_deactivate_resource(dev, SYS_RES_IRQ,
+				     sc->irq_rid, sc->irq_res);
 		bus_release_resource(dev, SYS_RES_IRQ,
 				     sc->irq_rid, sc->irq_res);
 		sc->irq_res = 0;