40c40
< __FBSDID("$FreeBSD: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c 267919 2014-06-26 17:03:08Z bz $");
---
> __FBSDID("$FreeBSD: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c 267920 2014-06-26 17:10:07Z bz $");
119a120,123
> #ifdef NF10BMAC_64BIT
> #define NF10BMAC_DATA_STRB 0x000000ff
> #define REGWTYPE uint64_t
> #else
120a125,126
> #define REGWTYPE uint32_t
> #endif
124c130
< nf10bmac_write(struct resource *res, uint32_t reg, uint32_t val,
---
> nf10bmac_write(struct resource *res, REGWTYPE reg, REGWTYPE val,
127a134,136
> #ifdef NF10BMAC_64BIT
> bus_write_8(res, reg, htole64(val));
> #else
128a138
> #endif
131,132c141,142
< static inline uint32_t
< nf10bmac_read(struct resource *res, uint32_t reg,
---
> static inline REGWTYPE
> nf10bmac_read(struct resource *res, REGWTYPE reg,
135a146,148
> #ifdef NF10BMAC_64BIT
> return (le64toh(bus_read_8(res, reg)));
> #else
136a150
> #endif
140c154
< nf10bmac_write_be(struct resource *res, uint32_t reg, uint32_t val,
---
> nf10bmac_write_be(struct resource *res, REGWTYPE reg, REGWTYPE val,
143a158,160
> #ifdef NF10BMAC_64BIT
> bus_write_8(res, reg, htobe64(val));
> #else
144a162
> #endif
148,149c166,167
< static inline uint32_t
< nf10bmac_read_be(struct resource *res, uint32_t reg,
---
> static inline REGWTYPE
> nf10bmac_read_be(struct resource *res, REGWTYPE reg,
152a171,173
> #ifdef NF10BMAC_64BIT
> return (be64toh(bus_read_8(res, reg)));
> #else
153a175
> #endif
199c221
< uint32_t md, val;
---
> REGWTYPE md, val;
314c336
< uint32_t md, val;
---
> REGWTYPE md, val;
329c351
< uint32_t md, val;
---
> REGWTYPE md, val;
424c446
< "md=0x%08x len=%d l=%d\n", md, len, l);
---
> "md=0x%08jx len=%d l=%d\n", (uintmax_t)md, len, l);