29c29
< __FBSDID("$FreeBSD: head/sys/sparc64/fhc/fhc.c 182070 2008-08-23 16:07:20Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/sparc64/fhc/fhc.c 190098 2009-03-19 20:29:23Z marius $");
93,94d92
< DEVMETHOD(bus_setup_intr, fhc_setup_intr),
< DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
96d93
< DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
99c96,98
< DEVMETHOD(bus_get_resource_list, fhc_get_resource_list),
---
> DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
> DEVMETHOD(bus_setup_intr, fhc_setup_intr),
> DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
100a100
> DEVMETHOD(bus_get_resource_list, fhc_get_resource_list),
110c110
< { NULL, NULL }
---
> KOBJMETHOD_END
168,170c168
< int nintr;
< int nreg;
< int rid;
---
> int j;
180c178
< rid = i;
---
> j = i;
182c180
< &rid, RF_ACTIVE);
---
> &j, RF_ACTIVE);
242c240,241
< * vectors.
---
> * vectors. We do this early in order to be able to catch
> * stray interrupts.
262c261
< if (intr_controller_register(INTMAP_VEC(sc->sc_ign,
---
> j = intr_controller_register(INTMAP_VEC(sc->sc_ign,
264,266c263,267
< &fhc_ic, fica) != 0)
< panic("%s: could not register interrupt "
< "controller for map %d", __func__, i);
---
> &fhc_ic, fica);
> if (j != 0)
> device_printf(dev, "could not register "
> "interrupt controller for map %d (%d)\n",
> i, j);
279c280
< nreg = OF_getprop_alloc(child, "reg", sizeof(*reg),
---
> i = OF_getprop_alloc(child, "reg", sizeof(*reg),
281c282
< if (nreg == -1) {
---
> if (i == -1) {
289,292c290,293
< for (i = 0; i < nreg; i++)
< resource_list_add(&fdi->fdi_rl, SYS_RES_MEMORY, i,
< reg[i].sbr_offset, reg[i].sbr_offset +
< reg[i].sbr_size, reg[i].sbr_size);
---
> for (j = 0; j < i; j++)
> resource_list_add(&fdi->fdi_rl, SYS_RES_MEMORY, j,
> reg[j].sbr_offset, reg[j].sbr_offset +
> reg[j].sbr_size, reg[j].sbr_size);
295c296
< nintr = OF_getprop_alloc(child, "interrupts",
---
> i = OF_getprop_alloc(child, "interrupts",
297,299c298,300
< if (nintr != -1) {
< for (i = 0; i < nintr; i++) {
< iv = INTMAP_VEC(sc->sc_ign, intr[i]);
---
> if (i != -1) {
> for (j = 0; j < i; j++) {
> iv = INTMAP_VEC(sc->sc_ign, intr[j]);
301c302
< SYS_RES_IRQ, i, iv, iv, 1);
---
> SYS_RES_IRQ, j, iv, iv, 1);