Deleted Added
full compact
if_vr.c (41591) if_vr.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_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $
32 * $Id: if_vr.c,v 1.3 1998/12/07 21:58:47 archie Exp $
33 */
34
35/*
36 * VIA Rhine fast ethernet PCI NIC driver
37 *
38 * Supports various network adapters based on the VIA Rhine
39 * and Rhine II PCI controllers, including the D-Link DFE530TX.
40 * Datasheets are available at http://www.via.com.tw.

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

92#define VR_USEIOSPACE
93
94/* #define VR_BACKGROUND_AUTONEG */
95
96#include <pci/if_vrreg.h>
97
98#ifndef lint
99static const char rcsid[] =
33 */
34
35/*
36 * VIA Rhine fast ethernet PCI NIC driver
37 *
38 * Supports various network adapters based on the VIA Rhine
39 * and Rhine II PCI controllers, including the D-Link DFE530TX.
40 * Datasheets are available at http://www.via.com.tw.

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

92#define VR_USEIOSPACE
93
94/* #define VR_BACKGROUND_AUTONEG */
95
96#include <pci/if_vrreg.h>
97
98#ifndef lint
99static const char rcsid[] =
100 "$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $";
100 "$Id: if_vr.c,v 1.3 1998/12/07 21:58:47 archie Exp $";
101#endif
102
103/*
104 * Various supported device vendors/types and their names.
105 */
106static struct vr_type vr_devs[] = {
107 { VIA_VENDORID, VIA_DEVICEID_RHINE,
108 "VIA VT3043 Rhine I 10/100BaseTX" },

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

123 { NS_PHY_VENDORID, NS_PHY_83840A, "<National Semiconductor DP83840A>"},
124 { LEVEL1_PHY_VENDORID, LEVEL1_PHY_LXT970, "<Level 1 LXT970>" },
125 { INTEL_PHY_VENDORID, INTEL_PHY_82555, "<Intel 82555>" },
126 { SEEQ_PHY_VENDORID, SEEQ_PHY_80220, "<SEEQ 80220>" },
127 { 0, 0, "<MII-compliant physical interface>" }
128};
129
130static unsigned long vr_count = 0;
101#endif
102
103/*
104 * Various supported device vendors/types and their names.
105 */
106static struct vr_type vr_devs[] = {
107 { VIA_VENDORID, VIA_DEVICEID_RHINE,
108 "VIA VT3043 Rhine I 10/100BaseTX" },

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

123 { NS_PHY_VENDORID, NS_PHY_83840A, "<National Semiconductor DP83840A>"},
124 { LEVEL1_PHY_VENDORID, LEVEL1_PHY_LXT970, "<Level 1 LXT970>" },
125 { INTEL_PHY_VENDORID, INTEL_PHY_82555, "<Intel 82555>" },
126 { SEEQ_PHY_VENDORID, SEEQ_PHY_80220, "<SEEQ 80220>" },
127 { 0, 0, "<MII-compliant physical interface>" }
128};
129
130static unsigned long vr_count = 0;
131static char *vr_probe __P((pcici_t, pcidi_t));
131static const char *vr_probe __P((pcici_t, pcidi_t));
132static void vr_attach __P((pcici_t, int));
133
134static int vr_newbuf __P((struct vr_softc *,
135 struct vr_chain_onefrag *));
136static int vr_encap __P((struct vr_softc *, struct vr_chain *,
137 struct mbuf * ));
138
139static void vr_rxeof __P((struct vr_softc *));

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

860
861 return;
862}
863
864/*
865 * Probe for a VIA Rhine chip. Check the PCI vendor and device
866 * IDs against our list and return a device name if we find a match.
867 */
132static void vr_attach __P((pcici_t, int));
133
134static int vr_newbuf __P((struct vr_softc *,
135 struct vr_chain_onefrag *));
136static int vr_encap __P((struct vr_softc *, struct vr_chain *,
137 struct mbuf * ));
138
139static void vr_rxeof __P((struct vr_softc *));

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

860
861 return;
862}
863
864/*
865 * Probe for a VIA Rhine chip. Check the PCI vendor and device
866 * IDs against our list and return a device name if we find a match.
867 */
868static char *
868static const char *
869vr_probe(config_id, device_id)
870 pcici_t config_id;
871 pcidi_t device_id;
872{
873 struct vr_type *t;
874
875 t = vr_devs;
876

--- 1092 unchanged lines hidden ---
869vr_probe(config_id, device_id)
870 pcici_t config_id;
871 pcidi_t device_id;
872{
873 struct vr_type *t;
874
875 t = vr_devs;
876

--- 1092 unchanged lines hidden ---