Deleted Added
full compact
if_wi.c (71161) if_wi.c (71228)
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/dev/wi/if_wi.c 71161 2001-01-17 12:31:59Z peter $
32 * $FreeBSD: head/sys/dev/wi/if_wi.c 71228 2001-01-19 01:59:14Z bmilekic $
33 */
34
35/*
36 * Lucent WaveLAN/IEEE 802.11 PCMCIA driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

105
106#include <dev/wi/if_wavelan_ieee.h>
107#include <dev/wi/if_wireg.h>
108
109#include "card_if.h"
110
111#if !defined(lint)
112static const char rcsid[] =
33 */
34
35/*
36 * Lucent WaveLAN/IEEE 802.11 PCMCIA driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

105
106#include <dev/wi/if_wavelan_ieee.h>
107#include <dev/wi/if_wireg.h>
108
109#include "card_if.h"
110
111#if !defined(lint)
112static const char rcsid[] =
113 "$FreeBSD: head/sys/dev/wi/if_wi.c 71161 2001-01-17 12:31:59Z peter $";
113 "$FreeBSD: head/sys/dev/wi/if_wi.c 71228 2001-01-19 01:59:14Z bmilekic $";
114#endif
115
116#ifdef foo
117static u_int8_t wi_mcast_addr[6] = { 0x01, 0x60, 0x1D, 0x00, 0x01, 0x00 };
118#endif
119
120static void wi_intr __P((void *));
121static void wi_reset __P((struct wi_softc *));

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

299 wi_intr, sc, &sc->wi_intrhand);
300
301 if (error) {
302 device_printf(dev, "bus_setup_intr() failed! (%d)\n", error);
303 wi_free(dev);
304 return (error);
305 }
306
114#endif
115
116#ifdef foo
117static u_int8_t wi_mcast_addr[6] = { 0x01, 0x60, 0x1D, 0x00, 0x01, 0x00 };
118#endif
119
120static void wi_intr __P((void *));
121static void wi_reset __P((struct wi_softc *));

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

299 wi_intr, sc, &sc->wi_intrhand);
300
301 if (error) {
302 device_printf(dev, "bus_setup_intr() failed! (%d)\n", error);
303 wi_free(dev);
304 return (error);
305 }
306
307 mtx_init(&sc->wi_mtx, device_get_nameunit(dev), MTX_DEF);
307 mtx_init(&sc->wi_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
308 WI_LOCK(sc);
309
310 /* Reset the NIC. */
311 wi_reset(sc);
312
313 /* Read the station address. */
314 mac.wi_type = WI_RID_MAC_NODE;
315 mac.wi_len = 4;

--- 1484 unchanged lines hidden ---
308 WI_LOCK(sc);
309
310 /* Reset the NIC. */
311 wi_reset(sc);
312
313 /* Read the station address. */
314 mac.wi_type = WI_RID_MAC_NODE;
315 mac.wi_len = 4;

--- 1484 unchanged lines hidden ---