GC ipw(4)
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Sat, 22 Mar 2008 09:49:11 +0000 (09:49 +0000)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Sat, 22 Mar 2008 09:49:11 +0000 (09:49 +0000)
sys/dev/netif/ipw/Makefile [deleted file]
sys/dev/netif/ipw/if_ipw.c [deleted file]
sys/dev/netif/ipw/if_ipwreg.h [deleted file]
sys/dev/netif/ipw/if_ipwvar.h [deleted file]

diff --git a/sys/dev/netif/ipw/Makefile b/sys/dev/netif/ipw/Makefile
deleted file mode 100644 (file)
index 1aacd1d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# $DragonFly: src/sys/dev/netif/ipw/Attic/Makefile,v 1.3 2005/07/03 15:47:01 corecode Exp $
-#
-KMOD=  if_ipw
-SRCS=  if_ipw.c
-SRCS+= device_if.h bus_if.h pci_if.h
-SRCS+= opt_inet.h
-
-#WARNS?=       6
-
-.if !defined(BUILDING_WITH_KERNEL)
-opt_inet.h:
-       echo "#define INET 1" > ${.TARGET}
-.endif
-
-.include <bsd.kmod.mk>
diff --git a/sys/dev/netif/ipw/if_ipw.c b/sys/dev/netif/ipw/if_ipw.c
deleted file mode 100644 (file)
index 1d618b7..0000000
+++ /dev/null
@@ -1,2261 +0,0 @@
-/*-
- * Copyright (c) 2004, 2005
- *      Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *
- * $Id: if_ipw.c,v 1.7.2.1 2005/01/13 20:01:03 damien Exp $
- * $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.7.2.4 2006/01/29 15:13:01 damien Exp $
- * $DragonFly: src/sys/dev/netif/ipw/Attic/if_ipw.c,v 1.21 2008/01/06 16:55:50 swildner Exp $
- */
-
-/*-
- * Intel(R) PRO/Wireless 2100 MiniPCI driver
- * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
- */
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <sys/endian.h>
-#include <sys/proc.h>
-#include <sys/ucred.h>
-#include <sys/serialize.h>
-#include <sys/rman.h>
-#include <sys/thread2.h>
-
-#include <machine/clock.h>
-
-#include <bus/pci/pcireg.h>
-#include <bus/pci/pcivar.h>
-#include <bus/pci/pcidevs.h>
-
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/if_types.h>
-#include <net/ifq_var.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-
-#include <netproto/802_11/ieee80211_var.h>
-#include <netproto/802_11/ieee80211_ioctl.h>
-#include <netproto/802_11/ieee80211_radiotap.h>
-#include <netproto/802_11/if_wavelan_ieee.h>
-
-#include <dev/netif/ipw/if_ipwreg.h>
-#include <dev/netif/ipw/if_ipwvar.h>
-
-#ifdef IPW_DEBUG
-#define DPRINTF(x)     if (ipw_debug > 0) kprintf x
-#define DPRINTFN(n, x) if (ipw_debug >= (n)) kprintf x
-int ipw_debug = 0;
-SYSCTL_INT(_debug, OID_AUTO, ipw, CTLFLAG_RW, &ipw_debug, 0, "ipw debug level");
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n, x)
-#endif
-
-MODULE_DEPEND(ipw, pci,  1, 1, 1);
-MODULE_DEPEND(ipw, wlan, 1, 1, 1);
-
-struct ipw_ident {
-       u_int16_t       vendor;
-       u_int16_t       device;
-       const char      *name;
-};
-
-static const struct ipw_ident ipw_ident_table[] = {
-       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_2100,
-         "Intel(R) PRO/Wireless 2100 MiniPCI" },
-
-       { 0, 0, NULL }
-};
-
-static const struct ieee80211_rateset ipw_rateset_11b =
-       { 4, { 2, 4, 11, 22 } };
-
-static int             ipw_dma_alloc(device_t);
-static void            ipw_release(struct ipw_softc *);
-static int             ipw_media_change(struct ifnet *);
-static void            ipw_media_status(struct ifnet *, struct ifmediareq *);
-static int             ipw_newstate(struct ieee80211com *,
-                           enum ieee80211_state, int);
-static u_int16_t       ipw_read_prom_word(struct ipw_softc *, u_int8_t);
-static void            ipw_command_intr(struct ipw_softc *,
-                           struct ipw_soft_buf *);
-static void            ipw_newstate_intr(struct ipw_softc *,
-                           struct ipw_soft_buf *);
-static void            ipw_data_intr(struct ipw_softc *, struct ipw_status *,
-                           struct ipw_soft_bd *, struct ipw_soft_buf *);
-static void            ipw_notification_intr(struct ipw_softc *,
-                           struct ipw_soft_buf *);
-static void            ipw_rx_intr(struct ipw_softc *);
-static void            ipw_release_sbd(struct ipw_softc *,
-                           struct ipw_soft_bd *);
-static void            ipw_tx_intr(struct ipw_softc *);
-static void            ipw_intr(void *);
-static void            ipw_dma_map_txbuf(void *, bus_dma_segment_t *, int,
-                           bus_size_t, int);
-static void            ipw_dma_map_addr(void *, bus_dma_segment_t *, int, int);
-static int             ipw_cmd(struct ipw_softc *, u_int32_t, void *,
-                           u_int32_t);
-static int             ipw_tx_start(struct ifnet *, struct mbuf *,
-                           struct ieee80211_node *);
-static void            ipw_start(struct ifnet *);
-static void            ipw_watchdog(struct ifnet *);
-static int             ipw_ioctl(struct ifnet *, u_long, caddr_t,
-                               struct ucred *cr);
-static void            ipw_stop_master(struct ipw_softc *);
-static int             ipw_reset(struct ipw_softc *);
-static int             ipw_load_ucode(struct ipw_softc *, u_char *, int);
-static int             ipw_load_firmware(struct ipw_softc *, u_char *, int);
-static int             ipw_cache_firmware(struct ipw_softc *, void *);
-static void            ipw_free_firmware(struct ipw_softc *);
-static int             ipw_config(struct ipw_softc *);
-static void            ipw_init(void *);
-static void            ipw_stop(void *);
-static int             ipw_sysctl_stats(SYSCTL_HANDLER_ARGS);
-static int             ipw_sysctl_radio(SYSCTL_HANDLER_ARGS);
-static u_int32_t       ipw_read_table1(struct ipw_softc *, u_int32_t);
-static void            ipw_write_table1(struct ipw_softc *, u_int32_t,
-                           u_int32_t);
-static int             ipw_read_table2(struct ipw_softc *, u_int32_t, void *,
-                           u_int32_t *);
-static void            ipw_read_mem_1(struct ipw_softc *, bus_size_t,
-                           u_int8_t *, bus_size_t);
-static void            ipw_write_mem_1(struct ipw_softc *, bus_size_t,
-                           u_int8_t *, bus_size_t);
-
-static __inline u_int8_t
-MEM_READ_1(struct ipw_softc *sc, u_int32_t addr)
-{
-       CSR_WRITE_4(sc, IPW_CSR_INDIRECT_ADDR, addr);
-       return CSR_READ_1(sc, IPW_CSR_INDIRECT_DATA);
-}
-
-static __inline u_int32_t
-MEM_READ_4(struct ipw_softc *sc, u_int32_t addr)
-{
-       CSR_WRITE_4(sc, IPW_CSR_INDIRECT_ADDR, addr);
-       return CSR_READ_4(sc, IPW_CSR_INDIRECT_DATA);
-}
-
-static int ipw_probe(device_t);
-static int ipw_attach(device_t);
-static int ipw_detach(device_t);
-static int ipw_shutdown(device_t);
-static int ipw_suspend(device_t);
-static int ipw_resume(device_t);
-
-static device_method_t ipw_methods[] = {
-       /* Device interface */
-       DEVMETHOD(device_probe,         ipw_probe),
-       DEVMETHOD(device_attach,        ipw_attach),
-       DEVMETHOD(device_detach,        ipw_detach),
-       DEVMETHOD(device_shutdown,      ipw_shutdown),
-       DEVMETHOD(device_suspend,       ipw_suspend),
-       DEVMETHOD(device_resume,        ipw_resume),
-
-       { 0, 0 }
-};
-
-static DEFINE_CLASS_0(ipw, ipw_driver, ipw_methods, sizeof(struct ipw_softc));
-static devclass_t ipw_devclass;
-
-DRIVER_MODULE(ipw, pci, ipw_driver, ipw_devclass, 0, 0);
-
-static int
-ipw_probe(device_t dev)
-{
-       const struct ipw_ident *ident;
-
-       for (ident = ipw_ident_table; ident->name != NULL; ident++) {
-               if (pci_get_vendor(dev) == ident->vendor &&
-                   pci_get_device(dev) == ident->device) {
-                       device_set_desc(dev, ident->name);
-                       return 0;
-               }
-       }
-       return ENXIO;
-}
-
-/* Base Address Register */
-#define IPW_PCI_BAR0   0x10
-
-static int
-ipw_attach(device_t dev)
-{
-       struct ipw_softc *sc = device_get_softc(dev);
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct ifnet *ifp = &ic->ic_if;
-       struct sysctl_oid *sysctl_tree;
-       u_int16_t val;
-       int error, i;
-
-       if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {
-               device_printf(dev, "chip is in D%d power mode "
-                   "-- setting to D0\n", pci_get_powerstate(dev));
-               pci_set_powerstate(dev, PCI_POWERSTATE_D0);
-       }
-
-       pci_write_config(dev, 0x41, 0, 1);
-
-       /* enable bus-mastering */
-       pci_enable_busmaster(dev);
-
-       /* map the register window */
-       sc->mem_rid = IPW_PCI_BAR0;
-       sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->mem_rid,
-                                        RF_ACTIVE);
-       if (sc->mem == NULL) {
-               device_printf(dev, "could not allocate memory resource\n");
-               goto fail;
-       }
-
-       sc->sc_st = rman_get_bustag(sc->mem);
-       sc->sc_sh = rman_get_bushandle(sc->mem);
-
-       sc->irq_rid = 0;
-       sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid,
-                                        RF_ACTIVE | RF_SHAREABLE);
-       if (sc->irq == NULL) {
-               device_printf(dev, "could not allocate interrupt resource\n");
-               goto fail;
-       }
-
-       if_initname(ifp, device_get_name(dev), device_get_unit(dev));
-
-       if (ipw_reset(sc) != 0) {
-               device_printf(dev, "could not reset adapter\n");
-               goto fail;
-       }
-
-       sysctl_ctx_init(&sc->sysctl_ctx);
-       sysctl_tree = SYSCTL_ADD_NODE(&sc->sysctl_ctx,
-               SYSCTL_STATIC_CHILDREN(_hw),
-               OID_AUTO, 
-               device_get_nameunit(dev),
-               CTLFLAG_RD,
-               0, "");
-
-       if (ipw_dma_alloc(dev) != 0) {
-               device_printf(dev, "could not allocate DMA resources\n");
-               goto fail;
-       }
-
-       ic->ic_phytype = IEEE80211_T_DS;
-       ic->ic_opmode = IEEE80211_M_STA;
-       ic->ic_state = IEEE80211_S_INIT;
-
-       /* set device capabilities */
-       ic->ic_caps = IEEE80211_C_SHPREAMBLE | IEEE80211_C_TXPMGT |
-           IEEE80211_C_PMGT | IEEE80211_C_IBSS | IEEE80211_C_MONITOR |
-           IEEE80211_C_WEP;
-
-       /* read MAC address from EEPROM */
-       val = ipw_read_prom_word(sc, IPW_EEPROM_MAC + 0);
-       ic->ic_myaddr[0] = val >> 8;
-       ic->ic_myaddr[1] = val & 0xff;
-       val = ipw_read_prom_word(sc, IPW_EEPROM_MAC + 1);
-       ic->ic_myaddr[2] = val >> 8;
-       ic->ic_myaddr[3] = val & 0xff;
-       val = ipw_read_prom_word(sc, IPW_EEPROM_MAC + 2);
-       ic->ic_myaddr[4] = val >> 8;
-       ic->ic_myaddr[5] = val & 0xff;
-
-       /* set supported .11b rates */
-       ic->ic_sup_rates[IEEE80211_MODE_11B] = ipw_rateset_11b;
-
-       /* set supported .11b channels (read from EEPROM) */
-       if ((val = ipw_read_prom_word(sc, IPW_EEPROM_CHANNEL_LIST)) == 0)
-               val = 0x7ff; /* default to channels 1-11 */
-       val <<= 1;
-       for (i = 1; i < 16; i++) {
-               if (val & (1 << i)) {
-                       ic->ic_channels[i].ic_freq =
-                           ieee80211_ieee2mhz(i, IEEE80211_CHAN_B);
-                       ic->ic_channels[i].ic_flags = IEEE80211_CHAN_B;
-               }
-       }
-
-        /* check support for radio transmitter switch in EEPROM */
-        if (!(ipw_read_prom_word(sc, IPW_EEPROM_RADIO) & 8))
-                sc->flags |= IPW_FLAG_HAS_RADIO_SWITCH;
-
-       /* IBSS channel undefined for now */
-       ic->ic_ibss_chan = &ic->ic_channels[0];
-
-       ifp->if_softc = sc;
-       ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-       ifp->if_init = ipw_init;
-       ifp->if_ioctl = ipw_ioctl;
-       ifp->if_start = ipw_start;
-       ifp->if_watchdog = ipw_watchdog;
-       ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
-       ifq_set_ready(&ifp->if_snd);
-
-       ieee80211_ifattach(ic);
-       /* override state transition machine */
-       sc->sc_newstate = ic->ic_newstate;
-       ic->ic_newstate = ipw_newstate;
-       ieee80211_media_init(ic, ipw_media_change, ipw_media_status);
-
-       bpfattach_dlt(ifp, DLT_IEEE802_11_RADIO,
-           sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf);
-
-       sc->sc_rxtap_len = sizeof sc->sc_rxtapu;
-       sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len);
-       sc->sc_rxtap.wr_ihdr.it_present = htole32(IPW_RX_RADIOTAP_PRESENT);
-
-       sc->sc_txtap_len = sizeof sc->sc_txtapu;
-       sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len);
-       sc->sc_txtap.wt_ihdr.it_present = htole32(IPW_TX_RADIOTAP_PRESENT);
-
-       sc->dwelltime = 100;
-
-       SYSCTL_ADD_PROC(&sc->sysctl_ctx,
-           SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "radio",
-           CTLTYPE_INT | CTLFLAG_RD, sc, 0, ipw_sysctl_radio, "I",
-           "Radio transmitter switch");
-
-       SYSCTL_ADD_PROC(&sc->sysctl_ctx,
-           SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "stats",
-           CTLTYPE_OPAQUE | CTLFLAG_RD, sc, 0, ipw_sysctl_stats, "S",
-           "Statistics");
-
-       SYSCTL_ADD_INT(&sc->sysctl_ctx,
-           SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "dwell",
-           CTLFLAG_RW, &sc->dwelltime, 0,
-           "Channel dwell time (ms) for AP/station scanning");
-
-       /*
-        * Hook our interrupt after all initialization is complete
-        */
-       error = bus_setup_intr(dev, sc->irq, INTR_MPSAFE,
-                              ipw_intr, sc, &sc->sc_ih, ifp->if_serializer);
-       if (error != 0) {
-               device_printf(dev, "could not set up interrupt\n");
-               bpfdetach(ifp);
-               ieee80211_ifdetach(ic);
-               goto fail;
-       }
-
-       if (bootverbose)
-               ieee80211_announce(ic);
-
-       return 0;
-
-fail:
-       ipw_detach(dev);
-       return ENXIO;
-}
-
-static int
-ipw_detach(device_t dev)
-{
-       struct ipw_softc *sc = device_get_softc(dev);
-       struct ifnet *ifp = &sc->sc_ic.ic_if;
-
-       if (device_is_attached(dev)) {
-               lwkt_serialize_enter(ifp->if_serializer);
-               ipw_stop(sc);
-               ipw_free_firmware(sc);
-               bus_teardown_intr(dev, sc->irq, sc->sc_ih);
-               lwkt_serialize_exit(ifp->if_serializer);
-
-               bpfdetach(ifp);
-               ieee80211_ifdetach(&sc->sc_ic);
-       }
-
-       ipw_release(sc);
-
-       if (sc->irq != NULL)
-               bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq);
-
-       if (sc->mem != NULL)
-               bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem);
-
-       sysctl_ctx_free(&sc->sysctl_ctx);
-
-       return 0;
-}
-
-static int
-ipw_dma_alloc(device_t dev)
-{
-       struct ipw_soft_bd *sbd;
-        struct ipw_soft_hdr *shdr;
-       struct ipw_soft_buf *sbuf;
-       bus_addr_t physaddr;
-       int error, i;
-       struct ipw_softc *sc;
-
-       sc = device_get_softc(dev);
-       /*
-        * Allocate and map tx ring
-        */
-       error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT,
-           BUS_SPACE_MAXADDR, NULL, NULL, IPW_TBD_SZ, 1, IPW_TBD_SZ, 0,
-           &sc->tbd_dmat);
-       if (error != 0) {
-               device_printf(dev, "could not create tx ring DMA tag\n");
-               goto fail;
-       }
-
-       error = bus_dmamem_alloc(sc->tbd_dmat, (void **)&sc->tbd_list,
-           BUS_DMA_WAITOK | BUS_DMA_ZERO, &sc->tbd_map);
-       if (error != 0) {
-               device_printf(dev, "could not allocate tx ring DMA memory\n");
-               goto fail;
-       }
-
-       error = bus_dmamap_load(sc->tbd_dmat, sc->tbd_map, sc->tbd_list,
-           IPW_TBD_SZ, ipw_dma_map_addr, &sc->tbd_phys, 0);
-       if (error != 0) {
-               device_printf(dev, "could not map tx ring DMA memory\n");
-               goto fail;
-       }
-
-       /*
-        * Allocate and map rx ring
-        */
-       error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT,
-           BUS_SPACE_MAXADDR, NULL, NULL, IPW_RBD_SZ, 1, IPW_RBD_SZ, 0,
-           &sc->rbd_dmat);
-       if (error != 0) {
-               device_printf(dev, "could not create rx ring DMA tag\n");
-               goto fail;
-       }
-
-       error = bus_dmamem_alloc(sc->rbd_dmat, (void **)&sc->rbd_list,
-           BUS_DMA_WAITOK | BUS_DMA_ZERO, &sc->rbd_map);
-       if (error != 0) {
-               device_printf(dev, "could not allocate rx ring DMA memory\n");
-               goto fail;
-       }
-
-       error = bus_dmamap_load(sc->rbd_dmat, sc->rbd_map, sc->rbd_list,
-           IPW_RBD_SZ, ipw_dma_map_addr, &sc->rbd_phys, 0);
-       if (error != 0) {
-               device_printf(dev, "could not map rx ring DMA memory\n");
-               goto fail;
-       }
-
-       /*
-        * Allocate and map status ring
-        */
-       error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT,
-           BUS_SPACE_MAXADDR, NULL, NULL, IPW_STATUS_SZ, 1, IPW_STATUS_SZ, 0,
-           &sc->status_dmat);
-       if (error != 0) {
-               device_printf(dev, "could not create status ring DMA tag\n");
-               goto fail;
-       }
-
-       error = bus_dmamem_alloc(sc->status_dmat, (void **)&sc->status_list,
-           BUS_DMA_WAITOK | BUS_DMA_ZERO, &sc->status_map);
-       if (error != 0) {
-               device_printf(dev,
-                   "could not allocate status ring DMA memory\n");
-               goto fail;
-       }
-
-       error = bus_dmamap_load(sc->status_dmat, sc->status_map,
-           sc->status_list, IPW_STATUS_SZ, ipw_dma_map_addr, &sc->status_phys,
-           0);
-       if (error != 0) {
-               device_printf(dev, "could not map status ring DMA memory\n");
-               goto fail;
-       }
-
-       /*
-        * Allocate command DMA map
-        */
-       error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT,
-           BUS_SPACE_MAXADDR, NULL, NULL, sizeof (struct ipw_cmd), 1,
-           sizeof (struct ipw_cmd), 0, &sc->cmd_dmat);
-       if (error != 0) {
-               device_printf(dev, "could not create command DMA tag\n");
-               goto fail;
-       }
-
-       error = bus_dmamap_create(sc->cmd_dmat, 0, &sc->cmd_map);
-       if (error != 0) {
-               device_printf(dev, "could not create command DMA map\n");
-               goto fail;
-       }
-
-       /*
-        * Allocate headers DMA maps
-        */
-       error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT,
-           BUS_SPACE_MAXADDR, NULL, NULL, sizeof (struct ipw_hdr), 1,
-           sizeof (struct ipw_hdr), 0, &sc->hdr_dmat);
-       if (error != 0) {
-               device_printf(dev, "could not create header DMA tag\n");
-               goto fail;
-       }
-
-       SLIST_INIT(&sc->free_shdr);
-       for (i = 0; i < IPW_NDATA; i++) {
-                shdr = &sc->shdr_list[i];
-               error = bus_dmamap_create(sc->hdr_dmat, 0, &shdr->map);
-               if (error != 0) {
-                       device_printf(dev, "could not create header DMA map\n");
-                       goto fail;
-               }
-               SLIST_INSERT_HEAD(&sc->free_shdr, shdr, next);
-       }
-
-       /*
-        * Allocate tx buffers DMA maps
-        */
-       error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT,
-           BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, IPW_MAX_NSEG, MCLBYTES, 0,
-           &sc->txbuf_dmat);
-       if (error != 0) {
-               device_printf(dev, "could not create tx DMA tag\n");
-               goto fail;
-       }
-
-       SLIST_INIT(&sc->free_sbuf);
-       for (i = 0; i < IPW_NDATA; i++) {
-               sbuf = &sc->tx_sbuf_list[i];
-               error = bus_dmamap_create(sc->txbuf_dmat, 0, &sbuf->map);
-               if (error != 0) {
-                       device_printf(dev, "could not create tx DMA map\n");
-                       goto fail;
-               }
-               SLIST_INSERT_HEAD(&sc->free_sbuf, sbuf, next);
-       }
-
-       /*
-        * Initialize tx ring
-        */
-       for (i = 0; i < IPW_NTBD; i++) {
-               sbd = &sc->stbd_list[i];
-               sbd->bd = &sc->tbd_list[i];
-               sbd->type = IPW_SBD_TYPE_NOASSOC;
-       }
-
-       /*
-        * Pre-allocate rx buffers and DMA maps
-        */
-       error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT,
-           BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, IPW_NRBD, MCLBYTES, 0,
-           &sc->rxbuf_dmat);
-       if (error != 0) {
-               device_printf(dev, "could not create rx DMA tag\n");
-               goto fail;
-       }
-
-       for (i = 0; i < IPW_NRBD; i++) {
-               sbd = &sc->srbd_list[i];
-               sbuf = &sc->rx_sbuf_list[i];
-               sbd->bd = &sc->rbd_list[i];
-
-               sbuf->m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
-               if (sbuf->m == NULL) {
-                       device_printf(dev, "could not allocate rx mbuf\n");
-                       error = ENOMEM;
-                       goto fail;
-               }
-
-               error = bus_dmamap_create(sc->rxbuf_dmat, 0, &sbuf->map);
-               if (error != 0) {
-                       device_printf(dev, "could not create rx DMA map\n");
-                       goto fail;
-               }
-
-               error = bus_dmamap_load(sc->rxbuf_dmat, sbuf->map,
-                   mtod(sbuf->m, void *), MCLBYTES, ipw_dma_map_addr,
-                   &physaddr, 0);
-               if (error != 0) {
-                       device_printf(dev, "could not map rx DMA memory\n");
-                       goto fail;
-               }
-
-               sbd->type = IPW_SBD_TYPE_DATA;
-               sbd->priv = sbuf;
-               sbd->bd->physaddr = htole32(physaddr);
-               sbd->bd->len = htole32(MCLBYTES);
-       }
-
-       bus_dmamap_sync(sc->rbd_dmat, sc->rbd_map, BUS_DMASYNC_PREWRITE);
-
-       return 0;
-
-fail:  ipw_release(sc);
-       return error;
-}
-
-static void
-ipw_release(struct ipw_softc *sc)
-{
-       struct ipw_soft_buf *sbuf;
-       int i;
-
-       if (sc->tbd_dmat != NULL) {
-               if (sc->stbd_list != NULL) {
-                       bus_dmamap_sync(sc->tbd_dmat, sc->tbd_map,
-                           BUS_DMASYNC_POSTWRITE);
-                       bus_dmamap_unload(sc->tbd_dmat, sc->tbd_map);
-                       bus_dmamem_free(sc->tbd_dmat, sc->tbd_list,
-                           sc->tbd_map);
-               }
-               bus_dma_tag_destroy(sc->tbd_dmat);
-       }
-
-       if (sc->rbd_dmat != NULL) {
-               if (sc->rbd_list != NULL) {
-                       bus_dmamap_sync(sc->rbd_dmat, sc->rbd_map,
-                           BUS_DMASYNC_POSTWRITE);
-                       bus_dmamap_unload(sc->rbd_dmat, sc->rbd_map);
-                       bus_dmamem_free(sc->rbd_dmat, sc->rbd_list,
-                           sc->rbd_map);
-               }
-               bus_dma_tag_destroy(sc->rbd_dmat);
-       }
-
-       if (sc->status_dmat != NULL) {
-               if (sc->status_list != NULL) {
-                       bus_dmamap_sync(sc->status_dmat, sc->status_map,
-                           BUS_DMASYNC_POSTWRITE);
-                       bus_dmamap_unload(sc->status_dmat, sc->status_map);
-                       bus_dmamem_free(sc->status_dmat, sc->status_list,
-                           sc->status_map);
-               }
-               bus_dma_tag_destroy(sc->status_dmat);
-       }
-
-       for (i = 0; i < IPW_NTBD; i++)
-               ipw_release_sbd(sc, &sc->stbd_list[i]);
-
-       if (sc->cmd_dmat != NULL) {
-               bus_dmamap_destroy(sc->cmd_dmat, sc->cmd_map);
-               bus_dma_tag_destroy(sc->cmd_dmat);
-       }
-
-       if (sc->hdr_dmat != NULL) {
-               for (i = 0; i < IPW_NDATA; i++)
-                       bus_dmamap_destroy(sc->hdr_dmat, sc->shdr_list[i].map);
-               bus_dma_tag_destroy(sc->hdr_dmat);
-       }
-
-       if (sc->txbuf_dmat != NULL) {
-               for (i = 0; i < IPW_NDATA; i++) {
-                       bus_dmamap_destroy(sc->txbuf_dmat,
-                           sc->tx_sbuf_list[i].map);
-               }
-               bus_dma_tag_destroy(sc->txbuf_dmat);
-       }
-
-       if (sc->rxbuf_dmat != NULL) {
-               for (i = 0; i < IPW_NRBD; i++) {
-                       sbuf = &sc->rx_sbuf_list[i];
-                       if (sbuf->m != NULL) {
-                               bus_dmamap_sync(sc->rxbuf_dmat, sbuf->map,
-                                   BUS_DMASYNC_POSTREAD);
-                               bus_dmamap_unload(sc->rxbuf_dmat, sbuf->map);
-                               m_freem(sbuf->m);
-                       }
-                       bus_dmamap_destroy(sc->rxbuf_dmat, sbuf->map);
-               }
-               bus_dma_tag_destroy(sc->rxbuf_dmat);
-       }
-}
-
-static int
-ipw_shutdown(device_t dev)
-{
-       struct ipw_softc *sc = device_get_softc(dev);
-       struct ifnet *ifp = &sc->sc_ic.ic_if;
-
-       lwkt_serialize_enter(ifp->if_serializer);
-       ipw_stop(sc);
-       lwkt_serialize_exit(ifp->if_serializer);
-
-       return 0;
-}
-
-static int
-ipw_suspend(device_t dev)
-{
-       struct ipw_softc *sc = device_get_softc(dev);
-       struct ifnet *ifp = &sc->sc_ic.ic_if;
-
-       lwkt_serialize_enter(ifp->if_serializer);
-       ipw_stop(sc);
-       lwkt_serialize_exit(ifp->if_serializer);
-
-       return 0;
-}
-
-static int
-ipw_resume(device_t dev)
-{
-       struct ipw_softc *sc = device_get_softc(dev);
-       struct ifnet *ifp = &sc->sc_ic.ic_if;
-
-       lwkt_serialize_enter(ifp->if_serializer);
-       pci_write_config(dev, 0x41, 0, 1);
-
-       if (ifp->if_flags & IFF_UP) {
-               ifp->if_init(ifp->if_softc);
-               if (ifp->if_flags & IFF_RUNNING)
-                       ifp->if_start(ifp);
-       }
-       lwkt_serialize_exit(ifp->if_serializer);
-
-       return 0;
-}
-
-static int
-ipw_media_change(struct ifnet *ifp)
-{
-       struct ipw_softc *sc = ifp->if_softc;
-       int error;
-
-       error = ieee80211_media_change(ifp);
-       if (error != ENETRESET)
-               return error;
-
-       if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) == (IFF_UP | IFF_RUNNING))
-               ipw_init(sc);
-
-       return 0;
-}
-
-static void
-ipw_media_status(struct ifnet *ifp, struct ifmediareq *imr)
-{
-       struct ipw_softc *sc = ifp->if_softc;
-       struct ieee80211com *ic = &sc->sc_ic;
-#define N(a)   (sizeof (a) / sizeof (a[0]))
-       static const struct {
-               u_int32_t       val;
-               int             rate;
-       } rates[] = {
-               { IPW_RATE_DS1,   2 },
-               { IPW_RATE_DS2,   4 },
-               { IPW_RATE_DS5,  11 },
-               { IPW_RATE_DS11, 22 },
-       };
-       u_int32_t val, i;
-       int rate;
-
-       imr->ifm_status = IFM_AVALID;
-       imr->ifm_active = IFM_IEEE80211;
-       if (ic->ic_state == IEEE80211_S_RUN)
-               imr->ifm_status |= IFM_ACTIVE;
-
-       /* read current transmission rate from adapter */
-       val = ipw_read_table1(sc, IPW_INFO_CURRENT_TX_RATE) & 0xf;
-
-       /* convert rate to 802.11 rate */
-       for (i = 0; i < N(rates) && rates[i].val != val; i++);
-       rate = (i < N(rates)) ? rates[i].rate : 0;
-
-       imr->ifm_active |= IFM_IEEE80211_11B;
-       imr->ifm_active |= ieee80211_rate2media(ic, rate, IEEE80211_MODE_11B);
-       switch (ic->ic_opmode) {
-       case IEEE80211_M_STA:
-               break;
-
-       case IEEE80211_M_IBSS:
-               imr->ifm_active |= IFM_IEEE80211_IBSS;
-               break;
-
-       case IEEE80211_M_MONITOR:
-               imr->ifm_active |= IFM_IEEE80211_MONITOR;
-               break;
-
-       case IEEE80211_M_AHDEMO:
-       case IEEE80211_M_HOSTAP:
-               /* should not get there */
-               break;
-       }
-#undef N
-}
-
-static int
-ipw_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg __unused)
-{
-       struct ipw_softc *sc = ic->ic_if.if_softc;
-       struct ieee80211_node *ni;
-       uint8_t macaddr[IEEE80211_ADDR_LEN];
-       uint32_t len;
-
-       switch (nstate) {
-       case IEEE80211_S_RUN:
-               DELAY(200); /* firmware needs a short delay here */
-
-               len = IEEE80211_ADDR_LEN;
-               ipw_read_table2(sc, IPW_INFO_CURRENT_BSSID, macaddr, &len);
-               ni = ieee80211_find_node(&ic->ic_scan, macaddr);
-               if (ni == NULL)
-                       break;
-
-               ieee80211_ref_node(ni);
-               ieee80211_sta_join(ic, ni);
-               ieee80211_node_authorize(ni);
-
-               if (ic->ic_opmode == IEEE80211_M_STA)
-                       ieee80211_notify_node_join(ic, ni, 1);
-               break;
-
-       case IEEE80211_S_INIT:
-       case IEEE80211_S_SCAN:
-       case IEEE80211_S_AUTH:
-       case IEEE80211_S_ASSOC:
-               break;
-       }
-
-       ic->ic_state = nstate;
-       return 0;
-}
-
-/*
- * Read 16 bits at address 'addr' from the Microwire EEPROM.
- * DON'T PLAY WITH THIS CODE UNLESS YOU KNOW *EXACTLY* WHAT YOU'RE DOING!
- */
-static u_int16_t
-ipw_read_prom_word(struct ipw_softc *sc, u_int8_t addr)
-{
-       u_int32_t tmp;
-       u_int16_t val;
-       int n;
-
-       /* Clock C once before the first command */
-       IPW_EEPROM_CTL(sc, 0);
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S);
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S | IPW_EEPROM_C);
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S);
-
-       /* Write start bit (1) */
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S | IPW_EEPROM_D);
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S | IPW_EEPROM_D | IPW_EEPROM_C);
-
-       /* Write READ opcode (10) */
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S | IPW_EEPROM_D);
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S | IPW_EEPROM_D | IPW_EEPROM_C);
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S);
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S | IPW_EEPROM_C);
-
-       /* Write address A7-A0 */
-       for (n = 7; n >= 0; n--) {
-               IPW_EEPROM_CTL(sc, IPW_EEPROM_S |
-                   (((addr >> n) & 1) << IPW_EEPROM_SHIFT_D));
-               IPW_EEPROM_CTL(sc, IPW_EEPROM_S |
-                   (((addr >> n) & 1) << IPW_EEPROM_SHIFT_D) | IPW_EEPROM_C);
-       }
-
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S);
-
-       /* Read data Q15-Q0 */
-       val = 0;
-       for (n = 15; n >= 0; n--) {
-               IPW_EEPROM_CTL(sc, IPW_EEPROM_S | IPW_EEPROM_C);
-               IPW_EEPROM_CTL(sc, IPW_EEPROM_S);
-               tmp = MEM_READ_4(sc, IPW_MEM_EEPROM_CTL);
-               val |= ((tmp & IPW_EEPROM_Q) >> IPW_EEPROM_SHIFT_Q) << n;
-       }
-
-       IPW_EEPROM_CTL(sc, 0);
-
-       /* Clear Chip Select and clock C */
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_S);
-       IPW_EEPROM_CTL(sc, 0);
-       IPW_EEPROM_CTL(sc, IPW_EEPROM_C);
-
-       return le16toh(val);
-}
-
-static void
-ipw_command_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf)
-{
-       struct ipw_cmd *cmd;
-
-       bus_dmamap_sync(sc->rxbuf_dmat, sbuf->map, BUS_DMASYNC_POSTREAD);
-
-       cmd = mtod(sbuf->m, struct ipw_cmd *);
-
-       DPRINTFN(2, ("RX!CMD!%u!%u!%u!%u!%u\n",
-           le32toh(cmd->type), le32toh(cmd->subtype), le32toh(cmd->seq),
-           le32toh(cmd->len), le32toh(cmd->status)));
-
-       wakeup(sc);
-}
-
-static void
-ipw_newstate_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf)
-{
-       struct ieee80211com *ic = &sc->sc_ic;
-       u_int32_t state;
-
-       bus_dmamap_sync(sc->rxbuf_dmat, sbuf->map, BUS_DMASYNC_POSTREAD);
-
-       state = le32toh(*mtod(sbuf->m, u_int32_t *));
-
-       DPRINTFN(2, ("RX!NEWSTATE!%u\n", state));
-
-       switch (state) {
-       case IPW_STATE_ASSOCIATED:
-               ieee80211_new_state(ic, IEEE80211_S_RUN, -1);
-               break;
-
-       case IPW_STATE_SCANNING:
-               /* don't leave run state on background scan */
-               if (ic->ic_state != IEEE80211_S_RUN)
-                       ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
-
-               ic->ic_flags |= IEEE80211_F_SCAN;
-               break;
-
-       case IPW_STATE_SCAN_COMPLETE:
-               ieee80211_notify_scan_done(ic);
-               ic->ic_flags &= ~IEEE80211_F_SCAN;
-               break;
-
-       case IPW_STATE_ASSOCIATION_LOST:
-               ieee80211_new_state(ic, IEEE80211_S_INIT, -1);
-               break;
-
-       case IPW_STATE_RADIO_DISABLED:
-               ic->ic_if.if_flags &= ~IFF_UP;
-               ipw_stop(sc);
-               break;
-       }
-}
-
-/*
- * XXX: Hack to set the current channel to the value advertised in beacons or
- * probe responses. Only used during AP detection.
- */
-static void
-ipw_fix_channel(struct ieee80211com *ic, struct mbuf *m)
-{
-       struct ieee80211_frame *wh;
-       uint8_t subtype;
-       uint8_t *frm, *efrm;
-
-       wh = mtod(m, struct ieee80211_frame *);
-
-       if ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_MGT)
-               return;
-
-       subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
-
-       if (subtype != IEEE80211_FC0_SUBTYPE_BEACON &&
-           subtype != IEEE80211_FC0_SUBTYPE_PROBE_RESP)
-               return;
-
-       frm = (uint8_t *)(wh + 1);
-       efrm = mtod(m, uint8_t *) + m->m_len;
-
-       frm += 12;      /* skip tstamp, bintval and capinfo fields */
-       while (frm < efrm) {
-               if (*frm == IEEE80211_ELEMID_DSPARMS)
-#if IEEE80211_CHAN_MAX < 255
-               if (frm[2] <= IEEE80211_CHAN_MAX)
-#endif
-                       ic->ic_curchan = &ic->ic_channels[frm[2]];
-
-               frm += frm[1] + 2;
-       }
-}
-
-static void
-ipw_data_intr(struct ipw_softc *sc, struct ipw_status *status,
-    struct ipw_soft_bd *sbd, struct ipw_soft_buf *sbuf)
-{
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct ifnet *ifp = &ic->ic_if;
-       struct mbuf *mnew, *m;
-       struct ieee80211_frame *wh;
-       struct ieee80211_node *ni;
-       bus_addr_t physaddr;
-       int error;
-
-       DPRINTFN(5, ("RX!DATA!%u!%u\n", le32toh(status->len), status->rssi));
-
-       if (le32toh(status->len) < sizeof (struct ieee80211_frame_min) ||
-           le32toh(status->len) > MCLBYTES) {
-               if_printf(ifp, "bad frame length\n");
-               return;
-       }
-
-       /*
-        * Try to allocate a new mbuf for this ring element and load it before
-        * processing the current mbuf. If the ring element cannot be loaded,
-        * drop the received packet and reuse the old mbuf. In the unlikely
-        * case that the old mbuf can't be reloaded either, explicitly panic.
-        */
-       mnew = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
-       if (mnew == NULL) {
-               ifp->if_ierrors++;
-               return;
-       }
-       bus_dmamap_sync(sc->rxbuf_dmat, sbuf->map, BUS_DMASYNC_POSTREAD);
-       bus_dmamap_unload(sc->rxbuf_dmat, sbuf->map);
-
-       error = bus_dmamap_load(sc->rxbuf_dmat, sbuf->map, mtod(mnew, void *),
-           MCLBYTES, ipw_dma_map_addr, &physaddr, 0);
-       if (error != 0) {
-               m_freem(mnew);
-
-               /* try to reload the old mbuf */
-               error = bus_dmamap_load(sc->rxbuf_dmat, sbuf->map,
-                   mtod(sbuf->m, void *), MCLBYTES, ipw_dma_map_addr,
-                   &physaddr, 0);
-               if (error != 0) /* XXX very unlikely that it will fail... */
-                       panic("%s: could not load old rx mbuf", ifp->if_xname);
-               ifp->if_ierrors++;
-               return;
-       }
-
-       /*
-        * New mbuf successfully loaded, update Rx ring and continue
-        * processing.
-        */
-       m = sbuf->m;
-       sbuf->m = mnew;
-       sbd->bd->physaddr = htole32(physaddr);
-
-       /* finalize mbuf */
-       m->m_pkthdr.rcvif = ifp;
-       m->m_pkthdr.len = m->m_len = le32toh(status->len);
-
-       if (sc->sc_drvbpf != NULL) {
-               struct ipw_rx_radiotap_header *tap = &sc->sc_rxtap;
-
-               tap->wr_flags = 0;
-               tap->wr_antsignal = status->rssi;
-               tap->wr_chan_freq = htole16(ic->ic_ibss_chan->ic_freq);
-               tap->wr_chan_flags = htole16(ic->ic_ibss_chan->ic_flags);
-
-               bpf_ptap(sc->sc_drvbpf, m, tap, sc->sc_rxtap_len);
-       }
-
-       if (ic->ic_state == IEEE80211_S_SCAN)
-               ipw_fix_channel(ic, m);
-
-       wh = mtod(m, struct ieee80211_frame *);
-       ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh);
-
-       /* send the frame to the 802.11 layer */
-       ieee80211_input(ic, m, ni, status->rssi, 0);
-
-       /* node is no longer needed */
-       ieee80211_free_node(ni);
-
-       bus_dmamap_sync(sc->rbd_dmat, sc->rbd_map, BUS_DMASYNC_PREWRITE);
-}
-
-static void
-ipw_notification_intr(struct ipw_softc *sc __unused, struct ipw_soft_buf *sbuf __unused)
-{
-       DPRINTFN(2, ("RX!NOTIFICATION\n"));
-}
-
-static void
-ipw_rx_intr(struct ipw_softc *sc)
-{
-       struct ipw_status *status;
-       struct ipw_soft_bd *sbd;
-       struct ipw_soft_buf *sbuf;
-       u_int32_t r, i;
-
-       if (!(sc->flags & IPW_FLAG_FW_INITED))
-               return;
-
-       r = CSR_READ_4(sc, IPW_CSR_RX_READ_INDEX);
-
-       bus_dmamap_sync(sc->status_dmat, sc->status_map, BUS_DMASYNC_POSTREAD);
-
-       for (i = (sc->rxcur + 1) % IPW_NRBD; i != r; i = (i + 1) % IPW_NRBD) {
-
-               status = &sc->status_list[i];
-               sbd = &sc->srbd_list[i];
-               sbuf = sbd->priv;
-
-               switch (le16toh(status->code) & 0xf) {
-               case IPW_STATUS_CODE_COMMAND:
-                       ipw_command_intr(sc, sbuf);
-                       break;
-
-               case IPW_STATUS_CODE_NEWSTATE:
-                       ipw_newstate_intr(sc, sbuf);
-                       break;
-
-               case IPW_STATUS_CODE_DATA_802_3:
-               case IPW_STATUS_CODE_DATA_802_11:
-                       ipw_data_intr(sc, status, sbd, sbuf);
-                       break;
-
-               case IPW_STATUS_CODE_NOTIFICATION:
-                       ipw_notification_intr(sc, sbuf);
-                       break;
-
-               default:
-                       if_printf(&sc->sc_ic.ic_if, "unknown status code %u\n",
-                                 le16toh(status->code));
-               }
-
-               /* firmware was killed, stop processing received frames */
-               if (!(sc->flags & IPW_FLAG_FW_INITED))
-                       return;
-
-               sbd->bd->flags = 0;
-       }
-       /* Some buffer descriptors may have changed */
-       bus_dmamap_sync(sc->rbd_dmat, sc->rbd_map, BUS_DMASYNC_PREWRITE);
-
-       /* Tell the firmware what we have processed */
-       sc->rxcur = (r == 0) ? IPW_NRBD - 1 : r - 1;
-       CSR_WRITE_4(sc, IPW_CSR_RX_WRITE_INDEX, sc->rxcur);
-}
-
-static void
-ipw_release_sbd(struct ipw_softc *sc, struct ipw_soft_bd *sbd)
-{
-       struct ipw_soft_hdr *shdr;
-       struct ipw_soft_buf *sbuf;
-
-       switch (sbd->type) {
-       case IPW_SBD_TYPE_COMMAND:
-               bus_dmamap_sync(sc->cmd_dmat, sc->cmd_map,
-                   BUS_DMASYNC_POSTWRITE);
-               bus_dmamap_unload(sc->cmd_dmat, sc->cmd_map);
-               break;
-
-       case IPW_SBD_TYPE_HEADER:
-               shdr = sbd->priv;
-               bus_dmamap_sync(sc->hdr_dmat, shdr->map, BUS_DMASYNC_POSTWRITE);
-               bus_dmamap_unload(sc->hdr_dmat, shdr->map);
-               SLIST_INSERT_HEAD(&sc->free_shdr, shdr, next);
-               break;
-
-       case IPW_SBD_TYPE_DATA:
-               sbuf = sbd->priv;
-               bus_dmamap_sync(sc->txbuf_dmat, sbuf->map,
-                   BUS_DMASYNC_POSTWRITE);
-               bus_dmamap_unload(sc->txbuf_dmat, sbuf->map);
-               SLIST_INSERT_HEAD(&sc->free_sbuf, sbuf, next);
-
-               m_freem(sbuf->m);
-               ieee80211_free_node(sbuf->ni);
-
-               /* kill watchdog timer */
-               sc->sc_tx_timer = 0;
-               break;
-       }
-       sbd->type = IPW_SBD_TYPE_NOASSOC;
-}
-
-static void
-ipw_tx_intr(struct ipw_softc *sc)
-{
-       struct ifnet *ifp = &sc->sc_ic.ic_if;
-       u_int32_t r, i;
-
-       if (!(sc->flags & IPW_FLAG_FW_INITED))
-               return;
-
-       r = CSR_READ_4(sc, IPW_CSR_TX_READ_INDEX);
-
-       for (i = (sc->txold + 1) % IPW_NTBD; i != r; i = (i + 1) % IPW_NTBD) {
-               struct ipw_soft_bd *sbd;
-
-               sbd = &sc->stbd_list[i];
-               if (sbd->type == IPW_SBD_TYPE_DATA)
-                       ifp->if_opackets++;
-
-               ipw_release_sbd(sc, sbd);
-               sc->txfree++;
-       }
-
-       /* Remember what the firmware has processed */
-       sc->txold = (r == 0) ? IPW_NTBD - 1 : r - 1;
-
-       /* Call start() since some buffer descriptors have been released */
-       ifp->if_flags &= ~IFF_OACTIVE;
-       (*ifp->if_start)(ifp);
-}
-
-static void
-ipw_intr(void *arg)
-{
-       struct ipw_softc *sc = arg;
-       u_int32_t r;
-
-       if ((r = CSR_READ_4(sc, IPW_CSR_INTR)) == 0 || r == 0xffffffff)
-               return;
-
-       /* Disable interrupts */
-       CSR_WRITE_4(sc, IPW_CSR_INTR_MASK, 0);
-
-       DPRINTFN(8, ("INTR!0x%08x\n", r));
-
-       if (r & (IPW_INTR_FATAL_ERROR | IPW_INTR_PARITY_ERROR)) {
-               if_printf(&sc->sc_ic.ic_if, "fatal error\n");
-               sc->sc_ic.ic_if.if_flags &= ~IFF_UP;
-               ipw_stop(sc);
-       }
-
-       if (r & IPW_INTR_FW_INIT_DONE) {
-               if (!(r & (IPW_INTR_FATAL_ERROR | IPW_INTR_PARITY_ERROR)))
-                       wakeup(sc);
-       }
-
-       if (r & IPW_INTR_RX_TRANSFER)
-               ipw_rx_intr(sc);
-
-       if (r & IPW_INTR_TX_TRANSFER)
-               ipw_tx_intr(sc);
-
-       /* Acknowledge interrupts */
-       CSR_WRITE_4(sc, IPW_CSR_INTR, r);
-
-       /* Re-enable interrupts */
-       CSR_WRITE_4(sc, IPW_CSR_INTR_MASK, IPW_INTR_MASK);
-}
-
-static void
-ipw_dma_map_txbuf(void *arg, bus_dma_segment_t *segs, int nseg,
-    bus_size_t mapsize, int error)
-{
-       struct ipw_dma_mapping *map = arg;
-
-       if (error != 0)
-               return;
-
-       KASSERT(nseg <= IPW_MAX_NSEG, ("too many DMA segments %d", nseg));
-
-       bcopy(segs, map->segs, nseg * sizeof (bus_dma_segment_t));
-       map->nseg = nseg;
-       map->mapsize = mapsize;
-}
-
-static void
-ipw_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nseg __unused, int error)
-{
-       if (error != 0)
-               return;
-
-       KASSERT(nseg == 1, ("too many DMA segments, %d should be 1", nseg));
-
-       *(bus_addr_t *)arg = segs[0].ds_addr;
-}
-
-static int
-ipw_cmd(struct ipw_softc *sc, u_int32_t type, void *data, u_int32_t len)
-{
-       struct ifnet *ifp = &sc->sc_ic.ic_if;
-       struct ipw_soft_bd *sbd;
-       bus_addr_t physaddr;
-       int error;
-
-       sbd = &sc->stbd_list[sc->txcur];
-
-       error = bus_dmamap_load(sc->cmd_dmat, sc->cmd_map, &sc->cmd,
-           sizeof (struct ipw_cmd), ipw_dma_map_addr, &physaddr, 0);
-       if (error != 0) {
-               if_printf(&sc->sc_ic.ic_if,
-                         "could not map command DMA memory\n");
-               return error;
-       }
-
-       sc->cmd.type = htole32(type);
-       sc->cmd.subtype = htole32(0);
-       sc->cmd.len = htole32(len);
-       sc->cmd.seq = htole32(0);
-       if (data != NULL)
-               bcopy(data, sc->cmd.data, len);
-
-       sbd->type = IPW_SBD_TYPE_COMMAND;
-       sbd->bd->physaddr = htole32(physaddr);
-       sbd->bd->len = htole32(sizeof (struct ipw_cmd));
-       sbd->bd->nfrag = 1;
-       sbd->bd->flags = IPW_BD_FLAG_TX_FRAME_COMMAND |
-                        IPW_BD_FLAG_TX_LAST_FRAGMENT;
-
-       bus_dmamap_sync(sc->cmd_dmat, sc->cmd_map, BUS_DMASYNC_PREWRITE);
-       bus_dmamap_sync(sc->tbd_dmat, sc->tbd_map, BUS_DMASYNC_PREWRITE);
-
-       /* kick firmware */
-       sc->txcur = (sc->txcur + 1) % IPW_NTBD;
-       sc->txfree--;
-       CSR_WRITE_4(sc, IPW_CSR_TX_WRITE_INDEX, sc->txcur);
-
-       /*
-        * This is kinda messy.  Since we may be MP, a combination of
-        * a critical section for a local cpu interrupt and 
-        * tsleep_interlock() for a remote cpu interrupt is required to
-        * avoid command completion racing the tsleep.
-        */
-       crit_enter();
-       tsleep_interlock(sc);
-       CSR_WRITE_4(sc, IPW_CSR_TX_WRITE_INDEX, sc->txcur);
-       lwkt_serialize_exit(ifp->if_serializer);
-       error = tsleep(sc, 0, "ipwcmd", hz);
-       crit_exit();
-       lwkt_serialize_enter(ifp->if_serializer);
-       return (error);
-}
-
-static int
-ipw_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni)
-{
-       struct ipw_softc *sc = ifp->if_softc;
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct ieee80211_frame *wh;
-       struct ipw_dma_mapping map;
-       struct ipw_soft_bd *sbd;
-       struct ipw_soft_hdr *shdr;
-       struct ipw_soft_buf *sbuf;
-       struct mbuf *mnew;
-       bus_addr_t physaddr;
-       int error, i;
-
-       wh = mtod(m0, struct ieee80211_frame *);
-       if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
-               if (ieee80211_crypto_encap(ic, ni, m0) == NULL) {
-                       m_freem(m0);
-                       return ENOBUFS;
-               }
-
-               /* packet header may have moved, reset our local pointer */
-               wh = mtod(m0, struct ieee80211_frame *);
-       }
-
-       if (sc->sc_drvbpf != NULL) {
-               struct ipw_tx_radiotap_header *tap = &sc->sc_txtap;
-
-               tap->wt_flags = 0;
-               tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq);
-               tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags);
-
-               bpf_ptap(sc->sc_drvbpf, m0, tap, sc->sc_txtap_len);
-       }
-
-       shdr = SLIST_FIRST(&sc->free_shdr);
-       sbuf = SLIST_FIRST(&sc->free_sbuf);
-       KASSERT(shdr != NULL && sbuf != NULL, ("empty sw hdr/buf pool"));
-
-       shdr->hdr.type = htole32(IPW_HDR_TYPE_SEND);
-       shdr->hdr.subtype = htole32(0);
-       shdr->hdr.encrypted = (wh->i_fc[1] & IEEE80211_FC1_WEP) ? 1 : 0;
-       shdr->hdr.encrypt = 0;
-       shdr->hdr.keyidx = 0;
-       shdr->hdr.keysz = 0;
-       shdr->hdr.fragmentsz = htole16(0);
-       IEEE80211_ADDR_COPY(shdr->hdr.src_addr, wh->i_addr2);
-       if (ic->ic_opmode == IEEE80211_M_STA)
-               IEEE80211_ADDR_COPY(shdr->hdr.dst_addr, wh->i_addr3);
-       else
-               IEEE80211_ADDR_COPY(shdr->hdr.dst_addr, wh->i_addr1);
-
-       /* trim IEEE802.11 header */
-       m_adj(m0, sizeof (struct ieee80211_frame));
-
-       error = bus_dmamap_load_mbuf(sc->txbuf_dmat, sbuf->map, m0,
-           ipw_dma_map_txbuf, &map, 0);
-       if (error != 0 && error != EFBIG) {
-               if_printf(ifp, "could not map mbuf (error %d)\n", error);
-               m_freem(m0);
-               return error;
-       }
-       if (error != 0) {
-               mnew = m_defrag(m0, MB_DONTWAIT);
-               if (mnew == NULL) {
-                       if_printf(ifp, "could not defragment mbuf\n");
-                       m_freem(m0);
-                       return ENOBUFS;
-               }
-               m0 = mnew;
-
-               error = bus_dmamap_load_mbuf(sc->txbuf_dmat, sbuf->map, m0,
-                   ipw_dma_map_txbuf, &map, 0);
-               if (error != 0) {
-                       if_printf(ifp,
-                                 "could not map mbuf (error %d)\n", error);
-                       m_freem(m0);
-                       return error;
-               }
-       }
-
-       error = bus_dmamap_load(sc->hdr_dmat, shdr->map, &shdr->hdr,
-           sizeof (struct ipw_hdr), ipw_dma_map_addr, &physaddr, 0);
-       if (error != 0) {
-               if_printf(ifp, "could not map header DMA memory\n");
-               bus_dmamap_unload(sc->txbuf_dmat, sbuf->map);
-               m_freem(m0);
-               return error;
-       }
-
-       SLIST_REMOVE_HEAD(&sc->free_sbuf, next);
-       SLIST_REMOVE_HEAD(&sc->free_shdr, next);
-
-       sbd = &sc->stbd_list[sc->txcur];
-       sbd->type = IPW_SBD_TYPE_HEADER;
-       sbd->priv = shdr;
-       sbd->bd->physaddr = htole32(physaddr);
-       sbd->bd->len = htole32(sizeof (struct ipw_hdr));
-       sbd->bd->nfrag = 1 + map.nseg;
-       sbd->bd->flags = IPW_BD_FLAG_TX_FRAME_802_3 |
-                        IPW_BD_FLAG_TX_NOT_LAST_FRAGMENT;
-
-       DPRINTFN(5, ("TX!HDR!%u!%u!%u!%u!%6D!%6D\n", shdr->hdr.type,
-           shdr->hdr.subtype, shdr->hdr.encrypted, shdr->hdr.encrypt,
-           shdr->hdr.src_addr, ":", shdr->hdr.dst_addr, ":"));
-       sc->txcur = (sc->txcur + 1) % IPW_NTBD;
-       sc->txfree--;
-
-       sbuf->m = m0;
-       sbuf->ni = ni;
-
-       for (i = 0; i < map.nseg; i++) {
-               sbd = &sc->stbd_list[sc->txcur];
-
-               sbd->bd->physaddr = htole32(map.segs[i].ds_addr);
-               sbd->bd->len = htole32(map.segs[i].ds_len);
-               sbd->bd->nfrag = 0; /* used only in first bd */
-               sbd->bd->flags = IPW_BD_FLAG_TX_FRAME_802_3;
-               if (i == map.nseg - 1) {
-                       sbd->type = IPW_SBD_TYPE_DATA;
-                       sbd->priv = sbuf;
-                       sbd->bd->flags |= IPW_BD_FLAG_TX_LAST_FRAGMENT;
-               } else {
-                       sbd->type = IPW_SBD_TYPE_NOASSOC;
-                       sbd->bd->flags |= IPW_BD_FLAG_TX_NOT_LAST_FRAGMENT;
-               }
-
-               DPRINTFN(5, ("TX!FRAG!%d!%d\n", i, map.segs[i].ds_len));
-               sc->txcur = (sc->txcur + 1) % IPW_NTBD;
-               sc->txfree--;
-       }
-
-       bus_dmamap_sync(sc->hdr_dmat, shdr->map, BUS_DMASYNC_PREWRITE);
-       bus_dmamap_sync(sc->txbuf_dmat, sbuf->map, BUS_DMASYNC_PREWRITE);
-       bus_dmamap_sync(sc->tbd_dmat, sc->tbd_map, BUS_DMASYNC_PREWRITE);
-
-       /* Inform firmware about this new packet */
-       CSR_WRITE_4(sc, IPW_CSR_TX_WRITE_INDEX, sc->txcur);
-
-       return 0;
-}
-
-static void
-ipw_start(struct ifnet *ifp)
-{
-       struct ipw_softc *sc = ifp->if_softc;
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct mbuf *m0;
-       struct ieee80211_node *ni;
-
-       if (ic->ic_state != IEEE80211_S_RUN)
-               return;
-
-       IF_POLL(&ic->ic_mgtq, m0);
-       if (m0 != NULL)
-               ieee80211_drain_mgtq(&ic->ic_mgtq);
-
-       for (;;) {
-               struct ether_header *eh;
-
-               m0 = ifq_poll(&ifp->if_snd);
-               if (m0 == NULL)
-                       break;
-               if (sc->txfree < 1 + IPW_MAX_NSEG) {
-                       ifp->if_flags |= IFF_OACTIVE;
-                       break;
-               }
-               ifq_dequeue(&ifp->if_snd, m0);
-
-               if (m0->m_len < sizeof (struct ether_header) &&
-                   (m0 = m_pullup(m0, sizeof (struct ether_header))) == NULL)
-                       continue;
-
-               eh = mtod(m0, struct ether_header *);
-               ni = ieee80211_find_txnode(ic, eh->ether_dhost);
-               if (ni == NULL) {
-                       m_freem(m0);
-                       continue;
-               }
-
-               BPF_MTAP(ifp, m0);
-
-               m0 = ieee80211_encap(ic, m0, ni);
-               if (m0 == NULL) {
-                       ieee80211_free_node(ni);
-                       continue;
-               }
-
-               if (ic->ic_rawbpf != NULL)
-                       bpf_mtap(ic->ic_rawbpf, m0);
-
-               if (ipw_tx_start(ifp, m0, ni) != 0) {
-                       ieee80211_free_node(ni);
-                       ifp->if_oerrors++;
-                       break;
-               }
-
-               /* start watchdog timer */
-               sc->sc_tx_timer = 5;
-               ifp->if_timer = 1;
-       }
-}
-
-static void
-ipw_watchdog(struct ifnet *ifp)
-{
-       struct ipw_softc *sc = ifp->if_softc;
-
-       ifp->if_timer = 0;
-
-       if (sc->sc_tx_timer > 0) {
-               if (--sc->sc_tx_timer == 0) {
-                       if_printf(ifp, "device timeout\n");
-                       ifp->if_oerrors++;
-                       ifp->if_flags &= ~IFF_UP;
-                       ipw_stop(sc);
-                       return;
-               }
-               ifp->if_timer = 1;
-       }
-
-       ieee80211_watchdog(&sc->sc_ic);
-}
-
-static int
-ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
-{
-       struct ipw_softc *sc = ifp->if_softc;
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct ifreq *ifr;
-       int error = 0;
-
-       switch (cmd) {
-       case SIOCSIFFLAGS:
-               if (ifp->if_flags & IFF_UP) {
-                       if (!(ifp->if_flags & IFF_RUNNING))
-                               ipw_init(sc);
-               } else {
-                       if (ifp->if_flags & IFF_RUNNING)
-                               ipw_stop(sc);
-               }
-               break;
-
-       case SIOCSLOADFW:
-               /* only super-user can do that! */
-               if ((error = suser(curthread)) != 0)
-                       break;
-
-               ifr = (struct ifreq *)data;
-               error = ipw_cache_firmware(sc, ifr->ifr_data);
-               break;
-
-       case SIOCSKILLFW:
-               /* only super-user can do that! */
-               if ((error = suser(curthread)) != 0)
-                       break;
-
-               ifp->if_flags &= ~IFF_UP;
-               ipw_stop(sc);
-               ipw_free_firmware(sc);
-               break;
-
-       default:
-               error = ieee80211_ioctl(ic, cmd, data, cr);
-       }
-
-       if (error == ENETRESET) {
-               if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) ==
-                   (IFF_UP | IFF_RUNNING))
-                       ipw_init(sc);
-               error = 0;
-       }
-
-       return error;
-}
-
-static void
-ipw_stop_master(struct ipw_softc *sc)
-{
-       int ntries;
-
-       /* Disable interrupts */
-       CSR_WRITE_4(sc, IPW_CSR_INTR_MASK, 0);
-
-       CSR_WRITE_4(sc, IPW_CSR_RST, IPW_RST_STOP_MASTER);
-       for (ntries = 0; ntries < 50; ntries++) {
-               if (CSR_READ_4(sc, IPW_CSR_RST) & IPW_RST_MASTER_DISABLED)
-                       break;
-               DELAY(10);
-       }
-       if (ntries == 50)
-               if_printf(&sc->sc_ic.ic_if, "timeout waiting for master\n");
-
-       CSR_WRITE_4(sc, IPW_CSR_RST, CSR_READ_4(sc, IPW_CSR_RST) |
-           IPW_RST_PRINCETON_RESET);
-
-       sc->flags &= ~IPW_FLAG_FW_INITED;
-}
-
-static int
-ipw_reset(struct ipw_softc *sc)
-{
-       int ntries;
-
-       ipw_stop_master(sc);
-
-       /* Move adapter to D0 state */
-       CSR_WRITE_4(sc, IPW_CSR_CTL, CSR_READ_4(sc, IPW_CSR_CTL) |
-           IPW_CTL_INIT);
-
-       /* Wait for clock stabilization */
-       for (ntries = 0; ntries < 1000; ntries++) {
-               if (CSR_READ_4(sc, IPW_CSR_CTL) & IPW_CTL_CLOCK_READY)
-                       break;
-               DELAY(200);
-       }
-       if (ntries == 1000)
-               return EIO;
-
-       CSR_WRITE_4(sc, IPW_CSR_RST, CSR_READ_4(sc, IPW_CSR_RST) |
-           IPW_RST_SW_RESET);
-
-       DELAY(10);
-
-       CSR_WRITE_4(sc, IPW_CSR_CTL, CSR_READ_4(sc, IPW_CSR_CTL) |
-           IPW_CTL_INIT);
-
-       return 0;
-}
-
-static int
-ipw_load_ucode(struct ipw_softc *sc, u_char *uc, int size)
-{
-       int ntries;
-
-       MEM_WRITE_4(sc, 0x3000e0, 0x80000000);
-       CSR_WRITE_4(sc, IPW_CSR_RST, 0);
-
-       MEM_WRITE_2(sc, 0x220000, 0x0703);
-       MEM_WRITE_2(sc, 0x220000, 0x0707);
-
-       MEM_WRITE_1(sc, 0x210014, 0x72);
-       MEM_WRITE_1(sc, 0x210014, 0x72);
-
-       MEM_WRITE_1(sc, 0x210000, 0x40);
-       MEM_WRITE_1(sc, 0x210000, 0x00);
-       MEM_WRITE_1(sc, 0x210000, 0x40);
-
-       MEM_WRITE_MULTI_1(sc, 0x210010, uc, size);
-
-       MEM_WRITE_1(sc, 0x210000, 0x00);
-       MEM_WRITE_1(sc, 0x210000, 0x00);
-       MEM_WRITE_1(sc, 0x210000, 0x80);
-
-       MEM_WRITE_2(sc, 0x220000, 0x0703);
-       MEM_WRITE_2(sc, 0x220000, 0x0707);
-
-       MEM_WRITE_1(sc, 0x210014, 0x72);
-       MEM_WRITE_1(sc, 0x210014, 0x72);
-
-       MEM_WRITE_1(sc, 0x210000, 0x00);
-       MEM_WRITE_1(sc, 0x210000, 0x80);
-
-       for (ntries = 0; ntries < 100; ntries++) {
-               if (MEM_READ_1(sc, 0x210000) & 1)
-                       break;
-               DELAY(1000);
-       }
-       if (ntries == 100) {
-               if_printf(&sc->sc_ic.ic_if,
-                         "timeout waiting for ucode to initialize\n");
-               return EIO;
-       }
-
-       MEM_WRITE_4(sc, 0x3000e0, 0);
-
-       return 0;
-}
-
-/* set of macros to handle unaligned little endian data in firmware image */
-#define GETLE32(p) ((p)[0] | (p)[1] << 8 | (p)[2] << 16 | (p)[3] << 24)
-#define GETLE16(p) ((p)[0] | (p)[1] << 8)
-static int
-ipw_load_firmware(struct ipw_softc *sc, u_char *fw, int size)
-{
-       struct ifnet *ifp = &sc->sc_ic.ic_if;
-       u_char *p, *end;
-       u_int32_t dst;
-       u_int16_t len;
-       int error;
-
-       p = fw;
-       end = fw + size;
-       while (p < end) {
-               if (p + 6 > end)
-                       return EINVAL;
-
-               dst = GETLE32(p); p += 4;
-               len = GETLE16(p); p += 2;
-
-               if (p + len > end)
-                       return EINVAL;
-
-               ipw_write_mem_1(sc, dst, p, len);
-               p += len;
-       }
-
-       CSR_WRITE_4(sc, IPW_CSR_IO, IPW_IO_GPIO1_ENABLE | IPW_IO_GPIO3_MASK |
-           IPW_IO_LED_OFF);
-
-       /* Allow interrupts so we know when the firmware is inited */
-       CSR_WRITE_4(sc, IPW_CSR_INTR_MASK, IPW_INTR_MASK);
-
-       /*
-        * Tell the adapter to initialize the firmware.
-        *
-        * This is kinda messy.  Since we may be MP, a combination of
-        * a critical section for a local cpu interrupt and 
-        * tsleep_interlock() for a remote cpu interrupt is required to
-        * avoid command completion racing the tsleep.
-        */
-       crit_enter();
-       CSR_WRITE_4(sc, IPW_CSR_RST, 0);
-       CSR_WRITE_4(sc, IPW_CSR_CTL, CSR_READ_4(sc, IPW_CSR_CTL) |
-           IPW_CTL_ALLOW_STANDBY);
-
-       tsleep_interlock(sc);
-       lwkt_serialize_exit(ifp->if_serializer);
-       error = tsleep(sc, 0, "ipwinit", hz);
-       crit_exit();
-       lwkt_serialize_enter(ifp->if_serializer);
-       if (error) {
-               if_printf(&sc->sc_ic.ic_if, "timeout waiting for firmware "
-                   "initialization to complete\n");
-               return error;
-       }
-
-       CSR_WRITE_4(sc, IPW_CSR_IO, CSR_READ_4(sc, IPW_CSR_IO) |
-           IPW_IO_GPIO1_MASK | IPW_IO_GPIO3_MASK);
-
-       return 0;
-}
-
-/*
- * Store firmware into kernel memory so we can download it when we need to,
- * e.g when the adapter wakes up from suspend mode.
- */
-static int
-ipw_cache_firmware(struct ipw_softc *sc, void *data)
-{
-       struct ipw_firmware *fw = &sc->fw;
-       struct ipw_firmware_hdr hdr;
-       u_char *p = data;
-       int error;
-
-       ipw_free_firmware(sc);
-
-       /*
-        * mutex(9): no mutexes should be held across functions which access
-        * memory in userspace, such as copyin(9) [...]
-        */
-
-       if ((error = copyin(data, &hdr, sizeof hdr)) != 0)
-               goto fail1;
-
-       fw->main_size  = le32toh(hdr.main_size);
-       fw->ucode_size = le32toh(hdr.ucode_size);
-       p += sizeof hdr;
-
-       fw->main = kmalloc(fw->main_size, M_DEVBUF, M_WAITOK);
-
-       fw->ucode = kmalloc(fw->ucode_size, M_DEVBUF, M_WAITOK);
-
-       if ((error = copyin(p, fw->main, fw->main_size)) != 0)
-               goto fail3;
-
-       p += fw->main_size;
-       if ((error = copyin(p, fw->ucode, fw->ucode_size)) != 0)
-               goto fail3;
-
-       DPRINTF(("Firmware cached: main %u, ucode %u\n", fw->main_size,
-           fw->ucode_size));
-
-       sc->flags |= IPW_FLAG_FW_CACHED;
-
-       return 0;
-
-fail3: kfree(fw->ucode, M_DEVBUF);
-       kfree(fw->main, M_DEVBUF);
-fail1:
-
-       return error;
-}
-
-static void
-ipw_free_firmware(struct ipw_softc *sc)
-{
-       if (!(sc->flags & IPW_FLAG_FW_CACHED))
-               return;
-
-       kfree(sc->fw.main, M_DEVBUF);
-       kfree(sc->fw.ucode, M_DEVBUF);
-
-       sc->flags &= ~IPW_FLAG_FW_CACHED;
-}
-
-static int
-ipw_config(struct ipw_softc *sc)
-{
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct ifnet *ifp = &ic->ic_if;
-       struct ipw_security security;
-       struct ieee80211_key *k;
-       struct ipw_wep_key wepkey;
-       struct ipw_scan_options options;
-       struct ipw_configuration config;
-       u_int32_t data;
-       int error, i;
-
-       switch (ic->ic_opmode) {
-       case IEEE80211_M_STA:
-       case IEEE80211_M_HOSTAP:
-               data = htole32(IPW_MODE_BSS);
-               break;
-
-       case IEEE80211_M_IBSS:
-       case IEEE80211_M_AHDEMO:
-               data = htole32(IPW_MODE_IBSS);
-               break;
-
-       case IEEE80211_M_MONITOR:
-               data = htole32(IPW_MODE_MONITOR);
-               break;
-       }
-       DPRINTF(("Setting mode to %u\n", le32toh(data)));
-       error = ipw_cmd(sc, IPW_CMD_SET_MODE, &data, sizeof data);
-       if (error != 0)
-               return error;
-
-       if (ic->ic_opmode == IEEE80211_M_IBSS ||
-           ic->ic_opmode == IEEE80211_M_MONITOR) {
-               data = htole32(ieee80211_chan2ieee(ic, ic->ic_ibss_chan));
-               DPRINTF(("Setting channel to %u\n", le32toh(data)));
-               error = ipw_cmd(sc, IPW_CMD_SET_CHANNEL, &data, sizeof data);
-               if (error != 0)
-                       return error;
-       }
-
-       if (ic->ic_opmode == IEEE80211_M_MONITOR) {
-               DPRINTF(("Enabling adapter\n"));
-               return ipw_cmd(sc, IPW_CMD_ENABLE, NULL, 0);
-       }
-
-       IEEE80211_ADDR_COPY(((struct arpcom *)ifp)->ac_enaddr, ic->ic_myaddr);
-       IEEE80211_ADDR_COPY(IF_LLADDR(ifp), ic->ic_myaddr);
-       DPRINTF(("Setting MAC address to %6D\n", ic->ic_myaddr, ":"));
-       error = ipw_cmd(sc, IPW_CMD_SET_MAC_ADDRESS, ic->ic_myaddr,
-           IEEE80211_ADDR_LEN);
-       if (error != 0)
-               return error;
-
-       config.flags = htole32(IPW_CFG_BSS_MASK | IPW_CFG_IBSS_MASK |
-           IPW_CFG_PREAMBLE_AUTO | IPW_CFG_802_1x_ENABLE);
-       if (ic->ic_opmode == IEEE80211_M_IBSS)
-               config.flags |= htole32(IPW_CFG_IBSS_AUTO_START);
-       if (ifp->if_flags & IFF_PROMISC)
-               config.flags |= htole32(IPW_CFG_PROMISCUOUS);
-       config.bss_chan = htole32(0x3fff); /* channels 1-14 */
-       config.ibss_chan = htole32(0x7ff); /* channels 1-11 */
-       DPRINTF(("Setting configuration to 0x%x\n", le32toh(config.flags)));
-       error = ipw_cmd(sc, IPW_CMD_SET_CONFIGURATION, &config, sizeof config);
-       if (error != 0)
-               return error;
-
-       data = htole32(0x3); /* 1, 2 */
-       DPRINTF(("Setting basic tx rates to 0x%x\n", le32toh(data)));
-       error = ipw_cmd(sc, IPW_CMD_SET_BASIC_TX_RATES, &data, sizeof data);
-       if (error != 0)
-               return error;
-
-       data = htole32(0xf); /* 1, 2, 5.5, 11 */
-       DPRINTF(("Setting tx rates to 0x%x\n", le32toh(data)));
-       error = ipw_cmd(sc, IPW_CMD_SET_TX_RATES, &data, sizeof data);
-       if (error != 0)
-               return error;
-
-       data = htole32(IPW_POWER_MODE_CAM);
-       DPRINTF(("Setting power mode to %u\n", le32toh(data)));
-       error = ipw_cmd(sc, IPW_CMD_SET_POWER_MODE, &data, sizeof data);
-       if (error != 0)
-               return error;
-
-       if (ic->ic_opmode == IEEE80211_M_IBSS) {
-               data = htole32(32); /* default value */
-               DPRINTF(("Setting tx power index to %u\n", le32toh(data)));
-               error = ipw_cmd(sc, IPW_CMD_SET_TX_POWER_INDEX, &data,
-                   sizeof data);
-               if (error != 0)
-                       return error;
-       }
-
-       data = htole32(ic->ic_rtsthreshold);
-       DPRINTF(("Setting RTS threshold to %u\n", le32toh(data)));
-       error = ipw_cmd(sc, IPW_CMD_SET_RTS_THRESHOLD, &data, sizeof data);
-       if (error != 0)
-               return error;
-
-       data = htole32(ic->ic_fragthreshold);
-       DPRINTF(("Setting frag threshold to %u\n", le32toh(data)));
-       error = ipw_cmd(sc, IPW_CMD_SET_FRAG_THRESHOLD, &data, sizeof data);
-       if (error != 0)
-               return error;
-
-#ifdef IPW_DEBUG
-       if (ipw_debug > 0) {
-               kprintf("Setting ESSID to ");
-               ieee80211_print_essid(ic->ic_des_essid, ic->ic_des_esslen);
-               kprintf("\n");
-       }
-#endif
-       error = ipw_cmd(sc, IPW_CMD_SET_ESSID, ic->ic_des_essid,
-           ic->ic_des_esslen);
-       if (error != 0)
-               return error;
-
-       /* no mandatory BSSID */
-       DPRINTF(("Setting mandatory BSSID to null\n"));
-       error = ipw_cmd(sc, IPW_CMD_SET_MANDATORY_BSSID, NULL, 0);
-       if (error != 0)
-               return error;
-
-       if (ic->ic_flags & IEEE80211_F_DESBSSID) {
-               DPRINTF(("Setting desired BSSID to %6D\n", ic->ic_des_bssid,
-                   ":"));
-               error = ipw_cmd(sc, IPW_CMD_SET_DESIRED_BSSID,
-                   ic->ic_des_bssid, IEEE80211_ADDR_LEN);
-               if (error != 0)
-                       return error;
-       }
-
-       bzero(&security, sizeof security);
-       security.authmode = (ic->ic_bss->ni_authmode == IEEE80211_AUTH_SHARED) ?
-           IPW_AUTH_SHARED : IPW_AUTH_OPEN;
-       security.ciphers = htole32(IPW_CIPHER_NONE);
-       DPRINTF(("Setting authmode to %u\n", security.authmode));
-       error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFORMATION, &security,
-           sizeof security);
-       if (error != 0)
-               return error;
-
-       if (ic->ic_flags & IEEE80211_F_PRIVACY) {
-               k = ic->ic_crypto.cs_nw_keys;
-               for (i = 0; i < IEEE80211_WEP_NKID; i++, k++) {
-                       if (k->wk_keylen == 0)
-                               continue;
-
-                       wepkey.idx = i;
-                       wepkey.len = k->wk_keylen;
-                       bzero(wepkey.key, sizeof wepkey.key);
-                       bcopy(k->wk_key, wepkey.key, k->wk_keylen);
-                       DPRINTF(("Setting wep key index %u len %u\n",
-                           wepkey.idx, wepkey.len));
-                       error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY, &wepkey,
-                           sizeof wepkey);
-                       if (error != 0)
-                               return error;
-               }
-
-               data = htole32(ic->ic_crypto.cs_def_txkey);
-               DPRINTF(("Setting wep tx key index to %u\n", le32toh(data)));
-               error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data,
-                   sizeof data);
-               if (error != 0)
-                       return error;
-       }
-
-       data = htole32((ic->ic_flags & IEEE80211_F_PRIVACY) ? IPW_WEPON : 0);
-       DPRINTF(("Setting wep flags to 0x%x\n", le32toh(data)));
-       error = ipw_cmd(sc, IPW_CMD_SET_WEP_FLAGS, &data, sizeof data);
-       if (error != 0)
-               return error;
-
-#if 0
-       struct ipw_wpa_ie ie;
-
-       memset(&ie, 0, sizeof ie);
-       ie.len = htole32(sizeof (struct ieee80211_ie_wpa));
-       DPRINTF(("Setting wpa ie\n"));
-       error = ipw_cmd(sc, IPW_CMD_SET_WPA_IE, &ie, sizeof ie);
-       if (error != 0)
-               return error;
-#endif
-
-       if (ic->ic_opmode == IEEE80211_M_IBSS ||
-           ic->ic_opmode == IEEE80211_M_HOSTAP) {
-               data = htole32(ic->ic_bintval);
-               DPRINTF(("Setting beacon interval to %u\n", le32toh(data)));
-               error = ipw_cmd(sc, IPW_CMD_SET_BEACON_INTERVAL, &data,
-                   sizeof data);
-               if (error != 0)
-                       return error;
-       }
-
-       options.flags = htole32(0);
-       options.channels = htole32(0x3fff); /* scan channels 1-14 */
-       DPRINTF(("Setting scan options to 0x%x\n", le32toh(options.flags)));
-       error = ipw_cmd(sc, IPW_CMD_SET_SCAN_OPTIONS, &options, sizeof options);
-       if (error != 0)
-               return error;
-
-       /* finally, enable adapter (start scanning for an access point) */
-       DPRINTF(("Enabling adapter\n"));
-       return ipw_cmd(sc, IPW_CMD_ENABLE, NULL, 0);
-}
-
-static void
-ipw_init(void *priv)
-{
-       struct ipw_softc *sc = priv;
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct ifnet *ifp = &ic->ic_if;
-       struct ipw_firmware *fw = &sc->fw;
-
-       /* exit immediately if firmware has not been ioctl'd */
-       if (!(sc->flags & IPW_FLAG_FW_CACHED)) {
-               if (!(sc->flags & IPW_FLAG_FW_WARNED))
-                       if_printf(ifp, "Please load firmware\n");
-               sc->flags |= IPW_FLAG_FW_WARNED;
-               ifp->if_flags &= ~IFF_UP;
-               return;
-       }
-
-       ipw_stop(sc);
-
-       if (ipw_reset(sc) != 0) {
-               if_printf(ifp, "could not reset adapter\n");
-               goto fail;
-       }
-
-       if (ipw_load_ucode(sc, fw->ucode, fw->ucode_size) != 0) {
-               if_printf(ifp, "could not load microcode\n");
-               goto fail;
-       }
-
-       ipw_stop_master(sc);
-
-       /*
-        * Setup tx, rx and status rings
-        */
-       CSR_WRITE_4(sc, IPW_CSR_TX_BD_BASE, sc->tbd_phys);
-       CSR_WRITE_4(sc, IPW_CSR_TX_BD_SIZE, IPW_NTBD);
-       CSR_WRITE_4(sc, IPW_CSR_TX_READ_INDEX, 0);
-       CSR_WRITE_4(sc, IPW_CSR_TX_WRITE_INDEX, 0);
-       sc->txold = IPW_NTBD - 1; /* latest bd index ack'ed by firmware */
-       sc->txcur = 0; /* bd index to write to */
-       sc->txfree = IPW_NTBD - 2;
-
-       CSR_WRITE_4(sc, IPW_CSR_RX_BD_BASE, sc->rbd_phys);
-       CSR_WRITE_4(sc, IPW_CSR_RX_BD_SIZE, IPW_NRBD);
-       CSR_WRITE_4(sc, IPW_CSR_RX_READ_INDEX, 0);
-       CSR_WRITE_4(sc, IPW_CSR_RX_WRITE_INDEX, IPW_NRBD - 1);
-       sc->rxcur = IPW_NRBD - 1; /* latest bd index I've read */
-
-       CSR_WRITE_4(sc, IPW_CSR_RX_STATUS_BASE, sc->status_phys);
-
-       if (ipw_load_firmware(sc, fw->main, fw->main_size) != 0) {
-               if_printf(ifp, "could not load firmware\n");
-               goto fail;
-       }
-
-       sc->flags |= IPW_FLAG_FW_INITED;
-
-       /* Retrieve information tables base addresses */
-       sc->table1_base = CSR_READ_4(sc, IPW_CSR_TABLE1_BASE);
-       sc->table2_base = CSR_READ_4(sc, IPW_CSR_TABLE2_BASE);
-
-       ipw_write_table1(sc, IPW_INFO_LOCK, 0);
-
-       if (ipw_config(sc) != 0) {
-               if_printf(ifp, "device configuration failed\n");
-               goto fail;
-       }
-
-       ifp->if_flags &= ~IFF_OACTIVE;
-       ifp->if_flags |= IFF_RUNNING;
-
-       return;
-
-fail:  ifp->if_flags &= ~IFF_UP;
-       ipw_stop(sc);
-}
-
-static void
-ipw_stop(void *priv)
-{
-       struct ipw_softc *sc = priv;
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct ifnet *ifp = &ic->ic_if;
-       int i;
-
-       ieee80211_new_state(ic, IEEE80211_S_INIT, -1);
-
-       ipw_stop_master(sc);
-       CSR_WRITE_4(sc, IPW_CSR_RST, IPW_RST_SW_RESET);
-
-       /*
-        * Release tx buffers
-        */
-       for (i = 0; i < IPW_NTBD; i++)
-               ipw_release_sbd(sc, &sc->stbd_list[i]);
-
-       sc->sc_tx_timer = 0;
-       ifp->if_timer = 0;
-       ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
-}
-
-static int
-ipw_sysctl_stats(SYSCTL_HANDLER_ARGS)
-{
-       struct ipw_softc *sc = arg1;
-       struct ifnet *ifp = &sc->sc_ic.ic_if;
-       u_int32_t i, size, buf[256];
-
-       (void)arg2; /* silence WARNS == 6 */
-       (void)oidp; /* silence WARNS == 6 */
-
-       lwkt_serialize_enter(ifp->if_serializer);
-
-       if (!(sc->flags & IPW_FLAG_FW_INITED)) {
-               bzero(buf, sizeof buf);
-               goto back;
-       }
-
-       CSR_WRITE_4(sc, IPW_CSR_AUTOINC_ADDR, sc->table1_base);
-
-       size = min(CSR_READ_4(sc, IPW_CSR_AUTOINC_DATA), 256);
-       for (i = 1; i < size; i++)
-               buf[i] = MEM_READ_4(sc, CSR_READ_4(sc, IPW_CSR_AUTOINC_DATA));
-back:
-       lwkt_serialize_exit(ifp->if_serializer);
-       return SYSCTL_OUT(req, buf, sizeof buf);
-}
-
-static int
-ipw_sysctl_radio(SYSCTL_HANDLER_ARGS)
-{
-       struct ipw_softc *sc = arg1;
-       struct ifnet *ifp = &sc->sc_ic.ic_if;
-       int val;
-
-       (void)arg2; /* silence WARNS == 6 */
-       (void)oidp; /* silence WARNS == 6 */
-
-       lwkt_serialize_enter(ifp->if_serializer);
-       val = !((sc->flags & IPW_FLAG_HAS_RADIO_SWITCH) &&
-               (CSR_READ_4(sc, IPW_CSR_IO) & IPW_IO_RADIO_DISABLED));
-       lwkt_serialize_exit(ifp->if_serializer);
-
-       return SYSCTL_OUT(req, &val, sizeof val);
-}
-
-static u_int32_t
-ipw_read_table1(struct ipw_softc *sc, u_int32_t off)
-{
-       return MEM_READ_4(sc, MEM_READ_4(sc, sc->table1_base + off));
-}
-
-static void
-ipw_write_table1(struct ipw_softc *sc, u_int32_t off, u_int32_t info)
-{
-       MEM_WRITE_4(sc, MEM_READ_4(sc, sc->table1_base + off), info);
-}
-
-static int
-ipw_read_table2(struct ipw_softc *sc, u_int32_t off, void *buf, u_int32_t *len)
-{
-       u_int32_t addr, info;
-       u_int16_t count, size;
-       u_int32_t total;
-
-       /* addr[4] + count[2] + size[2] */
-       addr = MEM_READ_4(sc, sc->table2_base + off);
-       info = MEM_READ_4(sc, sc->table2_base + off + 4);
-
-       count = info >> 16;
-       size = info & 0xffff;
-       total = count * size;
-
-       if (total > *len) {
-               *len = total;
-               return EINVAL;
-       }
-
-       *len = total;
-       ipw_read_mem_1(sc, addr, buf, total);
-
-       return 0;
-}
-
-static void
-ipw_read_mem_1(struct ipw_softc *sc, bus_size_t offset, u_int8_t *datap,
-    bus_size_t count)
-{
-       for (; count > 0; offset++, datap++, count--) {
-               CSR_WRITE_4(sc, IPW_CSR_INDIRECT_ADDR, offset & ~3);
-               *datap = CSR_READ_1(sc, IPW_CSR_INDIRECT_DATA + (offset & 3));
-       }
-}
-
-static void
-ipw_write_mem_1(struct ipw_softc *sc, bus_size_t offset, u_int8_t *datap,
-    bus_size_t count)
-{
-       for (; count > 0; offset++, datap++, count--) {
-               CSR_WRITE_4(sc, IPW_CSR_INDIRECT_ADDR, offset & ~3);
-               CSR_WRITE_1(sc, IPW_CSR_INDIRECT_DATA + (offset & 3), *datap);
-       }
-}
diff --git a/sys/dev/netif/ipw/if_ipwreg.h b/sys/dev/netif/ipw/if_ipwreg.h
deleted file mode 100644 (file)
index 0ee26b0..0000000
+++ /dev/null
@@ -1,348 +0,0 @@
-/*-
- * Copyright (c) 2004, 2005
- *      Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: if_ipwreg.h,v 1.2.2.1 2005/01/13 20:01:04 damien Exp $
- * $DragonFly: src/sys/dev/netif/ipw/Attic/if_ipwreg.h,v 1.1 2005/03/06 18:25:12 dillon Exp $
- */
-
-#define IPW_NTBD       128
-#define IPW_TBD_SZ     (IPW_NTBD * sizeof (struct ipw_bd))
-#define IPW_NDATA      (IPW_NTBD / 2)
-#define IPW_NRBD       128
-#define IPW_RBD_SZ     (IPW_NRBD * sizeof (struct ipw_bd))
-#define IPW_STATUS_SZ  (IPW_NRBD * sizeof (struct ipw_status))
-
-#define IPW_CSR_INTR           0x0008
-#define IPW_CSR_INTR_MASK      0x000c
-#define IPW_CSR_INDIRECT_ADDR  0x0010
-#define IPW_CSR_INDIRECT_DATA  0x0014
-#define IPW_CSR_AUTOINC_ADDR   0x0018
-#define IPW_CSR_AUTOINC_DATA   0x001c
-#define IPW_CSR_RST            0x0020
-#define IPW_CSR_CTL            0x0024
-#define IPW_CSR_IO             0x0030
-#define IPW_CSR_TX_BD_BASE     0x0200
-#define IPW_CSR_TX_BD_SIZE     0x0204
-#define IPW_CSR_RX_BD_BASE     0x0240
-#define IPW_CSR_RX_STATUS_BASE 0x0244
-#define IPW_CSR_RX_BD_SIZE     0x0248
-#define IPW_CSR_TX_READ_INDEX  0x0280
-#define IPW_CSR_RX_READ_INDEX  0x02a0
-#define IPW_CSR_TABLE1_BASE    0x0380
-#define IPW_CSR_TABLE2_BASE    0x0384
-#define IPW_CSR_TX_WRITE_INDEX 0x0f80
-#define IPW_CSR_RX_WRITE_INDEX 0x0fa0
-
-/* possible flags for register IPW_CSR_INTR */
-#define IPW_INTR_TX_TRANSFER   0x00000001
-#define IPW_INTR_RX_TRANSFER   0x00000002
-#define IPW_INTR_STATUS_CHANGE 0x00000010
-#define IPW_INTR_COMMAND_DONE  0x00010000
-#define IPW_INTR_FW_INIT_DONE  0x01000000
-#define IPW_INTR_FATAL_ERROR   0x40000000
-#define IPW_INTR_PARITY_ERROR  0x80000000
-
-#define IPW_INTR_MASK                                                  \
-       (IPW_INTR_TX_TRANSFER | IPW_INTR_RX_TRANSFER |                  \
-        IPW_INTR_STATUS_CHANGE | IPW_INTR_COMMAND_DONE |               \
-        IPW_INTR_FW_INIT_DONE | IPW_INTR_FATAL_ERROR |                 \
-        IPW_INTR_PARITY_ERROR)
-
-/* possible flags for register IPW_CSR_RST */
-#define IPW_RST_PRINCETON_RESET        0x00000001
-#define IPW_RST_SW_RESET       0x00000080
-#define IPW_RST_MASTER_DISABLED        0x00000100
-#define IPW_RST_STOP_MASTER    0x00000200
-
-/* possible flags for register IPW_CSR_CTL */
-#define IPW_CTL_CLOCK_READY    0x00000001
-#define IPW_CTL_ALLOW_STANDBY  0x00000002
-#define IPW_CTL_INIT           0x00000004
-
-/* possible flags for register IPW_CSR_IO */
-#define IPW_IO_GPIO1_ENABLE    0x00000008
-#define IPW_IO_GPIO1_MASK      0x0000000c
-#define IPW_IO_GPIO3_MASK      0x000000c0
-#define IPW_IO_LED_OFF         0x00002000
-#define IPW_IO_RADIO_DISABLED  0x00010000
-
-#define IPW_STATE_ASSOCIATED           0x0004
-#define IPW_STATE_ASSOCIATION_LOST     0x0008
-#define IPW_STATE_SCAN_COMPLETE                0x0020
-#define IPW_STATE_RADIO_DISABLED       0x0100
-#define IPW_STATE_DISABLED             0x0200
-#define IPW_STATE_SCANNING             0x0800
-
-/* table1 offsets */
-#define IPW_INFO_LOCK                  480
-#define IPW_INFO_APS_CNT               604
-#define IPW_INFO_APS_BASE              608
-#define IPW_INFO_CARD_DISABLED         628
-#define IPW_INFO_CURRENT_CHANNEL       756
-#define IPW_INFO_CURRENT_TX_RATE       768
-
-/* table2 offsets */
-#define IPW_INFO_CURRENT_SSID  48
-#define IPW_INFO_CURRENT_BSSID 112
-
-/* supported rates */
-#define IPW_RATE_DS1   1
-#define IPW_RATE_DS2   2
-#define IPW_RATE_DS5   4
-#define IPW_RATE_DS11  8
-
-/* firmware binary image header */
-struct ipw_firmware_hdr {
-       u_int32_t       version;
-       u_int32_t       main_size;      /* firmware size */
-       u_int32_t       ucode_size;     /* microcode size */
-} __packed;
-
-/* buffer descriptor */
-struct ipw_bd {
-       u_int32_t       physaddr;
-       u_int32_t       len;
-       u_int8_t        flags;
-#define IPW_BD_FLAG_TX_FRAME_802_3             0x00
-#define IPW_BD_FLAG_TX_NOT_LAST_FRAGMENT       0x01
-#define IPW_BD_FLAG_TX_FRAME_COMMAND           0x02
-#define IPW_BD_FLAG_TX_FRAME_802_11            0x04
-#define IPW_BD_FLAG_TX_LAST_FRAGMENT           0x08
-       u_int8_t        nfrag;  /* number of fragments */
-       u_int8_t        reserved[6];
-} __packed;
-
-/* status */
-struct ipw_status {
-       u_int32_t       len;
-       u_int16_t       code;
-#define IPW_STATUS_CODE_COMMAND                0
-#define IPW_STATUS_CODE_NEWSTATE       1
-#define IPW_STATUS_CODE_DATA_802_11    2
-#define IPW_STATUS_CODE_DATA_802_3     3
-#define IPW_STATUS_CODE_NOTIFICATION   4
-       u_int8_t        flags;
-#define IPW_STATUS_FLAG_DECRYPTED      0x01
-#define IPW_STATUS_FLAG_WEP_ENCRYPTED  0x02
-       u_int8_t        rssi;   /* received signal strength indicator */
-} __packed;
-
-/* data header */
-struct ipw_hdr {
-       u_int32_t       type;
-#define IPW_HDR_TYPE_SEND      33
-       u_int32_t       subtype;
-       u_int8_t        encrypted;
-       u_int8_t        encrypt;
-       u_int8_t        keyidx;
-       u_int8_t        keysz;
-       u_int8_t        key[IEEE80211_KEYBUF_SIZE];
-       u_int8_t        reserved[10];
-       u_int8_t        src_addr[IEEE80211_ADDR_LEN];
-       u_int8_t        dst_addr[IEEE80211_ADDR_LEN];
-       u_int16_t       fragmentsz;
-} __packed;
-
-/* command */
-struct ipw_cmd {
-       u_int32_t       type;
-#define IPW_CMD_ENABLE                         2
-#define IPW_CMD_SET_CONFIGURATION              6
-#define IPW_CMD_SET_ESSID                      8
-#define IPW_CMD_SET_MANDATORY_BSSID            9
-#define IPW_CMD_SET_MAC_ADDRESS                        11
-#define IPW_CMD_SET_MODE                       12
-#define IPW_CMD_SET_CHANNEL                    14
-#define IPW_CMD_SET_RTS_THRESHOLD              15
-#define IPW_CMD_SET_FRAG_THRESHOLD             16
-#define IPW_CMD_SET_POWER_MODE                 17
-#define IPW_CMD_SET_TX_RATES                   18
-#define IPW_CMD_SET_BASIC_TX_RATES             19
-#define IPW_CMD_SET_WEP_KEY                    20
-#define IPW_CMD_SET_WEP_KEY_INDEX              25
-#define IPW_CMD_SET_WEP_FLAGS                  26
-#define IPW_CMD_ADD_MULTICAST                  27
-#define IPW_CMD_SET_BEACON_INTERVAL            29
-#define IPW_CMD_SET_TX_POWER_INDEX             36
-#define IPW_CMD_BROADCAST_SCAN                 43
-#define IPW_CMD_DISABLE                                44
-#define IPW_CMD_SET_DESIRED_BSSID              45
-#define IPW_CMD_SET_SCAN_OPTIONS               46
-#define IPW_CMD_PREPARE_POWER_DOWN             58
-#define IPW_CMD_DISABLE_PHY                    61
-#define IPW_CMD_SET_SECURITY_INFORMATION       67
-       u_int32_t       subtype;
-       u_int32_t       seq;
-       u_int32_t       len;
-       u_int8_t        data[400];
-       u_int32_t       status;
-       u_int8_t        reserved[68];
-} __packed;
-
-/* possible values for command IPW_CMD_SET_POWER_MODE */
-#define IPW_POWER_MODE_CAM     0
-#define IPW_POWER_AUTOMATIC    6
-
-/* possible values for command IPW_CMD_SET_MODE */
-#define IPW_MODE_BSS           0
-#define IPW_MODE_IBSS          1
-#define IPW_MODE_MONITOR       2
-
-/* possible flags for command IPW_CMD_SET_WEP_FLAGS */
-#define IPW_WEPON      0x8
-
-/* structure for command IPW_CMD_SET_WEP_KEY */
-struct ipw_wep_key {
-       u_int8_t        idx;
-       u_int8_t        len;
-       u_int8_t        key[13];
-} __packed;
-
-/* structure for command IPW_CMD_SET_SECURITY_INFORMATION */
-struct ipw_security {
-       u_int32_t       ciphers;
-#define IPW_CIPHER_NONE                0x00000001
-#define IPW_CIPHER_WEP40       0x00000002
-#define IPW_CIPHER_WEP104      0x00000020
-       u_int16_t       reserved1;
-       u_int8_t        authmode;
-#define IPW_AUTH_OPEN  0
-#define IPW_AUTH_SHARED        1
-       u_int16_t       reserved2;
-} __packed;
-
-/* structure for command IPW_CMD_SET_SCAN_OPTIONS */
-struct ipw_scan_options {
-       u_int32_t       flags;
-#define IPW_SCAN_DO_NOT_ASSOCIATE      0x00000001
-#define IPW_SCAN_PASSIVE               0x00000008
-       u_int32_t       channels;
-} __packed;
-
-/* structure for command IPW_CMD_SET_CONFIGURATION */
-struct ipw_configuration {
-       u_int32_t       flags;
-#define IPW_CFG_PROMISCUOUS    0x00000004
-#define IPW_CFG_PREAMBLE_AUTO  0x00000010
-#define IPW_CFG_IBSS_AUTO_START        0x00000020
-#define IPW_CFG_802_1x_ENABLE  0x00004000
-#define IPW_CFG_BSS_MASK       0x00008000
-#define IPW_CFG_IBSS_MASK      0x00010000
-       u_int32_t       bss_chan;
-       u_int32_t       ibss_chan;
-} __packed;
-
-/* element in AP table */
-struct ipw_node {
-       u_int32_t       reserved1[2];
-       u_int8_t        bssid[IEEE80211_ADDR_LEN];
-       u_int8_t        chan;
-       u_int8_t        rates;
-       u_int16_t       reserved2;
-       u_int16_t       capinfo;
-       u_int16_t       reserved3;
-       u_int16_t       intval;
-       u_int8_t        reserved4[28];
-       u_int8_t        essid[IEEE80211_NWID_LEN];
-       u_int16_t       reserved5;
-       u_int8_t        esslen;
-       u_int8_t        reserved6[7];
-       u_int8_t        rssi;
-} __packed;
-
-/* EEPROM = Electrically Erasable Programmable Read-Only Memory */
-
-#define IPW_MEM_EEPROM_CTL     0x00300040
-
-#define IPW_EEPROM_RADIO        0x11
-#define IPW_EEPROM_MAC         0x21
-#define IPW_EEPROM_CHANNEL_LIST        0x37
-
-#define IPW_EEPROM_DELAY       1       /* minimum hold time (microsecond) */
-
-#define IPW_EEPROM_C   (1 << 0)        /* Serial Clock */
-#define IPW_EEPROM_S   (1 << 1)        /* Chip Select */
-#define IPW_EEPROM_D   (1 << 2)        /* Serial data input */
-#define IPW_EEPROM_Q   (1 << 4)        /* Serial data output */
-
-#define IPW_EEPROM_SHIFT_D     2
-#define IPW_EEPROM_SHIFT_Q     4
-
-/*
- * control and status registers access macros
- */
-#define CSR_READ_1(sc, reg)                                            \
-       bus_space_read_1((sc)->sc_st, (sc)->sc_sh, (reg))
-
-#define CSR_READ_2(sc, reg)                                            \
-       bus_space_read_2((sc)->sc_st, (sc)->sc_sh, (reg))
-
-#define CSR_READ_4(sc, reg)                                            \
-       bus_space_read_4((sc)->sc_st, (sc)->sc_sh, (reg))
-
-#define CSR_WRITE_1(sc, reg, val)                                      \
-       bus_space_write_1((sc)->sc_st, (sc)->sc_sh, (reg), (val))
-
-#define CSR_WRITE_2(sc, reg, val)                                      \
-       bus_space_write_2((sc)->sc_st, (sc)->sc_sh, (reg), (val))
-
-#define CSR_WRITE_4(sc, reg, val)                                      \
-       bus_space_write_4((sc)->sc_st, (sc)->sc_sh, (reg), (val))
-
-#define CSR_WRITE_MULTI_1(sc, reg, buf, len)                           \
-       bus_space_write_multi_1((sc)->sc_st, (sc)->sc_sh, (reg),        \
-           (buf), (len))
-
-/*
- * indirect memory space access macros
- */
-#define MEM_WRITE_1(sc, addr, val) do {                                        \
-       CSR_WRITE_4((sc), IPW_CSR_INDIRECT_ADDR, (addr));               \
-       CSR_WRITE_1((sc), IPW_CSR_INDIRECT_DATA, (val));                \
-} while (/* CONSTCOND */0)
-
-#define MEM_WRITE_2(sc, addr, val) do {                                        \
-       CSR_WRITE_4((sc), IPW_CSR_INDIRECT_ADDR, (addr));               \
-       CSR_WRITE_2((sc), IPW_CSR_INDIRECT_DATA, (val));                \
-} while (/* CONSTCOND */0)
-
-#define MEM_WRITE_4(sc, addr, val) do {                                        \
-       CSR_WRITE_4((sc), IPW_CSR_INDIRECT_ADDR, (addr));               \
-       CSR_WRITE_4((sc), IPW_CSR_INDIRECT_DATA, (val));                \
-} while (/* CONSTCOND */0)
-
-#define MEM_WRITE_MULTI_1(sc, addr, buf, len) do {                     \
-       CSR_WRITE_4((sc), IPW_CSR_INDIRECT_ADDR, (addr));               \
-       CSR_WRITE_MULTI_1((sc), IPW_CSR_INDIRECT_DATA, (buf), (len));   \
-} while (/* CONSTCOND */0)
-
-/*
- * EEPROM access macro
- */
-#define IPW_EEPROM_CTL(sc, val) do {                                   \
-       MEM_WRITE_4((sc), IPW_MEM_EEPROM_CTL, (val));                   \
-       DELAY(IPW_EEPROM_DELAY);                                        \
-} while (0)
diff --git a/sys/dev/netif/ipw/if_ipwvar.h b/sys/dev/netif/ipw/if_ipwvar.h
deleted file mode 100644 (file)
index 7281ba0..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * Copyright (c) 2004, 2005
- *      Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: if_ipwvar.h,v 1.2.2.1 2005/01/13 20:01:04 damien Exp $
- * $FreeBSD: src/sys/dev/ipw/if_ipwvar.h,v 1.3 2005/06/10 16:49:11 brooks Exp $
- * $DragonFly: src/sys/dev/netif/ipw/Attic/if_ipwvar.h,v 1.6 2006/05/18 13:51:45 sephe Exp $
- */
-
-struct ipw_firmware {
-       void    *main;
-       int     main_size;
-       void    *ucode;
-       int     ucode_size;
-};
-
-struct ipw_soft_bd {
-       struct ipw_bd   *bd;
-       int             type;
-#define IPW_SBD_TYPE_NOASSOC   0
-#define IPW_SBD_TYPE_COMMAND   1
-#define IPW_SBD_TYPE_HEADER    2
-#define IPW_SBD_TYPE_DATA      3
-       void            *priv;
-};
-
-struct ipw_soft_hdr {
-       struct ipw_hdr                  hdr;
-       bus_dmamap_t                    map;
-       SLIST_ENTRY(ipw_soft_hdr)       next;
-};
-
-struct ipw_soft_buf {
-       struct mbuf                     *m;
-       struct ieee80211_node           *ni;
-       bus_dmamap_t                    map;
-       SLIST_ENTRY(ipw_soft_buf)       next;
-};
-
-#define IPW_MAX_NSEG   6
-struct ipw_dma_mapping {
-       bus_dma_segment_t segs[IPW_MAX_NSEG];
-       int nseg;
-       bus_size_t mapsize;
-};
-
-struct ipw_rx_radiotap_header {
-       struct ieee80211_radiotap_header wr_ihdr;
-       u_int8_t        wr_flags;
-       u_int16_t       wr_chan_freq;
-       u_int16_t       wr_chan_flags;
-       u_int8_t        wr_antsignal;
-};
-
-#define IPW_RX_RADIOTAP_PRESENT                                                \
-       ((1 << IEEE80211_RADIOTAP_FLAGS) |                              \
-        (1 << IEEE80211_RADIOTAP_CHANNEL) |                            \
-        (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL))
-
-struct ipw_tx_radiotap_header {
-       struct ieee80211_radiotap_header wt_ihdr;
-       u_int8_t        wt_flags;
-       u_int16_t       wt_chan_freq;
-       u_int16_t       wt_chan_flags;
-};
-
-#define IPW_TX_RADIOTAP_PRESENT                                                \
-       ((1 << IEEE80211_RADIOTAP_FLAGS) |                              \
-        (1 << IEEE80211_RADIOTAP_CHANNEL))
-
-struct ipw_softc {
-       struct ieee80211com             sc_ic;
-       int                             (*sc_newstate)(struct ieee80211com *,
-                                           enum ieee80211_state, int);
-       struct ipw_firmware             fw;
-       u_int32_t                       flags;
-#define IPW_FLAG_FW_CACHED          (1 << 0)
-#define IPW_FLAG_FW_INITED          (1 << 1)
-#define IPW_FLAG_HAS_RADIO_SWITCH   (1 << 2)
-#define IPW_FLAG_FW_WARNED         (1 << 3)
-
-       int                             irq_rid;
-       int                             mem_rid;
-       struct resource                 *irq;
-       struct resource                 *mem;
-       bus_space_tag_t                 sc_st;
-       bus_space_handle_t              sc_sh;
-       void                            *sc_ih;
-
-       int                             sc_tx_timer;
-
-       bus_dma_tag_t                   tbd_dmat;
-       bus_dma_tag_t                   rbd_dmat;
-       bus_dma_tag_t                   status_dmat;
-       bus_dma_tag_t                   cmd_dmat;
-       bus_dma_tag_t                   hdr_dmat;
-       bus_dma_tag_t                   txbuf_dmat;
-       bus_dma_tag_t                   rxbuf_dmat;
-
-       bus_dmamap_t                    tbd_map;
-       bus_dmamap_t                    rbd_map;
-       bus_dmamap_t                    status_map;
-       bus_dmamap_t                    cmd_map;
-
-       bus_addr_t                      tbd_phys;
-       bus_addr_t                      rbd_phys;
-       bus_addr_t                      status_phys;
-
-       struct ipw_bd                   *tbd_list;
-       struct ipw_bd                   *rbd_list;
-       struct ipw_status               *status_list;
-
-       struct ipw_cmd                  cmd;
-       struct ipw_soft_bd              stbd_list[IPW_NTBD];
-       struct ipw_soft_buf             tx_sbuf_list[IPW_NDATA];
-       struct ipw_soft_hdr             shdr_list[IPW_NDATA];
-       struct ipw_soft_bd              srbd_list[IPW_NRBD];
-       struct ipw_soft_buf             rx_sbuf_list[IPW_NRBD];
-
-       SLIST_HEAD(, ipw_soft_hdr)      free_shdr;
-       SLIST_HEAD(, ipw_soft_buf)      free_sbuf;
-
-       u_int32_t                       table1_base;
-       u_int32_t                       table2_base;
-
-       u_int32_t                       txcur;
-       u_int32_t                       txold;
-       int                             txfree;
-       u_int32_t                       rxcur;
-
-       int                             dwelltime;
-
-       struct bpf_if                   *sc_drvbpf;
-
-       union {
-               struct ipw_rx_radiotap_header th;
-               u_int8_t        pad[64];
-       } sc_rxtapu;
-#define sc_rxtap       sc_rxtapu.th
-       int                             sc_rxtap_len;
-
-       union {
-               struct ipw_tx_radiotap_header th;
-               u_int8_t        pad[64];
-       } sc_txtapu;
-#define sc_txtap       sc_txtapu.th
-       int                             sc_txtap_len;
-       struct sysctl_ctx_list          sysctl_ctx;
-};
-
-#define SIOCSLOADFW     _IOW('i', 137, struct ifreq)
-#define SIOCSKILLFW     _IOW('i', 138, struct ifreq)
-