Deleted Added
full compact
if_rlreg.h (160883) if_rlreg.h (164460)
1/*-
2 * Copyright (c) 1997, 1998-2003
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
1/*-
2 * Copyright (c) 1997, 1998-2003
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/pci/if_rlreg.h 160883 2006-08-01 17:18:25Z wpaul $
32 * $FreeBSD: head/sys/pci/if_rlreg.h 164460 2006-11-21 04:11:31Z yongari $
33 */
34
35/*
36 * RealTek 8129/8139 register offsets
37 */
38#define RL_IDR0 0x0000 /* ID register 0 (station addr) */
39#define RL_IDR1 0x0001 /* Must use 32-bit accesses (?) */
40#define RL_IDR2 0x0002

--- 591 unchanged lines hidden (view full) ---

632/*
633 * Rx/Tx descriptor parameters (8139C+ and 8169 only)
634 *
635 * Tx/Rx count must be equal. Shared code like re_dma_map_desc assumes this.
636 * Buffers must be a multiple of 8 bytes. Currently limit to 64 descriptors
637 * due to the 8139C+. We need to put the number of descriptors in the ring
638 * structure and use that value instead.
639 */
33 */
34
35/*
36 * RealTek 8129/8139 register offsets
37 */
38#define RL_IDR0 0x0000 /* ID register 0 (station addr) */
39#define RL_IDR1 0x0001 /* Must use 32-bit accesses (?) */
40#define RL_IDR2 0x0002

--- 591 unchanged lines hidden (view full) ---

632/*
633 * Rx/Tx descriptor parameters (8139C+ and 8169 only)
634 *
635 * Tx/Rx count must be equal. Shared code like re_dma_map_desc assumes this.
636 * Buffers must be a multiple of 8 bytes. Currently limit to 64 descriptors
637 * due to the 8139C+. We need to put the number of descriptors in the ring
638 * structure and use that value instead.
639 */
640#if !defined(__i386__) && !defined(__amd64__)
640#ifndef __NO_STRICT_ALIGNMENT
641#define RE_FIXUP_RX 1
642#endif
643
644#define RL_TX_DESC_CNT 64
645#define RL_RX_DESC_CNT RL_TX_DESC_CNT
646
647#define RL_RX_LIST_SZ (RL_RX_DESC_CNT * sizeof(struct rl_desc))
648#define RL_TX_LIST_SZ (RL_TX_DESC_CNT * sizeof(struct rl_desc))

--- 334 unchanged lines hidden ---
641#define RE_FIXUP_RX 1
642#endif
643
644#define RL_TX_DESC_CNT 64
645#define RL_RX_DESC_CNT RL_TX_DESC_CNT
646
647#define RL_RX_LIST_SZ (RL_RX_DESC_CNT * sizeof(struct rl_desc))
648#define RL_TX_LIST_SZ (RL_TX_DESC_CNT * sizeof(struct rl_desc))

--- 334 unchanged lines hidden ---