27c27
< * $FreeBSD: head/sys/dev/fxp/if_fxpvar.h 148872 2005-08-08 21:03:54Z jhb $
---
> * $FreeBSD: head/sys/dev/fxp/if_fxpvar.h 150610 2005-09-27 09:01:11Z mux $
145,148c145,146
< struct resource *mem; /* resource descriptor for registers */
< int rtp; /* register resource type */
< int rgd; /* register descriptor in use */
< struct resource *irq; /* resource descriptor for interrupt */
---
> struct resource *fxp_res[2]; /* I/O and IRQ resources */
> struct resource_spec *fxp_spec; /* the resource spec we used */
151,152d148
< bus_space_tag_t sc_st; /* bus space tag */
< bus_space_handle_t sc_sh; /* bus space handle */
201,212c197,202
< #define CSR_READ_1(sc, reg) \
< bus_space_read_1((sc)->sc_st, (sc)->sc_sh, (reg))
< #define CSR_READ_2(sc, reg) \
< bus_space_read_2((sc)->sc_st, (sc)->sc_sh, (reg))
< #define CSR_READ_4(sc, reg) \
< bus_space_read_4((sc)->sc_st, (sc)->sc_sh, (reg))
< #define CSR_WRITE_1(sc, reg, val) \
< bus_space_write_1((sc)->sc_st, (sc)->sc_sh, (reg), (val))
< #define CSR_WRITE_2(sc, reg, val) \
< bus_space_write_2((sc)->sc_st, (sc)->sc_sh, (reg), (val))
< #define CSR_WRITE_4(sc, reg, val) \
< bus_space_write_4((sc)->sc_st, (sc)->sc_sh, (reg), (val))
---
> #define CSR_READ_1(sc, reg) bus_read_1(sc->fxp_res[0], reg)
> #define CSR_READ_2(sc, reg) bus_read_2(sc->fxp_res[0], reg)
> #define CSR_READ_4(sc, reg) bus_read_4(sc->fxp_res[0], reg)
> #define CSR_WRITE_1(sc, reg, val) bus_write_1(sc->fxp_res[0], reg, val)
> #define CSR_WRITE_2(sc, reg, val) bus_write_2(sc->fxp_res[0], reg, val)
> #define CSR_WRITE_4(sc, reg, val) bus_write_4(sc->fxp_res[0], reg, val)