Deleted Added
full compact
if_txpreg.h (150878) if_txpreg.h (151772)
1/* $OpenBSD: if_txpreg.h,v 1.30 2001/06/23 04:18:02 jason Exp $ */
1/* $OpenBSD: if_txpreg.h,v 1.30 2001/06/23 04:18:02 jason Exp $ */
2/* $FreeBSD: head/sys/dev/txp/if_txpreg.h 150878 2005-10-03 15:47:15Z jhb $ */
2/* $FreeBSD: head/sys/dev/txp/if_txpreg.h 151772 2005-10-27 21:16:17Z jhb $ */
3
4/*-
5 * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:

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

601 void *sc_intrhand;
602 struct mtx sc_mtx;
603 struct txp_ldata *sc_ldata;
604 void *sc_fwbuf;
605 int sc_rxbufprod;
606 struct txp_cmd_ring sc_cmdring;
607 struct txp_rsp_ring sc_rspring;
608 struct txp_swdesc sc_txd[TX_ENTRIES];
3
4/*-
5 * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:

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

601 void *sc_intrhand;
602 struct mtx sc_mtx;
603 struct txp_ldata *sc_ldata;
604 void *sc_fwbuf;
605 int sc_rxbufprod;
606 struct txp_cmd_ring sc_cmdring;
607 struct txp_rsp_ring sc_rspring;
608 struct txp_swdesc sc_txd[TX_ENTRIES];
609 struct callout_handle sc_tick;
609 struct callout sc_tick;
610 struct ifmedia sc_ifmedia;
611 struct txp_tx_ring sc_txhir, sc_txlor;
612 struct txp_rxbuf_desc *sc_rxbufs;
613 struct txp_rx_ring sc_rxhir, sc_rxlor;
614 u_int16_t sc_xcvr;
615 u_int16_t sc_seq;
616 int sc_cold;
617 u_int32_t sc_rx_capability, sc_tx_capability;

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

634#define TXP_MAX_SEGLEN 0xffff
635#define TXP_MAX_PKTLEN 0x0800
636
637#define WRITE_REG(sc,reg,val) \
638 bus_space_write_4((sc)->sc_bt, (sc)->sc_bh, reg, val)
639#define READ_REG(sc,reg) \
640 bus_space_read_4((sc)->sc_bt, (sc)->sc_bh, reg)
641
610 struct ifmedia sc_ifmedia;
611 struct txp_tx_ring sc_txhir, sc_txlor;
612 struct txp_rxbuf_desc *sc_rxbufs;
613 struct txp_rx_ring sc_rxhir, sc_rxlor;
614 u_int16_t sc_xcvr;
615 u_int16_t sc_seq;
616 int sc_cold;
617 u_int32_t sc_rx_capability, sc_tx_capability;

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

634#define TXP_MAX_SEGLEN 0xffff
635#define TXP_MAX_PKTLEN 0x0800
636
637#define WRITE_REG(sc,reg,val) \
638 bus_space_write_4((sc)->sc_bt, (sc)->sc_bh, reg, val)
639#define READ_REG(sc,reg) \
640 bus_space_read_4((sc)->sc_bt, (sc)->sc_bh, reg)
641
642#define TXP_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
643#define TXP_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx)
644#define TXP_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED)
645
642/*
643 * 3Com PCI vendor ID.
644 */
645#define TXP_VENDORID_3COM 0x10B7
646
647/*
648 * 3cR990 device IDs
649 */

--- 12 unchanged lines hidden ---
646/*
647 * 3Com PCI vendor ID.
648 */
649#define TXP_VENDORID_3COM 0x10B7
650
651/*
652 * 3cR990 device IDs
653 */

--- 12 unchanged lines hidden ---