Deleted Added
full compact
if_wb.c (41633) if_wb.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_wb.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $
32 * $Id: if_wb.c,v 1.3 1998/12/10 02:02:30 archie Exp $
33 */
34
35/*
36 * Winbond fast ethernet PCI NIC driver
37 *
38 * Supports various cheap network adapters based on the Winbond W89C840F
39 * fast ethernet controller chip. This includes adapters manufactured by
40 * Winbond itself and some made by Linksys.

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

116#define WB_USEIOSPACE
117
118/* #define WB_BACKGROUND_AUTONEG */
119
120#include <pci/if_wbreg.h>
121
122#ifndef lint
123static const char rcsid[] =
33 */
34
35/*
36 * Winbond fast ethernet PCI NIC driver
37 *
38 * Supports various cheap network adapters based on the Winbond W89C840F
39 * fast ethernet controller chip. This includes adapters manufactured by
40 * Winbond itself and some made by Linksys.

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

116#define WB_USEIOSPACE
117
118/* #define WB_BACKGROUND_AUTONEG */
119
120#include <pci/if_wbreg.h>
121
122#ifndef lint
123static const char rcsid[] =
124 "$Id: if_wb.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $";
124 "$Id: if_wb.c,v 1.3 1998/12/10 02:02:30 archie Exp $";
125#endif
126
127/*
128 * Various supported device vendors/types and their names.
129 */
130static struct wb_type wb_devs[] = {
131 { WB_VENDORID, WB_DEVICEID_840F,
132 "Winbond W89C840F 10/100BaseTX" },

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

147 { NS_PHY_VENDORID, NS_PHY_83840A, "<National Semiconductor DP83840A>"},
148 { LEVEL1_PHY_VENDORID, LEVEL1_PHY_LXT970, "<Level 1 LXT970>" },
149 { INTEL_PHY_VENDORID, INTEL_PHY_82555, "<Intel 82555>" },
150 { SEEQ_PHY_VENDORID, SEEQ_PHY_80220, "<SEEQ 80220>" },
151 { 0, 0, "<MII-compliant physical interface>" }
152};
153
154static unsigned long wb_count = 0;
125#endif
126
127/*
128 * Various supported device vendors/types and their names.
129 */
130static struct wb_type wb_devs[] = {
131 { WB_VENDORID, WB_DEVICEID_840F,
132 "Winbond W89C840F 10/100BaseTX" },

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

147 { NS_PHY_VENDORID, NS_PHY_83840A, "<National Semiconductor DP83840A>"},
148 { LEVEL1_PHY_VENDORID, LEVEL1_PHY_LXT970, "<Level 1 LXT970>" },
149 { INTEL_PHY_VENDORID, INTEL_PHY_82555, "<Intel 82555>" },
150 { SEEQ_PHY_VENDORID, SEEQ_PHY_80220, "<SEEQ 80220>" },
151 { 0, 0, "<MII-compliant physical interface>" }
152};
153
154static unsigned long wb_count = 0;
155static char *wb_probe __P((pcici_t, pcidi_t));
155static const char *wb_probe __P((pcici_t, pcidi_t));
156static void wb_attach __P((pcici_t, int));
157
158static int wb_newbuf __P((struct wb_softc *,
159 struct wb_chain_onefrag *));
160static int wb_encap __P((struct wb_softc *, struct wb_chain *,
161 struct mbuf *));
162
163static void wb_rxeof __P((struct wb_softc *));

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

990
991 return;
992}
993
994/*
995 * Probe for a Winbond chip. Check the PCI vendor and device
996 * IDs against our list and return a device name if we find a match.
997 */
156static void wb_attach __P((pcici_t, int));
157
158static int wb_newbuf __P((struct wb_softc *,
159 struct wb_chain_onefrag *));
160static int wb_encap __P((struct wb_softc *, struct wb_chain *,
161 struct mbuf *));
162
163static void wb_rxeof __P((struct wb_softc *));

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

990
991 return;
992}
993
994/*
995 * Probe for a Winbond chip. Check the PCI vendor and device
996 * IDs against our list and return a device name if we find a match.
997 */
998static char *
998static const char *
999wb_probe(config_id, device_id)
1000 pcici_t config_id;
1001 pcidi_t device_id;
1002{
1003 struct wb_type *t;
1004
1005 t = wb_devs;
1006

--- 1113 unchanged lines hidden ---
999wb_probe(config_id, device_id)
1000 pcici_t config_id;
1001 pcidi_t device_id;
1002{
1003 struct wb_type *t;
1004
1005 t = wb_devs;
1006

--- 1113 unchanged lines hidden ---