Deleted Added
full compact
if_xl.c (41651) if_xl.c (41771)
1/*
2 * Copyright (c) 1997, 1998
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
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 * $Id: if_xl.c,v 1.62 1998/12/10 00:55:04 wpaul Exp $
32 * $Id: if_xl.c,v 1.20 1998/12/10 16:18:42 wpaul Exp $
33 */
34
35/*
36 * 3Com 3c90x Etherlink XL PCI NIC driver
37 *
38 * Supports the 3Com "boomerang" and "cyclone" PCI
39 * bus-master chips (3c90x cards and embedded controllers) including
40 * the following:

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

142 * recompile.
143 */
144/* #define XL_BACKGROUND_AUTONEG */
145
146#include <pci/if_xlreg.h>
147
148#if !defined(lint)
149static const char rcsid[] =
33 */
34
35/*
36 * 3Com 3c90x Etherlink XL PCI NIC driver
37 *
38 * Supports the 3Com "boomerang" and "cyclone" PCI
39 * bus-master chips (3c90x cards and embedded controllers) including
40 * the following:

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

142 * recompile.
143 */
144/* #define XL_BACKGROUND_AUTONEG */
145
146#include <pci/if_xlreg.h>
147
148#if !defined(lint)
149static const char rcsid[] =
150 "$Id: if_xl.c,v 1.62 1998/12/10 00:55:04 wpaul Exp $";
150 "$Id: if_xl.c,v 1.20 1998/12/10 16:18:42 wpaul Exp $";
151#endif
152
153/*
154 * Various supported device vendors/types and their names.
155 */
156static struct xl_type xl_devs[] = {
157 { TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT,
158 "3Com 3c900 Etherlink XL 10BaseT" },

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

189 { NS_PHY_VENDORID, NS_PHY_83840A, "<National Semiconductor DP83840A>"},
190 { LEVEL1_PHY_VENDORID, LEVEL1_PHY_LXT970, "<Level 1 LXT970>" },
191 { INTEL_PHY_VENDORID, INTEL_PHY_82555, "<Intel 82555>" },
192 { SEEQ_PHY_VENDORID, SEEQ_PHY_80220, "<SEEQ 80220>" },
193 { 0, 0, "<MII-compliant physical interface>" }
194};
195
196static unsigned long xl_count = 0;
151#endif
152
153/*
154 * Various supported device vendors/types and their names.
155 */
156static struct xl_type xl_devs[] = {
157 { TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT,
158 "3Com 3c900 Etherlink XL 10BaseT" },

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

189 { NS_PHY_VENDORID, NS_PHY_83840A, "<National Semiconductor DP83840A>"},
190 { LEVEL1_PHY_VENDORID, LEVEL1_PHY_LXT970, "<Level 1 LXT970>" },
191 { INTEL_PHY_VENDORID, INTEL_PHY_82555, "<Intel 82555>" },
192 { SEEQ_PHY_VENDORID, SEEQ_PHY_80220, "<SEEQ 80220>" },
193 { 0, 0, "<MII-compliant physical interface>" }
194};
195
196static unsigned long xl_count = 0;
197static char *xl_probe __P((pcici_t, pcidi_t));
197static const char *xl_probe __P((pcici_t, pcidi_t));
198static void xl_attach __P((pcici_t, int));
199
200static int xl_newbuf __P((struct xl_softc *,
201 struct xl_chain_onefrag *));
202static void xl_stats_update __P((void *));
203static int xl_encap __P((struct xl_softc *, struct xl_chain *,
204 struct mbuf * ));
205

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

1180 DELAY(1000);
1181 return;
1182}
1183
1184/*
1185 * Probe for a 3Com Etherlink XL chip. Check the PCI vendor and device
1186 * IDs against our list and return a device name if we find a match.
1187 */
198static void xl_attach __P((pcici_t, int));
199
200static int xl_newbuf __P((struct xl_softc *,
201 struct xl_chain_onefrag *));
202static void xl_stats_update __P((void *));
203static int xl_encap __P((struct xl_softc *, struct xl_chain *,
204 struct mbuf * ));
205

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

1180 DELAY(1000);
1181 return;
1182}
1183
1184/*
1185 * Probe for a 3Com Etherlink XL chip. Check the PCI vendor and device
1186 * IDs against our list and return a device name if we find a match.
1187 */
1188static char *
1188static const char *
1189xl_probe(config_id, device_id)
1190 pcici_t config_id;
1191 pcidi_t device_id;
1192{
1193 struct xl_type *t;
1194
1195 t = xl_devs;
1196

--- 1580 unchanged lines hidden ---
1189xl_probe(config_id, device_id)
1190 pcici_t config_id;
1191 pcidi_t device_id;
1192{
1193 struct xl_type *t;
1194
1195 t = xl_devs;
1196

--- 1580 unchanged lines hidden ---