24,25d23
< *
< * $FreeBSD: head/sys/sparc64/pci/ofw_pcib_subr.c 133589 2004-08-12 17:41:33Z marius $
27a26,28
> #include <sys/cdefs.h>
> __FBSDID("$FreeBSD: head/sys/sparc64/pci/ofw_pcib_subr.c 153057 2005-12-03 18:11:26Z marius $");
>
53c54
< struct ofw_pcib_gen_softc *sc = device_get_softc(bridge);
---
> struct ofw_pcib_gen_softc *sc;
55a57
> sc = device_get_softc(bridge);
81,82c83,84
< struct ofw_pcib_gen_softc *sc = device_get_softc(bridge);
< struct ofw_bus_iinfo *ii = &sc->ops_iinfo;
---
> struct ofw_pcib_gen_softc *sc;
> struct ofw_bus_iinfo *ii;
84,85d85
< device_t pbridge = device_get_parent(device_get_parent(bridge));
< phandle_t node = ofw_bus_get_node(dev);
87c87
< u_int8_t maskbuf[sizeof(reg) + sizeof(pintr)];
---
> uint8_t maskbuf[sizeof(reg) + sizeof(pintr)];
88a89,90
> sc = device_get_softc(bridge);
> ii = &sc->ops_iinfo;
91,92c93,95
< if (ofw_bus_lookup_imap(node, ii, &reg, sizeof(reg), &pintr,
< sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) {
---
> if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), ii, &reg,
> sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr),
> maskbuf)) {
108c111,112
< return (PCIB_ROUTE_INTERRUPT(pbridge, bridge, intpin));
---
> return (PCIB_ROUTE_INTERRUPT(device_get_parent(bridge), bridge,
> intpin));
114c118
< struct ofw_pcib_gen_softc *sc = device_get_softc(bridge);
---
> struct ofw_pcib_gen_softc *sc;
115a120
> sc = device_get_softc(bridge);
122c127
< struct ofw_pcib_gen_softc *sc = device_get_softc(bridge);
---
> struct ofw_pcib_gen_softc *sc;
123a129
> sc = device_get_softc(bridge);