29c29
< __FBSDID("$FreeBSD: head/sys/arm/lpc/lpc_intc.c 261410 2014-02-02 19:17:28Z ian $");
---
> __FBSDID("$FreeBSD: head/sys/arm/lpc/lpc_intc.c 276023 2014-12-21 16:59:41Z andrew $");
62,65c62,65
< #define intc_read_4(reg) \
< bus_space_read_4(intc_softc->li_bst, intc_softc->li_bsh, reg)
< #define intc_write_4(reg, val) \
< bus_space_write_4(intc_softc->li_bst, intc_softc->li_bsh, reg, val)
---
> #define intc_read_4(_sc, _reg) \
> bus_space_read_4((_sc)->li_bst, (_sc)->li_bsh, (_reg))
> #define intc_write_4(_sc, _reg, _val) \
> bus_space_write_4((_sc)->li_bst, (_sc)->li_bsh, (_reg), (_val))
103,108c103,108
< intc_write_4(LPC_INTC_MIC_ER, 0);
< intc_write_4(LPC_INTC_SIC1_ER, 0);
< intc_write_4(LPC_INTC_SIC2_ER, 0);
< intc_write_4(LPC_INTC_MIC_RSR, ~0);
< intc_write_4(LPC_INTC_SIC1_RSR, ~0);
< intc_write_4(LPC_INTC_SIC2_RSR, ~0);
---
> intc_write_4(sc, LPC_INTC_MIC_ER, 0);
> intc_write_4(sc, LPC_INTC_SIC1_ER, 0);
> intc_write_4(sc, LPC_INTC_SIC2_ER, 0);
> intc_write_4(sc, LPC_INTC_MIC_RSR, ~0);
> intc_write_4(sc, LPC_INTC_SIC1_RSR, ~0);
> intc_write_4(sc, LPC_INTC_SIC2_RSR, ~0);
130a131
> struct lpc_intc_softc *sc = intc_softc;
135c136
< value = intc_read_4(LPC_INTC_MIC_SR);
---
> value = intc_read_4(sc, LPC_INTC_MIC_SR);
142c143
< value = intc_read_4(LPC_INTC_SIC1_SR);
---
> value = intc_read_4(sc, LPC_INTC_SIC1_SR);
149c150
< value = intc_read_4(LPC_INTC_SIC2_SR);
---
> value = intc_read_4(sc, LPC_INTC_SIC2_SR);
160a162
> struct lpc_intc_softc *sc = intc_softc;
177c179
< value = intc_read_4(reg);
---
> value = intc_read_4(sc, reg);
179c181
< intc_write_4(reg, value);
---
> intc_write_4(sc, reg, value);
184a187
> struct lpc_intc_softc *sc = intc_softc;
198c201
< value = intc_read_4(reg);
---
> value = intc_read_4(sc, reg);
200c203
< intc_write_4(reg, value);
---
> intc_write_4(sc, reg, value);
205a209
> struct lpc_intc_softc *sc = intc_softc;
220c224
< value = intc_read_4(reg);
---
> value = intc_read_4(sc, reg);
222c226
< intc_write_4(reg, value);
---
> intc_write_4(sc, reg, value);