summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbenno <benno@FreeBSD.org>2003-02-01 00:43:25 +0000
committerbenno <benno@FreeBSD.org>2003-02-01 00:43:25 +0000
commit1679457554d8ee04734979724f755b5ce1cdb000 (patch)
tree9d91748392cc7914b5f33d4fdcb8b7bea2adcf58 /sys
parentacb0d0293933d3ef676029a536971780bf6d18e5 (diff)
downloadFreeBSD-src-1679457554d8ee04734979724f755b5ce1cdb000.zip
FreeBSD-src-1679457554d8ee04734979724f755b5ce1cdb000.tar.gz
Make nirq mean 'number of irqs' and not 'last irq'.
Diffstat (limited to 'sys')
-rw-r--r--sys/powerpc/powerpc/openpic.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c
index 5124c43..50dab9f 100644
--- a/sys/powerpc/powerpc/openpic.c
+++ b/sys/powerpc/powerpc/openpic.c
@@ -183,9 +183,9 @@ openpic_probe(device_t dev)
}
sc->sc_ncpu = ((val & OPENPIC_FEATURE_LAST_CPU_MASK) >>
- OPENPIC_FEATURE_LAST_CPU_SHIFT);
+ OPENPIC_FEATURE_LAST_CPU_SHIFT) + 1;
sc->sc_nirq = ((val & OPENPIC_FEATURE_LAST_IRQ_MASK) >>
- OPENPIC_FEATURE_LAST_IRQ_SHIFT);
+ OPENPIC_FEATURE_LAST_IRQ_SHIFT) + 1;
device_set_desc(dev, "OpenPIC interrupt controller");
return (0);
@@ -201,14 +201,14 @@ openpic_attach(device_t dev)
softc = sc;
device_printf(dev,
- "Version %s, supports up to %d CPUs and up to %d irqs\n",
- sc->sc_version, sc->sc_ncpu+1, sc->sc_nirq+1);
+ "Version %s, supports %d CPUs and %d irqs\n",
+ sc->sc_version, sc->sc_ncpu, sc->sc_nirq);
sc->sc_rman.rm_type = RMAN_ARRAY;
sc->sc_rman.rm_descr = device_get_nameunit(dev);
if (rman_init(&sc->sc_rman) != 0 ||
- rman_manage_region(&sc->sc_rman, 0, sc->sc_nirq) != 0) {
+ rman_manage_region(&sc->sc_rman, 0, sc->sc_nirq - 1) != 0) {
device_printf(dev, "could not set up resource management");
return (ENXIO);
}
OpenPOWER on IntegriCloud