Deleted Added
full compact
if_rlreg.h (118586) if_rlreg.h (118712)
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 118586 2003-08-07 07:00:30Z wpaul $
32 * $FreeBSD: head/sys/pci/if_rlreg.h 118712 2003-08-10 01:41:35Z wpaul $
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

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

588#define RL_RING_ALIGN 256
589#define RL_IFQ_MAXLEN 512
590#define RL_DESC_INC(x) (x = (x + 1) % RL_TX_DESC_CNT)
591#define RL_OWN(x) (le32toh((x)->rl_cmdstat) & RL_RDESC_STAT_OWN)
592#define RL_RXBYTES(x) (le32toh((x)->rl_cmdstat) & \
593 RL_RDESC_STAT_FRAGLEN)
594#define RL_PKTSZ(x) ((x) >> 3)
595
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

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

588#define RL_RING_ALIGN 256
589#define RL_IFQ_MAXLEN 512
590#define RL_DESC_INC(x) (x = (x + 1) % RL_TX_DESC_CNT)
591#define RL_OWN(x) (le32toh((x)->rl_cmdstat) & RL_RDESC_STAT_OWN)
592#define RL_RXBYTES(x) (le32toh((x)->rl_cmdstat) & \
593 RL_RDESC_STAT_FRAGLEN)
594#define RL_PKTSZ(x) ((x) >> 3)
595
596#define RL_ADDR_LO(y) ((u_int64_t) (y) & 0xFFFFFFFF)
597#define RL_ADDR_HI(y) ((u_int64_t) (y) >> 32)
598
596struct rl_softc;
597
598struct rl_dmaload_arg {
599 struct rl_softc *sc;
600 int rl_idx;
601 int rl_maxsegs;
602 struct rl_desc *rl_ring;
603};

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

610 int rl_tx_considx;
611 int rl_tx_free;
612 bus_dmamap_t rl_tx_dmamap[RL_TX_DESC_CNT];
613 bus_dmamap_t rl_rx_dmamap[RL_RX_DESC_CNT];
614 bus_dma_tag_t rl_mtag; /* mbuf mapping tag */
615 bus_dma_tag_t rl_stag; /* stats mapping tag */
616 bus_dmamap_t rl_smap; /* stats map */
617 struct rl_stats *rl_stats;
599struct rl_softc;
600
601struct rl_dmaload_arg {
602 struct rl_softc *sc;
603 int rl_idx;
604 int rl_maxsegs;
605 struct rl_desc *rl_ring;
606};

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

613 int rl_tx_considx;
614 int rl_tx_free;
615 bus_dmamap_t rl_tx_dmamap[RL_TX_DESC_CNT];
616 bus_dmamap_t rl_rx_dmamap[RL_RX_DESC_CNT];
617 bus_dma_tag_t rl_mtag; /* mbuf mapping tag */
618 bus_dma_tag_t rl_stag; /* stats mapping tag */
619 bus_dmamap_t rl_smap; /* stats map */
620 struct rl_stats *rl_stats;
618 u_int32_t rl_stats_addr;
621 bus_addr_t rl_stats_addr;
619 bus_dma_tag_t rl_rx_list_tag;
620 bus_dmamap_t rl_rx_list_map;
621 struct rl_desc *rl_rx_list;
622 bus_dma_tag_t rl_rx_list_tag;
623 bus_dmamap_t rl_rx_list_map;
624 struct rl_desc *rl_rx_list;
622 u_int32_t rl_rx_list_addr;
625 bus_addr_t rl_rx_list_addr;
623 bus_dma_tag_t rl_tx_list_tag;
624 bus_dmamap_t rl_tx_list_map;
625 struct rl_desc *rl_tx_list;
626 bus_dma_tag_t rl_tx_list_tag;
627 bus_dmamap_t rl_tx_list_map;
628 struct rl_desc *rl_tx_list;
626 u_int32_t rl_tx_list_addr;
629 bus_addr_t rl_tx_list_addr;
627};
628
629struct rl_softc {
630 struct arpcom arpcom; /* interface info */
631 bus_space_handle_t rl_bhandle; /* bus space handle */
632 bus_space_tag_t rl_btag; /* bus space tag */
633 struct resource *rl_res;
634 struct resource *rl_irq;

--- 208 unchanged lines hidden ---
630};
631
632struct rl_softc {
633 struct arpcom arpcom; /* interface info */
634 bus_space_handle_t rl_bhandle; /* bus space handle */
635 bus_space_tag_t rl_btag; /* bus space tag */
636 struct resource *rl_res;
637 struct resource *rl_irq;

--- 208 unchanged lines hidden ---