Deleted Added
full compact
if_sis.c (51455) if_sis.c (51473)
1/*
2 * Copyright (c) 1997, 1998, 1999
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, 1999
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 * $FreeBSD: head/sys/pci/if_sis.c 51455 1999-09-20 08:47:11Z wpaul $
32 * $FreeBSD: head/sys/pci/if_sis.c 51473 1999-09-20 19:06:45Z wpaul $
33 */
34
35/*
36 * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
37 * available from http://www.sis.com.tw.
38 *
39 * Written by Bill Paul <wpaul@ee.columbia.edu>
40 * Electrical Engineering Department

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

94
95#include <pci/if_sisreg.h>
96
97/* "controller miibus0" required. See GENERIC if you get errors here. */
98#include "miibus_if.h"
99
100#ifndef lint
101static const char rcsid[] =
33 */
34
35/*
36 * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
37 * available from http://www.sis.com.tw.
38 *
39 * Written by Bill Paul <wpaul@ee.columbia.edu>
40 * Electrical Engineering Department

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

94
95#include <pci/if_sisreg.h>
96
97/* "controller miibus0" required. See GENERIC if you get errors here. */
98#include "miibus_if.h"
99
100#ifndef lint
101static const char rcsid[] =
102 "$FreeBSD: head/sys/pci/if_sis.c 51455 1999-09-20 08:47:11Z wpaul $";
102 "$FreeBSD: head/sys/pci/if_sis.c 51473 1999-09-20 19:06:45Z wpaul $";
103#endif
104
105/*
106 * Various supported device vendors/types and their names.
107 */
108static struct sis_type sis_devs[] = {
109 { SIS_VENDORID, SIS_DEVICEID_900, "SiS 900 10/100BaseTX" },
110 { SIS_VENDORID, SIS_DEVICEID_7016, "SiS 7016 10/100BaseTX" },

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

180static driver_t sis_driver = {
181 "sis",
182 sis_methods,
183 sizeof(struct sis_softc)
184};
185
186static devclass_t sis_devclass;
187
103#endif
104
105/*
106 * Various supported device vendors/types and their names.
107 */
108static struct sis_type sis_devs[] = {
109 { SIS_VENDORID, SIS_DEVICEID_900, "SiS 900 10/100BaseTX" },
110 { SIS_VENDORID, SIS_DEVICEID_7016, "SiS 7016 10/100BaseTX" },

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

180static driver_t sis_driver = {
181 "sis",
182 sis_methods,
183 sizeof(struct sis_softc)
184};
185
186static devclass_t sis_devclass;
187
188DRIVER_MODULE(if_sis, pci, sis_driver, sis_devclass, 0, 0);
189DRIVER_MODULE(miibus, if_sis, miibus_driver, miibus_devclass, 0, 0);
188DRIVER_MODULE(sis, pci, sis_driver, sis_devclass, 0, 0);
189DRIVER_MODULE(miibus, sis, miibus_driver, miibus_devclass, 0, 0);
190
191#define SIS_SETBIT(sc, reg, x) \
192 CSR_WRITE_4(sc, reg, \
193 CSR_READ_4(sc, reg) | (x))
194
195#define SIS_CLRBIT(sc, reg, x) \
196 CSR_WRITE_4(sc, reg, \
197 CSR_READ_4(sc, reg) & ~(x))

--- 1262 unchanged lines hidden ---
190
191#define SIS_SETBIT(sc, reg, x) \
192 CSR_WRITE_4(sc, reg, \
193 CSR_READ_4(sc, reg) | (x))
194
195#define SIS_CLRBIT(sc, reg, x) \
196 CSR_WRITE_4(sc, reg, \
197 CSR_READ_4(sc, reg) & ~(x))

--- 1262 unchanged lines hidden ---