2c2
< * Copyright (c) 2006 Benno Rice. All rights reserved.
---
> * Copyright (c) 2008 Benno Rice. All rights reserved.
26c26
< __FBSDID("$FreeBSD: head/sys/dev/smc/if_smc.c 179592 2008-06-06 05:00:49Z benno $");
---
> __FBSDID("$FreeBSD: head/sys/dev/smc/if_smc.c 179718 2008-06-11 06:53:55Z benno $");
120c120
< bus_space_write_2(sc->smc_bst, sc->smc_bsh, BSR, bank & BSR_BANK_MASK);
---
> bus_write_2(sc->smc_reg, BSR, bank & BSR_BANK_MASK);
128c128
< KASSERT((bus_space_read_2(sc->smc_bst, sc->smc_bsh, BSR) &
---
> KASSERT((bus_read_2(sc->smc_reg, BSR) &
131c131
< while (bus_space_read_2(sc->smc_bst, sc->smc_bsh, MMUCR) & MMUCR_BUSY)
---
> while (bus_read_2(sc->smc_reg, MMUCR) & MMUCR_BUSY)
139c139
< return (bus_space_read_1(sc->smc_bst, sc->smc_bsh, offset));
---
> return (bus_read_1(sc->smc_reg, offset));
146c146
< bus_space_write_1(sc->smc_bst, sc->smc_bsh, offset, val);
---
> bus_write_1(sc->smc_reg, offset, val);
153c153
< return (bus_space_read_2(sc->smc_bst, sc->smc_bsh, offset));
---
> return (bus_read_2(sc->smc_reg, offset));
160c160
< bus_space_write_2(sc->smc_bst, sc->smc_bsh, offset, val);
---
> bus_write_2(sc->smc_reg, offset, val);
168c168
< bus_space_read_multi_2(sc->smc_bst, sc->smc_bsh, offset, datap, count);
---
> bus_read_multi_2(sc->smc_reg, offset, datap, count);
176c176
< bus_space_write_multi_2(sc->smc_bst, sc->smc_bsh, offset, datap, count);
---
> bus_write_multi_2(sc->smc_reg, offset, datap, count);
186,187d185
< bus_space_tag_t bst;
< bus_space_handle_t bsh;
205,207d202
< bst = rman_get_bustag(reg);
< bsh = rman_get_bushandle(reg);
<
209c204
< val = bus_space_read_2(bst, bsh, BSR);
---
> val = bus_read_2(reg, BSR);
221,222c216,217
< bus_space_write_2(bst, bsh, BSR, 0);
< val = bus_space_read_2(bst, bsh, BSR);
---
> bus_write_2(reg, BSR, 0);
> val = bus_read_2(reg, BSR);
233,234c228,229
< bus_space_write_2(bst, bsh, BSR, 1);
< val = bus_space_read_2(bst, bsh, BAR);
---
> bus_write_2(reg, BSR, 1);
> val = bus_read_2(reg, BAR);
247,248c242,243
< bus_space_write_2(bst, bsh, BSR, 3);
< val = bus_space_read_2(bst, bsh, REV);
---
> bus_write_2(reg, BSR, 3);
> val = bus_read_2(reg, REV);
308,310d302
< sc->smc_bst = rman_get_bustag(sc->smc_reg);
< sc->smc_bsh = rman_get_bushandle(sc->smc_reg);
<