Deleted Added
full compact
33c33
< * $FreeBSD: head/sys/dev/bge/if_bgereg.h 153239 2005-12-08 16:11:45Z glebius $
---
> * $FreeBSD: head/sys/dev/bge/if_bgereg.h 153437 2005-12-15 05:48:49Z yongari $
210,213c210,219
< #define BGE_BIGENDIAN_INIT \
< (BGE_PCIMISCCTL_ENDIAN_BYTESWAP| \
< BGE_PCIMISCCTL_ENDIAN_WORDSWAP|BGE_PCIMISCCTL_CLEAR_INTA| \
< BGE_PCIMISCCTL_INDIRECT_ACCESS|BGE_PCIMISCCTL_MASK_PCI_INTR)
---
> #define BGE_HIF_SWAP_OPTIONS (BGE_PCIMISCCTL_ENDIAN_WORDSWAP)
> #if BYTE_ORDER == LITTLE_ENDIAN
> #define BGE_DMA_SWAP_OPTIONS \
> BGE_MODECTL_WORDSWAP_NONFRAME| \
> BGE_MODECTL_BYTESWAP_DATA|BGE_MODECTL_WORDSWAP_DATA
> #else
> #define BGE_DMA_SWAP_OPTIONS \
> BGE_MODECTL_WORDSWAP_NONFRAME|BGE_MODECTL_BYTESWAP_NONFRAME| \
> BGE_MODECTL_BYTESWAP_DATA|BGE_MODECTL_WORDSWAP_DATA
> #endif
215,217c221,223
< #define BGE_LITTLEENDIAN_INIT \
< (BGE_PCIMISCCTL_CLEAR_INTA|BGE_PCIMISCCTL_MASK_PCI_INTR| \
< BGE_PCIMISCCTL_ENDIAN_WORDSWAP|BGE_PCIMISCCTL_INDIRECT_ACCESS)
---
> #define BGE_INIT \
> (BGE_HIF_SWAP_OPTIONS|BGE_PCIMISCCTL_CLEAR_INTA| \
> BGE_PCIMISCCTL_MASK_PCI_INTR|BGE_PCIMISCCTL_INDIRECT_ACCESS)
1769a1776,1779
>
> #define RCB_WRITE_4(sc, rcb, offset, val) \
> bus_space_write_4(sc->bge_btag, sc->bge_bhandle, \
> rcb + offsetof(struct bge_rcb, offset), val)
1776a1787
> #if BYTE_ORDER == LITTLE_ENDIAN
1780a1792,1797
> #else
> u_int16_t bge_len;
> u_int16_t bge_flags;
> u_int16_t bge_rsvd;
> u_int16_t bge_vlan_tag;
> #endif
1801a1819
> #if BYTE_ORDER == LITTLE_ENDIAN
1809a1828,1837
> #else
> u_int16_t bge_idx;
> u_int16_t bge_len;
> u_int16_t bge_type;
> u_int16_t bge_flags;
> u_int16_t bge_ip_csum;
> u_int16_t bge_tcp_udp_csum;
> u_int16_t bge_error_flag;
> u_int16_t bge_vlan_tag;
> #endif
1817a1846
> #if BYTE_ORDER == LITTLE_ENDIAN
1821a1851,1856
> #else
> u_int16_t bge_len1;
> u_int16_t bge_len2;
> u_int16_t bge_len3;
> u_int16_t bge_rsvd1;
> #endif
1822a1858
> #if BYTE_ORDER == LITTLE_ENDIAN
1830a1867,1876
> #else
> u_int16_t bge_idx;
> u_int16_t bge_len0;
> u_int16_t bge_type;
> u_int16_t bge_flags;
> u_int16_t bge_ip_csum;
> u_int16_t bge_tcp_udp_csum;
> u_int16_t bge_error_flag;
> u_int16_t bge_vlan_tag;
> #endif
1853a1900
> #if BYTE_ORDER == LITTLE_ENDIAN
1855a1903,1906
> #else
> u_int16_t bge_tx_cons_idx;
> u_int16_t bge_rx_prod_idx;
> #endif
1860a1912
> #if BYTE_ORDER == LITTLE_ENDIAN
1864a1917,1922
> #else
> u_int16_t bge_rx_std_cons_idx;
> u_int16_t bge_rx_jumbo_cons_idx;
> u_int16_t bge_rsvd1;
> u_int16_t bge_rx_mini_cons_idx;
> #endif
2336d2393
< vm_offset_t bge_vhandle;