Deleted Added
full compact
if_txp.c (139749) if_txp.c (142880)
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 139749 2005-01-06 01:43:34Z imp $");
38__FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 142880 2005-03-01 07:50:12Z imp $");
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 139749 2005-01-06 01:43:34Z imp $");
45__FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 142880 2005-03-01 07:50:12Z imp $");
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>

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

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[] =
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>

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

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[] =
97 "$FreeBSD: head/sys/dev/txp/if_txp.c 139749 2005-01-06 01:43:34Z imp $";
97 "$FreeBSD: head/sys/dev/txp/if_txp.c 142880 2005-03-01 07:50:12Z imp $";
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" },

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

197 struct txp_type *t;
198
199 t = txp_devs;
200
201 while(t->txp_name != NULL) {
202 if ((pci_get_vendor(dev) == t->txp_vid) &&
203 (pci_get_device(dev) == t->txp_did)) {
204 device_set_desc(dev, t->txp_name);
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" },

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

197 struct txp_type *t;
198
199 t = txp_devs;
200
201 while(t->txp_name != NULL) {
202 if ((pci_get_vendor(dev) == t->txp_vid) &&
203 (pci_get_device(dev) == t->txp_did)) {
204 device_set_desc(dev, t->txp_name);
205 return(0);
205 return(BUS_PROBE_DEFAULT);
206 }
207 t++;
208 }
209
210 return(ENXIO);
211}
212
213static int

--- 1658 unchanged lines hidden ---
206 }
207 t++;
208 }
209
210 return(ENXIO);
211}
212
213static int

--- 1658 unchanged lines hidden ---