diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-06-18 14:06:27 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-06-18 14:06:27 +0000 |
| commit | c757ee90aefd19aff23dfb5e938e8e1e8576dbd4 (patch) | |
| tree | 28ab8d6b3802ae7f1a631f84f71839a5baa6a137 /sys/sparc64/pci | |
| parent | f26dfb440a0d48a874435768ee94475ddbe496a2 (diff) | |
| download | FreeBSD-src-c757ee90aefd19aff23dfb5e938e8e1e8576dbd4.zip FreeBSD-src-c757ee90aefd19aff23dfb5e938e8e1e8576dbd4.tar.gz | |
Provide for multiple, cascaded PICs on PowerPC systems, and extend the
OFW interrupt map interface to also return the device's interrupt parent.
MFC after: 8.1-RELEASE
Diffstat (limited to 'sys/sparc64/pci')
| -rw-r--r-- | sys/sparc64/pci/fire.c | 2 | ||||
| -rw-r--r-- | sys/sparc64/pci/ofw_pcib_subr.c | 2 | ||||
| -rw-r--r-- | sys/sparc64/pci/psycho.c | 2 | ||||
| -rw-r--r-- | sys/sparc64/pci/schizo.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/sparc64/pci/fire.c b/sys/sparc64/pci/fire.c index 4a3b060..e401a6c 100644 --- a/sys/sparc64/pci/fire.c +++ b/sys/sparc64/pci/fire.c @@ -1476,7 +1476,7 @@ fire_route_interrupt(device_t bridge, device_t dev, int pin) pintr = pin; if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), - maskbuf) != 0) + NULL, maskbuf) != 0) return (mintr); device_printf(bridge, "could not route pin %d for device %d.%d\n", diff --git a/sys/sparc64/pci/ofw_pcib_subr.c b/sys/sparc64/pci/ofw_pcib_subr.c index 6dd0990..6001023 100644 --- a/sys/sparc64/pci/ofw_pcib_subr.c +++ b/sys/sparc64/pci/ofw_pcib_subr.c @@ -77,7 +77,7 @@ ofw_pcib_gen_route_interrupt(device_t bridge, device_t dev, int intpin) pintr = intpin; if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), ii, ®, sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), - maskbuf)) { + NULL, maskbuf)) { /* * If we've found a mapping, return it and don't map * it again on higher levels - that causes problems diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c index 28933f5..7f6fdc26 100644 --- a/sys/sparc64/pci/psycho.c +++ b/sys/sparc64/pci/psycho.c @@ -1046,7 +1046,7 @@ psycho_route_interrupt(device_t bridge, device_t dev, int pin) pintr = pin; if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), - maskbuf)) + NULL, maskbuf)) return (mintr); /* * If this is outside of the range for an intpin, it's likely a full diff --git a/sys/sparc64/pci/schizo.c b/sys/sparc64/pci/schizo.c index 1d06199..ae0d9a0 100644 --- a/sys/sparc64/pci/schizo.c +++ b/sys/sparc64/pci/schizo.c @@ -1077,7 +1077,7 @@ schizo_route_interrupt(device_t bridge, device_t dev, int pin) pintr = pin; if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), - maskbuf)) + NULL, maskbuf)) return (mintr); device_printf(bridge, "could not route pin %d for device %d.%d\n", |
