Deleted Added
full compact
if_skreg.h (67087) if_skreg.h (72200)
1/*
2 * Copyright (c) 1997, 1998, 1999, 2000
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, 2000
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/dev/sk/if_skreg.h 67087 2000-10-13 17:54:19Z wpaul $
32 * $FreeBSD: head/sys/dev/sk/if_skreg.h 72200 2001-02-09 06:11:45Z bmilekic $
33 */
34
35/*
36 * SysKonnect PCI vendor ID
37 */
38#define SK_VENDORID 0x1148
39
40/*

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

1177 u_int32_t sk_ramsize; /* amount of RAM on NIC */
1178 u_int32_t sk_pmd; /* physical media type */
1179 u_int32_t sk_intrmask;
1180 struct sk_if_softc *sk_if[2];
1181 device_t sk_devs[2];
1182 struct mtx sk_mtx;
1183};
1184
33 */
34
35/*
36 * SysKonnect PCI vendor ID
37 */
38#define SK_VENDORID 0x1148
39
40/*

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

1177 u_int32_t sk_ramsize; /* amount of RAM on NIC */
1178 u_int32_t sk_pmd; /* physical media type */
1179 u_int32_t sk_intrmask;
1180 struct sk_if_softc *sk_if[2];
1181 device_t sk_devs[2];
1182 struct mtx sk_mtx;
1183};
1184
1185#define SK_LOCK(_sc) mtx_enter(&(_sc)->sk_mtx, MTX_DEF)
1186#define SK_UNLOCK(_sc) mtx_exit(&(_sc)->sk_mtx, MTX_DEF)
1187#define SK_IF_LOCK(_sc) mtx_enter(&(_sc)->sk_softc->sk_mtx, MTX_DEF)
1188#define SK_IF_UNLOCK(_sc) mtx_exit(&(_sc)->sk_softc->sk_mtx, MTX_DEF)
1185#define SK_LOCK(_sc) mtx_lock(&(_sc)->sk_mtx)
1186#define SK_UNLOCK(_sc) mtx_unlock(&(_sc)->sk_mtx)
1187#define SK_IF_LOCK(_sc) mtx_lock(&(_sc)->sk_softc->sk_mtx)
1188#define SK_IF_UNLOCK(_sc) mtx_unlock(&(_sc)->sk_softc->sk_mtx)
1189
1190/* Softc for each logical interface */
1191struct sk_if_softc {
1192 struct arpcom arpcom; /* interface info */
1193 device_t sk_miibus;
1194 u_int8_t sk_unit; /* interface number */
1195 u_int8_t sk_port; /* port # on controller */
1196 u_int8_t sk_xmac_rev; /* XMAC chip rev (B2 or C1) */

--- 27 unchanged lines hidden ---
1189
1190/* Softc for each logical interface */
1191struct sk_if_softc {
1192 struct arpcom arpcom; /* interface info */
1193 device_t sk_miibus;
1194 u_int8_t sk_unit; /* interface number */
1195 u_int8_t sk_port; /* port # on controller */
1196 u_int8_t sk_xmac_rev; /* XMAC chip rev (B2 or C1) */

--- 27 unchanged lines hidden ---