Deleted Added
full compact
if_txp.c (142880) if_txp.c (146734)
1/* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */
2
3/*-
4 * Copyright (c) 2001
5 * Jason L. Wright <jason@thought.net>, Theo de Raadt, and
6 * Aaron Campbell <aaron@monkey.org>. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

30 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
32 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
33 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
34 * THE POSSIBILITY OF SUCH DAMAGE.
35 */
36
37#include <sys/cdefs.h>
1/* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */
2
3/*-
4 * Copyright (c) 2001
5 * Jason L. Wright <jason@thought.net>, Theo de Raadt, and
6 * Aaron Campbell <aaron@monkey.org>. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

30 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
32 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
33 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
34 * THE POSSIBILITY OF SUCH DAMAGE.
35 */
36
37#include <sys/cdefs.h>
38__FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 142880 2005-03-01 07:50:12Z imp $");
38__FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 146734 2005-05-29 04:42:30Z nyan $");
39
40/*
41 * Driver for 3c990 (Typhoon) Ethernet ASIC
42 */
43
44#include <sys/cdefs.h>
39
40/*
41 * Driver for 3c990 (Typhoon) Ethernet ASIC
42 */
43
44#include <sys/cdefs.h>
45__FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 142880 2005-03-01 07:50:12Z imp $");
45__FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 146734 2005-05-29 04:42:30Z nyan $");
46
47#include <sys/param.h>
48#include <sys/systm.h>
49#include <sys/sockio.h>
50#include <sys/mbuf.h>
51#include <sys/malloc.h>
52#include <sys/kernel.h>
53#include <sys/module.h>

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

69
70#include <net/if_media.h>
71
72#include <net/bpf.h>
73
74#include <vm/vm.h> /* for vtophys */
75#include <vm/pmap.h> /* for vtophys */
76#include <machine/clock.h> /* for DELAY */
46
47#include <sys/param.h>
48#include <sys/systm.h>
49#include <sys/sockio.h>
50#include <sys/mbuf.h>
51#include <sys/malloc.h>
52#include <sys/kernel.h>
53#include <sys/module.h>

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

69
70#include <net/if_media.h>
71
72#include <net/bpf.h>
73
74#include <vm/vm.h> /* for vtophys */
75#include <vm/pmap.h> /* for vtophys */
76#include <machine/clock.h> /* for DELAY */
77#include <machine/bus_pio.h>
78#include <machine/bus_memio.h>
79#include <machine/bus.h>
80#include <machine/resource.h>
81#include <sys/bus.h>
82#include <sys/rman.h>
83
84#include <dev/mii/mii.h>
85#include <dev/mii/miivar.h>
86#include <dev/pci/pcireg.h>
87#include <dev/pci/pcivar.h>
88
89#define TXP_USEIOSPACE
90#define __STRICT_ALIGNMENT
91
92#include <dev/txp/if_txpreg.h>
93#include <dev/txp/3c990img.h>
94
95#ifndef lint
96static const char rcsid[] =
77#include <machine/bus.h>
78#include <machine/resource.h>
79#include <sys/bus.h>
80#include <sys/rman.h>
81
82#include <dev/mii/mii.h>
83#include <dev/mii/miivar.h>
84#include <dev/pci/pcireg.h>
85#include <dev/pci/pcivar.h>
86
87#define TXP_USEIOSPACE
88#define __STRICT_ALIGNMENT
89
90#include <dev/txp/if_txpreg.h>
91#include <dev/txp/3c990img.h>
92
93#ifndef lint
94static const char rcsid[] =
97 "$FreeBSD: head/sys/dev/txp/if_txp.c 142880 2005-03-01 07:50:12Z imp $";
95 "$FreeBSD: head/sys/dev/txp/if_txp.c 146734 2005-05-29 04:42:30Z nyan $";
98#endif
99
100/*
101 * Various supported device vendors/types and their names.
102 */
103static struct txp_type txp_devs[] = {
104 { TXP_VENDORID_3COM, TXP_DEVICEID_3CR990_TX_95,
105 "3Com 3cR990-TX-95 Etherlink with 3XP Processor" },

--- 1766 unchanged lines hidden ---
96#endif
97
98/*
99 * Various supported device vendors/types and their names.
100 */
101static struct txp_type txp_devs[] = {
102 { TXP_VENDORID_3COM, TXP_DEVICEID_3CR990_TX_95,
103 "3Com 3cR990-TX-95 Etherlink with 3XP Processor" },

--- 1766 unchanged lines hidden ---