26c26
< * $FreeBSD: head/sys/dev/aic/aicvar.h 170872 2007-06-17 05:55:54Z scottl $
---
> * $FreeBSD: head/sys/dev/aic/aicvar.h 241591 2012-10-15 16:09:59Z jhb $
49a50,51
> SLIST_ENTRY(aic_scb) link;
> struct callout timer;
73,75c75,76
< int unit;
< bus_space_tag_t tag;
< bus_space_handle_t bsh;
---
> struct mtx lock;
> struct resource *res;
80a82
> SLIST_HEAD(,aic_scb) free_scbs;
130c132
< bus_space_read_1((aic)->tag, (aic)->bsh, (port))
---
> bus_read_1((aic)->res, (port))
133c135
< bus_space_write_1((aic)->tag, (aic)->bsh, (port), (value))
---
> bus_write_1((aic)->res, (port), (value))
136c138
< bus_space_read_multi_1((aic)->tag, (aic)->bsh, (port), (addr), (count))
---
> bus_read_multi_1((aic)->res, (port), (addr), (count))
139c141
< bus_space_write_multi_1((aic)->tag, (aic)->bsh, (port), (addr), (count))
---
> bus_write_multi_1((aic)->res, (port), (addr), (count))
142,143c144
< bus_space_read_multi_2((aic)->tag, (aic)->bsh, (port), \
< (u_int16_t *)(addr), (count))
---
> bus_read_multi_2((aic)->res, (port), (u_int16_t *)(addr), (count))
146,147c147
< bus_space_write_multi_2((aic)->tag, (aic)->bsh, (port), \
< (u_int16_t *)(addr), (count))
---
> bus_write_multi_2((aic)->res, (port), (u_int16_t *)(addr), (count))
150,151c150
< bus_space_read_multi_4((aic)->tag, (aic)->bsh, (port), \
< (u_int32_t *)(addr), (count))
---
> bus_read_multi_4((aic)->res, (port), (u_int32_t *)(addr), (count))
154,155c153
< bus_space_write_multi_4((aic)->tag, (aic)->bsh, (port), \
< (u_int32_t *)(addr), (count))
---
> bus_write_multi_4((aic)->res, (port), (u_int32_t *)(addr), (count))