delete old bcm4319 driver
authorhwg <hwg@I7-CH.(none)>
Sun, 20 Nov 2011 02:16:46 +0000 (10:16 +0800)
committerhwg <hwg@I7-CH.(none)>
Sun, 20 Nov 2011 02:16:46 +0000 (10:16 +0800)
98 files changed:
drivers/net/wireless/bcm4319/ChangeLog.txt [deleted file]
drivers/net/wireless/bcm4319/Kconfig [deleted file]
drivers/net/wireless/bcm4319/Kconfig.bcm4319 [deleted file]
drivers/net/wireless/bcm4319/Makefile [deleted file]
drivers/net/wireless/bcm4319/Makefile.bcm4319 [deleted file]
drivers/net/wireless/bcm4319/aiutils.c [deleted file]
drivers/net/wireless/bcm4319/bcmpcispi.c [deleted file]
drivers/net/wireless/bcm4319/bcmsdh.c [deleted file]
drivers/net/wireless/bcm4319/bcmsdh_linux.c [deleted file]
drivers/net/wireless/bcm4319/bcmsdh_sdmmc.c [deleted file]
drivers/net/wireless/bcm4319/bcmsdh_sdmmc_linux.c [deleted file]
drivers/net/wireless/bcm4319/bcmsdspi.c [deleted file]
drivers/net/wireless/bcm4319/bcmsdspi_linux.c [deleted file]
drivers/net/wireless/bcm4319/bcmsdstd.c [deleted file]
drivers/net/wireless/bcm4319/bcmsdstd_linux.c [deleted file]
drivers/net/wireless/bcm4319/bcmutils.c [deleted file]
drivers/net/wireless/bcm4319/bcmwifi.c [deleted file]
drivers/net/wireless/bcm4319/dhd.h [deleted file]
drivers/net/wireless/bcm4319/dhd_bus.h [deleted file]
drivers/net/wireless/bcm4319/dhd_cdc.c [deleted file]
drivers/net/wireless/bcm4319/dhd_common.c [deleted file]
drivers/net/wireless/bcm4319/dhd_custom_gpio.c [deleted file]
drivers/net/wireless/bcm4319/dhd_dbg.h [deleted file]
drivers/net/wireless/bcm4319/dhd_linux.c [deleted file]
drivers/net/wireless/bcm4319/dhd_linux_sched.c [deleted file]
drivers/net/wireless/bcm4319/dhd_proto.h [deleted file]
drivers/net/wireless/bcm4319/dhd_sdio.c [deleted file]
drivers/net/wireless/bcm4319/dngl_stats.h [deleted file]
drivers/net/wireless/bcm4319/firmware/nvram_4319_201008.txt [deleted file]
drivers/net/wireless/bcm4319/hndpmu.c [deleted file]
drivers/net/wireless/bcm4319/include/Makefile [deleted file]
drivers/net/wireless/bcm4319/include/aidmp.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmcdc.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmdefs.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmdevs.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmendian.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmpcispi.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmperf.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmsdbus.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmsdh.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmsdh_sdmmc.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmsdpcm.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmsdspi.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmsdstd.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmspi.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmutils.h [deleted file]
drivers/net/wireless/bcm4319/include/bcmwifi.h [deleted file]
drivers/net/wireless/bcm4319/include/dhdioctl.h [deleted file]
drivers/net/wireless/bcm4319/include/epivers.h [deleted file]
drivers/net/wireless/bcm4319/include/hndpmu.h [deleted file]
drivers/net/wireless/bcm4319/include/hndrte_armtrap.h [deleted file]
drivers/net/wireless/bcm4319/include/hndrte_cons.h [deleted file]
drivers/net/wireless/bcm4319/include/hndsoc.h [deleted file]
drivers/net/wireless/bcm4319/include/linux_osl.h [deleted file]
drivers/net/wireless/bcm4319/include/linuxver.h [deleted file]
drivers/net/wireless/bcm4319/include/miniopt.h [deleted file]
drivers/net/wireless/bcm4319/include/msgtrace.h [deleted file]
drivers/net/wireless/bcm4319/include/osl.h [deleted file]
drivers/net/wireless/bcm4319/include/packed_section_end.h [deleted file]
drivers/net/wireless/bcm4319/include/packed_section_start.h [deleted file]
drivers/net/wireless/bcm4319/include/pcicfg.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/802.11.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/802.11e.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/802.1d.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/bcmeth.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/bcmevent.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/bcmip.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/eapol.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/ethernet.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/sdspi.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/vlan.h [deleted file]
drivers/net/wireless/bcm4319/include/proto/wpa.h [deleted file]
drivers/net/wireless/bcm4319/include/sbchipc.h [deleted file]
drivers/net/wireless/bcm4319/include/sbconfig.h [deleted file]
drivers/net/wireless/bcm4319/include/sbhnddma.h [deleted file]
drivers/net/wireless/bcm4319/include/sbpcmcia.h [deleted file]
drivers/net/wireless/bcm4319/include/sbsdio.h [deleted file]
drivers/net/wireless/bcm4319/include/sbsdpcmdev.h [deleted file]
drivers/net/wireless/bcm4319/include/sbsocram.h [deleted file]
drivers/net/wireless/bcm4319/include/sdio.h [deleted file]
drivers/net/wireless/bcm4319/include/sdioh.h [deleted file]
drivers/net/wireless/bcm4319/include/sdiovar.h [deleted file]
drivers/net/wireless/bcm4319/include/siutils.h [deleted file]
drivers/net/wireless/bcm4319/include/trxhdr.h [deleted file]
drivers/net/wireless/bcm4319/include/typedefs.h [deleted file]
drivers/net/wireless/bcm4319/include/wlioctl.h [deleted file]
drivers/net/wireless/bcm4319/linux_osl.c [deleted file]
drivers/net/wireless/bcm4319/miniopt.c [deleted file]
drivers/net/wireless/bcm4319/mkclean.sh [deleted file]
drivers/net/wireless/bcm4319/mkpkg.sh [deleted file]
drivers/net/wireless/bcm4319/sbutils.c [deleted file]
drivers/net/wireless/bcm4319/siutils.c [deleted file]
drivers/net/wireless/bcm4319/siutils_priv.h [deleted file]
drivers/net/wireless/bcm4319/wl_cfg80211.c [deleted file]
drivers/net/wireless/bcm4319/wl_cfg80211.h [deleted file]
drivers/net/wireless/bcm4319/wl_iw.c [deleted file]
drivers/net/wireless/bcm4319/wl_iw.h [deleted file]
drivers/net/wireless/bcm4319/wl_iw_dbg.c [deleted file]

diff --git a/drivers/net/wireless/bcm4319/ChangeLog.txt b/drivers/net/wireless/bcm4319/ChangeLog.txt
deleted file mode 100644 (file)
index 8782b44..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-===========================================================================\r
-=== Version 1.05 @ 2011-03-26 ===\r
-===========================================================================\r
-\r
-1. ½â¾öÁËÉî¶È˯Ãß15·ÖÖÓºó»½ÐÑÒì³£µÄÎÊÌâ\r
-2. ¿ªÆôCombo-SCANÒÔÖ§³Öwpa_supplicant_6\r
-\r
-===========================================================================\r
-=== Version 1.04 @ 2011-03-21 ===\r
-===========================================================================\r
-\r
-1. ½â¾öÁ˲»ÄÜÕý³£Á¬½ÓAPµÄÎÊÌâ\r
-\r
-===========================================================================\r
-=== Version 1.03 @ 2011-01-24 ===\r
-===========================================================================\r
-\r
-1. Ìí¼Ó¶ÔRK29ƽ̨µÄÖ§³Ö¡£\r
-\r
-===========================================================================\r
-=== Version 1.02 @ 20101102 ===\r
-===========================================================================\r
-\r
-1. ÔÚɨÃèÁбíÖУ¬ÓÐһЩAP¼´Ê¹½Ï½ü£¬ÈÔÈ»»áËÑË÷²»µ½¡£\r
-   =>½«tplinklai¸ÄΪͨµÀ13ºó£¬ÈÔÈ»ÕÒ²»µ½Ëü¡£\r
-   =>·¢ÏÖµ±Ç°µÄ¹¤×÷ģʽÖУ¬Ö»Ö§³ÖɨÃ赽ͨµÀ11¡£\r
-   =>dhd_preinit_ioctlsº¯ÊýÖÐÌí¼ÓÈçϺ¯Êý£º\r
-     dhdcdc_query_ioctl(dhd, 0, WLC_GET_COUNTRY,\r
-                               dhd->country_code, sizeof(dhd->country_code));\r
-     ·¢ÏÖÄ¿Ç°Ä£×éĬÈϵÄCOUNTRY CODEÊÇUS£¬¶øUSÖÐÊÇÖ»Ö§³Ö11¸öͨµÀµÄ¡£\r
-   =>\r
-===========================================================================\r
-=== Version 1.01 @ 20101027 ===\r
-===========================================================================\r
-\r
-1. ¸ÄΪʹÓÃwifi_version.hÖеİ汾¶¨Òå¡£\r
-\r
-2. Í¨¹ýÔÚ°åÉÏnetperf -H 192.168.1.200 -t TCP_STREAM½øÐвâÊÔ£¬»á³öÏÖ£º\r
-    [204] dhd_bus_txdata: out of bus->txq !!!\r
-    [204] dhd_bus_txdata: out of bus->txq !!!\r
-    [205] CMD: 53 <arg=21000020> FAIL raw_ints: 12034 masked ints: 4\r
-    [207] CMD: 52 <arg=12003800> FAIL raw_ints: 11030 masked ints: 1000\r
-    [207] CMD: 52 <arg=12003800> FAIL raw_ints: 11030 masked ints: 1000\r
-    [207] CMD: 52 <arg=12003800> FAIL raw_ints: 11030 masked ints: 1000\r
-    [207] CMD: 52 <arg=12003600> FAIL raw_ints: 11030 masked ints: 1000\r
-    [207] CMD: 52 <arg=12003600> FAIL raw_ints: 11030 masked ints: 1000\r
-\r
-   ÊÖ¶¯ÅäÖÃÃüÁ\r
-     iwconfig wlan0 mode managed\r
-     iwconfig wlan0 essid tplinklai\r
-     ifconfig wlan0 192.168.1.21\r
-     netperf -H 192.168.1.200 -t TCP_STREAM\r
-   \r
-   ÔÚSDIOÇý¶¯ÖУ¬´ò¿ªDATA BUSYµÄ¼ì²â£¬ÔòûÓгöÏÖÎÊÌâ¡£\r
diff --git a/drivers/net/wireless/bcm4319/Kconfig b/drivers/net/wireless/bcm4319/Kconfig
deleted file mode 100644 (file)
index 11aafd3..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-config BCM4319
-       bool "Broadcom 4319 wireless cards support"
-       depends on WLAN_80211 && MMC
-       select WIRELESS_EXT
-       select IEEE80211
-       select FW_LOADER
-       ---help---
-         This module adds support for wireless adapters based on
-         Broadcom 4319 chipset.
-
-         This driver uses the kernel's wireless extensions subsystem.
-
-         If you choose to build a module, it'll be called dhd. Say M if
-         unsure.
diff --git a/drivers/net/wireless/bcm4319/Kconfig.bcm4319 b/drivers/net/wireless/bcm4319/Kconfig.bcm4319
deleted file mode 100644 (file)
index 11aafd3..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-config BCM4319
-       bool "Broadcom 4319 wireless cards support"
-       depends on WLAN_80211 && MMC
-       select WIRELESS_EXT
-       select IEEE80211
-       select FW_LOADER
-       ---help---
-         This module adds support for wireless adapters based on
-         Broadcom 4319 chipset.
-
-         This driver uses the kernel's wireless extensions subsystem.
-
-         If you choose to build a module, it'll be called dhd. Say M if
-         unsure.
diff --git a/drivers/net/wireless/bcm4319/Makefile b/drivers/net/wireless/bcm4319/Makefile
deleted file mode 100644 (file)
index 3c7768f..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-
-RKWLCFGDIR = ../wifi_power
-BROADCOM_SRC_DIR = drivers/net/wireless/bcm4319
-
-EXTRA_CFLAGS += -I$(src) -I$(src)/include -I$(src)/$(RKWLCFGDIR)/
-EXTRA_CFLAGS += -DLINUX -DSRCBASE=\"$(BROADCOM_SRC_DIR)\" -DBCMDRIVER -DBCMDONGLEHOST -DDHDTHREAD\
-                -DBCMWPA2 -DBCMWAPI_WPI
-EXTRA_CFLAGS += -DUNRELEASEDCHIP -DOEM_ANDROID -DEMBEDDED_PLATFORM -DARP_OFFLOAD_SUPPORT -DPKT_FILTER_SUPPORT 
-EXTRA_CFLAGS += -DBCMSDIO -DDHD_GPL -DBCMLXSDMMC -DBCMPLATFORM_BUS
-EXTRA_CFLAGS += -DSDIO_ISR_THREAD
-EXTRA_CFLAGS += -DBDC -DTOE -DDHD_BCMEVENTS -DDHD_SCHED -DCSCAN
-#EXTRA_CFLAGS += -DSHOW_EVENTS -DDHD_DEBUG -DSDTEST 
-#EXTRA_CFLAGS += -DBCMSDH_MODULE
-#EXTRA_CFLAGS += -DCONFIG_WIFI_CONTROL_FUNC
-
-
-bcmsdio-objs := bcmsdh.o bcmsdh_linux.o bcmsdh_sdmmc.o \
-                bcmsdh_sdmmc_linux.o
-
-dhd-objs := dhd_common.o  dhd_linux.o dhd_linux_sched.o dhd_sdio.o \
-            dhd_custom_gpio.o dhd_cdc.o
-
-shared-objs := aiutils.o bcmutils.o bcmwifi.o hndpmu.o \
-               linux_osl.o  sbutils.o siutils.o
-
-wl-objs := wl_iw.o
-
-bcm4319-objs := $(bcmsdio-objs) $(dhd-objs) $(shared-objs) $(wl-objs) $(RKWLCFGDIR)/wifi_power_ops.o
-
-obj-$(CONFIG_BCM4319) += bcm4319.o $(RKWLCFGDIR)/wifi_power.o
-
-default:
-       $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
-clean:
-       rm -rvf *.o *.ko *.mod.c *.o.cmd *.tmp_versions *.mod.o *.cmd modules.order Module.symvers .tmp_versions rkpub
-       find . -name '*.o' -exec rm -f {} \;
-       find . -name '.*.cmd' -exec rm -f {} \;
-.PHONY: clean
-
-
-
-                 
diff --git a/drivers/net/wireless/bcm4319/Makefile.bcm4319 b/drivers/net/wireless/bcm4319/Makefile.bcm4319
deleted file mode 100644 (file)
index 97a3655..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-EXTRA_CFLAGS += -I$(src)
-
-rkcfg-y := \
-    wifi_power.o \
-
-obj-$(CONFIG_BCM4319)          += bcm4319.o rkcfg.o
-
-$(obj)/bcm4319.o: $(obj)/bcm4319.uu
-       @echo "UUDE    bcm4319.uu"
-       @uudecode $(obj)/bcm4319.uu -o $(obj)/bcm4319.o
-
-
diff --git a/drivers/net/wireless/bcm4319/aiutils.c b/drivers/net/wireless/bcm4319/aiutils.c
deleted file mode 100644 (file)
index df48ac0..0000000
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- * Misc utility routines for accessing chip-specific features
- * of the SiliconBackplane-based Broadcom chips.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: aiutils.c,v 1.6.4.7.4.6 2010/04/21 20:43:47 Exp $
- */
-
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
-#include <bcmutils.h>
-#include <siutils.h>
-#include <hndsoc.h>
-#include <sbchipc.h>
-#include <pcicfg.h>
-
-#include "siutils_priv.h"
-
-STATIC uint32
-get_asd(si_t *sih, uint32 *eromptr, uint sp, uint ad, uint st,
-       uint32 *addrl, uint32 *addrh, uint32 *sizel, uint32 *sizeh);
-
-
-/* EROM parsing */
-
-static uint32
-get_erom_ent(si_t *sih, uint32 *eromptr, uint32 mask, uint32 match)
-{
-       uint32 ent;
-       uint inv = 0, nom = 0;
-
-       while (TRUE) {
-               ent = R_REG(si_osh(sih), (uint32 *)(uintptr)(*eromptr));
-               *eromptr += sizeof(uint32);
-
-               if (mask == 0)
-                       break;
-
-               if ((ent & ER_VALID) == 0) {
-                       inv++;
-                       continue;
-               }
-
-               if (ent == (ER_END | ER_VALID))
-                       break;
-
-               if ((ent & mask) == match)
-                       break;
-
-               nom++;
-       }
-
-       SI_MSG(("%s: Returning ent 0x%08x\n", __FUNCTION__, ent));
-       if (inv + nom)
-               SI_MSG(("  after %d invalid and %d non-matching entries\n", inv, nom));
-       return ent;
-}
-
-STATIC uint32
-get_asd(si_t *sih, uint32 *eromptr, uint sp, uint ad, uint st,
-       uint32 *addrl, uint32 *addrh, uint32 *sizel, uint32 *sizeh)
-{
-       uint32 asd, sz, szd;
-
-       asd = get_erom_ent(sih, eromptr, ER_VALID, ER_VALID);
-       if (((asd & ER_TAG1) != ER_ADD) ||
-           (((asd & AD_SP_MASK) >> AD_SP_SHIFT) != sp) ||
-           ((asd & AD_ST_MASK) != st)) {
-               /* This is not what we want, "push" it back */
-               *eromptr -= sizeof(uint32);
-               return 0;
-       }
-       *addrl = asd & AD_ADDR_MASK;
-       if (asd & AD_AG32)
-               *addrh = get_erom_ent(sih, eromptr, 0, 0);
-       else
-               *addrh = 0;
-       *sizeh = 0;
-       sz = asd & AD_SZ_MASK;
-       if (sz == AD_SZ_SZD) {
-               szd = get_erom_ent(sih, eromptr, 0, 0);
-               *sizel = szd & SD_SZ_MASK;
-               if (szd & SD_SG32)
-                       *sizeh = get_erom_ent(sih, eromptr, 0, 0);
-       } else
-               *sizel = AD_SZ_BASE << (sz >> AD_SZ_SHIFT);
-
-       SI_MSG(("  SP %d, ad %d: st = %d, 0x%08x_0x%08x @ 0x%08x_0x%08x\n",
-               sp, ad, st, *sizeh, *sizel, *addrh, *addrl));
-
-       return asd;
-}
-
-/* parse the enumeration rom to identify all cores */
-void
-ai_scan(si_t *sih, void *regs, uint devid)
-{
-       si_info_t *sii = SI_INFO(sih);
-       chipcregs_t *cc = (chipcregs_t *)regs;
-       uint32 erombase, eromptr, eromlim;
-
-       erombase = R_REG(sii->osh, &cc->eromptr);
-
-       switch (BUSTYPE(sih->bustype)) {
-       case SI_BUS:
-               eromptr = (uintptr)REG_MAP(erombase, SI_CORE_SIZE);
-               break;
-
-       case PCI_BUS:
-               /* Set wrappers address */
-               sii->curwrap = (void *)((uintptr)regs + SI_CORE_SIZE);
-
-               /* Now point the window at the erom */
-               OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN, 4, erombase);
-               eromptr = (uint32)(uintptr)regs;
-               break;
-
-       case SPI_BUS:
-       case SDIO_BUS:
-               eromptr = erombase;
-               break;
-
-       case PCMCIA_BUS:
-       default:
-               SI_ERROR(("Don't know how to do AXI enumertion on bus %d\n", sih->bustype));
-               ASSERT(0);
-               return;
-       }
-       eromlim = eromptr + ER_REMAPCONTROL;
-
-       SI_MSG(("ai_scan: regs = 0x%p, erombase = 0x%08x, eromptr = 0x%08x, eromlim = 0x%08x\n",
-               regs, erombase, eromptr, eromlim));
-       while (eromptr < eromlim) {
-               uint32 cia, cib, base, cid, mfg, crev, nmw, nsw, nmp, nsp;
-               uint32 mpd, asd, addrl, addrh, sizel, sizeh;
-               uint i, j, idx;
-               bool br;
-
-               br = FALSE;
-
-               /* Grok a component */
-               cia = get_erom_ent(sih, &eromptr, ER_TAG, ER_CI);
-               if (cia == (ER_END | ER_VALID)) {
-                       SI_MSG(("Found END of erom after %d cores\n", sii->numcores));
-                       return;
-               }
-               base = eromptr - sizeof(uint32);
-               cib = get_erom_ent(sih, &eromptr, 0, 0);
-
-               if ((cib & ER_TAG) != ER_CI) {
-                       SI_ERROR(("CIA not followed by CIB\n"));
-                       goto error;
-               }
-
-               cid = (cia & CIA_CID_MASK) >> CIA_CID_SHIFT;
-               mfg = (cia & CIA_MFG_MASK) >> CIA_MFG_SHIFT;
-               crev = (cib & CIB_REV_MASK) >> CIB_REV_SHIFT;
-               nmw = (cib & CIB_NMW_MASK) >> CIB_NMW_SHIFT;
-               nsw = (cib & CIB_NSW_MASK) >> CIB_NSW_SHIFT;
-               nmp = (cib & CIB_NMP_MASK) >> CIB_NMP_SHIFT;
-               nsp = (cib & CIB_NSP_MASK) >> CIB_NSP_SHIFT;
-
-               SI_MSG(("Found component 0x%04x/0x%4x rev %d at erom addr 0x%08x, with nmw = %d, "
-                       "nsw = %d, nmp = %d & nsp = %d\n",
-                       mfg, cid, crev, base, nmw, nsw, nmp, nsp));
-
-               if (((mfg == MFGID_ARM) && (cid == DEF_AI_COMP)) || (nsp == 0))
-                       continue;
-               if ((nmw + nsw == 0)) {
-                       /* A component which is not a core */
-                       if (cid == OOB_ROUTER_CORE_ID) {
-                               asd = get_asd(sih, &eromptr, 0, 0, AD_ST_SLAVE,
-                                       &addrl, &addrh, &sizel, &sizeh);
-                               if (asd != 0) {
-                                       sii->common_info->oob_router = addrl;
-                               }
-                       }
-                       continue;
-               }
-
-               idx = sii->numcores;
-/*             sii->eromptr[idx] = base; */
-               sii->common_info->cia[idx] = cia;
-               sii->common_info->cib[idx] = cib;
-               sii->common_info->coreid[idx] = cid;
-
-               for (i = 0; i < nmp; i++) {
-                       mpd = get_erom_ent(sih, &eromptr, ER_VALID, ER_VALID);
-                       if ((mpd & ER_TAG) != ER_MP) {
-                               SI_ERROR(("Not enough MP entries for component 0x%x\n", cid));
-                               goto error;
-                       }
-                       SI_MSG(("  Master port %d, mp: %d id: %d\n", i,
-                               (mpd & MPD_MP_MASK) >> MPD_MP_SHIFT,
-                               (mpd & MPD_MUI_MASK) >> MPD_MUI_SHIFT));
-               }
-
-               /* First Slave Address Descriptor should be port 0:
-                * the main register space for the core
-                */
-               asd = get_asd(sih, &eromptr, 0, 0, AD_ST_SLAVE, &addrl, &addrh, &sizel, &sizeh);
-               if (asd == 0) {
-                       /* Try again to see if it is a bridge */
-                       asd = get_asd(sih, &eromptr, 0, 0, AD_ST_BRIDGE, &addrl, &addrh,
-                                     &sizel, &sizeh);
-                       if (asd != 0)
-                               br = TRUE;
-                       else
-                               if ((addrh != 0) || (sizeh != 0) || (sizel != SI_CORE_SIZE)) {
-                                       SI_ERROR(("First Slave ASD for core 0x%04x malformed "
-                                                 "(0x%08x)\n", cid, asd));
-                                       goto error;
-                               }
-               }
-               sii->common_info->coresba[idx] = addrl;
-               sii->common_info->coresba_size[idx] = sizel;
-               /* Get any more ASDs in port 0 */
-               j = 1;
-               do {
-                       asd = get_asd(sih, &eromptr, 0, j, AD_ST_SLAVE, &addrl, &addrh,
-                                     &sizel, &sizeh);
-                       if ((asd != 0) && (j == 1) && (sizel == SI_CORE_SIZE))
-                               sii->common_info->coresba2[idx] = addrl;
-                               sii->common_info->coresba2_size[idx] = sizel;
-                       j++;
-               } while (asd != 0);
-
-               /* Go through the ASDs for other slave ports */
-               for (i = 1; i < nsp; i++) {
-                       j = 0;
-                       do {
-                               asd = get_asd(sih, &eromptr, i, j++, AD_ST_SLAVE, &addrl, &addrh,
-                                             &sizel, &sizeh);
-                       } while (asd != 0);
-                       if (j == 0) {
-                               SI_ERROR((" SP %d has no address descriptors\n", i));
-                               goto error;
-                       }
-               }
-
-               /* Now get master wrappers */
-               for (i = 0; i < nmw; i++) {
-                       asd = get_asd(sih, &eromptr, i, 0, AD_ST_MWRAP, &addrl, &addrh,
-                                     &sizel, &sizeh);
-                       if (asd == 0) {
-                               SI_ERROR(("Missing descriptor for MW %d\n", i));
-                               goto error;
-                       }
-                       if ((sizeh != 0) || (sizel != SI_CORE_SIZE)) {
-                               SI_ERROR(("Master wrapper %d is not 4KB\n", i));
-                               goto error;
-                       }
-                       if (i == 0)
-                               sii->common_info->wrapba[idx] = addrl;
-               }
-
-               /* And finally slave wrappers */
-               for (i = 0; i < nsw; i++) {
-                       uint fwp = (nsp == 1) ? 0 : 1;
-                       asd = get_asd(sih, &eromptr, fwp + i, 0, AD_ST_SWRAP, &addrl, &addrh,
-                                     &sizel, &sizeh);
-                       if (asd == 0) {
-                               SI_ERROR(("Missing descriptor for SW %d\n", i));
-                               goto error;
-                       }
-                       if ((sizeh != 0) || (sizel != SI_CORE_SIZE)) {
-                               SI_ERROR(("Slave wrapper %d is not 4KB\n", i));
-                               goto error;
-                       }
-                       if ((nmw == 0) && (i == 0))
-                               sii->common_info->wrapba[idx] = addrl;
-               }
-
-               /* Don't record bridges */
-               if (br)
-                       continue;
-
-               /* Done with core */
-               sii->numcores++;
-       }
-
-       SI_ERROR(("Reached end of erom without finding END"));
-
-error:
-       sii->numcores = 0;
-       return;
-}
-
-/* This function changes the logical "focus" to the indicated core.
- * Return the current core's virtual address.
- */
-void *
-ai_setcoreidx(si_t *sih, uint coreidx)
-{
-       si_info_t *sii = SI_INFO(sih);
-       uint32 addr = sii->common_info->coresba[coreidx];
-       uint32 wrap = sii->common_info->wrapba[coreidx];
-       void *regs;
-
-       if (coreidx >= sii->numcores)
-               return (NULL);
-
-       /*
-        * If the user has provided an interrupt mask enabled function,
-        * then assert interrupts are disabled before switching the core.
-        */
-       ASSERT((sii->intrsenabled_fn == NULL) || !(*(sii)->intrsenabled_fn)((sii)->intr_arg));
-
-       switch (BUSTYPE(sih->bustype)) {
-       case SI_BUS:
-               /* map new one */
-               if (!sii->common_info->regs[coreidx]) {
-                       sii->common_info->regs[coreidx] = REG_MAP(addr, SI_CORE_SIZE);
-                       ASSERT(GOODREGS(sii->common_info->regs[coreidx]));
-               }
-               sii->curmap = regs = sii->common_info->regs[coreidx];
-               if (!sii->common_info->wrappers[coreidx]) {
-                       sii->common_info->wrappers[coreidx] = REG_MAP(wrap, SI_CORE_SIZE);
-                       ASSERT(GOODREGS(sii->common_info->wrappers[coreidx]));
-               }
-               sii->curwrap = sii->common_info->wrappers[coreidx];
-               break;
-
-
-       case SPI_BUS:
-       case SDIO_BUS:
-               sii->curmap = regs = (void *)((uintptr)addr);
-               sii->curwrap = (void *)((uintptr)wrap);
-               break;
-
-       case PCMCIA_BUS:
-       default:
-               ASSERT(0);
-               regs = NULL;
-               break;
-       }
-
-       sii->curmap = regs;
-       sii->curidx = coreidx;
-
-       return regs;
-}
-
-/* Return the number of address spaces in current core */
-int
-ai_numaddrspaces(si_t *sih)
-{
-       return 2;
-}
-
-/* Return the address of the nth address space in the current core */
-uint32
-ai_addrspace(si_t *sih, uint asidx)
-{
-       si_info_t *sii;
-       uint cidx;
-
-       sii = SI_INFO(sih);
-       cidx = sii->curidx;
-
-       if (asidx == 0)
-               return sii->common_info->coresba[cidx];
-       else if (asidx == 1)
-               return sii->common_info->coresba2[cidx];
-       else {
-               SI_ERROR(("%s: Need to parse the erom again to find addr space %d\n",
-                         __FUNCTION__, asidx));
-               return 0;
-       }
-}
-
-/* Return the size of the nth address space in the current core */
-uint32
-ai_addrspacesize(si_t *sih, uint asidx)
-{
-       si_info_t *sii;
-       uint cidx;
-
-       sii = SI_INFO(sih);
-       cidx = sii->curidx;
-
-       if (asidx == 0)
-               return sii->common_info->coresba_size[cidx];
-       else if (asidx == 1)
-               return sii->common_info->coresba2_size[cidx];
-       else {
-               SI_ERROR(("%s: Need to parse the erom again to find addr space %d\n",
-                         __FUNCTION__, asidx));
-               return 0;
-       }
-}
-
-uint
-ai_flag(si_t *sih)
-{
-       si_info_t *sii;
-       aidmp_t *ai;
-
-       sii = SI_INFO(sih);
-       ai = sii->curwrap;
-
-       return (R_REG(sii->osh, &ai->oobselouta30) & 0x1f);
-}
-
-void
-ai_setint(si_t *sih, int siflag)
-{
-}
-
-void
-ai_write_wrap_reg(si_t *sih, uint32 offset, uint32 val)
-{
-       si_info_t *sii = SI_INFO(sih);
-       aidmp_t *ai = sii->curwrap;
-       W_REG(sii->osh, (uint32 *)((uint8 *)ai+offset), val);
-       return;
-}
-
-uint
-ai_corevendor(si_t *sih)
-{
-       si_info_t *sii;
-       uint32 cia;
-
-       sii = SI_INFO(sih);
-       cia = sii->common_info->cia[sii->curidx];
-       return ((cia & CIA_MFG_MASK) >> CIA_MFG_SHIFT);
-}
-
-uint
-ai_corerev(si_t *sih)
-{
-       si_info_t *sii;
-       uint32 cib;
-
-       sii = SI_INFO(sih);
-       cib = sii->common_info->cib[sii->curidx];
-       return ((cib & CIB_REV_MASK) >> CIB_REV_SHIFT);
-}
-
-bool
-ai_iscoreup(si_t *sih)
-{
-       si_info_t *sii;
-       aidmp_t *ai;
-
-       sii = SI_INFO(sih);
-       ai = sii->curwrap;
-
-       return (((R_REG(sii->osh, &ai->ioctrl) & (SICF_FGC | SICF_CLOCK_EN)) == SICF_CLOCK_EN) &&
-               ((R_REG(sii->osh, &ai->resetctrl) & AIRC_RESET) == 0));
-}
-
-/*
- * Switch to 'coreidx', issue a single arbitrary 32bit register mask&set operation,
- * switch back to the original core, and return the new value.
- *
- * When using the silicon backplane, no fidleing with interrupts or core switches are needed.
- *
- * Also, when using pci/pcie, we can optimize away the core switching for pci registers
- * and (on newer pci cores) chipcommon registers.
- */
-uint
-ai_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val)
-{
-       uint origidx = 0;
-       uint32 *r = NULL;
-       uint w;
-       uint intr_val = 0;
-       bool fast = FALSE;
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       ASSERT(GOODIDX(coreidx));
-       ASSERT(regoff < SI_CORE_SIZE);
-       ASSERT((val & ~mask) == 0);
-
-       if (coreidx >= SI_MAXCORES)
-               return 0;
-
-       if (BUSTYPE(sih->bustype) == SI_BUS) {
-               /* If internal bus, we can always get at everything */
-               fast = TRUE;
-               /* map if does not exist */
-               if (!sii->common_info->wrappers[coreidx]) {
-                       sii->common_info->regs[coreidx] =
-                           REG_MAP(sii->common_info->coresba[coreidx], SI_CORE_SIZE);
-                       ASSERT(GOODREGS(sii->common_info->regs[coreidx]));
-               }
-               r = (uint32 *)((uchar *)sii->common_info->regs[coreidx] + regoff);
-       } else if (BUSTYPE(sih->bustype) == PCI_BUS) {
-               /* If pci/pcie, we can get at pci/pcie regs and on newer cores to chipc */
-
-               if ((sii->common_info->coreid[coreidx] == CC_CORE_ID) && SI_FAST(sii)) {
-                       /* Chipc registers are mapped at 12KB */
-
-                       fast = TRUE;
-                       r = (uint32 *)((char *)sii->curmap + PCI_16KB0_CCREGS_OFFSET + regoff);
-               } else if (sii->pub.buscoreidx == coreidx) {
-                       /* pci registers are at either in the last 2KB of an 8KB window
-                        * or, in pcie and pci rev 13 at 8KB
-                        */
-                       fast = TRUE;
-                       if (SI_FAST(sii))
-                               r = (uint32 *)((char *)sii->curmap +
-                                              PCI_16KB0_PCIREGS_OFFSET + regoff);
-                       else
-                               r = (uint32 *)((char *)sii->curmap +
-                                              ((regoff >= SBCONFIGOFF) ?
-                                               PCI_BAR0_PCISBR_OFFSET : PCI_BAR0_PCIREGS_OFFSET) +
-                                              regoff);
-               }
-       }
-
-       if (!fast) {
-               INTR_OFF(sii, intr_val);
-
-               /* save current core index */
-               origidx = si_coreidx(&sii->pub);
-
-               /* switch core */
-               r = (uint32*) ((uchar*) ai_setcoreidx(&sii->pub, coreidx) + regoff);
-       }
-       ASSERT(r != NULL);
-
-       /* mask and set */
-       if (mask || val) {
-               w = (R_REG(sii->osh, r) & ~mask) | val;
-               W_REG(sii->osh, r, w);
-       }
-
-       /* readback */
-       w = R_REG(sii->osh, r);
-
-       if (!fast) {
-               /* restore core index */
-               if (origidx != coreidx)
-                       ai_setcoreidx(&sii->pub, origidx);
-
-               INTR_RESTORE(sii, intr_val);
-       }
-
-       return (w);
-}
-
-void
-ai_core_disable(si_t *sih, uint32 bits)
-{
-       si_info_t *sii;
-       volatile uint32 dummy;
-       aidmp_t *ai;
-
-       sii = SI_INFO(sih);
-
-       ASSERT(GOODREGS(sii->curwrap));
-       ai = sii->curwrap;
-
-       /* if core is already in reset, just return */
-       if (R_REG(sii->osh, &ai->resetctrl) & AIRC_RESET)
-               return;
-
-       W_REG(sii->osh, &ai->ioctrl, bits);
-       dummy = R_REG(sii->osh, &ai->ioctrl);
-       OSL_DELAY(10);
-
-       W_REG(sii->osh, &ai->resetctrl, AIRC_RESET);
-       OSL_DELAY(1);
-}
-
-/* reset and re-enable a core
- * inputs:
- * bits - core specific bits that are set during and after reset sequence
- * resetbits - core specific bits that are set only during reset sequence
- */
-void
-ai_core_reset(si_t *sih, uint32 bits, uint32 resetbits)
-{
-       si_info_t *sii;
-       aidmp_t *ai;
-       volatile uint32 dummy;
-
-       sii = SI_INFO(sih);
-       ASSERT(GOODREGS(sii->curwrap));
-       ai = sii->curwrap;
-
-       /*
-        * Must do the disable sequence first to work for arbitrary current core state.
-        */
-       ai_core_disable(sih, (bits | resetbits));
-
-       /*
-        * Now do the initialization sequence.
-        */
-       W_REG(sii->osh, &ai->ioctrl, (bits | SICF_FGC | SICF_CLOCK_EN));
-       dummy = R_REG(sii->osh, &ai->ioctrl);
-       W_REG(sii->osh, &ai->resetctrl, 0);
-       OSL_DELAY(1);
-
-       W_REG(sii->osh, &ai->ioctrl, (bits | SICF_CLOCK_EN));
-       dummy = R_REG(sii->osh, &ai->ioctrl);
-       OSL_DELAY(1);
-}
-
-
-void
-ai_core_cflags_wo(si_t *sih, uint32 mask, uint32 val)
-{
-       si_info_t *sii;
-       aidmp_t *ai;
-       uint32 w;
-
-       sii = SI_INFO(sih);
-       ASSERT(GOODREGS(sii->curwrap));
-       ai = sii->curwrap;
-
-       ASSERT((val & ~mask) == 0);
-
-       if (mask || val) {
-               w = ((R_REG(sii->osh, &ai->ioctrl) & ~mask) | val);
-               W_REG(sii->osh, &ai->ioctrl, w);
-       }
-}
-
-uint32
-ai_core_cflags(si_t *sih, uint32 mask, uint32 val)
-{
-       si_info_t *sii;
-       aidmp_t *ai;
-       uint32 w;
-
-       sii = SI_INFO(sih);
-       ASSERT(GOODREGS(sii->curwrap));
-       ai = sii->curwrap;
-
-       ASSERT((val & ~mask) == 0);
-
-       if (mask || val) {
-               w = ((R_REG(sii->osh, &ai->ioctrl) & ~mask) | val);
-               W_REG(sii->osh, &ai->ioctrl, w);
-       }
-
-       return R_REG(sii->osh, &ai->ioctrl);
-}
-
-uint32
-ai_core_sflags(si_t *sih, uint32 mask, uint32 val)
-{
-       si_info_t *sii;
-       aidmp_t *ai;
-       uint32 w;
-
-       sii = SI_INFO(sih);
-       ASSERT(GOODREGS(sii->curwrap));
-       ai = sii->curwrap;
-
-       ASSERT((val & ~mask) == 0);
-       ASSERT((mask & ~SISF_CORE_BITS) == 0);
-
-       if (mask || val) {
-               w = ((R_REG(sii->osh, &ai->iostatus) & ~mask) | val);
-               W_REG(sii->osh, &ai->iostatus, w);
-       }
-
-       return R_REG(sii->osh, &ai->iostatus);
-}
diff --git a/drivers/net/wireless/bcm4319/bcmpcispi.c b/drivers/net/wireless/bcm4319/bcmpcispi.c
deleted file mode 100644 (file)
index c0a66f1..0000000
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- * Broadcom SPI over PCI-SPI Host Controller, low-level hardware driver
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmpcispi.c,v 1.22.2.4.4.5 2008/07/09 21:23:30 Exp $
- */
-
-#include <typedefs.h>
-#include <bcmutils.h>
-
-#include <sdio.h>              /* SDIO Specs */
-#include <bcmsdbus.h>          /* bcmsdh to/from specific controller APIs */
-#include <sdiovar.h>           /* to get msglevel bit values */
-
-#include <pcicfg.h>
-#include <bcmsdspi.h>
-#include <bcmspi.h>
-#include <bcmpcispi.h>         /* BRCM PCI-SPI Host Controller Register definitions */
-
-
-/* ndis_osl.h needs to do a runtime check of the osh to map
- * R_REG/W_REG to bus specific access similar to linux_osl.h.
- * Until then...
- */
-/* linux */
-
-#define SPIPCI_RREG R_REG
-#define SPIPCI_WREG W_REG
-
-
-#define        SPIPCI_ANDREG(osh, r, v) SPIPCI_WREG(osh, (r), (SPIPCI_RREG(osh, r) & (v)))
-#define        SPIPCI_ORREG(osh, r, v) SPIPCI_WREG(osh, (r), (SPIPCI_RREG(osh, r) | (v)))
-
-
-int bcmpcispi_dump = 0;                /* Set to dump complete trace of all SPI bus transactions */
-
-typedef struct spih_info_ {
-       uint            bar0;           /* BAR0 of PCI Card */
-       uint            bar1;           /* BAR1 of PCI Card */
-       osl_t           *osh;           /* osh handle */
-       spih_pciregs_t  *pciregs;       /* PCI Core Registers */
-       spih_regs_t     *regs;          /* SPI Controller Registers */
-       uint8           rev;            /* PCI Card Revision ID */
-} spih_info_t;
-
-
-/* Attach to PCI-SPI Host Controller Hardware */
-bool
-spi_hw_attach(sdioh_info_t *sd)
-{
-       osl_t *osh;
-       spih_info_t *si;
-
-       sd_trace(("%s: enter\n", __FUNCTION__));
-
-       osh = sd->osh;
-
-       if ((si = (spih_info_t *)MALLOC(osh, sizeof(spih_info_t))) == NULL) {
-               sd_err(("%s: out of memory, malloced %d bytes\n", __FUNCTION__, MALLOCED(osh)));
-               return FALSE;
-       }
-
-       bzero(si, sizeof(spih_info_t));
-
-       sd->controller = si;
-
-       si->osh = sd->osh;
-       si->rev = OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_REV, 4) & 0xFF;
-
-       if (si->rev < 3) {
-               sd_err(("Host controller %d not supported, please upgrade to rev >= 3\n", si->rev));
-               MFREE(osh, si, sizeof(spih_info_t));
-               return (FALSE);
-       }
-
-       sd_err(("Attaching to Generic PCI SPI Host Controller Rev %d\n", si->rev));
-
-       /* FPGA Revision < 3 not supported by driver anymore. */
-       ASSERT(si->rev >= 3);
-
-       si->bar0 = sd->bar0;
-
-       /* Rev < 10 PciSpiHost has 2 BARs:
-        *    BAR0 = PCI Core Registers
-        *    BAR1 = PciSpiHost Registers (all other cores on backplane)
-        *
-        * Rev 10 and up use a different PCI core which only has a single
-        * BAR0 which contains the PciSpiHost Registers.
-        */
-       if (si->rev < 10) {
-               si->pciregs = (spih_pciregs_t *)spi_reg_map(osh,
-                                                             (uintptr)si->bar0,
-                                                             sizeof(spih_pciregs_t));
-               sd_err(("Mapped PCI Core regs to BAR0 at %p\n", si->pciregs));
-
-               si->bar1 = OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_BAR1, 4);
-               si->regs = (spih_regs_t *)spi_reg_map(osh,
-                                                       (uintptr)si->bar1,
-                                                       sizeof(spih_regs_t));
-               sd_err(("Mapped SPI Controller regs to BAR1 at %p\n", si->regs));
-       } else {
-               si->regs = (spih_regs_t *)spi_reg_map(osh,
-                                                             (uintptr)si->bar0,
-                                                             sizeof(spih_regs_t));
-               sd_err(("Mapped SPI Controller regs to BAR0 at %p\n", si->regs));
-               si->pciregs = NULL;
-       }
-       /* Enable SPI Controller, 16.67MHz SPI Clock */
-       SPIPCI_WREG(osh, &si->regs->spih_ctrl, 0x000000d1);
-
-       /* Set extended feature register to defaults */
-       SPIPCI_WREG(osh, &si->regs->spih_ext, 0x00000000);
-
-       /* Set GPIO CS# High (de-asserted) */
-       SPIPCI_WREG(osh, &si->regs->spih_gpio_data, SPIH_CS);
-
-       /* set GPIO[0] to output for CS# */
-       /* set GPIO[1] to output for power control */
-       /* set GPIO[2] to input for card detect */
-       SPIPCI_WREG(osh, &si->regs->spih_gpio_ctrl, (SPIH_CS | SPIH_SLOT_POWER));
-
-       /* Clear out the Read FIFO in case there is any stuff left in there from a previous run. */
-       while ((SPIPCI_RREG(osh, &si->regs->spih_stat) & SPIH_RFEMPTY) == 0) {
-               SPIPCI_RREG(osh, &si->regs->spih_data);
-       }
-
-       /* Wait for power to stabilize to the SDIO Card (100msec was insufficient) */
-       OSL_DELAY(250000);
-
-       /* Check card detect on FPGA Revision >= 4 */
-       if (si->rev >= 4) {
-               if (SPIPCI_RREG(osh, &si->regs->spih_gpio_data) & SPIH_CARD_DETECT) {
-                       sd_err(("%s: no card detected in SD slot\n", __FUNCTION__));
-                       spi_reg_unmap(osh, (uintptr)si->regs, sizeof(spih_regs_t));
-                       if (si->pciregs) {
-                               spi_reg_unmap(osh, (uintptr)si->pciregs, sizeof(spih_pciregs_t));
-                       }
-                       MFREE(osh, si, sizeof(spih_info_t));
-                       return FALSE;
-               }
-       }
-
-       /* Interrupts are level sensitive */
-       SPIPCI_WREG(osh, &si->regs->spih_int_edge, 0x80000000);
-
-       /* Interrupts are active low. */
-       SPIPCI_WREG(osh, &si->regs->spih_int_pol, 0x40000004);
-
-       /* Enable interrupts through PCI Core. */
-       if (si->pciregs) {
-               SPIPCI_WREG(osh, &si->pciregs->ICR, PCI_INT_PROP_EN);
-       }
-
-       sd_trace(("%s: exit\n", __FUNCTION__));
-       return TRUE;
-}
-
-/* Detach and return PCI-SPI Hardware to unconfigured state */
-bool
-spi_hw_detach(sdioh_info_t *sd)
-{
-       spih_info_t *si = (spih_info_t *)sd->controller;
-       osl_t *osh = si->osh;
-       spih_regs_t *regs = si->regs;
-       spih_pciregs_t *pciregs = si->pciregs;
-
-       sd_trace(("%s: enter\n", __FUNCTION__));
-
-       SPIPCI_WREG(osh, &regs->spih_ctrl, 0x00000010);
-       SPIPCI_WREG(osh, &regs->spih_gpio_ctrl, 0x00000000);    /* Disable GPIO for CS# */
-       SPIPCI_WREG(osh, &regs->spih_int_mask, 0x00000000);     /* Clear Intmask */
-       SPIPCI_WREG(osh, &regs->spih_hex_disp, 0x0000DEAF);
-       SPIPCI_WREG(osh, &regs->spih_int_edge, 0x00000000);
-       SPIPCI_WREG(osh, &regs->spih_int_pol, 0x00000000);
-       SPIPCI_WREG(osh, &regs->spih_hex_disp, 0x0000DEAD);
-
-       /* Disable interrupts through PCI Core. */
-       if (si->pciregs) {
-               SPIPCI_WREG(osh, &pciregs->ICR, 0x00000000);
-               spi_reg_unmap(osh, (uintptr)pciregs, sizeof(spih_pciregs_t));
-       }
-       spi_reg_unmap(osh, (uintptr)regs, sizeof(spih_regs_t));
-
-       MFREE(osh, si, sizeof(spih_info_t));
-
-       sd->controller = NULL;
-
-       sd_trace(("%s: exit\n", __FUNCTION__));
-       return TRUE;
-}
-
-/* Switch between internal (PCI) and external clock oscillator */
-static bool
-sdspi_switch_clock(sdioh_info_t *sd, bool ext_clk)
-{
-       spih_info_t *si = (spih_info_t *)sd->controller;
-       osl_t *osh = si->osh;
-       spih_regs_t *regs = si->regs;
-
-       /* Switch to desired clock, and reset the PLL. */
-       SPIPCI_WREG(osh, &regs->spih_pll_ctrl, ext_clk ? SPIH_EXT_CLK : 0);
-
-       SPINWAIT(((SPIPCI_RREG(osh, &regs->spih_pll_status) & SPIH_PLL_LOCKED)
-                 != SPIH_PLL_LOCKED), 1000);
-       if ((SPIPCI_RREG(osh, &regs->spih_pll_status) & SPIH_PLL_LOCKED) != SPIH_PLL_LOCKED) {
-               sd_err(("%s: timeout waiting for PLL to lock\n", __FUNCTION__));
-               return (FALSE);
-       }
-       return (TRUE);
-
-}
-
-/* Configure PCI-SPI Host Controller's SPI Clock rate as a divisor into the
- * base clock rate.  The base clock is either the PCI Clock (33MHz) or the
- * external clock oscillator at U17 on the PciSpiHost.
- */
-bool
-spi_start_clock(sdioh_info_t *sd, uint16 div)
-{
-       spih_info_t *si = (spih_info_t *)sd->controller;
-       osl_t *osh = si->osh;
-       spih_regs_t *regs = si->regs;
-       uint32 t, espr, disp;
-       uint32 disp_xtal_freq;
-       bool    ext_clock = FALSE;
-       char disp_string[5];
-
-       if (div > 2048) {
-               sd_err(("%s: divisor %d too large; using max of 2048\n", __FUNCTION__, div));
-               div = 2048;
-       } else if (div & (div - 1)) {   /* Not a power of 2? */
-               /* Round up to a power of 2 */
-               while ((div + 1) & div)
-                       div |= div >> 1;
-               div++;
-       }
-
-       /* For FPGA Rev >= 5, the use of an external clock oscillator is supported.
-        * If the oscillator is populated, use it to provide the SPI base clock,
-        * otherwise, default to the PCI clock as the SPI base clock.
-        */
-       if (si->rev >= 5) {
-               uint32 clk_tick;
-               /* Enable the External Clock Oscillator as PLL clock source. */
-               if (!sdspi_switch_clock(sd, TRUE)) {
-                       sd_err(("%s: error switching to external clock\n", __FUNCTION__));
-               }
-
-               /* Check to make sure the external clock is running.  If not, then it
-                * is not populated on the card, so we will default to the PCI clock.
-                */
-               clk_tick = SPIPCI_RREG(osh, &regs->spih_clk_count);
-               if (clk_tick == SPIPCI_RREG(osh, &regs->spih_clk_count)) {
-
-                       /* Switch back to the PCI clock as the clock source. */
-                       if (!sdspi_switch_clock(sd, FALSE)) {
-                               sd_err(("%s: error switching to external clock\n", __FUNCTION__));
-                       }
-               } else {
-                       ext_clock = TRUE;
-               }
-       }
-
-       /* Hack to allow hot-swapping oscillators:
-        * 1. Force PCI clock as clock source, using sd_divisor of 0.
-        * 2. Swap oscillator
-        * 3. Set desired sd_divisor (will switch to external oscillator as clock source.
-        */
-       if (div == 0) {
-               ext_clock = FALSE;
-               div = 2;
-
-               /* Select PCI clock as the clock source. */
-               if (!sdspi_switch_clock(sd, FALSE)) {
-                       sd_err(("%s: error switching to external clock\n", __FUNCTION__));
-               }
-
-               sd_err(("%s: Ok to hot-swap oscillators.\n", __FUNCTION__));
-       }
-
-       /* If using the external oscillator, read the clock frequency from the controller
-        * The value read is in units of 10000Hz, and it's not a nice round number because
-        * it is calculated by the FPGA.  So to make up for that, we round it off.
-        */
-       if (ext_clock == TRUE) {
-               uint32 xtal_freq;
-
-               OSL_DELAY(1000);
-               xtal_freq = SPIPCI_RREG(osh, &regs->spih_xtal_freq) * 10000;
-
-               sd_info(("%s: Oscillator is %dHz\n", __FUNCTION__, xtal_freq));
-
-
-               disp_xtal_freq = xtal_freq / 10000;
-
-               /* Round it off to a nice number. */
-               if ((disp_xtal_freq % 100) > 50) {
-                       disp_xtal_freq += 100;
-               }
-
-               disp_xtal_freq = (disp_xtal_freq / 100) * 100;
-       } else {
-               sd_err(("%s: no external oscillator installed, using PCI clock.\n", __FUNCTION__));
-               disp_xtal_freq = 3333;
-       }
-
-       /* Convert the SPI Clock frequency to BCD format. */
-       sprintf(disp_string, "%04d", disp_xtal_freq / div);
-
-       disp  = (disp_string[0] - '0') << 12;
-       disp |= (disp_string[1] - '0') << 8;
-       disp |= (disp_string[2] - '0') << 4;
-       disp |= (disp_string[3] - '0');
-
-       /* Select the correct ESPR register value based on the divisor. */
-       switch (div) {
-               case 1:         espr = 0x0; break;
-               case 2:         espr = 0x1; break;
-               case 4:         espr = 0x2; break;
-               case 8:         espr = 0x5; break;
-               case 16:        espr = 0x3; break;
-               case 32:        espr = 0x4; break;
-               case 64:        espr = 0x6; break;
-               case 128:       espr = 0x7; break;
-               case 256:       espr = 0x8; break;
-               case 512:       espr = 0x9; break;
-               case 1024:      espr = 0xa; break;
-               case 2048:      espr = 0xb; break;
-               default:        espr = 0x0; ASSERT(0); break;
-       }
-
-       t = SPIPCI_RREG(osh, &regs->spih_ctrl);
-       t &= ~3;
-       t |= espr & 3;
-       SPIPCI_WREG(osh, &regs->spih_ctrl, t);
-
-       t = SPIPCI_RREG(osh, &regs->spih_ext);
-       t &= ~3;
-       t |= (espr >> 2) & 3;
-       SPIPCI_WREG(osh, &regs->spih_ext, t);
-
-       SPIPCI_WREG(osh, &regs->spih_hex_disp, disp);
-
-       /* For Rev 8, writing to the PLL_CTRL register resets
-        * the PLL, and it can re-acquire in 200uS.  For
-        * Rev 7 and older, we use a software delay to allow
-        * the PLL to re-acquire, which takes more than 2mS.
-        */
-       if (si->rev < 8) {
-               /* Wait for clock to settle. */
-               OSL_DELAY(5000);
-       }
-
-       sd_info(("%s: SPI_CTRL=0x%08x SPI_EXT=0x%08x\n",
-                __FUNCTION__,
-                SPIPCI_RREG(osh, &regs->spih_ctrl),
-                SPIPCI_RREG(osh, &regs->spih_ext)));
-
-       return TRUE;
-}
-
-/* Configure PCI-SPI Host Controller High-Speed Clocking mode setting */
-bool
-spi_controller_highspeed_mode(sdioh_info_t *sd, bool hsmode)
-{
-       spih_info_t *si = (spih_info_t *)sd->controller;
-       osl_t *osh = si->osh;
-       spih_regs_t *regs = si->regs;
-
-       if (si->rev >= 10) {
-               if (hsmode) {
-                       SPIPCI_ORREG(osh, &regs->spih_ext, 0x10);
-               } else {
-                       SPIPCI_ANDREG(osh, &regs->spih_ext, ~0x10);
-               }
-       }
-
-       return TRUE;
-}
-
-/* Disable device interrupt */
-void
-spi_devintr_off(sdioh_info_t *sd)
-{
-       spih_info_t *si = (spih_info_t *)sd->controller;
-       osl_t *osh = si->osh;
-       spih_regs_t *regs = si->regs;
-
-       sd_trace(("%s: %d\n", __FUNCTION__, sd->use_client_ints));
-       if (sd->use_client_ints) {
-               sd->intmask &= ~SPIH_DEV_INTR;
-               SPIPCI_WREG(osh, &regs->spih_int_mask, sd->intmask);    /* Clear Intmask */
-       }
-}
-
-/* Enable device interrupt */
-void
-spi_devintr_on(sdioh_info_t *sd)
-{
-       spih_info_t *si = (spih_info_t *)sd->controller;
-       osl_t *osh = si->osh;
-       spih_regs_t *regs = si->regs;
-
-       ASSERT(sd->lockcount == 0);
-       sd_trace(("%s: %d\n", __FUNCTION__, sd->use_client_ints));
-       if (sd->use_client_ints) {
-               if (SPIPCI_RREG(osh, &regs->spih_ctrl) & 0x02) {
-                       /* Ack in case one was pending but is no longer... */
-                       SPIPCI_WREG(osh, &regs->spih_int_status, SPIH_DEV_INTR);
-               }
-               sd->intmask |= SPIH_DEV_INTR;
-               /* Set device intr in Intmask */
-               SPIPCI_WREG(osh, &regs->spih_int_mask, sd->intmask);
-       }
-}
-
-/* Check to see if an interrupt belongs to the PCI-SPI Host or a SPI Device */
-bool
-spi_check_client_intr(sdioh_info_t *sd, int *is_dev_intr)
-{
-       spih_info_t *si = (spih_info_t *)sd->controller;
-       osl_t *osh = si->osh;
-       spih_regs_t *regs = si->regs;
-       bool ours = FALSE;
-
-       uint32 raw_int, cur_int;
-       ASSERT(sd);
-
-       if (is_dev_intr)
-               *is_dev_intr = FALSE;
-       raw_int = SPIPCI_RREG(osh, &regs->spih_int_status);
-       cur_int = raw_int & sd->intmask;
-       if (cur_int & SPIH_DEV_INTR) {
-               if (sd->client_intr_enabled && sd->use_client_ints) {
-                       sd->intrcount++;
-                       ASSERT(sd->intr_handler);
-                       ASSERT(sd->intr_handler_arg);
-                       (sd->intr_handler)(sd->intr_handler_arg);
-                       if (is_dev_intr)
-                               *is_dev_intr = TRUE;
-               } else {
-                       sd_trace(("%s: Not ready for intr: enabled %d, handler 0x%p\n",
-                               __FUNCTION__, sd->client_intr_enabled, sd->intr_handler));
-               }
-               SPIPCI_WREG(osh, &regs->spih_int_status, SPIH_DEV_INTR);
-               SPIPCI_RREG(osh, &regs->spih_int_status);
-               ours = TRUE;
-       } else if (cur_int & SPIH_CTLR_INTR) {
-               /* Interrupt is from SPI FIFO... just clear and ack it... */
-               sd_trace(("%s: SPI CTLR interrupt: raw_int 0x%08x cur_int 0x%08x\n",
-                         __FUNCTION__, raw_int, cur_int));
-
-               /* Clear the interrupt in the SPI_STAT register */
-               SPIPCI_WREG(osh, &regs->spih_stat, 0x00000080);
-
-               /* Ack the interrupt in the interrupt controller */
-               SPIPCI_WREG(osh, &regs->spih_int_status, SPIH_CTLR_INTR);
-               SPIPCI_RREG(osh, &regs->spih_int_status);
-
-               ours = TRUE;
-       } else if (cur_int & SPIH_WFIFO_INTR) {
-               sd_trace(("%s: SPI WR FIFO Empty interrupt: raw_int 0x%08x cur_int 0x%08x\n",
-                         __FUNCTION__, raw_int, cur_int));
-
-               /* Disable the FIFO Empty Interrupt */
-               sd->intmask &= ~SPIH_WFIFO_INTR;
-               SPIPCI_WREG(osh, &regs->spih_int_mask, sd->intmask);
-
-               sd->local_intrcount++;
-               sd->got_hcint = TRUE;
-               ours = TRUE;
-       } else {
-               /* Not an error: can share interrupts... */
-               sd_trace(("%s: Not my interrupt: raw_int 0x%08x cur_int 0x%08x\n",
-                         __FUNCTION__, raw_int, cur_int));
-               ours = FALSE;
-       }
-
-       return ours;
-}
-
-static void
-hexdump(char *pfx, unsigned char *msg, int msglen)
-{
-       int i, col;
-       char buf[80];
-
-       ASSERT(strlen(pfx) + 49 <= sizeof(buf));
-
-       col = 0;
-
-       for (i = 0; i < msglen; i++, col++) {
-               if (col % 16 == 0)
-                       strcpy(buf, pfx);
-               sprintf(buf + strlen(buf), "%02x", msg[i]);
-               if ((col + 1) % 16 == 0)
-                       printf("%s\n", buf);
-               else
-                       sprintf(buf + strlen(buf), " ");
-       }
-
-       if (col % 16 != 0)
-               printf("%s\n", buf);
-}
-
-/* Send/Receive an SPI Packet */
-void
-spi_sendrecv(sdioh_info_t *sd, uint8 *msg_out, uint8 *msg_in, int msglen)
-{
-       spih_info_t *si = (spih_info_t *)sd->controller;
-       osl_t *osh = si->osh;
-       spih_regs_t *regs = si->regs;
-       uint32 count;
-       uint32 spi_data_out;
-       uint32 spi_data_in;
-       bool yield;
-
-       sd_trace(("%s: enter\n", __FUNCTION__));
-
-       if (bcmpcispi_dump) {
-               printf("SENDRECV(len=%d)\n", msglen);
-               hexdump(" OUT: ", msg_out, msglen);
-       }
-
-#ifdef BCMSDYIELD
-       /* Only yield the CPU and wait for interrupt on Rev 8 and newer FPGA images. */
-       yield = ((msglen > 500) && (si->rev >= 8));
-#else
-       yield = FALSE;
-#endif /* BCMSDYIELD */
-
-       ASSERT(msglen % 4 == 0);
-
-
-       SPIPCI_ANDREG(osh, &regs->spih_gpio_data, ~SPIH_CS);    /* Set GPIO CS# Low (asserted) */
-
-       for (count = 0; count < (uint32)msglen/4; count++) {
-               spi_data_out = ((uint32)((uint32 *)msg_out)[count]);
-               SPIPCI_WREG(osh, &regs->spih_data, spi_data_out);
-       }
-
-#ifdef BCMSDYIELD
-       if (yield) {
-               /* Ack the interrupt in the interrupt controller */
-               SPIPCI_WREG(osh, &regs->spih_int_status, SPIH_WFIFO_INTR);
-               SPIPCI_RREG(osh, &regs->spih_int_status);
-
-               /* Enable the FIFO Empty Interrupt */
-               sd->intmask |= SPIH_WFIFO_INTR;
-               sd->got_hcint = FALSE;
-               SPIPCI_WREG(osh, &regs->spih_int_mask, sd->intmask);
-
-       }
-#endif /* BCMSDYIELD */
-
-       /* Wait for write fifo to empty... */
-       SPIPCI_ANDREG(osh, &regs->spih_gpio_data, ~0x00000020); /* Set GPIO 5 Low */
-
-       if (yield) {
-               ASSERT((SPIPCI_RREG(sd->osh, &regs->spih_stat) & SPIH_WFEMPTY) == 0);
-       }
-
-       spi_waitbits(sd, yield);
-       SPIPCI_ORREG(osh, &regs->spih_gpio_data, 0x00000020);   /* Set GPIO 5 High (de-asserted) */
-
-       for (count = 0; count < (uint32)msglen/4; count++) {
-               spi_data_in = SPIPCI_RREG(osh, &regs->spih_data);
-               ((uint32 *)msg_in)[count] = spi_data_in;
-       }
-
-       /* Set GPIO CS# High (de-asserted) */
-       SPIPCI_ORREG(osh, &regs->spih_gpio_data, SPIH_CS);
-
-       if (bcmpcispi_dump) {
-               hexdump(" IN : ", msg_in, msglen);
-       }
-}
-
-void
-spi_spinbits(sdioh_info_t *sd)
-{
-       spih_info_t *si = (spih_info_t *)sd->controller;
-       osl_t *osh = si->osh;
-       spih_regs_t *regs = si->regs;
-       uint spin_count; /* Spin loop bound check */
-
-       spin_count = 0;
-       while ((SPIPCI_RREG(sd->osh, &regs->spih_stat) & SPIH_WFEMPTY) == 0) {
-               if (spin_count > SPI_SPIN_BOUND) {
-                       ASSERT(FALSE); /* Spin bound exceeded */
-               }
-               spin_count++;
-       }
-       spin_count = 0;
-       /* Wait for SPI Transfer state machine to return to IDLE state.
-        * The state bits are only implemented in Rev >= 5 FPGA.  These
-        * bits are hardwired to 00 for Rev < 5, so this check doesn't cause
-        * any problems.
-        */
-       while ((SPIPCI_RREG(osh, &regs->spih_stat) & SPIH_STATE_MASK) != 0) {
-               if (spin_count > SPI_SPIN_BOUND) {
-                       ASSERT(FALSE);
-               }
-               spin_count++;
-       }
-}
diff --git a/drivers/net/wireless/bcm4319/bcmsdh.c b/drivers/net/wireless/bcm4319/bcmsdh.c
deleted file mode 100644 (file)
index 4bf5889..0000000
+++ /dev/null
@@ -1,652 +0,0 @@
-/*
- *  BCMSDH interface glue
- *  implement bcmsdh API for SDIOH driver
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdh.c,v 1.35.2.1.4.8.6.13 2010/04/06 03:26:57 Exp $
- */
-/* ****************** BCMSDH Interface Functions *************************** */
-
-#include <typedefs.h>
-#include <bcmdevs.h>
-#include <bcmendian.h>
-#include <bcmutils.h>
-#include <hndsoc.h>
-#include <siutils.h>
-#include <osl.h>
-
-#include <bcmsdh.h>    /* BRCM API for SDIO clients (such as wl, dhd) */
-#include <bcmsdbus.h>  /* common SDIO/controller interface */
-#include <sbsdio.h>    /* BRCM sdio device core */
-
-#include <sdio.h>      /* sdio spec */
-
-#define SDIOH_API_ACCESS_RETRY_LIMIT   2
-const uint bcmsdh_msglevel = BCMSDH_ERROR_VAL;
-
-
-struct bcmsdh_info
-{
-       bool    init_success;   /* underlying driver successfully attached */
-       void    *sdioh;         /* handler for sdioh */
-       uint32  vendevid;       /* Target Vendor and Device ID on SD bus */
-       osl_t   *osh;
-       bool    regfail;        /* Save status of last reg_read/reg_write call */
-       uint32  sbwad;          /* Save backplane window address */
-};
-/* local copy of bcm sd handler */
-bcmsdh_info_t * l_bcmsdh = NULL;
-
-#if defined(OOB_INTR_ONLY) && defined(HW_OOB)
-extern int
-sdioh_enable_hw_oob_intr(void *sdioh, bool enable);
-
-void
-bcmsdh_enable_hw_oob_intr(bcmsdh_info_t *sdh, bool enable)
-{
-       sdioh_enable_hw_oob_intr(sdh->sdioh, enable);
-}
-#endif
-
-bcmsdh_info_t *
-bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq)
-{
-       bcmsdh_info_t *bcmsdh;
-
-       if ((bcmsdh = (bcmsdh_info_t *)MALLOC(osh, sizeof(bcmsdh_info_t))) == NULL) {
-               BCMSDH_ERROR(("bcmsdh_attach: out of memory, malloced %d bytes\n", MALLOCED(osh)));
-               return NULL;
-       }
-       bzero((char *)bcmsdh, sizeof(bcmsdh_info_t));
-
-       /* save the handler locally */
-       l_bcmsdh = bcmsdh;
-
-       if (!(bcmsdh->sdioh = sdioh_attach(osh, cfghdl, irq))) {
-               bcmsdh_detach(osh, bcmsdh);
-               return NULL;
-       }
-
-       bcmsdh->osh = osh;
-       bcmsdh->init_success = TRUE;
-
-       *regsva = (uint32 *)SI_ENUM_BASE;
-
-       /* Report the BAR, to fix if needed */
-       bcmsdh->sbwad = SI_ENUM_BASE;
-       return bcmsdh;
-}
-
-int
-bcmsdh_detach(osl_t *osh, void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-
-       if (bcmsdh != NULL) {
-               if (bcmsdh->sdioh) {
-                       sdioh_detach(osh, bcmsdh->sdioh);
-                       bcmsdh->sdioh = NULL;
-               }
-               MFREE(osh, bcmsdh, sizeof(bcmsdh_info_t));
-       }
-
-       l_bcmsdh = NULL;
-       return 0;
-}
-
-int
-bcmsdh_iovar_op(void *sdh, const char *name,
-                void *params, int plen, void *arg, int len, bool set)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       return sdioh_iovar_op(bcmsdh->sdioh, name, params, plen, arg, len, set);
-}
-
-bool
-bcmsdh_intr_query(void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       bool on;
-
-       ASSERT(bcmsdh);
-       status = sdioh_interrupt_query(bcmsdh->sdioh, &on);
-       if (SDIOH_API_SUCCESS(status))
-               return FALSE;
-       else
-               return on;
-}
-
-int
-bcmsdh_intr_enable(void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       ASSERT(bcmsdh);
-
-       status = sdioh_interrupt_set(bcmsdh->sdioh, TRUE);
-       return (SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR);
-}
-
-int
-bcmsdh_intr_disable(void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       ASSERT(bcmsdh);
-
-       status = sdioh_interrupt_set(bcmsdh->sdioh, FALSE);
-       return (SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR);
-}
-
-int
-bcmsdh_intr_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       ASSERT(bcmsdh);
-
-       status = sdioh_interrupt_register(bcmsdh->sdioh, fn, argh);
-       return (SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR);
-}
-
-int
-bcmsdh_intr_dereg(void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       ASSERT(bcmsdh);
-
-       status = sdioh_interrupt_deregister(bcmsdh->sdioh);
-       return (SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR);
-}
-
-#if defined(DHD_DEBUG)
-bool
-bcmsdh_intr_pending(void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-
-       ASSERT(sdh);
-       return sdioh_interrupt_pending(bcmsdh->sdioh);
-}
-#endif
-
-
-int
-bcmsdh_devremove_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh)
-{
-       ASSERT(sdh);
-
-       /* don't support yet */
-       return BCME_UNSUPPORTED;
-}
-
-uint8
-bcmsdh_cfg_read(void *sdh, uint fnc_num, uint32 addr, int *err)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
-       int32 retry = 0;
-#endif
-       uint8 data = 0;
-
-       if (!bcmsdh)
-               bcmsdh = l_bcmsdh;
-
-       ASSERT(bcmsdh->init_success);
-
-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
-       do {
-               if (retry)      /* wait for 1 ms till bus get settled down */
-                       OSL_DELAY(1000);
-#endif
-       status = sdioh_cfg_read(bcmsdh->sdioh, fnc_num, addr, (uint8 *)&data);
-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
-       } while (!SDIOH_API_SUCCESS(status) && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
-#endif
-       if (err)
-               *err = (SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR);
-
-       BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint8data = 0x%x\n", __FUNCTION__,
-                   fnc_num, addr, data));
-
-       return data;
-}
-
-void
-bcmsdh_cfg_write(void *sdh, uint fnc_num, uint32 addr, uint8 data, int *err)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
-       int32 retry = 0;
-#endif
-
-       if (!bcmsdh)
-               bcmsdh = l_bcmsdh;
-
-       ASSERT(bcmsdh->init_success);
-
-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
-       do {
-               if (retry)      /* wait for 1 ms till bus get settled down */
-                       OSL_DELAY(1000);
-#endif
-       status = sdioh_cfg_write(bcmsdh->sdioh, fnc_num, addr, (uint8 *)&data);
-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
-       } while (!SDIOH_API_SUCCESS(status) && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
-#endif
-       if (err)
-               *err = SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR;
-
-       BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint8data = 0x%x\n", __FUNCTION__,
-                   fnc_num, addr, data));
-}
-
-uint32
-bcmsdh_cfg_read_word(void *sdh, uint fnc_num, uint32 addr, int *err)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       uint32 data = 0;
-
-       if (!bcmsdh)
-               bcmsdh = l_bcmsdh;
-
-       ASSERT(bcmsdh->init_success);
-
-       status = sdioh_request_word(bcmsdh->sdioh, SDIOH_CMD_TYPE_NORMAL, SDIOH_READ, fnc_num,
-                                   addr, &data, 4);
-
-       if (err)
-               *err = (SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR);
-
-       BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint32data = 0x%x\n", __FUNCTION__,
-                   fnc_num, addr, data));
-
-       return data;
-}
-
-void
-bcmsdh_cfg_write_word(void *sdh, uint fnc_num, uint32 addr, uint32 data, int *err)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-
-       if (!bcmsdh)
-               bcmsdh = l_bcmsdh;
-
-       ASSERT(bcmsdh->init_success);
-
-       status = sdioh_request_word(bcmsdh->sdioh, SDIOH_CMD_TYPE_NORMAL, SDIOH_WRITE, fnc_num,
-                                   addr, &data, 4);
-
-       if (err)
-               *err = (SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR);
-
-       BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint32data = 0x%x\n", __FUNCTION__, fnc_num,
-                    addr, data));
-}
-
-
-int
-bcmsdh_cis_read(void *sdh, uint func, uint8 *cis, uint length)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-
-       uint8 *tmp_buf, *tmp_ptr;
-       uint8 *ptr;
-       bool ascii = func & ~0xf;
-       func &= 0x7;
-
-       if (!bcmsdh)
-               bcmsdh = l_bcmsdh;
-
-       ASSERT(bcmsdh->init_success);
-       ASSERT(cis);
-       ASSERT(length <= SBSDIO_CIS_SIZE_LIMIT);
-
-       status = sdioh_cis_read(bcmsdh->sdioh, func, cis, length);
-
-       if (ascii) {
-               /* Move binary bits to tmp and format them into the provided buffer. */
-               if ((tmp_buf = (uint8 *)MALLOC(bcmsdh->osh, length)) == NULL) {
-                       BCMSDH_ERROR(("%s: out of memory\n", __FUNCTION__));
-                       return BCME_NOMEM;
-               }
-               bcopy(cis, tmp_buf, length);
-               for (tmp_ptr = tmp_buf, ptr = cis; ptr < (cis + length - 4); tmp_ptr++) {
-                       ptr += sprintf((char*)ptr, "%.2x ", *tmp_ptr & 0xff);
-                       if ((((tmp_ptr - tmp_buf) + 1) & 0xf) == 0)
-                               ptr += sprintf((char *)ptr, "\n");
-               }
-               MFREE(bcmsdh->osh, tmp_buf, length);
-       }
-
-       return (SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR);
-}
-
-
-static int
-bcmsdhsdio_set_sbaddr_window(void *sdh, uint32 address)
-{
-       int err = 0;
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       bcmsdh_cfg_write(bcmsdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW,
-                        (address >> 8) & SBSDIO_SBADDRLOW_MASK, &err);
-       if (!err)
-               bcmsdh_cfg_write(bcmsdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRMID,
-                                (address >> 16) & SBSDIO_SBADDRMID_MASK, &err);
-       if (!err)
-               bcmsdh_cfg_write(bcmsdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRHIGH,
-                                (address >> 24) & SBSDIO_SBADDRHIGH_MASK, &err);
-
-
-       return err;
-}
-
-uint32
-bcmsdh_reg_read(void *sdh, uint32 addr, uint size)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       uint32 word = 0;
-       uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
-
-       BCMSDH_INFO(("%s:fun = 1, addr = 0x%x, ", __FUNCTION__, addr));
-
-       if (!bcmsdh)
-               bcmsdh = l_bcmsdh;
-
-       ASSERT(bcmsdh->init_success);
-
-       if (bar0 != bcmsdh->sbwad) {
-               if (bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0))
-                       return 0xFFFFFFFF;
-
-               bcmsdh->sbwad = bar0;
-       }
-
-       addr &= SBSDIO_SB_OFT_ADDR_MASK;
-       if (size == 4)
-               addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
-
-       status = sdioh_request_word(bcmsdh->sdioh, SDIOH_CMD_TYPE_NORMAL,
-               SDIOH_READ, SDIO_FUNC_1, addr, &word, size);
-
-       bcmsdh->regfail = !(SDIOH_API_SUCCESS(status));
-
-       BCMSDH_INFO(("uint32data = 0x%x\n", word));
-
-       /* if ok, return appropriately masked word */
-       if (SDIOH_API_SUCCESS(status)) {
-               switch (size) {
-                       case sizeof(uint8):
-                               return (word & 0xff);
-                       case sizeof(uint16):
-                               return (word & 0xffff);
-                       case sizeof(uint32):
-                               return word;
-                       default:
-                               bcmsdh->regfail = TRUE;
-
-               }
-       }
-
-       /* otherwise, bad sdio access or invalid size */
-       BCMSDH_ERROR(("%s: error reading addr 0x%04x size %d\n", __FUNCTION__, addr, size));
-       return 0xFFFFFFFF;
-}
-
-uint32
-bcmsdh_reg_write(void *sdh, uint32 addr, uint size, uint32 data)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
-       int err = 0;
-
-       BCMSDH_INFO(("%s:fun = 1, addr = 0x%x, uint%ddata = 0x%x\n",
-                    __FUNCTION__, addr, size*8, data));
-
-       if (!bcmsdh)
-               bcmsdh = l_bcmsdh;
-
-       ASSERT(bcmsdh->init_success);
-
-       if (bar0 != bcmsdh->sbwad) {
-               if ((err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0)))
-                       return err;
-
-               bcmsdh->sbwad = bar0;
-       }
-
-       addr &= SBSDIO_SB_OFT_ADDR_MASK;
-       if (size == 4)
-               addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
-       status = sdioh_request_word(bcmsdh->sdioh, SDIOH_CMD_TYPE_NORMAL, SDIOH_WRITE, SDIO_FUNC_1,
-                                   addr, &data, size);
-       bcmsdh->regfail = !(SDIOH_API_SUCCESS(status));
-
-       if (SDIOH_API_SUCCESS(status))
-               return 0;
-
-       BCMSDH_ERROR(("%s: error writing 0x%08x to addr 0x%04x size %d\n",
-                     __FUNCTION__, data, addr, size));
-       return 0xFFFFFFFF;
-}
-
-bool
-bcmsdh_regfail(void *sdh)
-{
-       return ((bcmsdh_info_t *)sdh)->regfail;
-}
-
-int
-bcmsdh_recv_buf(void *sdh, uint32 addr, uint fn, uint flags,
-                uint8 *buf, uint nbytes, void *pkt,
-                bcmsdh_cmplt_fn_t complete, void *handle)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       uint incr_fix;
-       uint width;
-       uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
-       int err = 0;
-
-       ASSERT(bcmsdh);
-       ASSERT(bcmsdh->init_success);
-
-       BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n",
-                    __FUNCTION__, fn, addr, nbytes));
-
-       /* Async not implemented yet */
-       ASSERT(!(flags & SDIO_REQ_ASYNC));
-       if (flags & SDIO_REQ_ASYNC)
-               return BCME_UNSUPPORTED;
-
-       if (bar0 != bcmsdh->sbwad) {
-               if ((err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0)))
-                       return err;
-
-               bcmsdh->sbwad = bar0;
-       }
-
-       addr &= SBSDIO_SB_OFT_ADDR_MASK;
-
-       incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC;
-       width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
-       if (width == 4)
-               addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
-
-       status = sdioh_request_buffer(bcmsdh->sdioh, SDIOH_DATA_PIO, incr_fix,
-                                     SDIOH_READ, fn, addr, width, nbytes, buf, pkt);
-
-       return (SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR);
-}
-
-int
-bcmsdh_send_buf(void *sdh, uint32 addr, uint fn, uint flags,
-                uint8 *buf, uint nbytes, void *pkt,
-                bcmsdh_cmplt_fn_t complete, void *handle)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-       uint incr_fix;
-       uint width;
-       uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
-       int err = 0;
-
-       ASSERT(bcmsdh);
-       ASSERT(bcmsdh->init_success);
-
-       BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n",
-                   __FUNCTION__, fn, addr, nbytes));
-
-       /* Async not implemented yet */
-       ASSERT(!(flags & SDIO_REQ_ASYNC));
-       if (flags & SDIO_REQ_ASYNC)
-               return BCME_UNSUPPORTED;
-
-       if (bar0 != bcmsdh->sbwad) {
-               if ((err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0)))
-                       return err;
-
-               bcmsdh->sbwad = bar0;
-       }
-
-       addr &= SBSDIO_SB_OFT_ADDR_MASK;
-
-       incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC;
-       width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
-       if (width == 4)
-               addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
-
-       status = sdioh_request_buffer(bcmsdh->sdioh, SDIOH_DATA_PIO, incr_fix,
-                                     SDIOH_WRITE, fn, addr, width, nbytes, buf, pkt);
-
-       return (SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR);
-}
-
-int
-bcmsdh_rwdata(void *sdh, uint rw, uint32 addr, uint8 *buf, uint nbytes)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       SDIOH_API_RC status;
-
-       ASSERT(bcmsdh);
-       ASSERT(bcmsdh->init_success);
-       ASSERT((addr & SBSDIO_SBWINDOW_MASK) == 0);
-
-       addr &= SBSDIO_SB_OFT_ADDR_MASK;
-       addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
-
-       status = sdioh_request_buffer(bcmsdh->sdioh, SDIOH_DATA_PIO, SDIOH_DATA_INC,
-                                     (rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1,
-                                     addr, 4, nbytes, buf, NULL);
-
-       return (SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR);
-}
-
-int
-bcmsdh_abort(void *sdh, uint fn)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-
-       return sdioh_abort(bcmsdh->sdioh, fn);
-}
-
-int
-bcmsdh_start(void *sdh, int stage)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-
-       return sdioh_start(bcmsdh->sdioh, stage);
-}
-
-int
-bcmsdh_stop(void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-
-       return sdioh_stop(bcmsdh->sdioh);
-}
-
-
-int
-bcmsdh_query_device(void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-       bcmsdh->vendevid = (VENDOR_BROADCOM << 16) | 0;
-       return (bcmsdh->vendevid);
-}
-
-uint
-bcmsdh_query_iofnum(void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-
-       if (!bcmsdh)
-               bcmsdh = l_bcmsdh;
-
-       return (sdioh_query_iofnum(bcmsdh->sdioh));
-}
-
-int
-bcmsdh_reset(bcmsdh_info_t *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-
-       return sdioh_sdio_reset(bcmsdh->sdioh);
-}
-
-void *bcmsdh_get_sdioh(bcmsdh_info_t *sdh)
-{
-       ASSERT(sdh);
-       return sdh->sdioh;
-}
-
-/* Function to pass device-status bits to DHD. */
-uint32
-bcmsdh_get_dstatus(void *sdh)
-{
-       return 0;
-}
-uint32
-bcmsdh_cur_sbwad(void *sdh)
-{
-       bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *)sdh;
-
-       if (!bcmsdh)
-               bcmsdh = l_bcmsdh;
-
-       return (bcmsdh->sbwad);
-}
-
-void
-bcmsdh_chipinfo(void *sdh, uint32 chip, uint32 chiprev)
-{
-       return;
-}
diff --git a/drivers/net/wireless/bcm4319/bcmsdh_linux.c b/drivers/net/wireless/bcm4319/bcmsdh_linux.c
deleted file mode 100644 (file)
index e6241cc..0000000
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- * SDIO access interface for drivers - linux specific (pci only)
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdh_linux.c,v 1.42.10.10.2.12 2010/03/10 03:09:48 Exp $
- */
-
-/**
- * @file bcmsdh_linux.c
- */
-
-#define __UNDEF_NO_VERSION__
-
-#include <typedefs.h>
-#include <linuxver.h>
-
-#include <linux/pci.h>
-#include <linux/completion.h>
-
-#include <osl.h>
-#include <pcicfg.h>
-#include <bcmdefs.h>
-#include <bcmdevs.h>
-
-#if defined(OOB_INTR_ONLY)
-#include <linux/irq.h>
-extern void dhdsdio_isr(void * args);
-#include <bcmutils.h>
-#include <dngl_stats.h>
-#include <dhd.h>
-#endif /* defined(OOB_INTR_ONLY) */
-#if defined(CONFIG_MACH_SANDGATE2G) || defined(CONFIG_MACH_LOGICPD_PXA270)
-#if !defined(BCMPLATFORM_BUS)
-#define BCMPLATFORM_BUS
-#endif /* !defined(BCMPLATFORM_BUS) */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
-#include <linux/platform_device.h>
-#endif /* KERNEL_VERSION(2, 6, 19) */
-#endif /* CONFIG_MACH_SANDGATE2G || CONFIG_MACH_LOGICPD_PXA270 */
-
-/**
- * SDIO Host Controller info
- */
-typedef struct bcmsdh_hc bcmsdh_hc_t;
-
-struct bcmsdh_hc {
-       bcmsdh_hc_t *next;
-#ifdef BCMPLATFORM_BUS
-       struct device *dev;                     /* platform device handle */
-#else
-       struct pci_dev *dev;            /* pci device handle */
-#endif /* BCMPLATFORM_BUS */
-       osl_t *osh;
-       void *regs;                     /* SDIO Host Controller address */
-       bcmsdh_info_t *sdh;             /* SDIO Host Controller handle */
-       void *ch;
-       unsigned int oob_irq;
-       unsigned long oob_flags; /* OOB Host specifiction as edge and etc */
-};
-static bcmsdh_hc_t *sdhcinfo = NULL;
-
-/* driver info, initialized when bcmsdh_register is called */
-static bcmsdh_driver_t drvinfo = {NULL, NULL};
-
-/* debugging macros */
-#define SDLX_MSG(x)
-
-/**
- * Checks to see if vendor and device IDs match a supported SDIO Host Controller.
- */
-bool
-bcmsdh_chipmatch(uint16 vendor, uint16 device)
-{
-       /* Add other vendors and devices as required */
-
-#ifdef BCMSDIOH_STD
-       /* Check for Arasan host controller */
-       if (vendor == VENDOR_SI_IMAGE) {
-               return (TRUE);
-       }
-       /* Check for BRCM 27XX Standard host controller */
-       if (device == BCM27XX_SDIOH_ID && vendor == VENDOR_BROADCOM) {
-               return (TRUE);
-       }
-       /* Check for BRCM Standard host controller */
-       if (device == SDIOH_FPGA_ID && vendor == VENDOR_BROADCOM) {
-               return (TRUE);
-       }
-       /* Check for TI PCIxx21 Standard host controller */
-       if (device == PCIXX21_SDIOH_ID && vendor == VENDOR_TI) {
-               return (TRUE);
-       }
-       if (device == PCIXX21_SDIOH0_ID && vendor == VENDOR_TI) {
-               return (TRUE);
-       }
-       /* Ricoh R5C822 Standard SDIO Host */
-       if (device == R5C822_SDIOH_ID && vendor == VENDOR_RICOH) {
-               return (TRUE);
-       }
-       /* JMicron Standard SDIO Host */
-       if (device == JMICRON_SDIOH_ID && vendor == VENDOR_JMICRON) {
-               return (TRUE);
-       }
-
-#endif /* BCMSDIOH_STD */
-#ifdef BCMSDIOH_SPI
-       /* This is the PciSpiHost. */
-       if (device == SPIH_FPGA_ID && vendor == VENDOR_BROADCOM) {
-               printf("Found PCI SPI Host Controller\n");
-               return (TRUE);
-       }
-
-#endif /* BCMSDIOH_SPI */
-
-       return (FALSE);
-}
-
-#if defined(BCMPLATFORM_BUS)
-#if defined(BCMLXSDMMC)
-/* forward declarations */
-int bcmsdh_probe(struct device *dev);
-int bcmsdh_remove(struct device *dev);
-
-EXPORT_SYMBOL(bcmsdh_probe);
-EXPORT_SYMBOL(bcmsdh_remove);
-
-#else
-/* forward declarations */
-static int __devinit bcmsdh_probe(struct device *dev);
-static int __devexit bcmsdh_remove(struct device *dev);
-#endif /* BCMLXSDMMC */
-
-#ifndef BCMLXSDMMC
-static struct device_driver bcmsdh_driver = {
-       .name           = "pxa2xx-mci",
-       .bus            = &platform_bus_type,
-       .probe          = bcmsdh_probe,
-       .remove         = bcmsdh_remove,
-       .suspend        = NULL,
-       .resume         = NULL,
-       };
-#endif /* BCMLXSDMMC */
-
-#ifndef BCMLXSDMMC
-static
-#endif /* BCMLXSDMMC */
-int bcmsdh_probe(struct device *dev)
-{
-       osl_t *osh = NULL;
-       bcmsdh_hc_t *sdhc = NULL;
-       ulong regs = 0;
-       bcmsdh_info_t *sdh = NULL;
-#if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS)
-       struct platform_device *pdev;
-       struct resource *r;
-#endif /* BCMLXSDMMC */
-       int irq = 0;
-       uint32 vendevid;
-       unsigned long irq_flags = 0;
-
-#if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS)
-       pdev = to_platform_device(dev);
-       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       irq = platform_get_irq(pdev, 0);
-       if (!r || irq == NO_IRQ)
-               return -ENXIO;
-#endif /* BCMLXSDMMC */
-
-#if defined(OOB_INTR_ONLY)
-       irq_flags = IRQF_TRIGGER_FALLING;
-       irq = dhd_customer_oob_irq_map(&irq_flags);
-       if  (irq < 0) {
-               SDLX_MSG(("%s: Host irq is not defined\n", __FUNCTION__));
-               return 1;
-       }
-#endif /* defined(OOB_INTR_ONLY) */
-       /* allocate SDIO Host Controller state info */
-       if (!(osh = osl_attach(dev, PCI_BUS, FALSE))) {
-               SDLX_MSG(("%s: osl_attach failed\n", __FUNCTION__));
-               goto err;
-       }
-       if (!(sdhc = MALLOC(osh, sizeof(bcmsdh_hc_t)))) {
-               SDLX_MSG(("%s: out of memory, allocated %d bytes\n",
-                       __FUNCTION__,
-                       MALLOCED(osh)));
-               goto err;
-       }
-       bzero(sdhc, sizeof(bcmsdh_hc_t));
-       sdhc->osh = osh;
-
-       sdhc->dev = (void *)dev;
-
-#ifdef BCMLXSDMMC
-       if (!(sdh = bcmsdh_attach(osh, (void *)0,
-                                 (void **)&regs, irq))) {
-               SDLX_MSG(("%s: bcmsdh_attach failed\n", __FUNCTION__));
-               goto err;
-       }
-#else
-       if (!(sdh = bcmsdh_attach(osh, (void *)r->start,
-                                 (void **)&regs, irq))) {
-               SDLX_MSG(("%s: bcmsdh_attach failed\n", __FUNCTION__));
-               goto err;
-       }
-#endif /* BCMLXSDMMC */
-       sdhc->sdh = sdh;
-       sdhc->oob_irq = irq;
-       sdhc->oob_flags = irq_flags;
-
-       /* chain SDIO Host Controller info together */
-       sdhc->next = sdhcinfo;
-       sdhcinfo = sdhc;
-       /* Read the vendor/device ID from the CIS */
-       vendevid = bcmsdh_query_device(sdh);
-
-       /* try to attach to the target device */
-       if (!(sdhc->ch = drvinfo.attach((vendevid >> 16),
-                                        (vendevid & 0xFFFF), 0, 0, 0, 0,
-                                       (void *)regs, NULL, sdh))) {
-               SDLX_MSG(("%s: device attach failed\n", __FUNCTION__));
-               goto err;
-       }
-
-       return 0;
-
-       /* error handling */
-err:
-       if (sdhc) {
-               if (sdhc->sdh)
-                       bcmsdh_detach(sdhc->osh, sdhc->sdh);
-               MFREE(osh, sdhc, sizeof(bcmsdh_hc_t));
-       }
-       if (osh)
-               osl_detach(osh);
-       return -ENODEV;
-}
-
-#ifndef BCMLXSDMMC
-static
-#endif /* BCMLXSDMMC */
-int bcmsdh_remove(struct device *dev)
-{
-       bcmsdh_hc_t *sdhc, *prev;
-       osl_t *osh;
-
-       sdhc = sdhcinfo;
-       drvinfo.detach(sdhc->ch);
-       bcmsdh_detach(sdhc->osh, sdhc->sdh);
-       /* find the SDIO Host Controller state for this pdev and take it out from the list */
-       for (sdhc = sdhcinfo, prev = NULL; sdhc; sdhc = sdhc->next) {
-               if (sdhc->dev == (void *)dev) {
-                       if (prev)
-                               prev->next = sdhc->next;
-                       else
-                               sdhcinfo = NULL;
-                       break;
-               }
-               prev = sdhc;
-       }
-       if (!sdhc) {
-               SDLX_MSG(("%s: failed\n", __FUNCTION__));
-               return 0;
-       }
-
-
-       /* release SDIO Host Controller info */
-       osh = sdhc->osh;
-       MFREE(osh, sdhc, sizeof(bcmsdh_hc_t));
-       osl_detach(osh);
-
-#if !defined(BCMLXSDMMC)
-       dev_set_drvdata(dev, NULL);
-#endif /* !defined(BCMLXSDMMC) */
-
-       return 0;
-}
-
-#else /* BCMPLATFORM_BUS */
-
-#if !defined(BCMLXSDMMC)
-/* forward declarations for PCI probe and remove functions. */
-static int __devinit bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
-static void __devexit bcmsdh_pci_remove(struct pci_dev *pdev);
-
-/**
- * pci id table
- */
-static struct pci_device_id bcmsdh_pci_devid[] __devinitdata = {
-       { vendor: PCI_ANY_ID,
-       device: PCI_ANY_ID,
-       subvendor: PCI_ANY_ID,
-       subdevice: PCI_ANY_ID,
-       class: 0,
-       class_mask: 0,
-       driver_data: 0,
-       },
-       { 0, }
-};
-MODULE_DEVICE_TABLE(pci, bcmsdh_pci_devid);
-
-/**
- * SDIO Host Controller pci driver info
- */
-static struct pci_driver bcmsdh_pci_driver = {
-       node:           {},
-       name:           "bcmsdh",
-       id_table:       bcmsdh_pci_devid,
-       probe:          bcmsdh_pci_probe,
-       remove:         bcmsdh_pci_remove,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
-       save_state:     NULL,
-#endif
-       suspend:        NULL,
-       resume:         NULL,
-       };
-
-
-extern uint sd_pci_slot;       /* Force detection to a particular PCI */
-                                                       /* slot only . Allows for having multiple */
-                                                       /* WL devices at once in a PC */
-                                                       /* Only one instance of dhd will be */
-                                                       /* useable at a time */
-                                                       /* Upper word is bus number, */
-                                                       /* lower word is slot number */
-                                                       /* Default value of 0xFFFFffff turns this */
-                                                       /* off */
-module_param(sd_pci_slot, uint, 0);
-
-
-/**
- * Detect supported SDIO Host Controller and attach if found.
- *
- * Determine if the device described by pdev is a supported SDIO Host
- * Controller.  If so, attach to it and attach to the target device.
- */
-static int __devinit
-bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-       osl_t *osh = NULL;
-       bcmsdh_hc_t *sdhc = NULL;
-       ulong regs;
-       bcmsdh_info_t *sdh = NULL;
-       int rc;
-
-       if (sd_pci_slot != 0xFFFFffff) {
-               if (pdev->bus->number != (sd_pci_slot>>16) ||
-                       PCI_SLOT(pdev->devfn) != (sd_pci_slot&0xffff)) {
-                       SDLX_MSG(("%s: %s: bus %X, slot %X, vend %X, dev %X\n",
-                               __FUNCTION__,
-                               bcmsdh_chipmatch(pdev->vendor, pdev->device)
-                               ?"Found compatible SDIOHC"
-                               :"Probing unknown device",
-                               pdev->bus->number, PCI_SLOT(pdev->devfn), pdev->vendor,
-                               pdev->device));
-                       return -ENODEV;
-               }
-               SDLX_MSG(("%s: %s: bus %X, slot %X, vendor %X, device %X (good PCI location)\n",
-                       __FUNCTION__,
-                       bcmsdh_chipmatch(pdev->vendor, pdev->device)
-                       ?"Using compatible SDIOHC"
-                       :"WARNING, forced use of unkown device",
-                       pdev->bus->number, PCI_SLOT(pdev->devfn), pdev->vendor, pdev->device));
-       }
-
-       if ((pdev->vendor == VENDOR_TI) && ((pdev->device == PCIXX21_FLASHMEDIA_ID) ||
-           (pdev->device == PCIXX21_FLASHMEDIA0_ID))) {
-               uint32 config_reg;
-
-               SDLX_MSG(("%s: Disabling TI FlashMedia Controller.\n", __FUNCTION__));
-               if (!(osh = osl_attach(pdev, PCI_BUS, FALSE))) {
-                       SDLX_MSG(("%s: osl_attach failed\n", __FUNCTION__));
-                       goto err;
-               }
-
-               config_reg = OSL_PCI_READ_CONFIG(osh, 0x4c, 4);
-
-               /*
-                * Set MMC_SD_DIS bit in FlashMedia Controller.
-                * Disbling the SD/MMC Controller in the FlashMedia Controller
-                * allows the Standard SD Host Controller to take over control
-                * of the SD Slot.
-                */
-               config_reg |= 0x02;
-               OSL_PCI_WRITE_CONFIG(osh, 0x4c, 4, config_reg);
-               osl_detach(osh);
-       }
-       /* match this pci device with what we support */
-       /* we can't solely rely on this to believe it is our SDIO Host Controller! */
-       if (!bcmsdh_chipmatch(pdev->vendor, pdev->device)) {
-               return -ENODEV;
-       }
-
-       /* this is a pci device we might support */
-       SDLX_MSG(("%s: Found possible SDIO Host Controller: bus %d slot %d func %d irq %d\n",
-               __FUNCTION__,
-               pdev->bus->number, PCI_SLOT(pdev->devfn),
-               PCI_FUNC(pdev->devfn), pdev->irq));
-
-       /* use bcmsdh_query_device() to get the vendor ID of the target device so
-        * it will eventually appear in the Broadcom string on the console
-        */
-
-       /* allocate SDIO Host Controller state info */
-       if (!(osh = osl_attach(pdev, PCI_BUS, FALSE))) {
-               SDLX_MSG(("%s: osl_attach failed\n", __FUNCTION__));
-               goto err;
-       }
-       if (!(sdhc = MALLOC(osh, sizeof(bcmsdh_hc_t)))) {
-               SDLX_MSG(("%s: out of memory, allocated %d bytes\n",
-                       __FUNCTION__,
-                       MALLOCED(osh)));
-               goto err;
-       }
-       bzero(sdhc, sizeof(bcmsdh_hc_t));
-       sdhc->osh = osh;
-
-       sdhc->dev = pdev;
-
-       /* map to address where host can access */
-       pci_set_master(pdev);
-       rc = pci_enable_device(pdev);
-       if (rc) {
-               SDLX_MSG(("%s: Cannot enble PCI device\n", __FUNCTION__));
-               goto err;
-       }
-       if (!(sdh = bcmsdh_attach(osh, (void *)(uintptr)pci_resource_start(pdev, 0),
-                                 (void **)&regs, pdev->irq))) {
-               SDLX_MSG(("%s: bcmsdh_attach failed\n", __FUNCTION__));
-               goto err;
-       }
-
-       sdhc->sdh = sdh;
-
-       /* try to attach to the target device */
-       if (!(sdhc->ch = drvinfo.attach(VENDOR_BROADCOM, /* pdev->vendor, */
-                                       bcmsdh_query_device(sdh) & 0xFFFF, 0, 0, 0, 0,
-                                       (void *)regs, NULL, sdh))) {
-               SDLX_MSG(("%s: device attach failed\n", __FUNCTION__));
-               goto err;
-       }
-
-       /* chain SDIO Host Controller info together */
-       sdhc->next = sdhcinfo;
-       sdhcinfo = sdhc;
-
-       return 0;
-
-       /* error handling */
-err:
-       if (sdhc->sdh)
-               bcmsdh_detach(sdhc->osh, sdhc->sdh);
-       if (sdhc)
-               MFREE(osh, sdhc, sizeof(bcmsdh_hc_t));
-       if (osh)
-               osl_detach(osh);
-       return -ENODEV;
-}
-
-
-/**
- * Detach from target devices and SDIO Host Controller
- */
-static void __devexit
-bcmsdh_pci_remove(struct pci_dev *pdev)
-{
-       bcmsdh_hc_t *sdhc, *prev;
-       osl_t *osh;
-
-       /* find the SDIO Host Controller state for this pdev and take it out from the list */
-       for (sdhc = sdhcinfo, prev = NULL; sdhc; sdhc = sdhc->next) {
-               if (sdhc->dev == pdev) {
-                       if (prev)
-                               prev->next = sdhc->next;
-                       else
-                               sdhcinfo = NULL;
-                       break;
-               }
-               prev = sdhc;
-       }
-       if (!sdhc)
-               return;
-
-       drvinfo.detach(sdhc->ch);
-
-       bcmsdh_detach(sdhc->osh, sdhc->sdh);
-
-       /* release SDIO Host Controller info */
-       osh = sdhc->osh;
-       MFREE(osh, sdhc, sizeof(bcmsdh_hc_t));
-       osl_detach(osh);
-}
-#endif /* BCMLXSDMMC */
-#endif /* BCMPLATFORM_BUS */
-
-extern int sdio_function_init(void);
-
-int
-bcmsdh_register(bcmsdh_driver_t *driver)
-{
-       int error = 0;
-
-       drvinfo = *driver;
-
-       SDLX_MSG(("Linux Kernel SDIO/MMC Driver\n"));
-       error = sdio_function_init();
-
-       return error;
-}
-
-extern void sdio_function_cleanup(void);
-
-void
-bcmsdh_unregister(void)
-{
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
-       if (bcmsdh_pci_driver.node.next)
-#endif
-
-#if defined(BCMPLATFORM_BUS) && !defined(BCMLXSDMMC)
-               driver_unregister(&bcmsdh_driver);
-#endif
-#if defined(BCMLXSDMMC)
-       sdio_function_cleanup();
-#endif /* BCMLXSDMMC */
-#if !defined(BCMPLATFORM_BUS) && !defined(BCMLXSDMMC)
-               pci_unregister_driver(&bcmsdh_pci_driver);
-#endif /* BCMPLATFORM_BUS */
-}
-
-#if defined(OOB_INTR_ONLY)
-static irqreturn_t wlan_oob_irq(int irq, void *dev_id)
-{
-       dhd_pub_t *dhdp;
-
-       dhdp = (dhd_pub_t *)dev_get_drvdata(sdhcinfo->dev);
-
-       if (dhdp == NULL) {
-               disable_irq(sdhcinfo->oob_irq);
-               SDLX_MSG(("Out of band GPIO interrupt fired way too early\n"));
-               return IRQ_HANDLED;
-       }
-
-       WAKE_LOCK_TIMEOUT(dhdp, WAKE_LOCK_TMOUT, 25);
-
-       dhdsdio_isr((void *)dhdp->bus);
-
-       return IRQ_HANDLED;
-}
-
-int bcmsdh_register_oob_intr(void * dhdp)
-{
-       int error = 0;
-
-       SDLX_MSG(("%s Enter\n", __FUNCTION__));
-
-       dev_set_drvdata(sdhcinfo->dev, dhdp);
-
-
-       /* Refer to customer Host IRQ docs about proper irqflags definition */
-       error = request_irq(sdhcinfo->oob_irq, wlan_oob_irq, sdhcinfo->oob_flags,
-               "bcmsdh_sdmmc", NULL);
-
-       if (error)
-               return -ENODEV;
-
-       set_irq_wake(sdhcinfo->oob_irq, 1);
-
-       return 0;
-}
-
-void bcmsdh_unregister_oob_intr(void)
-{
-       SDLX_MSG(("%s: Enter\n", __FUNCTION__));
-
-       set_irq_wake(sdhcinfo->oob_irq, 0);
-       disable_irq(sdhcinfo->oob_irq); /* just in case.. */
-       free_irq(sdhcinfo->oob_irq, NULL);
-}
-
-void bcmsdh_oob_intr_set(bool enable)
-{
-       if (enable)
-               enable_irq(sdhcinfo->oob_irq);
-       else
-               disable_irq(sdhcinfo->oob_irq);
-}
-#endif /* defined(OOB_INTR_ONLY) */
-/* Module parameters specific to each host-controller driver */
-
-extern uint sd_msglevel;       /* Debug message level */
-module_param(sd_msglevel, uint, 0);
-
-extern uint sd_power;  /* 0 = SD Power OFF, 1 = SD Power ON. */
-module_param(sd_power, uint, 0);
-
-extern uint sd_clock;  /* SD Clock Control, 0 = SD Clock OFF, 1 = SD Clock ON */
-module_param(sd_clock, uint, 0);
-
-extern uint sd_divisor;        /* Divisor (-1 means external clock) */
-module_param(sd_divisor, uint, 0);
-
-extern uint sd_sdmode; /* Default is SD4, 0=SPI, 1=SD1, 2=SD4 */
-module_param(sd_sdmode, uint, 0);
-
-extern uint sd_hiok;   /* Ok to use hi-speed mode */
-module_param(sd_hiok, uint, 0);
-
-extern uint sd_f2_blocksize;
-module_param(sd_f2_blocksize, int, 0);
-
-
-#ifdef BCMSDH_MODULE
-EXPORT_SYMBOL(bcmsdh_attach);
-EXPORT_SYMBOL(bcmsdh_detach);
-EXPORT_SYMBOL(bcmsdh_intr_query);
-EXPORT_SYMBOL(bcmsdh_intr_enable);
-EXPORT_SYMBOL(bcmsdh_intr_disable);
-EXPORT_SYMBOL(bcmsdh_intr_reg);
-EXPORT_SYMBOL(bcmsdh_intr_dereg);
-
-#if defined(DHD_DEBUG)
-EXPORT_SYMBOL(bcmsdh_intr_pending);
-#endif
-
-EXPORT_SYMBOL(bcmsdh_devremove_reg);
-EXPORT_SYMBOL(bcmsdh_cfg_read);
-EXPORT_SYMBOL(bcmsdh_cfg_write);
-EXPORT_SYMBOL(bcmsdh_cis_read);
-EXPORT_SYMBOL(bcmsdh_reg_read);
-EXPORT_SYMBOL(bcmsdh_reg_write);
-EXPORT_SYMBOL(bcmsdh_regfail);
-EXPORT_SYMBOL(bcmsdh_send_buf);
-EXPORT_SYMBOL(bcmsdh_recv_buf);
-
-EXPORT_SYMBOL(bcmsdh_rwdata);
-EXPORT_SYMBOL(bcmsdh_abort);
-EXPORT_SYMBOL(bcmsdh_query_device);
-EXPORT_SYMBOL(bcmsdh_query_iofnum);
-EXPORT_SYMBOL(bcmsdh_iovar_op);
-EXPORT_SYMBOL(bcmsdh_register);
-EXPORT_SYMBOL(bcmsdh_unregister);
-EXPORT_SYMBOL(bcmsdh_chipmatch);
-EXPORT_SYMBOL(bcmsdh_reset);
-
-EXPORT_SYMBOL(bcmsdh_get_dstatus);
-EXPORT_SYMBOL(bcmsdh_cfg_read_word);
-EXPORT_SYMBOL(bcmsdh_cfg_write_word);
-EXPORT_SYMBOL(bcmsdh_cur_sbwad);
-EXPORT_SYMBOL(bcmsdh_chipinfo);
-
-#endif /* BCMSDH_MODULE */
diff --git a/drivers/net/wireless/bcm4319/bcmsdh_sdmmc.c b/drivers/net/wireless/bcm4319/bcmsdh_sdmmc.c
deleted file mode 100644 (file)
index 7948bbe..0000000
+++ /dev/null
@@ -1,1299 +0,0 @@
-/*
- * BCMSDH Function Driver for the native SDIO/MMC driver in the Linux Kernel
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdh_sdmmc.c,v 1.1.2.5.6.29 2010/03/19 17:16:08 Exp $
- */
-#include <typedefs.h>
-
-#include <bcmdevs.h>
-#include <bcmendian.h>
-#include <bcmutils.h>
-#include <osl.h>
-#include <sdio.h>      /* SDIO Device and Protocol Specs */
-#include <sdioh.h>     /* SDIO Host Controller Specification */
-#include <bcmsdbus.h>  /* bcmsdh to/from specific controller APIs */
-#include <sdiovar.h>   /* ioctl/iovars */
-
-#include <linux/mmc/core.h>
-#include <linux/mmc/sdio_func.h>
-#include <linux/mmc/sdio_ids.h>
-
-#include <dngl_stats.h>
-#include <dhd.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP)
-#include <linux/suspend.h>
-extern volatile bool dhd_mmc_suspend;
-#endif
-#include "bcmsdh_sdmmc.h"
-
-#ifndef BCMSDH_MODULE
-extern int sdio_function_init(void);
-extern void sdio_function_cleanup(void);
-#endif /* BCMSDH_MODULE */
-
-#if !defined(OOB_INTR_ONLY)
-static void IRQHandler(struct sdio_func *func);
-static void IRQHandlerF2(struct sdio_func *func);
-#endif
-static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr);
-extern int sdio_reset_comm(struct mmc_card *card);
-
-extern PBCMSDH_SDMMC_INSTANCE gInstance;
-
-uint sd_sdmode = SDIOH_MODE_SD4;       /* Use SD4 mode by default */
-uint sd_f2_blocksize = 512;            /* Default blocksize */
-
-uint sd_divisor = 2;                   /* Default 48MHz/2 = 24MHz */
-
-uint sd_power = 1;             /* Default to SD Slot powered ON */
-uint sd_clock = 1;             /* Default to SD Clock turned ON */
-uint sd_hiok = FALSE;  /* Don't use hi-speed mode by default */
-uint sd_msglevel = 0x01;
-uint sd_use_dma = TRUE;
-DHD_PM_RESUME_WAIT_INIT(sdioh_request_byte_wait);
-DHD_PM_RESUME_WAIT_INIT(sdioh_request_word_wait);
-DHD_PM_RESUME_WAIT_INIT(sdioh_request_packet_wait);
-DHD_PM_RESUME_WAIT_INIT(sdioh_request_buffer_wait);
-
-#define DMA_ALIGN_MASK 0x03
-
-int sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, uint32 regaddr, int regsize, uint32 *data);
-
-static int
-sdioh_sdmmc_card_enablefuncs(sdioh_info_t *sd)
-{
-       int err_ret;
-       uint32 fbraddr;
-       uint8 func;
-
-       sd_trace(("%s\n", __FUNCTION__));
-
-       /* Get the Card's common CIS address */
-       sd->com_cis_ptr = sdioh_sdmmc_get_cisaddr(sd, SDIOD_CCCR_CISPTR_0);
-       sd->func_cis_ptr[0] = sd->com_cis_ptr;
-       sd_info(("%s: Card's Common CIS Ptr = 0x%x\n", __FUNCTION__, sd->com_cis_ptr));
-
-       /* Get the Card's function CIS (for each function) */
-       for (fbraddr = SDIOD_FBR_STARTADDR, func = 1;
-            func <= sd->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) {
-               sd->func_cis_ptr[func] = sdioh_sdmmc_get_cisaddr(sd, SDIOD_FBR_CISPTR_0 + fbraddr);
-               sd_info(("%s: Function %d CIS Ptr = 0x%x\n",
-                        __FUNCTION__, func, sd->func_cis_ptr[func]));
-       }
-
-       sd->func_cis_ptr[0] = sd->com_cis_ptr;
-       sd_info(("%s: Card's Common CIS Ptr = 0x%x\n", __FUNCTION__, sd->com_cis_ptr));
-
-       /* Enable Function 1 */
-       sdio_claim_host(gInstance->func[1]);
-       err_ret = sdio_enable_func(gInstance->func[1]);
-       sdio_release_host(gInstance->func[1]);
-       if (err_ret) {
-               sd_err(("bcmsdh_sdmmc: Failed to enable F1 Err: 0x%08x", err_ret));
-       }
-
-       return FALSE;
-}
-
-/*
- *     Public entry points & extern's
- */
-extern sdioh_info_t *
-sdioh_attach(osl_t *osh, void *bar0, uint irq)
-{
-       sdioh_info_t *sd;
-       int err_ret;
-
-       sd_trace(("%s\n", __FUNCTION__));
-
-       if (gInstance == NULL) {
-               sd_err(("%s: SDIO Device not present\n", __FUNCTION__));
-               return NULL;
-       }
-
-       if ((sd = (sdioh_info_t *)MALLOC(osh, sizeof(sdioh_info_t))) == NULL) {
-               sd_err(("sdioh_attach: out of memory, malloced %d bytes\n", MALLOCED(osh)));
-               return NULL;
-       }
-       bzero((char *)sd, sizeof(sdioh_info_t));
-       sd->osh = osh;
-       if (sdioh_sdmmc_osinit(sd) != 0) {
-               sd_err(("%s:sdioh_sdmmc_osinit() failed\n", __FUNCTION__));
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-               return NULL;
-       }
-
-       sd->num_funcs = 2;
-       sd->sd_blockmode = TRUE;
-       sd->use_client_ints = TRUE;
-       sd->client_block_size[0] = 64;
-
-       gInstance->sd = sd;
-
-       /* Claim host controller */
-       sdio_claim_host(gInstance->func[1]);
-
-       sd->client_block_size[1] = 64;
-       err_ret = sdio_set_block_size(gInstance->func[1], 64);
-       if (err_ret) {
-               sd_err(("bcmsdh_sdmmc: Failed to set F1 blocksize\n"));
-       }
-
-       /* Release host controller F1 */
-       sdio_release_host(gInstance->func[1]);
-
-       if (gInstance->func[2]) {
-               /* Claim host controller F2 */
-               sdio_claim_host(gInstance->func[2]);
-
-               sd->client_block_size[2] = sd_f2_blocksize;
-               err_ret = sdio_set_block_size(gInstance->func[2], sd_f2_blocksize);
-               if (err_ret) {
-                       sd_err(("bcmsdh_sdmmc: Failed to set F2 blocksize to %d\n",
-                               sd_f2_blocksize));
-               }
-
-               /* Release host controller F2 */
-               sdio_release_host(gInstance->func[2]);
-       }
-
-       sdioh_sdmmc_card_enablefuncs(sd);
-
-       sd_trace(("%s: Done\n", __FUNCTION__));
-       return sd;
-}
-
-
-extern SDIOH_API_RC
-sdioh_detach(osl_t *osh, sdioh_info_t *sd)
-{
-       sd_trace(("%s\n", __FUNCTION__));
-
-       if (sd) {
-
-               /* Disable Function 2 */
-               sdio_claim_host(gInstance->func[2]);
-               sdio_disable_func(gInstance->func[2]);
-               sdio_release_host(gInstance->func[2]);
-
-               /* Disable Function 1 */
-               sdio_claim_host(gInstance->func[1]);
-               sdio_disable_func(gInstance->func[1]);
-               sdio_release_host(gInstance->func[1]);
-
-               /* deregister irq */
-               sdioh_sdmmc_osfree(sd);
-
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-       }
-       return SDIOH_API_RC_SUCCESS;
-}
-
-#if defined(OOB_INTR_ONLY) && defined(HW_OOB)
-
-extern SDIOH_API_RC
-sdioh_enable_func_intr(void)
-{
-       uint8 reg;
-       int err;
-
-       if (gInstance->func[0]) {
-               sdio_claim_host(gInstance->func[0]);
-
-               reg = sdio_readb(gInstance->func[0], SDIOD_CCCR_INTEN, &err);
-               if (err) {
-                       sd_err(("%s: error for read SDIO_CCCR_IENx : 0x%x\n", __FUNCTION__, err));
-                       sdio_release_host(gInstance->func[0]);
-                       return SDIOH_API_RC_FAIL;
-               }
-
-               /* Enable F1 and F2 interrupts, set master enable */
-               reg |= (INTR_CTL_FUNC1_EN | INTR_CTL_FUNC2_EN | INTR_CTL_MASTER_EN);
-
-               sdio_writeb(gInstance->func[0], reg, SDIOD_CCCR_INTEN, &err);
-               sdio_release_host(gInstance->func[0]);
-
-               if (err) {
-                       sd_err(("%s: error for write SDIO_CCCR_IENx : 0x%x\n", __FUNCTION__, err));
-                       return SDIOH_API_RC_FAIL;
-               }
-       }
-
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_disable_func_intr(void)
-{
-       uint8 reg;
-       int err;
-
-       if (gInstance->func[0]) {
-               sdio_claim_host(gInstance->func[0]);
-               reg = sdio_readb(gInstance->func[0], SDIOD_CCCR_INTEN, &err);
-               if (err) {
-                       sd_err(("%s: error for read SDIO_CCCR_IENx : 0x%x\n", __FUNCTION__, err));
-                       sdio_release_host(gInstance->func[0]);
-                       return SDIOH_API_RC_FAIL;
-               }
-
-               reg &= ~(INTR_CTL_FUNC1_EN | INTR_CTL_FUNC2_EN);
-               /* Disable master interrupt with the last function interrupt */
-               if (!(reg & 0xFE))
-                       reg = 0;
-               sdio_writeb(gInstance->func[0], reg, SDIOD_CCCR_INTEN, &err);
-
-               sdio_release_host(gInstance->func[0]);
-               if (err) {
-                       sd_err(("%s: error for write SDIO_CCCR_IENx : 0x%x\n", __FUNCTION__, err));
-                       return SDIOH_API_RC_FAIL;
-               }
-       }
-       return SDIOH_API_RC_SUCCESS;
-}
-#endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */
-
-/* Configure callback to client when we recieve client interrupt */
-extern SDIOH_API_RC
-sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh)
-{
-       sd_trace(("%s: Entering\n", __FUNCTION__));
-       if (fn == NULL) {
-               sd_err(("%s: interrupt handler is NULL, not registering\n", __FUNCTION__));
-               return SDIOH_API_RC_FAIL;
-       }
-#if !defined(OOB_INTR_ONLY)
-       sd->intr_handler = fn;
-       sd->intr_handler_arg = argh;
-       sd->intr_handler_valid = TRUE;
-
-       /* register and unmask irq */
-       if (gInstance->func[2]) {
-               sdio_claim_host(gInstance->func[2]);
-               sdio_claim_irq(gInstance->func[2], IRQHandlerF2);
-               sdio_release_host(gInstance->func[2]);
-       }
-
-       if (gInstance->func[1]) {
-               sdio_claim_host(gInstance->func[1]);
-               sdio_claim_irq(gInstance->func[1], IRQHandler);
-               sdio_release_host(gInstance->func[1]);
-       }
-#elif defined(HW_OOB)
-       sdioh_enable_func_intr();
-#endif /* defined(OOB_INTR_ONLY) */
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_interrupt_deregister(sdioh_info_t *sd)
-{
-       sd_trace(("%s: Entering\n", __FUNCTION__));
-
-#if !defined(OOB_INTR_ONLY)
-       if (gInstance->func[1]) {
-               /* register and unmask irq */
-               sdio_claim_host(gInstance->func[1]);
-               sdio_release_irq(gInstance->func[1]);
-               sdio_release_host(gInstance->func[1]);
-       }
-
-       if (gInstance->func[2]) {
-               /* Claim host controller F2 */
-               sdio_claim_host(gInstance->func[2]);
-               sdio_release_irq(gInstance->func[2]);
-               /* Release host controller F2 */
-               sdio_release_host(gInstance->func[2]);
-       }
-
-       sd->intr_handler_valid = FALSE;
-       sd->intr_handler = NULL;
-       sd->intr_handler_arg = NULL;
-#elif defined(HW_OOB)
-       sdioh_disable_func_intr();
-#endif /*  !defined(OOB_INTR_ONLY) */
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_interrupt_query(sdioh_info_t *sd, bool *onoff)
-{
-       sd_trace(("%s: Entering\n", __FUNCTION__));
-       *onoff = sd->client_intr_enabled;
-       return SDIOH_API_RC_SUCCESS;
-}
-
-#if defined(DHD_DEBUG)
-extern bool
-sdioh_interrupt_pending(sdioh_info_t *sd)
-{
-       return (0);
-}
-#endif
-
-uint
-sdioh_query_iofnum(sdioh_info_t *sd)
-{
-       return sd->num_funcs;
-}
-
-/* IOVar table */
-enum {
-       IOV_MSGLEVEL = 1,
-       IOV_BLOCKMODE,
-       IOV_BLOCKSIZE,
-       IOV_DMA,
-       IOV_USEINTS,
-       IOV_NUMINTS,
-       IOV_NUMLOCALINTS,
-       IOV_HOSTREG,
-       IOV_DEVREG,
-       IOV_DIVISOR,
-       IOV_SDMODE,
-       IOV_HISPEED,
-       IOV_HCIREGS,
-       IOV_POWER,
-       IOV_CLOCK,
-       IOV_RXCHAIN
-};
-
-const bcm_iovar_t sdioh_iovars[] = {
-       {"sd_msglevel", IOV_MSGLEVEL,   0,      IOVT_UINT32,    0 },
-       {"sd_blockmode", IOV_BLOCKMODE, 0,      IOVT_BOOL,      0 },
-       {"sd_blocksize", IOV_BLOCKSIZE, 0,      IOVT_UINT32,    0 }, /* ((fn << 16) | size) */
-       {"sd_dma",      IOV_DMA,        0,      IOVT_BOOL,      0 },
-       {"sd_ints",     IOV_USEINTS,    0,      IOVT_BOOL,      0 },
-       {"sd_numints",  IOV_NUMINTS,    0,      IOVT_UINT32,    0 },
-       {"sd_numlocalints", IOV_NUMLOCALINTS, 0, IOVT_UINT32,   0 },
-       {"sd_hostreg",  IOV_HOSTREG,    0,      IOVT_BUFFER,    sizeof(sdreg_t) },
-       {"sd_devreg",   IOV_DEVREG,     0,      IOVT_BUFFER,    sizeof(sdreg_t) },
-       {"sd_divisor",  IOV_DIVISOR,    0,      IOVT_UINT32,    0 },
-       {"sd_power",    IOV_POWER,      0,      IOVT_UINT32,    0 },
-       {"sd_clock",    IOV_CLOCK,      0,      IOVT_UINT32,    0 },
-       {"sd_mode",     IOV_SDMODE,     0,      IOVT_UINT32,    100},
-       {"sd_highspeed", IOV_HISPEED,   0,      IOVT_UINT32,    0 },
-       {"sd_rxchain",  IOV_RXCHAIN,    0,      IOVT_BOOL,      0 },
-       {NULL, 0, 0, 0, 0 }
-};
-
-int
-sdioh_iovar_op(sdioh_info_t *si, const char *name,
-                           void *params, int plen, void *arg, int len, bool set)
-{
-       const bcm_iovar_t *vi = NULL;
-       int bcmerror = 0;
-       int val_size;
-       int32 int_val = 0;
-       bool bool_val;
-       uint32 actionid;
-
-       ASSERT(name);
-       ASSERT(len >= 0);
-
-       /* Get must have return space; Set does not take qualifiers */
-       ASSERT(set || (arg && len));
-       ASSERT(!set || (!params && !plen));
-
-       sd_trace(("%s: Enter (%s %s)\n", __FUNCTION__, (set ? "set" : "get"), name));
-
-       if ((vi = bcm_iovar_lookup(sdioh_iovars, name)) == NULL) {
-               bcmerror = BCME_UNSUPPORTED;
-               goto exit;
-       }
-
-       if ((bcmerror = bcm_iovar_lencheck(vi, arg, len, set)) != 0)
-               goto exit;
-
-       /* Set up params so get and set can share the convenience variables */
-       if (params == NULL) {
-               params = arg;
-               plen = len;
-       }
-
-       if (vi->type == IOVT_VOID)
-               val_size = 0;
-       else if (vi->type == IOVT_BUFFER)
-               val_size = len;
-       else
-               val_size = sizeof(int);
-
-       if (plen >= (int)sizeof(int_val))
-               bcopy(params, &int_val, sizeof(int_val));
-
-       bool_val = (int_val != 0) ? TRUE : FALSE;
-
-       actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid);
-       switch (actionid) {
-       case IOV_GVAL(IOV_MSGLEVEL):
-               int_val = (int32)sd_msglevel;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_MSGLEVEL):
-               sd_msglevel = int_val;
-               break;
-
-       case IOV_GVAL(IOV_BLOCKMODE):
-               int_val = (int32)si->sd_blockmode;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_BLOCKMODE):
-               si->sd_blockmode = (bool)int_val;
-               /* Haven't figured out how to make non-block mode with DMA */
-               break;
-
-       case IOV_GVAL(IOV_BLOCKSIZE):
-               if ((uint32)int_val > si->num_funcs) {
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-               int_val = (int32)si->client_block_size[int_val];
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_BLOCKSIZE):
-       {
-               uint func = ((uint32)int_val >> 16);
-               uint blksize = (uint16)int_val;
-               uint maxsize;
-
-               if (func > si->num_funcs) {
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-
-               switch (func) {
-               case 0: maxsize = 32; break;
-               case 1: maxsize = BLOCK_SIZE_4318; break;
-               case 2: maxsize = BLOCK_SIZE_4328; break;
-               default: maxsize = 0;
-               }
-               if (blksize > maxsize) {
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-               if (!blksize) {
-                       blksize = maxsize;
-               }
-
-               /* Now set it */
-               si->client_block_size[func] = blksize;
-
-               break;
-       }
-
-       case IOV_GVAL(IOV_RXCHAIN):
-               int_val = FALSE;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_GVAL(IOV_DMA):
-               int_val = (int32)si->sd_use_dma;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_DMA):
-               si->sd_use_dma = (bool)int_val;
-               break;
-
-       case IOV_GVAL(IOV_USEINTS):
-               int_val = (int32)si->use_client_ints;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_USEINTS):
-               si->use_client_ints = (bool)int_val;
-               if (si->use_client_ints)
-                       si->intmask |= CLIENT_INTR;
-               else
-                       si->intmask &= ~CLIENT_INTR;
-
-               break;
-
-       case IOV_GVAL(IOV_DIVISOR):
-               int_val = (uint32)sd_divisor;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_DIVISOR):
-               sd_divisor = int_val;
-               break;
-
-       case IOV_GVAL(IOV_POWER):
-               int_val = (uint32)sd_power;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_POWER):
-               sd_power = int_val;
-               break;
-
-       case IOV_GVAL(IOV_CLOCK):
-               int_val = (uint32)sd_clock;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_CLOCK):
-               sd_clock = int_val;
-               break;
-
-       case IOV_GVAL(IOV_SDMODE):
-               int_val = (uint32)sd_sdmode;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_SDMODE):
-               sd_sdmode = int_val;
-               break;
-
-       case IOV_GVAL(IOV_HISPEED):
-               int_val = (uint32)sd_hiok;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_HISPEED):
-               sd_hiok = int_val;
-               break;
-
-       case IOV_GVAL(IOV_NUMINTS):
-               int_val = (int32)si->intrcount;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_GVAL(IOV_NUMLOCALINTS):
-               int_val = (int32)0;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_GVAL(IOV_HOSTREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-
-               if (sd_ptr->offset < SD_SysAddr || sd_ptr->offset > SD_MaxCurCap) {
-                       sd_err(("%s: bad offset 0x%x\n", __FUNCTION__, sd_ptr->offset));
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-
-               sd_trace(("%s: rreg%d at offset %d\n", __FUNCTION__,
-                                 (sd_ptr->offset & 1) ? 8 : ((sd_ptr->offset & 2) ? 16 : 32),
-                                 sd_ptr->offset));
-               if (sd_ptr->offset & 1)
-                       int_val = 8; /* sdioh_sdmmc_rreg8(si, sd_ptr->offset); */
-               else if (sd_ptr->offset & 2)
-                       int_val = 16; /* sdioh_sdmmc_rreg16(si, sd_ptr->offset); */
-               else
-                       int_val = 32; /* sdioh_sdmmc_rreg(si, sd_ptr->offset); */
-
-               bcopy(&int_val, arg, sizeof(int_val));
-               break;
-       }
-
-       case IOV_SVAL(IOV_HOSTREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-
-               if (sd_ptr->offset < SD_SysAddr || sd_ptr->offset > SD_MaxCurCap) {
-                       sd_err(("%s: bad offset 0x%x\n", __FUNCTION__, sd_ptr->offset));
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-
-               sd_trace(("%s: wreg%d value 0x%08x at offset %d\n", __FUNCTION__, sd_ptr->value,
-                                 (sd_ptr->offset & 1) ? 8 : ((sd_ptr->offset & 2) ? 16 : 32),
-                                 sd_ptr->offset));
-               break;
-       }
-
-       case IOV_GVAL(IOV_DEVREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-               uint8 data = 0;
-
-               if (sdioh_cfg_read(si, sd_ptr->func, sd_ptr->offset, &data)) {
-                       bcmerror = BCME_SDIO_ERROR;
-                       break;
-               }
-
-               int_val = (int)data;
-               bcopy(&int_val, arg, sizeof(int_val));
-               break;
-       }
-
-       case IOV_SVAL(IOV_DEVREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-               uint8 data = (uint8)sd_ptr->value;
-
-               if (sdioh_cfg_write(si, sd_ptr->func, sd_ptr->offset, &data)) {
-                       bcmerror = BCME_SDIO_ERROR;
-                       break;
-               }
-               break;
-       }
-
-       default:
-               bcmerror = BCME_UNSUPPORTED;
-               break;
-       }
-exit:
-
-       return bcmerror;
-}
-
-#if defined(OOB_INTR_ONLY) && defined(HW_OOB)
-
-SDIOH_API_RC
-sdioh_enable_hw_oob_intr(sdioh_info_t *sd, bool enable)
-{
-       SDIOH_API_RC status;
-       uint8 data;
-
-       if (enable)
-               data = 3;       /* enable hw oob interrupt */
-       else
-               data = 4;       /* disable hw oob interrupt */
-
-       status = sdioh_request_byte(sd, SDIOH_WRITE, 0, 0xf2, &data);
-       return status;
-}
-#endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */
-
-extern SDIOH_API_RC
-sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, uint8 *data)
-{
-       SDIOH_API_RC status;
-       /* No lock needed since sdioh_request_byte does locking */
-       status = sdioh_request_byte(sd, SDIOH_READ, fnc_num, addr, data);
-       return status;
-}
-
-extern SDIOH_API_RC
-sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, uint32 addr, uint8 *data)
-{
-       /* No lock needed since sdioh_request_byte does locking */
-       SDIOH_API_RC status;
-       status = sdioh_request_byte(sd, SDIOH_WRITE, fnc_num, addr, data);
-       return status;
-}
-
-static int
-sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr)
-{
-       /* read 24 bits and return valid 17 bit addr */
-       int i;
-       uint32 scratch, regdata;
-       uint8 *ptr = (uint8 *)&scratch;
-       for (i = 0; i < 3; i++) {
-               if ((sdioh_sdmmc_card_regread (sd, 0, regaddr, 1, &regdata)) != SUCCESS)
-                       sd_err(("%s: Can't read!\n", __FUNCTION__));
-
-               *ptr++ = (uint8) regdata;
-               regaddr++;
-       }
-
-       /* Only the lower 17-bits are valid */
-       scratch = ltoh32(scratch);
-       scratch &= 0x0001FFFF;
-       return (scratch);
-}
-
-extern SDIOH_API_RC
-sdioh_cis_read(sdioh_info_t *sd, uint func, uint8 *cisd, uint32 length)
-{
-       uint32 count;
-       int offset;
-       uint32 foo;
-       uint8 *cis = cisd;
-
-       sd_trace(("%s: Func = %d\n", __FUNCTION__, func));
-
-       if (!sd->func_cis_ptr[func]) {
-               bzero(cis, length);
-               sd_err(("%s: no func_cis_ptr[%d]\n", __FUNCTION__, func));
-               return SDIOH_API_RC_FAIL;
-       }
-
-       sd_err(("%s: func_cis_ptr[%d]=0x%04x\n", __FUNCTION__, func, sd->func_cis_ptr[func]));
-
-       for (count = 0; count < length; count++) {
-               offset =  sd->func_cis_ptr[func] + count;
-               if (sdioh_sdmmc_card_regread (sd, 0, offset, 1, &foo) < 0) {
-                       sd_err(("%s: regread failed: Can't read CIS\n", __FUNCTION__));
-                       return SDIOH_API_RC_FAIL;
-               }
-
-               *cis = (uint8)(foo & 0xff);
-               cis++;
-       }
-
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_request_byte(sdioh_info_t *sd, uint rw, uint func, uint regaddr, uint8 *byte)
-{
-       int err_ret;
-
-       sd_info(("%s: rw=%d, func=%d, addr=0x%05x\n", __FUNCTION__, rw, func, regaddr));
-
-       DHD_PM_RESUME_WAIT(sdioh_request_byte_wait);
-       DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);
-       if(rw) { /* CMD52 Write */
-               if (func == 0) {
-                       /* Can only directly write to some F0 registers.  Handle F2 enable
-                        * as a special case.
-                        */
-                       if (regaddr == SDIOD_CCCR_IOEN) {
-                               if (gInstance->func[2]) {
-                                       sdio_claim_host(gInstance->func[2]);
-                                       if (*byte & SDIO_FUNC_ENABLE_2) {
-                                               /* Enable Function 2 */
-                                               err_ret = sdio_enable_func(gInstance->func[2]);
-                                               if (err_ret) {
-                                                       sd_err(("bcmsdh_sdmmc: enable F2 failed:%d",
-                                                               err_ret));
-                                               }
-                                       } else {
-                                               /* Disable Function 2 */
-                                               err_ret = sdio_disable_func(gInstance->func[2]);
-                                               if (err_ret) {
-                                                       sd_err(("bcmsdh_sdmmc: Disab F2 failed:%d",
-                                                               err_ret));
-                                               }
-                                       }
-                                       sdio_release_host(gInstance->func[2]);
-                               }
-                       }
-#if defined(MMC_SDIO_ABORT)
-                       /* to allow abort command through F1 */
-                       else if (regaddr == SDIOD_CCCR_IOABORT) {
-                               sdio_claim_host(gInstance->func[func]);
-                               /*
-                               * this sdio_f0_writeb() can be replaced with another api
-                               * depending upon MMC driver change.
-                               * As of this time, this is temporaray one
-                               */
-                               sdio_writeb(gInstance->func[func], *byte, regaddr, &err_ret);
-                               sdio_release_host(gInstance->func[func]);
-                       }
-#endif /* MMC_SDIO_ABORT */
-                       else if (regaddr < 0xF0) {
-                               sd_err(("bcmsdh_sdmmc: F0 Wr:0x%02x: write disallowed\n", regaddr));
-                       } else {
-                               /* Claim host controller, perform F0 write, and release */
-                               sdio_claim_host(gInstance->func[func]);
-                               sdio_f0_writeb(gInstance->func[func], *byte, regaddr, &err_ret);
-                               sdio_release_host(gInstance->func[func]);
-                       }
-               } else {
-                       /* Claim host controller, perform Fn write, and release */
-                       sdio_claim_host(gInstance->func[func]);
-                       sdio_writeb(gInstance->func[func], *byte, regaddr, &err_ret);
-                       sdio_release_host(gInstance->func[func]);
-               }
-       } else { /* CMD52 Read */
-               /* Claim host controller, perform Fn read, and release */
-               sdio_claim_host(gInstance->func[func]);
-
-               if (func == 0) {
-                       *byte = sdio_f0_readb(gInstance->func[func], regaddr, &err_ret);
-               } else {
-                       *byte = sdio_readb(gInstance->func[func], regaddr, &err_ret);
-               }
-
-               sdio_release_host(gInstance->func[func]);
-       }
-
-       if (err_ret) {
-               sd_err(("bcmsdh_sdmmc: Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n",
-                                       rw ? "Write" : "Read", func, regaddr, *byte, err_ret));
-       }
-
-       return ((err_ret == 0) ? SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL);
-}
-
-extern SDIOH_API_RC
-sdioh_request_word(sdioh_info_t *sd, uint cmd_type, uint rw, uint func, uint addr,
-                                   uint32 *word, uint nbytes)
-{
-       int err_ret = SDIOH_API_RC_FAIL;
-
-       if (func == 0) {
-               sd_err(("%s: Only CMD52 allowed to F0.\n", __FUNCTION__));
-               return SDIOH_API_RC_FAIL;
-       }
-
-       sd_info(("%s: cmd_type=%d, rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
-                __FUNCTION__, cmd_type, rw, func, addr, nbytes));
-
-       DHD_PM_RESUME_WAIT(sdioh_request_word_wait);
-       DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);
-       /* Claim host controller */
-       sdio_claim_host(gInstance->func[func]);
-
-       if(rw) { /* CMD52 Write */
-               if (nbytes == 4) {
-                       sdio_writel(gInstance->func[func], *word, addr, &err_ret);
-               } else if (nbytes == 2) {
-                       sdio_writew(gInstance->func[func], (*word & 0xFFFF), addr, &err_ret);
-               } else {
-                       sd_err(("%s: Invalid nbytes: %d\n", __FUNCTION__, nbytes));
-               }
-       } else { /* CMD52 Read */
-               if (nbytes == 4) {
-                       *word = sdio_readl(gInstance->func[func], addr, &err_ret);
-               } else if (nbytes == 2) {
-                       *word = sdio_readw(gInstance->func[func], addr, &err_ret) & 0xFFFF;
-               } else {
-                       sd_err(("%s: Invalid nbytes: %d\n", __FUNCTION__, nbytes));
-               }
-       }
-
-       /* Release host controller */
-       sdio_release_host(gInstance->func[func]);
-
-       if (err_ret) {
-               sd_err(("bcmsdh_sdmmc: Failed to %s word, Err: 0x%08x",
-                                       rw ? "Write" : "Read", err_ret));
-       }
-
-       return ((err_ret == 0) ? SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL);
-}
-
-static SDIOH_API_RC
-sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func,
-                     uint addr, void *pkt)
-{
-       bool fifo = (fix_inc == SDIOH_DATA_FIX);
-       uint32  SGCount = 0;
-       int err_ret = 0;
-
-       void *pnext;
-
-       sd_trace(("%s: Enter\n", __FUNCTION__));
-
-       ASSERT(pkt);
-       DHD_PM_RESUME_WAIT(sdioh_request_packet_wait);
-       DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);
-
-       /* Claim host controller */
-       sdio_claim_host(gInstance->func[func]);
-       for (pnext = pkt; pnext; pnext = PKTNEXT(sd->osh, pnext)) {
-               uint pkt_len = PKTLEN(sd->osh, pnext);
-               pkt_len += 3;
-               pkt_len &= 0xFFFFFFFC;
-
-#ifdef CONFIG_MMC_MSM7X00A
-               if ((pkt_len % 64) == 32) {
-                       sd_trace(("%s: Rounding up TX packet +=32\n", __FUNCTION__));
-                       pkt_len += 32;
-               }
-#endif /* CONFIG_MMC_MSM7X00A */
-               /* Make sure the packet is aligned properly. If it isn't, then this
-                * is the fault of sdioh_request_buffer() which is supposed to give
-                * us something we can work with.
-                */
-               ASSERT(((uint32)(PKTDATA(sd->osh, pkt)) & DMA_ALIGN_MASK) == 0);
-
-               if ((write) && (!fifo)) {
-                       err_ret = sdio_memcpy_toio(gInstance->func[func], addr,
-                               ((uint8*)PKTDATA(sd->osh, pnext)),
-                               pkt_len);
-               } else if (write) {
-                       err_ret = sdio_memcpy_toio(gInstance->func[func], addr,
-                               ((uint8*)PKTDATA(sd->osh, pnext)),
-                               pkt_len);
-               } else if (fifo) {
-                       err_ret = sdio_readsb(gInstance->func[func],
-                               ((uint8*)PKTDATA(sd->osh, pnext)),
-                               addr,
-                               pkt_len);
-               } else {
-                       err_ret = sdio_memcpy_fromio(gInstance->func[func],
-                               ((uint8*)PKTDATA(sd->osh, pnext)),
-                               addr,
-                               pkt_len);
-               }
-
-               if (err_ret) {
-                       sd_err(("%s: %s FAILED %p[%d], addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",
-                               __FUNCTION__,
-                               (write) ? "TX" : "RX",
-                               pnext, SGCount, addr, pkt_len, err_ret));
-               } else {
-                       sd_trace(("%s: %s xfr'd %p[%d], addr=0x%05x, len=%d\n",
-                               __FUNCTION__,
-                               (write) ? "TX" : "RX",
-                               pnext, SGCount, addr, pkt_len));
-               }
-
-               if (!fifo) {
-                       addr += pkt_len;
-               }
-               SGCount ++;
-
-       }
-
-       /* Release host controller */
-       sdio_release_host(gInstance->func[func]);
-
-       sd_trace(("%s: Exit\n", __FUNCTION__));
-       return ((err_ret == 0) ? SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL);
-}
-
-
-/*
- * This function takes a buffer or packet, and fixes everything up so that in the
- * end, a DMA-able packet is created.
- *
- * A buffer does not have an associated packet pointer, and may or may not be aligned.
- * A packet may consist of a single packet, or a packet chain.  If it is a packet chain,
- * then all the packets in the chain must be properly aligned.  If the packet data is not
- * aligned, then there may only be one packet, and in this case, it is copied to a new
- * aligned packet.
- *
- */
-extern SDIOH_API_RC
-sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, uint func,
-                     uint addr, uint reg_width, uint buflen_u, uint8 *buffer, void *pkt)
-{
-       SDIOH_API_RC Status;
-       void *mypkt = NULL;
-
-       sd_trace(("%s: Enter\n", __FUNCTION__));
-
-       DHD_PM_RESUME_WAIT(sdioh_request_buffer_wait);
-       DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);
-       /* Case 1: we don't have a packet. */
-       if (pkt == NULL) {
-               sd_data(("%s: Creating new %s Packet, len=%d\n",
-                        __FUNCTION__, write ? "TX" : "RX", buflen_u));
-#ifdef DHD_USE_STATIC_BUF
-               if (!(mypkt = PKTGET_STATIC(sd->osh, buflen_u, write ? TRUE : FALSE))) {
-#else
-               if (!(mypkt = PKTGET(sd->osh, buflen_u, write ? TRUE : FALSE))) {
-#endif /* DHD_USE_STATIC_BUF */
-                       sd_err(("%s: PKTGET failed: len %d\n",
-                                  __FUNCTION__, buflen_u));
-                       return SDIOH_API_RC_FAIL;
-               }
-
-               /* For a write, copy the buffer data into the packet. */
-               if (write) {
-                       bcopy(buffer, PKTDATA(sd->osh, mypkt), buflen_u);
-               }
-
-               Status = sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt);
-
-               /* For a read, copy the packet data back to the buffer. */
-               if (!write) {
-                       bcopy(PKTDATA(sd->osh, mypkt), buffer, buflen_u);
-               }
-#ifdef DHD_USE_STATIC_BUF
-               PKTFREE_STATIC(sd->osh, mypkt, write ? TRUE : FALSE);
-#else
-               PKTFREE(sd->osh, mypkt, write ? TRUE : FALSE);
-#endif /* DHD_USE_STATIC_BUF */
-       } else if (((uint32)(PKTDATA(sd->osh, pkt)) & DMA_ALIGN_MASK) != 0) {
-               /* Case 2: We have a packet, but it is unaligned. */
-
-               /* In this case, we cannot have a chain. */
-               ASSERT(PKTNEXT(sd->osh, pkt) == NULL);
-
-               sd_data(("%s: Creating aligned %s Packet, len=%d\n",
-                        __FUNCTION__, write ? "TX" : "RX", PKTLEN(sd->osh, pkt)));
-#ifdef DHD_USE_STATIC_BUF
-               if (!(mypkt = PKTGET_STATIC(sd->osh, PKTLEN(sd->osh, pkt), write ? TRUE : FALSE))) {
-#else
-               if (!(mypkt = PKTGET(sd->osh, PKTLEN(sd->osh, pkt), write ? TRUE : FALSE))) {
-#endif /* DHD_USE_STATIC_BUF */
-                       sd_err(("%s: PKTGET failed: len %d\n",
-                                  __FUNCTION__, PKTLEN(sd->osh, pkt)));
-                       return SDIOH_API_RC_FAIL;
-               }
-
-               /* For a write, copy the buffer data into the packet. */
-               if (write) {
-                       bcopy(PKTDATA(sd->osh, pkt),
-                             PKTDATA(sd->osh, mypkt),
-                             PKTLEN(sd->osh, pkt));
-               }
-
-               Status = sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt);
-
-               /* For a read, copy the packet data back to the buffer. */
-               if (!write) {
-                       bcopy(PKTDATA(sd->osh, mypkt),
-                             PKTDATA(sd->osh, pkt),
-                             PKTLEN(sd->osh, mypkt));
-               }
-#ifdef DHD_USE_STATIC_BUF
-               PKTFREE_STATIC(sd->osh, mypkt, write ? TRUE : FALSE);
-#else
-               PKTFREE(sd->osh, mypkt, write ? TRUE : FALSE);
-#endif /* DHD_USE_STATIC_BUF */
-       } else { /* case 3: We have a packet and it is aligned. */
-               sd_data(("%s: Aligned %s Packet, direct DMA\n",
-                        __FUNCTION__, write ? "Tx" : "Rx"));
-               Status = sdioh_request_packet(sd, fix_inc, write, func, addr, pkt);
-       }
-
-       return (Status);
-}
-
-extern int
-sdioh_abort(sdioh_info_t *sd, uint func)
-{
-       sd_trace(("%s: Enter\n", __FUNCTION__));
-
-#if defined(MMC_SDIO_ABORT)
-       /* issue abort cmd52 command through F1 */
-       sdioh_request_byte(sd, SD_IO_OP_WRITE, SDIO_FUNC_0, SDIOD_CCCR_IOABORT, (uint8 *)&func);
-#endif /* defined(MMC_SDIO_ABORT) */
-
-       sd_trace(("%s: Exit\n", __FUNCTION__));
-       return SDIOH_API_RC_SUCCESS;
-}
-
-/* Reset and re-initialize the device */
-int sdioh_sdio_reset(sdioh_info_t *si)
-{
-       sd_trace(("%s: Enter\n", __FUNCTION__));
-       sd_trace(("%s: Exit\n", __FUNCTION__));
-       return SDIOH_API_RC_SUCCESS;
-}
-
-/* Disable device interrupt */
-void
-sdioh_sdmmc_devintr_off(sdioh_info_t *sd)
-{
-       sd_trace(("%s: %d\n", __FUNCTION__, sd->use_client_ints));
-       sd->intmask &= ~CLIENT_INTR;
-}
-
-/* Enable device interrupt */
-void
-sdioh_sdmmc_devintr_on(sdioh_info_t *sd)
-{
-       sd_trace(("%s: %d\n", __FUNCTION__, sd->use_client_ints));
-       sd->intmask |= CLIENT_INTR;
-}
-
-/* Read client card reg */
-int
-sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, uint32 regaddr, int regsize, uint32 *data)
-{
-
-       if ((func == 0) || (regsize == 1)) {
-               uint8 temp = 0;
-
-               sdioh_request_byte(sd, SDIOH_READ, func, regaddr, &temp);
-               *data = temp;
-               *data &= 0xff;
-               sd_data(("%s: byte read data=0x%02x\n",
-                        __FUNCTION__, *data));
-       } else {
-               sdioh_request_word(sd, 0, SDIOH_READ, func, regaddr, data, regsize);
-               if (regsize == 2)
-                       *data &= 0xffff;
-
-               sd_data(("%s: word read data=0x%08x\n",
-                        __FUNCTION__, *data));
-       }
-
-       return SUCCESS;
-}
-
-#if !defined(OOB_INTR_ONLY)
-/* bcmsdh_sdmmc interrupt handler */
-static void IRQHandler(struct sdio_func *func)
-{
-       sdioh_info_t *sd;
-
-       sd_trace(("bcmsdh_sdmmc: ***IRQHandler\n"));
-       sd = gInstance->sd;
-
-       ASSERT(sd != NULL);
-       sdio_release_host(gInstance->func[0]);
-
-       if (sd->use_client_ints) {
-               sd->intrcount++;
-               ASSERT(sd->intr_handler);
-               ASSERT(sd->intr_handler_arg);
-               (sd->intr_handler)(sd->intr_handler_arg);
-       } else {
-               sd_err(("bcmsdh_sdmmc: ***IRQHandler\n"));
-
-               sd_err(("%s: Not ready for intr: enabled %d, handler %p\n",
-                       __FUNCTION__, sd->client_intr_enabled, sd->intr_handler));
-       }
-
-       sdio_claim_host(gInstance->func[0]);
-}
-
-/* bcmsdh_sdmmc interrupt handler for F2 (dummy handler) */
-static void IRQHandlerF2(struct sdio_func *func)
-{
-       sdioh_info_t *sd;
-
-       sd_trace(("bcmsdh_sdmmc: ***IRQHandlerF2\n"));
-
-       sd = gInstance->sd;
-
-       ASSERT(sd != NULL);
-}
-#endif /* !defined(OOB_INTR_ONLY) */
-
-#ifdef NOTUSED
-/* Write client card reg */
-static int
-sdioh_sdmmc_card_regwrite(sdioh_info_t *sd, int func, uint32 regaddr, int regsize, uint32 data)
-{
-
-       if ((func == 0) || (regsize == 1)) {
-               uint8 temp;
-
-               temp = data & 0xff;
-               sdioh_request_byte(sd, SDIOH_READ, func, regaddr, &temp);
-               sd_data(("%s: byte write data=0x%02x\n",
-                        __FUNCTION__, data));
-       } else {
-               if (regsize == 2)
-                       data &= 0xffff;
-
-               sdioh_request_word(sd, 0, SDIOH_READ, func, regaddr, &data, regsize);
-
-               sd_data(("%s: word write data=0x%08x\n",
-                        __FUNCTION__, data));
-       }
-
-       return SUCCESS;
-}
-#endif /* NOTUSED */
-
-int
-sdioh_start(sdioh_info_t *si, int stage)
-{
-       int ret;
-       sdioh_info_t *sd = gInstance->sd;
-
-       /* Need to do this stages as we can't enable the interrupt till
-               downloading of the firmware is complete, other wise polling
-               sdio access will come in way
-       */
-       if (gInstance->func[0]) {
-                       if (stage == 0) {
-               /* Since the power to the chip is killed, we will have
-                       re enumerate the device again. Set the block size
-                       and enable the fucntion 1 for in preparation for
-                       downloading the code
-               */
-               /* sdio_reset_comm() - has been fixed in latest kernel/msm.git for Linux
-                  2.6.27. The implementation prior to that is buggy, and needs broadcom's
-                  patch for it
-               */
-//             if ((ret = sdio_reset_comm(gInstance->func[0]->card)))
-//                     sd_err(("%s Failed, error = %d\n", __FUNCTION__, ret));
-//             else {
-                       sd->num_funcs = 2;
-                       sd->sd_blockmode = TRUE;
-                       sd->use_client_ints = TRUE;
-                       sd->client_block_size[0] = 64;
-
-                       /* Claim host controller */
-                       sdio_claim_host(gInstance->func[1]);
-
-                       sd->client_block_size[1] = 64;
-                       if (sdio_set_block_size(gInstance->func[1], 64)) {
-                               sd_err(("bcmsdh_sdmmc: Failed to set F1 blocksize\n"));
-                       }
-
-                       /* Release host controller F1 */
-                       sdio_release_host(gInstance->func[1]);
-
-                       if (gInstance->func[2]) {
-                               /* Claim host controller F2 */
-                               sdio_claim_host(gInstance->func[2]);
-
-                               sd->client_block_size[2] = sd_f2_blocksize;
-                               if (sdio_set_block_size(gInstance->func[2],
-                                       sd_f2_blocksize)) {
-                                       sd_err(("bcmsdh_sdmmc: Failed to set F2 "
-                                               "blocksize to %d\n", sd_f2_blocksize));
-                               }
-
-                               /* Release host controller F2 */
-                               sdio_release_host(gInstance->func[2]);
-                       }
-
-                       sdioh_sdmmc_card_enablefuncs(sd);
-//                     }
-               } else {
-#if !defined(OOB_INTR_ONLY)
-                       sdio_claim_host(gInstance->func[0]);
-                       sdio_claim_irq(gInstance->func[2], IRQHandlerF2);
-                       sdio_claim_irq(gInstance->func[1], IRQHandler);
-                       sdio_release_host(gInstance->func[0]);
-#else /* defined(OOB_INTR_ONLY) */
-#if defined(HW_OOB)
-                       sdioh_enable_func_intr();
-#endif
-                       bcmsdh_oob_intr_set(TRUE);
-#endif /* !defined(OOB_INTR_ONLY) */
-               }
-       }
-       else
-               sd_err(("%s Failed\n", __FUNCTION__));
-
-       return (0);
-}
-
-int
-sdioh_stop(sdioh_info_t *si)
-{
-       /* MSM7201A Android sdio stack has bug with interrupt
-               So internaly within SDIO stack they are polling
-               which cause issue when device is turned off. So
-               unregister interrupt with SDIO stack to stop the
-               polling
-       */
-       if (gInstance->func[0]) {
-#if !defined(OOB_INTR_ONLY)
-               sdio_claim_host(gInstance->func[0]);
-               sdio_release_irq(gInstance->func[1]);
-               sdio_release_irq(gInstance->func[2]);
-               sdio_release_host(gInstance->func[0]);
-#else /* defined(OOB_INTR_ONLY) */
-#if defined(HW_OOB)
-               sdioh_disable_func_intr();
-#endif
-               bcmsdh_oob_intr_set(FALSE);
-#endif /* !defined(OOB_INTR_ONLY) */
-       }
-       else
-               sd_err(("%s Failed\n", __FUNCTION__));
-       return (0);
-}
diff --git a/drivers/net/wireless/bcm4319/bcmsdh_sdmmc_linux.c b/drivers/net/wireless/bcm4319/bcmsdh_sdmmc_linux.c
deleted file mode 100644 (file)
index f52207e..0000000
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * BCMSDH Function Driver for the native SDIO/MMC driver in the Linux Kernel
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdh_sdmmc_linux.c,v 1.1.2.5.6.15 2010/04/14 21:11:46 Exp $
- */
-
-#include <typedefs.h>
-#include <bcmutils.h>
-#include <sdio.h>      /* SDIO Specs */
-#include <bcmsdbus.h>  /* bcmsdh to/from specific controller APIs */
-#include <sdiovar.h>   /* to get msglevel bit values */
-
-#include <linux/sched.h>       /* request_irq() */
-
-#include <linux/mmc/core.h>
-#include <linux/mmc/card.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/sdio_func.h>
-#include <linux/mmc/sdio_ids.h>
-
-#if !defined(SDIO_VENDOR_ID_BROADCOM)
-#define SDIO_VENDOR_ID_BROADCOM                0x02d0
-#endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4325) */
-#if !defined(SDIO_DEVICE_ID_BROADCOM_4325)
-#define SDIO_DEVICE_ID_BROADCOM_4325   0x0000
-#endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4325) */
-#if !defined(SDIO_DEVICE_ID_BROADCOM_4329)
-#define SDIO_DEVICE_ID_BROADCOM_4329   0x4329
-#endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4329) */
-#if !defined(SDIO_DEVICE_ID_BROADCOM_4319)
-#define SDIO_DEVICE_ID_BROADCOM_4319   0x4319
-#endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4329) */
-
-
-#include <bcmsdh_sdmmc.h>
-
-#include <dhd_dbg.h>
-
-
-struct sdio_func *wifi_sdio_func = NULL;
-EXPORT_SYMBOL(wifi_sdio_func);
-
-extern void sdioh_sdmmc_devintr_off(sdioh_info_t *sd);
-extern void sdioh_sdmmc_devintr_on(sdioh_info_t *sd);
-
-int sdio_function_init(void);
-void sdio_function_cleanup(void);
-
-#define DESCRIPTION "bcmsdh_sdmmc Driver"
-#define AUTHOR "Broadcom Corporation"
-
-/* module param defaults */
-static int clockoverride = 0;
-
-module_param(clockoverride, int, 0644);
-MODULE_PARM_DESC(clockoverride, "SDIO card clock override");
-
-PBCMSDH_SDMMC_INSTANCE gInstance;
-
-/* Maximum number of bcmsdh_sdmmc devices supported by driver */
-#define BCMSDH_SDMMC_MAX_DEVICES 1
-
-extern int bcmsdh_probe(struct device *dev);
-extern int bcmsdh_remove(struct device *dev);
-struct device sdmmc_dev;
-
-static int bcmsdh_sdmmc_probe(struct sdio_func *func,
-                              const struct sdio_device_id *id)
-{
-       int ret = 0;
-       static struct sdio_func sdio_func_0;
-       sd_trace(("bcmsdh_sdmmc: %s Enter\n", __FUNCTION__));
-       sd_trace(("sdio_bcmsdh: func->class=%x\n", func->class));
-       sd_trace(("sdio_vendor: 0x%04x\n", func->vendor));
-       sd_trace(("sdio_device: 0x%04x\n", func->device));
-       sd_trace(("Function#: 0x%04x\n", func->num));
-
-       if (func->num == 1) {
-               sdio_func_0.num = 0;
-               sdio_func_0.card = func->card;
-               gInstance->func[0] = &sdio_func_0;
-               if(func->device == 0x4) { /* 4318 */
-                       gInstance->func[2] = NULL;
-                       sd_trace(("NIC found, calling bcmsdh_probe...\n"));
-                       ret = bcmsdh_probe(&sdmmc_dev);
-               }
-       }
-
-       gInstance->func[func->num] = func;
-
-       if (func->num == 2) {
-               sd_trace(("F2 found, calling bcmsdh_probe...\n"));
-               ret = bcmsdh_probe(&sdmmc_dev);
-       }
-
-       wifi_sdio_func = func;
-       //printk("get wifi_sdio_func\n");
-
-       return ret;
-}
-
-extern int wifi_func_removed;
-static void bcmsdh_sdmmc_remove(struct sdio_func *func)
-{
-       sd_trace(("bcmsdh_sdmmc: %s Enter\n", __FUNCTION__));
-       sd_info(("sdio_bcmsdh: func->class=%x\n", func->class));
-       sd_info(("sdio_vendor: 0x%04x\n", func->vendor));
-       sd_info(("sdio_device: 0x%04x\n", func->device));
-       sd_info(("Function#: 0x%04x\n", func->num));
-
-       if (func->num == 2) {
-               sd_trace(("F2 found, calling bcmsdh_probe...\n"));
-               bcmsdh_remove(&sdmmc_dev);
-       }
-    wifi_func_removed = 1;
-    
-       wifi_sdio_func = NULL;
-}
-
-/* devices we support, null terminated */
-static const struct sdio_device_id bcmsdh_sdmmc_ids[] = {
-       { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4325) },
-       { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329) },
-       { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4319) },
-       { /* end: all zeroes */                         },
-};
-
-MODULE_DEVICE_TABLE(sdio, bcmsdh_sdmmc_ids);
-
-static struct sdio_driver bcmsdh_sdmmc_driver = {
-       .probe          = bcmsdh_sdmmc_probe,
-       .remove         = bcmsdh_sdmmc_remove,
-       .name           = "bcmsdh_sdmmc",
-       .id_table       = bcmsdh_sdmmc_ids,
-       };
-
-struct sdos_info {
-       sdioh_info_t *sd;
-       spinlock_t lock;
-};
-
-
-int
-sdioh_sdmmc_osinit(sdioh_info_t *sd)
-{
-       struct sdos_info *sdos;
-
-       sdos = (struct sdos_info*)MALLOC(sd->osh, sizeof(struct sdos_info));
-       sd->sdos_info = (void*)sdos;
-       if (sdos == NULL)
-               return BCME_NOMEM;
-
-       sdos->sd = sd;
-       spin_lock_init(&sdos->lock);
-       return BCME_OK;
-}
-
-void
-sdioh_sdmmc_osfree(sdioh_info_t *sd)
-{
-       struct sdos_info *sdos;
-       ASSERT(sd && sd->sdos_info);
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       MFREE(sd->osh, sdos, sizeof(struct sdos_info));
-}
-
-/* Interrupt enable/disable */
-SDIOH_API_RC
-sdioh_interrupt_set(sdioh_info_t *sd, bool enable)
-{
-       ulong flags;
-       struct sdos_info *sdos;
-
-       sd_trace(("%s: %s\n", __FUNCTION__, enable ? "Enabling" : "Disabling"));
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       ASSERT(sdos);
-
-#if !defined(OOB_INTR_ONLY)
-       if (enable && !(sd->intr_handler && sd->intr_handler_arg)) {
-               sd_err(("%s: no handler registered, will not enable\n", __FUNCTION__));
-               return SDIOH_API_RC_FAIL;
-       }
-#endif /* !defined(OOB_INTR_ONLY) */
-
-       /* Ensure atomicity for enable/disable calls */
-       spin_lock_irqsave(&sdos->lock, flags);
-
-       sd->client_intr_enabled = enable;
-       if (enable) {
-               sdioh_sdmmc_devintr_on(sd);
-       } else {
-               sdioh_sdmmc_devintr_off(sd);
-       }
-
-       spin_unlock_irqrestore(&sdos->lock, flags);
-
-       return SDIOH_API_RC_SUCCESS;
-}
-
-
-#ifdef BCMSDH_MODULE
-static int __init
-bcmsdh_module_init(void)
-{
-       int error = 0;
-       sdio_function_init();
-       return error;
-}
-
-static void __exit
-bcmsdh_module_cleanup(void)
-{
-       sdio_function_cleanup();
-}
-
-//module_init(bcmsdh_module_init);
-//module_exit(bcmsdh_module_cleanup);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION(DESCRIPTION);
-MODULE_AUTHOR(AUTHOR);
-
-#endif /* BCMSDH_MODULE */
-/*
- * module init
-*/
-int sdio_function_init(void)
-{
-       int error = 0;
-       sd_trace(("bcmsdh_sdmmc: %s Enter\n", __FUNCTION__));
-
-       gInstance = kzalloc(sizeof(BCMSDH_SDMMC_INSTANCE), GFP_KERNEL);
-       if (!gInstance)
-               return -ENOMEM;
-
-       bzero(&sdmmc_dev, sizeof(sdmmc_dev));
-       error = sdio_register_driver(&bcmsdh_sdmmc_driver);
-
-       return error;
-}
-
-/*
- * module cleanup
-*/
-extern int bcmsdh_remove(struct device *dev);
-void sdio_function_cleanup(void)
-{
-       sd_trace(("%s Enter\n", __FUNCTION__));
-
-
-       sdio_unregister_driver(&bcmsdh_sdmmc_driver);
-
-       if (gInstance)
-               kfree(gInstance);
-}
diff --git a/drivers/net/wireless/bcm4319/bcmsdspi.c b/drivers/net/wireless/bcm4319/bcmsdspi.c
deleted file mode 100644 (file)
index 636539b..0000000
+++ /dev/null
@@ -1,1596 +0,0 @@
-/*
- * Broadcom BCMSDH to SPI Protocol Conversion Layer
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdspi.c,v 1.14.4.2.4.4.6.5 2010/03/10 03:09:48 Exp $
- */
-
-#include <typedefs.h>
-
-#include <bcmdevs.h>
-#include <bcmendian.h>
-#include <bcmutils.h>
-#include <osl.h>
-#include <siutils.h>
-#include <sdio.h>              /* SDIO Device and Protocol Specs */
-#include <sdioh.h>             /* SDIO Host Controller Specification */
-#include <bcmsdbus.h>          /* bcmsdh to/from specific controller APIs */
-#include <sdiovar.h>           /* ioctl/iovars */
-
-#include <pcicfg.h>
-
-
-#include <bcmsdspi.h>
-#include <bcmspi.h>
-
-#include <proto/sdspi.h>
-
-#define SD_PAGE 4096
-
-/* Globals */
-
-uint sd_msglevel = SDH_ERROR_VAL;
-uint sd_hiok = FALSE;          /* Use hi-speed mode if available? */
-uint sd_sdmode = SDIOH_MODE_SPI;               /* Use SD4 mode by default */
-uint sd_f2_blocksize = 512;    /* Default blocksize */
-
-uint sd_divisor = 2;           /* Default 33MHz/2 = 16MHz for dongle */
-uint sd_power = 1;             /* Default to SD Slot powered ON */
-uint sd_clock = 1;             /* Default to SD Clock turned ON */
-uint sd_crc = 0;               /* Default to SPI CRC Check turned OFF */
-uint sd_pci_slot = 0xFFFFffff; /* Used to force selection of a particular PCI slot */
-
-uint sd_toctl = 7;
-
-/* Prototypes */
-static bool sdspi_start_power(sdioh_info_t *sd);
-static int sdspi_set_highspeed_mode(sdioh_info_t *sd, bool HSMode);
-static int sdspi_card_enablefuncs(sdioh_info_t *sd);
-static void sdspi_cmd_getrsp(sdioh_info_t *sd, uint32 *rsp_buffer, int count);
-static int sdspi_cmd_issue(sdioh_info_t *sd, bool use_dma, uint32 cmd, uint32 arg,
-                           uint32 *data, uint32 datalen);
-static int sdspi_card_regread(sdioh_info_t *sd, int func, uint32 regaddr,
-                              int regsize, uint32 *data);
-static int sdspi_card_regwrite(sdioh_info_t *sd, int func, uint32 regaddr,
-                               int regsize, uint32 data);
-static int sdspi_driver_init(sdioh_info_t *sd);
-static bool sdspi_reset(sdioh_info_t *sd, bool host_reset, bool client_reset);
-static int sdspi_card_buf(sdioh_info_t *sd, int rw, int func, bool fifo,
-                          uint32 addr, int nbytes, uint32 *data);
-static int sdspi_abort(sdioh_info_t *sd, uint func);
-
-static int set_client_block_size(sdioh_info_t *sd, int func, int blocksize);
-
-static uint8 sdspi_crc7(unsigned char* p, uint32 len);
-static uint16 sdspi_crc16(unsigned char* p, uint32 len);
-static int sdspi_crc_onoff(sdioh_info_t *sd, bool use_crc);
-
-/*
- *  Public entry points & extern's
- */
-extern sdioh_info_t *
-sdioh_attach(osl_t *osh, void *bar0, uint irq)
-{
-       sdioh_info_t *sd;
-
-       sd_trace(("%s\n", __FUNCTION__));
-       if ((sd = (sdioh_info_t *)MALLOC(osh, sizeof(sdioh_info_t))) == NULL) {
-               sd_err(("sdioh_attach: out of memory, malloced %d bytes\n", MALLOCED(osh)));
-               return NULL;
-       }
-       bzero((char *)sd, sizeof(sdioh_info_t));
-       sd->osh = osh;
-
-       if (spi_osinit(sd) != 0) {
-               sd_err(("%s: spi_osinit() failed\n", __FUNCTION__));
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-               return NULL;
-       }
-
-       sd->bar0 = (uintptr)bar0;
-       sd->irq = irq;
-       sd->intr_handler = NULL;
-       sd->intr_handler_arg = NULL;
-       sd->intr_handler_valid = FALSE;
-
-       /* Set defaults */
-       sd->sd_blockmode = FALSE;
-       sd->use_client_ints = TRUE;
-       sd->sd_use_dma = FALSE; /* DMA Not supported */
-
-       /* Haven't figured out how to make bytemode work with dma */
-       if (!sd->sd_blockmode)
-               sd->sd_use_dma = 0;
-
-       if (!spi_hw_attach(sd)) {
-               sd_err(("%s: spi_hw_attach() failed\n", __FUNCTION__));
-               spi_osfree(sd);
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-               return NULL;
-       }
-
-       if (sdspi_driver_init(sd) != SUCCESS) {
-               if (sdspi_driver_init(sd) != SUCCESS) {
-                       sd_err(("%s:sdspi_driver_init() failed()\n", __FUNCTION__));
-                       spi_hw_detach(sd);
-                       spi_osfree(sd);
-                       MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-                       return (NULL);
-               }
-       }
-
-       if (spi_register_irq(sd, irq) != SUCCESS) {
-               sd_err(("%s: spi_register_irq() failed for irq = %d\n", __FUNCTION__, irq));
-               spi_hw_detach(sd);
-               spi_osfree(sd);
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-               return (NULL);
-       }
-
-       sd_trace(("%s: Done\n", __FUNCTION__));
-       return sd;
-}
-
-extern SDIOH_API_RC
-sdioh_detach(osl_t *osh, sdioh_info_t *sd)
-{
-       sd_trace(("%s\n", __FUNCTION__));
-
-       if (sd) {
-               if (sd->card_init_done)
-                       sdspi_reset(sd, 1, 1);
-
-               sd_info(("%s: detaching from hardware\n", __FUNCTION__));
-               spi_free_irq(sd->irq, sd);
-               spi_hw_detach(sd);
-               spi_osfree(sd);
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-       }
-
-       return SDIOH_API_RC_SUCCESS;
-}
-
-/* Configure callback to client when we recieve client interrupt */
-extern SDIOH_API_RC
-sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh)
-{
-       sd_trace(("%s: Entering\n", __FUNCTION__));
-
-       sd->intr_handler = fn;
-       sd->intr_handler_arg = argh;
-       sd->intr_handler_valid = TRUE;
-
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_interrupt_deregister(sdioh_info_t *sd)
-{
-       sd_trace(("%s: Entering\n", __FUNCTION__));
-
-       sd->intr_handler_valid = FALSE;
-       sd->intr_handler = NULL;
-       sd->intr_handler_arg = NULL;
-
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_interrupt_query(sdioh_info_t *sd, bool *onoff)
-{
-       sd_trace(("%s: Entering\n", __FUNCTION__));
-
-       *onoff = sd->client_intr_enabled;
-
-       return SDIOH_API_RC_SUCCESS;
-}
-
-#if defined(DHD_DEBUG)
-extern bool
-sdioh_interrupt_pending(sdioh_info_t *sd)
-{
-       return 0;
-}
-#endif
-
-uint
-sdioh_query_iofnum(sdioh_info_t *sd)
-{
-       return sd->num_funcs;
-}
-
-/* IOVar table */
-enum {
-       IOV_MSGLEVEL = 1,
-       IOV_BLOCKMODE,
-       IOV_BLOCKSIZE,
-       IOV_DMA,
-       IOV_USEINTS,
-       IOV_NUMINTS,
-       IOV_NUMLOCALINTS,
-       IOV_HOSTREG,
-       IOV_DEVREG,
-       IOV_DIVISOR,
-       IOV_SDMODE,
-       IOV_HISPEED,
-       IOV_HCIREGS,
-       IOV_POWER,
-       IOV_CLOCK,
-       IOV_CRC
-};
-
-const bcm_iovar_t sdioh_iovars[] = {
-       {"sd_msglevel", IOV_MSGLEVEL,   0,      IOVT_UINT32,    0 },
-       {"sd_blockmode", IOV_BLOCKMODE, 0,      IOVT_BOOL,      0 },
-       {"sd_blocksize", IOV_BLOCKSIZE, 0,      IOVT_UINT32,    0 }, /* ((fn << 16) | size) */
-       {"sd_dma",      IOV_DMA,        0,      IOVT_BOOL,      0 },
-       {"sd_ints",     IOV_USEINTS,    0,      IOVT_BOOL,      0 },
-       {"sd_numints",  IOV_NUMINTS,    0,      IOVT_UINT32,    0 },
-       {"sd_numlocalints", IOV_NUMLOCALINTS, 0, IOVT_UINT32,   0 },
-       {"sd_hostreg",  IOV_HOSTREG,    0,      IOVT_BUFFER,    sizeof(sdreg_t) },
-       {"sd_devreg",   IOV_DEVREG,     0,      IOVT_BUFFER,    sizeof(sdreg_t) },
-       {"sd_divisor",  IOV_DIVISOR,    0,      IOVT_UINT32,    0 },
-       {"sd_power",    IOV_POWER,      0,      IOVT_UINT32,    0 },
-       {"sd_clock",    IOV_CLOCK,      0,      IOVT_UINT32,    0 },
-       {"sd_crc",      IOV_CRC,        0,      IOVT_UINT32,    0 },
-       {"sd_mode",     IOV_SDMODE,     0,      IOVT_UINT32,    100},
-       {"sd_highspeed",        IOV_HISPEED,    0,      IOVT_UINT32,    0},
-       {NULL, 0, 0, 0, 0 }
-};
-
-int
-sdioh_iovar_op(sdioh_info_t *si, const char *name,
-               void *params, int plen, void *arg, int len, bool set)
-{
-       const bcm_iovar_t *vi = NULL;
-       int bcmerror = 0;
-       int val_size;
-       int32 int_val = 0;
-       bool bool_val;
-       uint32 actionid;
-
-       ASSERT(name);
-       ASSERT(len >= 0);
-
-       /* Get must have return space; Set does not take qualifiers */
-       ASSERT(set || (arg && len));
-       ASSERT(!set || (!params && !plen));
-
-       sd_trace(("%s: Enter (%s %s)\n", __FUNCTION__, (set ? "set" : "get"), name));
-
-       if ((vi = bcm_iovar_lookup(sdioh_iovars, name)) == NULL) {
-               bcmerror = BCME_UNSUPPORTED;
-               goto exit;
-       }
-
-       if ((bcmerror = bcm_iovar_lencheck(vi, arg, len, set)) != 0)
-               goto exit;
-
-       /* Set up params so get and set can share the convenience variables */
-       if (params == NULL) {
-               params = arg;
-               plen = len;
-       }
-
-       if (vi->type == IOVT_VOID)
-               val_size = 0;
-       else if (vi->type == IOVT_BUFFER)
-               val_size = len;
-       else
-               val_size = sizeof(int);
-
-       if (plen >= (int)sizeof(int_val))
-               bcopy(params, &int_val, sizeof(int_val));
-
-       bool_val = (int_val != 0) ? TRUE : FALSE;
-
-       actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid);
-       switch (actionid) {
-       case IOV_GVAL(IOV_MSGLEVEL):
-               int_val = (int32)sd_msglevel;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_MSGLEVEL):
-               sd_msglevel = int_val;
-               break;
-
-       case IOV_GVAL(IOV_BLOCKMODE):
-               int_val = (int32)si->sd_blockmode;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_BLOCKMODE):
-               si->sd_blockmode = (bool)int_val;
-               /* Haven't figured out how to make non-block mode with DMA */
-               if (!si->sd_blockmode)
-                       si->sd_use_dma = 0;
-               break;
-
-       case IOV_GVAL(IOV_BLOCKSIZE):
-               if ((uint32)int_val > si->num_funcs) {
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-               int_val = (int32)si->client_block_size[int_val];
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_BLOCKSIZE):
-       {
-               uint func = ((uint32)int_val >> 16);
-               uint blksize = (uint16)int_val;
-               uint maxsize;
-
-               if (func > si->num_funcs) {
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-
-               switch (func) {
-               case 0: maxsize = 32; break;
-               case 1: maxsize = BLOCK_SIZE_4318; break;
-               case 2: maxsize = BLOCK_SIZE_4328; break;
-               default: maxsize = 0;
-               }
-               if (blksize > maxsize) {
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-               if (!blksize) {
-                       blksize = maxsize;
-               }
-
-               /* Now set it */
-               spi_lock(si);
-               bcmerror = set_client_block_size(si, func, blksize);
-               spi_unlock(si);
-               break;
-       }
-
-       case IOV_GVAL(IOV_DMA):
-               int_val = (int32)si->sd_use_dma;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_DMA):
-               si->sd_use_dma = (bool)int_val;
-               break;
-
-       case IOV_GVAL(IOV_USEINTS):
-               int_val = (int32)si->use_client_ints;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_USEINTS):
-               break;
-
-       case IOV_GVAL(IOV_DIVISOR):
-               int_val = (uint32)sd_divisor;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_DIVISOR):
-               sd_divisor = int_val;
-               if (!spi_start_clock(si, (uint16)sd_divisor)) {
-                       sd_err(("set clock failed!\n"));
-                       bcmerror = BCME_ERROR;
-               }
-               break;
-
-       case IOV_GVAL(IOV_POWER):
-               int_val = (uint32)sd_power;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_POWER):
-               sd_power = int_val;
-               break;
-
-       case IOV_GVAL(IOV_CLOCK):
-               int_val = (uint32)sd_clock;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_CLOCK):
-               sd_clock = int_val;
-               break;
-
-       case IOV_GVAL(IOV_CRC):
-               int_val = (uint32)sd_crc;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_CRC):
-               /* Apply new setting, but don't change sd_crc until
-                * after the CRC-mode is selected in the device.  This
-                * is required because the software must generate a
-                * correct CRC for the CMD59 in order to be able to
-                * turn OFF the CRC.
-                */
-               sdspi_crc_onoff(si, int_val ? 1 : 0);
-               sd_crc = int_val;
-               break;
-
-       case IOV_GVAL(IOV_SDMODE):
-               int_val = (uint32)sd_sdmode;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_SDMODE):
-               sd_sdmode = int_val;
-               break;
-
-       case IOV_GVAL(IOV_HISPEED):
-               int_val = (uint32)sd_hiok;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_HISPEED):
-               sd_hiok = int_val;
-
-               if (!sdspi_set_highspeed_mode(si, (bool)sd_hiok)) {
-                       sd_err(("Failed changing highspeed mode to %d.\n", sd_hiok));
-                       bcmerror = BCME_ERROR;
-                       return ERROR;
-               }
-               break;
-
-       case IOV_GVAL(IOV_NUMINTS):
-               int_val = (int32)si->intrcount;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_GVAL(IOV_NUMLOCALINTS):
-               int_val = (int32)si->local_intrcount;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_GVAL(IOV_HOSTREG):
-       {
-               break;
-       }
-
-       case IOV_SVAL(IOV_HOSTREG):
-       {
-               sd_err(("IOV_HOSTREG unsupported\n"));
-               break;
-       }
-
-       case IOV_GVAL(IOV_DEVREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-               uint8 data;
-
-               if (sdioh_cfg_read(si, sd_ptr->func, sd_ptr->offset, &data)) {
-                       bcmerror = BCME_SDIO_ERROR;
-                       break;
-               }
-
-               int_val = (int)data;
-               bcopy(&int_val, arg, sizeof(int_val));
-               break;
-       }
-
-       case IOV_SVAL(IOV_DEVREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-               uint8 data = (uint8)sd_ptr->value;
-
-               if (sdioh_cfg_write(si, sd_ptr->func, sd_ptr->offset, &data)) {
-                       bcmerror = BCME_SDIO_ERROR;
-                       break;
-               }
-               break;
-       }
-
-
-       default:
-               bcmerror = BCME_UNSUPPORTED;
-               break;
-       }
-exit:
-
-       return bcmerror;
-}
-
-extern SDIOH_API_RC
-sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, uint8 *data)
-{
-       SDIOH_API_RC status;
-       /* No lock needed since sdioh_request_byte does locking */
-       status = sdioh_request_byte(sd, SDIOH_READ, fnc_num, addr, data);
-       return status;
-}
-
-extern SDIOH_API_RC
-sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, uint32 addr, uint8 *data)
-{
-       /* No lock needed since sdioh_request_byte does locking */
-       SDIOH_API_RC status;
-       status = sdioh_request_byte(sd, SDIOH_WRITE, fnc_num, addr, data);
-       return status;
-}
-
-extern SDIOH_API_RC
-sdioh_cis_read(sdioh_info_t *sd, uint func, uint8 *cisd, uint32 length)
-{
-       uint32 count;
-       int offset;
-       uint32 foo;
-       uint8 *cis = cisd;
-
-       sd_trace(("%s: Func = %d\n", __FUNCTION__, func));
-
-       if (!sd->func_cis_ptr[func]) {
-               bzero(cis, length);
-               return SDIOH_API_RC_FAIL;
-       }
-
-       spi_lock(sd);
-       *cis = 0;
-       for (count = 0; count < length; count++) {
-               offset =  sd->func_cis_ptr[func] + count;
-               if (sdspi_card_regread (sd, 0, offset, 1, &foo) < 0) {
-                       sd_err(("%s: regread failed: Can't read CIS\n", __FUNCTION__));
-                       spi_unlock(sd);
-                       return SDIOH_API_RC_FAIL;
-               }
-               *cis = (uint8)(foo & 0xff);
-               cis++;
-       }
-       spi_unlock(sd);
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_request_byte(sdioh_info_t *sd, uint rw, uint func, uint regaddr, uint8 *byte)
-{
-       int status;
-       uint32 cmd_arg;
-       uint32 rsp5;
-
-       spi_lock(sd);
-
-       cmd_arg = 0;
-       cmd_arg = SFIELD(cmd_arg, CMD52_FUNCTION, func);
-       cmd_arg = SFIELD(cmd_arg, CMD52_REG_ADDR, regaddr);
-       cmd_arg = SFIELD(cmd_arg, CMD52_RW_FLAG, rw == SDIOH_READ ? 0 : 1);
-       cmd_arg = SFIELD(cmd_arg, CMD52_RAW, 0);
-       cmd_arg = SFIELD(cmd_arg, CMD52_DATA, rw == SDIOH_READ ? 0 : *byte);
-
-       sd_trace(("%s: rw=%d, func=%d, regaddr=0x%08x\n", __FUNCTION__, rw, func, regaddr));
-
-       if ((status = sdspi_cmd_issue(sd, sd->sd_use_dma,
-                                     SDIOH_CMD_52, cmd_arg, NULL, 0)) != SUCCESS) {
-               spi_unlock(sd);
-               return status;
-       }
-
-       sdspi_cmd_getrsp(sd, &rsp5, 1);
-       if (rsp5 != 0x00) {
-               sd_err(("%s: rsp5 flags is 0x%x func=%d\n",
-                       __FUNCTION__, rsp5, func));
-               /* ASSERT(0); */
-               spi_unlock(sd);
-               return SDIOH_API_RC_FAIL;
-       }
-
-       if (rw == SDIOH_READ)
-               *byte = sd->card_rsp_data >> 24;
-
-       spi_unlock(sd);
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_request_word(sdioh_info_t *sd, uint cmd_type, uint rw, uint func, uint addr,
-                   uint32 *word, uint nbytes)
-{
-       int status;
-
-       spi_lock(sd);
-
-       if (rw == SDIOH_READ)
-               status = sdspi_card_regread(sd, func, addr, nbytes, word);
-       else
-               status = sdspi_card_regwrite(sd, func, addr, nbytes, *word);
-
-       spi_unlock(sd);
-       return (status == SUCCESS ?  SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL);
-}
-
-extern SDIOH_API_RC
-sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint rw, uint func,
-                     uint addr, uint reg_width, uint buflen_u, uint8 *buffer, void *pkt)
-{
-       int len;
-       int buflen = (int)buflen_u;
-       bool fifo = (fix_inc == SDIOH_DATA_FIX);
-
-       spi_lock(sd);
-
-       ASSERT(reg_width == 4);
-       ASSERT(buflen_u < (1 << 30));
-       ASSERT(sd->client_block_size[func]);
-
-       sd_data(("%s: %c len %d r_cnt %d t_cnt %d, pkt @0x%p\n",
-                __FUNCTION__, rw == SDIOH_READ ? 'R' : 'W',
-                buflen_u, sd->r_cnt, sd->t_cnt, pkt));
-
-       /* Break buffer down into blocksize chunks:
-        * Bytemode: 1 block at a time.
-        */
-       while (buflen > 0) {
-               if (sd->sd_blockmode) {
-                       /* Max xfer is Page size */
-                       len = MIN(SD_PAGE, buflen);
-
-                       /* Round down to a block boundry */
-                       if (buflen > sd->client_block_size[func])
-                               len = (len/sd->client_block_size[func]) *
-                                       sd->client_block_size[func];
-               } else {
-                       /* Byte mode: One block at a time */
-                       len = MIN(sd->client_block_size[func], buflen);
-               }
-
-               if (sdspi_card_buf(sd, rw, func, fifo, addr, len, (uint32 *)buffer) != SUCCESS) {
-                       spi_unlock(sd);
-                       return SDIOH_API_RC_FAIL;
-               }
-               buffer += len;
-               buflen -= len;
-               if (!fifo)
-                       addr += len;
-       }
-       spi_unlock(sd);
-       return SDIOH_API_RC_SUCCESS;
-}
-
-static int
-sdspi_abort(sdioh_info_t *sd, uint func)
-{
-       uint8 spi_databuf[] = { 0x74, 0x80, 0x00, 0x0C, 0xFF, 0x95, 0xFF, 0xFF,
-                               0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-       uint8 spi_rspbuf[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-                              0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-       int err = 0;
-
-       sd_err(("Sending SPI Abort to F%d\n", func));
-       spi_databuf[4] = func & 0x7;
-       /* write to function 0, addr 6 (IOABORT) func # in 3 LSBs. */
-       spi_sendrecv(sd, spi_databuf, spi_rspbuf, sizeof(spi_databuf));
-
-       return err;
-}
-
-extern int
-sdioh_abort(sdioh_info_t *sd, uint fnum)
-{
-       int ret;
-
-       spi_lock(sd);
-       ret = sdspi_abort(sd, fnum);
-       spi_unlock(sd);
-
-       return ret;
-}
-
-int
-sdioh_start(sdioh_info_t *sd, int stage)
-{
-       return SUCCESS;
-}
-
-int
-sdioh_stop(sdioh_info_t *sd)
-{
-       return SUCCESS;
-}
-
-
-/*
- * Private/Static work routines
- */
-static bool
-sdspi_reset(sdioh_info_t *sd, bool host_reset, bool client_reset)
-{
-       if (!sd)
-               return TRUE;
-
-       spi_lock(sd);
-       /* Reset client card */
-       if (client_reset && (sd->adapter_slot != -1)) {
-               if (sdspi_card_regwrite(sd, 0, SDIOD_CCCR_IOABORT, 1, 0x8) != SUCCESS)
-                       sd_err(("%s: Cannot write to card reg 0x%x\n",
-                               __FUNCTION__, SDIOD_CCCR_IOABORT));
-               else
-                       sd->card_rca = 0;
-       }
-
-       /* The host reset is a NOP in the sd-spi case. */
-       if (host_reset) {
-               sd->sd_mode = SDIOH_MODE_SPI;
-       }
-       spi_unlock(sd);
-       return TRUE;
-}
-
-static int
-sdspi_host_init(sdioh_info_t *sd)
-{
-       sdspi_reset(sd, 1, 0);
-
-       /* Default power on mode is SD1 */
-       sd->sd_mode = SDIOH_MODE_SPI;
-       sd->polled_mode = TRUE;
-       sd->host_init_done = TRUE;
-       sd->card_init_done = FALSE;
-       sd->adapter_slot = 1;
-
-       return (SUCCESS);
-}
-
-#define CMD0_RETRIES 3
-#define CMD5_RETRIES 10
-
-static int
-get_ocr(sdioh_info_t *sd, uint32 *cmd_arg, uint32 *cmd_rsp)
-{
-       uint32 rsp5;
-       int retries, status;
-
-       /* First issue a CMD0 to get the card into SPI mode. */
-       for (retries = 0; retries <= CMD0_RETRIES; retries++) {
-               if ((status = sdspi_cmd_issue(sd, sd->sd_use_dma,
-                                             SDIOH_CMD_0, *cmd_arg, NULL, 0)) != SUCCESS) {
-                       sd_err(("%s: No response to CMD0\n", __FUNCTION__));
-                       continue;
-               }
-
-               sdspi_cmd_getrsp(sd, &rsp5, 1);
-
-               if (GFIELD(rsp5, SPI_RSP_ILL_CMD)) {
-                       printf("%s: Card already initialized (continuing)\n", __FUNCTION__);
-                       break;
-               }
-
-               if (GFIELD(rsp5, SPI_RSP_IDLE)) {
-                       printf("%s: Card in SPI mode\n", __FUNCTION__);
-                       break;
-               }
-       }
-
-       if (retries > CMD0_RETRIES) {
-               sd_err(("%s: Too many retries for CMD0\n", __FUNCTION__));
-               return ERROR;
-       }
-
-       /* Get the Card's Operation Condition. */
-       /* Occasionally the board takes a while to become ready. */
-       for (retries = 0; retries <= CMD5_RETRIES; retries++) {
-               if ((status = sdspi_cmd_issue(sd, sd->sd_use_dma,
-                                             SDIOH_CMD_5, *cmd_arg, NULL, 0)) != SUCCESS) {
-                       sd_err(("%s: No response to CMD5\n", __FUNCTION__));
-                       continue;
-               }
-
-               printf("CMD5 response data was: 0x%08x\n", sd->card_rsp_data);
-
-               if (GFIELD(sd->card_rsp_data, RSP4_CARD_READY)) {
-                       printf("%s: Card ready\n", __FUNCTION__);
-                       break;
-               }
-       }
-
-       if (retries > CMD5_RETRIES) {
-               sd_err(("%s: Too many retries for CMD5\n", __FUNCTION__));
-               return ERROR;
-       }
-
-       *cmd_rsp = sd->card_rsp_data;
-
-       sdspi_crc_onoff(sd, sd_crc ? 1 : 0);
-
-       return (SUCCESS);
-}
-
-static int
-sdspi_crc_onoff(sdioh_info_t *sd, bool use_crc)
-{
-       uint32 args;
-       int status;
-
-       args = use_crc ? 1 : 0;
-       if ((status = sdspi_cmd_issue(sd, sd->sd_use_dma,
-                                     SDIOH_CMD_59, args, NULL, 0)) != SUCCESS) {
-               sd_err(("%s: No response to CMD59\n", __FUNCTION__));
-       }
-
-       sd_info(("CMD59 response data was: 0x%08x\n", sd->card_rsp_data));
-
-       sd_err(("SD-SPI CRC turned %s\n", use_crc ? "ON" : "OFF"));
-       return (SUCCESS);
-}
-
-static int
-sdspi_client_init(sdioh_info_t *sd)
-{
-       uint8 fn_ints;
-
-       sd_trace(("%s: Powering up slot %d\n", __FUNCTION__, sd->adapter_slot));
-
-       /* Start at ~400KHz clock rate for initialization */
-       if (!spi_start_clock(sd, 128)) {
-               sd_err(("spi_start_clock failed\n"));
-               return ERROR;
-       }
-
-       if (!sdspi_start_power(sd)) {
-               sd_err(("sdspi_start_power failed\n"));
-               return ERROR;
-       }
-
-       if (sd->num_funcs == 0) {
-               sd_err(("%s: No IO funcs!\n", __FUNCTION__));
-               return ERROR;
-       }
-
-       sdspi_card_enablefuncs(sd);
-
-       set_client_block_size(sd, 1, BLOCK_SIZE_4318);
-       fn_ints = INTR_CTL_FUNC1_EN;
-
-       if (sd->num_funcs >= 2) {
-               set_client_block_size(sd, 2, sd_f2_blocksize /* BLOCK_SIZE_4328 */);
-               fn_ints |= INTR_CTL_FUNC2_EN;
-       }
-
-       /* Enable/Disable Client interrupts */
-       /* Turn on here but disable at host controller */
-       if (sdspi_card_regwrite(sd, 0, SDIOD_CCCR_INTEN, 1,
-                               (fn_ints | INTR_CTL_MASTER_EN)) != SUCCESS) {
-               sd_err(("%s: Could not enable ints in CCCR\n", __FUNCTION__));
-               return ERROR;
-       }
-
-       /* Switch to High-speed clocking mode if both host and device support it */
-       sdspi_set_highspeed_mode(sd, (bool)sd_hiok);
-
-       /* After configuring for High-Speed mode, set the desired clock rate. */
-       if (!spi_start_clock(sd, (uint16)sd_divisor)) {
-               sd_err(("spi_start_clock failed\n"));
-               return ERROR;
-       }
-
-       sd->card_init_done = TRUE;
-
-       return SUCCESS;
-}
-
-static int
-sdspi_set_highspeed_mode(sdioh_info_t *sd, bool HSMode)
-{
-       uint32 regdata;
-       int status;
-       bool hsmode;
-
-       if (HSMode == TRUE) {
-
-               sd_err(("Attempting to enable High-Speed mode.\n"));
-
-               if ((status = sdspi_card_regread(sd, 0, SDIOD_CCCR_SPEED_CONTROL,
-                                                1, &regdata)) != SUCCESS) {
-                       return status;
-               }
-               if (regdata & SDIO_SPEED_SHS) {
-                       sd_err(("Device supports High-Speed mode.\n"));
-
-                       regdata |= SDIO_SPEED_EHS;
-
-                       sd_err(("Writing %08x to Card at %08x\n",
-                                regdata, SDIOD_CCCR_SPEED_CONTROL));
-                       if ((status = sdspi_card_regwrite(sd, 0, SDIOD_CCCR_SPEED_CONTROL,
-                                                         1, regdata)) != BCME_OK) {
-                               return status;
-                       }
-
-                       hsmode = 1;
-
-                       sd_err(("High-speed clocking mode enabled.\n"));
-               }
-               else {
-                       sd_err(("Device does not support High-Speed Mode.\n"));
-                       hsmode = 0;
-               }
-       } else {
-               if ((status = sdspi_card_regread(sd, 0, SDIOD_CCCR_SPEED_CONTROL,
-                                                1, &regdata)) != SUCCESS) {
-                       return status;
-               }
-
-               regdata = ~SDIO_SPEED_EHS;
-
-               sd_err(("Writing %08x to Card at %08x\n",
-                        regdata, SDIOD_CCCR_SPEED_CONTROL));
-               if ((status = sdspi_card_regwrite(sd, 0, SDIOD_CCCR_SPEED_CONTROL,
-                                                 1, regdata)) != BCME_OK) {
-                       return status;
-               }
-
-               sd_err(("Low-speed clocking mode enabled.\n"));
-               hsmode = 0;
-       }
-
-       spi_controller_highspeed_mode(sd, hsmode);
-
-       return TRUE;
-}
-
-bool
-sdspi_start_power(sdioh_info_t *sd)
-{
-       uint32 cmd_arg;
-       uint32 cmd_rsp;
-
-       sd_trace(("%s\n", __FUNCTION__));
-
-       /* Get the Card's Operation Condition.  Occasionally the board
-        * takes a while to become ready
-        */
-
-       cmd_arg = 0;
-       if (get_ocr(sd, &cmd_arg, &cmd_rsp) != SUCCESS) {
-               sd_err(("%s: Failed to get OCR; bailing\n", __FUNCTION__));
-               return FALSE;
-       }
-
-       sd_err(("mem_present = %d\n", GFIELD(cmd_rsp, RSP4_MEM_PRESENT)));
-       sd_err(("num_funcs = %d\n", GFIELD(cmd_rsp, RSP4_NUM_FUNCS)));
-       sd_err(("card_ready = %d\n", GFIELD(cmd_rsp, RSP4_CARD_READY)));
-       sd_err(("OCR = 0x%x\n", GFIELD(cmd_rsp, RSP4_IO_OCR)));
-
-       /* Verify that the card supports I/O mode */
-       if (GFIELD(cmd_rsp, RSP4_NUM_FUNCS) == 0) {
-               sd_err(("%s: Card does not support I/O\n", __FUNCTION__));
-               return ERROR;
-       }
-
-       sd->num_funcs = GFIELD(cmd_rsp, RSP4_NUM_FUNCS);
-
-       /* Examine voltage: Arasan only supports 3.3 volts,
-        * so look for 3.2-3.3 Volts and also 3.3-3.4 volts.
-        */
-
-       if ((GFIELD(cmd_rsp, RSP4_IO_OCR) & (0x3 << 20)) == 0) {
-               sd_err(("This client does not support 3.3 volts!\n"));
-               return ERROR;
-       }
-
-
-       return TRUE;
-}
-
-static int
-sdspi_driver_init(sdioh_info_t *sd)
-{
-       sd_trace(("%s\n", __FUNCTION__));
-
-       if ((sdspi_host_init(sd)) != SUCCESS) {
-               return ERROR;
-       }
-
-       if (sdspi_client_init(sd) != SUCCESS) {
-               return ERROR;
-       }
-
-       return SUCCESS;
-}
-
-static int
-sdspi_card_enablefuncs(sdioh_info_t *sd)
-{
-       int status;
-       uint32 regdata;
-       uint32 regaddr, fbraddr;
-       uint8 func;
-       uint8 *ptr;
-
-       sd_trace(("%s\n", __FUNCTION__));
-       /* Get the Card's common CIS address */
-       ptr = (uint8 *) &sd->com_cis_ptr;
-       for (regaddr = SDIOD_CCCR_CISPTR_0; regaddr <= SDIOD_CCCR_CISPTR_2; regaddr++) {
-               if ((status = sdspi_card_regread (sd, 0, regaddr, 1, &regdata)) != SUCCESS)
-                       return status;
-
-               *ptr++ = (uint8) regdata;
-       }
-
-       /* Only the lower 17-bits are valid */
-       sd->com_cis_ptr &= 0x0001FFFF;
-       sd->func_cis_ptr[0] = sd->com_cis_ptr;
-       sd_info(("%s: Card's Common CIS Ptr = 0x%x\n", __FUNCTION__, sd->com_cis_ptr));
-
-       /* Get the Card's function CIS (for each function) */
-       for (fbraddr = SDIOD_FBR_STARTADDR, func = 1;
-            func <= sd->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) {
-               ptr = (uint8 *) &sd->func_cis_ptr[func];
-               for (regaddr = SDIOD_FBR_CISPTR_0; regaddr <= SDIOD_FBR_CISPTR_2; regaddr++) {
-                       if ((status = sdspi_card_regread (sd, 0, regaddr + fbraddr, 1, &regdata))
-                           != SUCCESS)
-                               return status;
-
-                       *ptr++ = (uint8) regdata;
-               }
-
-               /* Only the lower 17-bits are valid */
-               sd->func_cis_ptr[func] &= 0x0001FFFF;
-               sd_info(("%s: Function %d CIS Ptr = 0x%x\n",
-                        __FUNCTION__, func, sd->func_cis_ptr[func]));
-       }
-
-       sd_info(("%s: write ESCI bit\n", __FUNCTION__));
-       /* Enable continuous SPI interrupt (ESCI bit) */
-       sdspi_card_regwrite(sd, 0, SDIOD_CCCR_BICTRL, 1, 0x60);
-
-       sd_info(("%s: enable f1\n", __FUNCTION__));
-       /* Enable function 1 on the card */
-       regdata = SDIO_FUNC_ENABLE_1;
-       if ((status = sdspi_card_regwrite(sd, 0, SDIOD_CCCR_IOEN, 1, regdata)) != SUCCESS)
-               return status;
-
-       sd_info(("%s: done\n", __FUNCTION__));
-       return SUCCESS;
-}
-
-/* Read client card reg */
-static int
-sdspi_card_regread(sdioh_info_t *sd, int func, uint32 regaddr, int regsize, uint32 *data)
-{
-       int status;
-       uint32 cmd_arg;
-       uint32 rsp5;
-
-       cmd_arg = 0;
-
-       if ((func == 0) || (regsize == 1)) {
-               cmd_arg = SFIELD(cmd_arg, CMD52_FUNCTION, func);
-               cmd_arg = SFIELD(cmd_arg, CMD52_REG_ADDR, regaddr);
-               cmd_arg = SFIELD(cmd_arg, CMD52_RW_FLAG, SDIOH_XFER_TYPE_READ);
-               cmd_arg = SFIELD(cmd_arg, CMD52_RAW, 0);
-               cmd_arg = SFIELD(cmd_arg, CMD52_DATA, 0);
-
-               if ((status = sdspi_cmd_issue(sd, sd->sd_use_dma, SDIOH_CMD_52, cmd_arg, NULL, 0))
-                   != SUCCESS)
-                       return status;
-
-               sdspi_cmd_getrsp(sd, &rsp5, 1);
-
-               if (rsp5 != 0x00)
-                       sd_err(("%s: rsp5 flags is 0x%x\t %d\n",
-                               __FUNCTION__, rsp5, func));
-
-               *data = sd->card_rsp_data >> 24;
-       } else {
-               cmd_arg = SFIELD(cmd_arg, CMD53_BYTE_BLK_CNT, regsize);
-               cmd_arg = SFIELD(cmd_arg, CMD53_OP_CODE, 1);
-               cmd_arg = SFIELD(cmd_arg, CMD53_BLK_MODE, 0);
-               cmd_arg = SFIELD(cmd_arg, CMD53_FUNCTION, func);
-               cmd_arg = SFIELD(cmd_arg, CMD53_REG_ADDR, regaddr);
-               cmd_arg = SFIELD(cmd_arg, CMD53_RW_FLAG, SDIOH_XFER_TYPE_READ);
-
-               sd->data_xfer_count = regsize;
-
-               /* sdspi_cmd_issue() returns with the command complete bit
-                * in the ISR already cleared
-                */
-               if ((status = sdspi_cmd_issue(sd, sd->sd_use_dma, SDIOH_CMD_53, cmd_arg, NULL, 0))
-                   != SUCCESS)
-                       return status;
-
-               sdspi_cmd_getrsp(sd, &rsp5, 1);
-
-               if (rsp5 != 0x00)
-                       sd_err(("%s: rsp5 flags is 0x%x\t %d\n",
-                               __FUNCTION__, rsp5, func));
-
-               *data = sd->card_rsp_data;
-               if (regsize == 2) {
-                       *data &= 0xffff;
-               }
-
-               sd_info(("%s: CMD53 func %d, addr 0x%x, size %d, data 0x%08x\n",
-                        __FUNCTION__, func, regaddr, regsize, *data));
-
-
-       }
-
-       return SUCCESS;
-}
-
-/* write a client register */
-static int
-sdspi_card_regwrite(sdioh_info_t *sd, int func, uint32 regaddr, int regsize, uint32 data)
-{
-       int status;
-       uint32 cmd_arg, rsp5, flags;
-
-       cmd_arg = 0;
-
-       if ((func == 0) || (regsize == 1)) {
-               cmd_arg = SFIELD(cmd_arg, CMD52_FUNCTION, func);
-               cmd_arg = SFIELD(cmd_arg, CMD52_REG_ADDR, regaddr);
-               cmd_arg = SFIELD(cmd_arg, CMD52_RW_FLAG, SDIOH_XFER_TYPE_WRITE);
-               cmd_arg = SFIELD(cmd_arg, CMD52_RAW, 0);
-               cmd_arg = SFIELD(cmd_arg, CMD52_DATA, data & 0xff);
-               if ((status = sdspi_cmd_issue(sd, sd->sd_use_dma, SDIOH_CMD_52, cmd_arg, NULL, 0))
-                   != SUCCESS)
-                       return status;
-
-               sdspi_cmd_getrsp(sd, &rsp5, 1);
-               flags = GFIELD(rsp5, RSP5_FLAGS);
-               if (flags && (flags != 0x10))
-                       sd_err(("%s: rsp5.rsp5.flags = 0x%x, expecting 0x10\n",
-                               __FUNCTION__,  flags));
-       }
-       else {
-               cmd_arg = SFIELD(cmd_arg, CMD53_BYTE_BLK_CNT, regsize);
-               cmd_arg = SFIELD(cmd_arg, CMD53_OP_CODE, 1);
-               cmd_arg = SFIELD(cmd_arg, CMD53_BLK_MODE, 0);
-               cmd_arg = SFIELD(cmd_arg, CMD53_FUNCTION, func);
-               cmd_arg = SFIELD(cmd_arg, CMD53_REG_ADDR, regaddr);
-               cmd_arg = SFIELD(cmd_arg, CMD53_RW_FLAG, SDIOH_XFER_TYPE_WRITE);
-
-               sd->data_xfer_count = regsize;
-               sd->cmd53_wr_data = data;
-
-               sd_info(("%s: CMD53 func %d, addr 0x%x, size %d, data 0x%08x\n",
-                        __FUNCTION__, func, regaddr, regsize, data));
-
-               /* sdspi_cmd_issue() returns with the command complete bit
-                * in the ISR already cleared
-                */
-               if ((status = sdspi_cmd_issue(sd, sd->sd_use_dma, SDIOH_CMD_53, cmd_arg, NULL, 0))
-                   != SUCCESS)
-                       return status;
-
-               sdspi_cmd_getrsp(sd, &rsp5, 1);
-
-               if (rsp5 != 0x00)
-                       sd_err(("%s: rsp5 flags = 0x%x, expecting 0x00\n",
-                               __FUNCTION__,  rsp5));
-
-       }
-       return SUCCESS;
-}
-
-void
-sdspi_cmd_getrsp(sdioh_info_t *sd, uint32 *rsp_buffer, int count /* num 32 bit words */)
-{
-       *rsp_buffer = sd->card_response;
-}
-
-int max_errors = 0;
-
-#define SPI_MAX_PKT_LEN                768
-uint8  spi_databuf[SPI_MAX_PKT_LEN];
-uint8  spi_rspbuf[SPI_MAX_PKT_LEN];
-
-/* datalen is used for CMD53 length only (0 for sd->data_xfer_count) */
-static int
-sdspi_cmd_issue(sdioh_info_t *sd, bool use_dma, uint32 cmd, uint32 arg,
-                uint32 *data, uint32 datalen)
-{
-       uint32 cmd_reg;
-       uint32 cmd_arg = arg;
-       uint8 cmd_crc = 0x95;           /* correct CRC for CMD0 and don't care for others. */
-       uint16 dat_crc;
-       uint8 cmd52data = 0;
-       uint32 i, j;
-       uint32 spi_datalen = 0;
-       uint32 spi_pre_cmd_pad  = 0;
-       uint32 spi_max_response_pad = 128;
-
-       cmd_reg = 0;
-       cmd_reg = SFIELD(cmd_reg, SPI_DIR, 1);
-       cmd_reg = SFIELD(cmd_reg, SPI_CMD_INDEX, cmd);
-
-       if (GFIELD(cmd_arg, CMD52_RW_FLAG) == 1) {      /* Same for CMD52 and CMD53 */
-               cmd_reg = SFIELD(cmd_reg, SPI_RW, 1);
-       }
-
-       switch (cmd) {
-       case SDIOH_CMD_59:      /* CRC_ON_OFF (SPI Mode Only) - Response R1 */
-               cmd52data = arg & 0x1;
-       case SDIOH_CMD_0:       /* Set Card to Idle State - No Response */
-       case SDIOH_CMD_5:       /* Send Operation condition - Response R4 */
-               sd_trace(("%s: CMD%d\n", __FUNCTION__, cmd));
-               spi_datalen = 44;
-               spi_pre_cmd_pad = 12;
-               spi_max_response_pad = 28;
-               break;
-
-       case SDIOH_CMD_3:       /* Ask card to send RCA - Response R6 */
-       case SDIOH_CMD_7:       /* Select card - Response R1 */
-       case SDIOH_CMD_15:      /* Set card to inactive state - Response None */
-               sd_err(("%s: CMD%d is invalid for SPI Mode.\n", __FUNCTION__, cmd));
-               return ERROR;
-               break;
-
-       case SDIOH_CMD_52:      /* IO R/W Direct (single byte) - Response R5 */
-               cmd52data = GFIELD(cmd_arg, CMD52_DATA);
-               cmd_arg = arg;
-               cmd_reg = SFIELD(cmd_reg, SPI_FUNC, GFIELD(cmd_arg, CMD52_FUNCTION));
-               cmd_reg = SFIELD(cmd_reg, SPI_ADDR, GFIELD(cmd_arg, CMD52_REG_ADDR));
-               /* Display trace for byte write */
-               if (GFIELD(cmd_arg, CMD52_RW_FLAG) == 1) {
-                       sd_trace(("%s: CMD52: Wr F:%d @0x%04x=%02x\n",
-                                 __FUNCTION__,
-                                 GFIELD(cmd_arg, CMD52_FUNCTION),
-                                 GFIELD(cmd_arg, CMD52_REG_ADDR),
-                                 cmd52data));
-               }
-
-               spi_datalen = 32;
-               spi_max_response_pad = 28;
-
-               break;
-       case SDIOH_CMD_53:      /* IO R/W Extended (multiple bytes/blocks) */
-               cmd_arg = arg;
-               cmd_reg = SFIELD(cmd_reg, SPI_FUNC, GFIELD(cmd_arg, CMD53_FUNCTION));
-               cmd_reg = SFIELD(cmd_reg, SPI_ADDR, GFIELD(cmd_arg, CMD53_REG_ADDR));
-               cmd_reg = SFIELD(cmd_reg, SPI_BLKMODE, 0);
-               cmd_reg = SFIELD(cmd_reg, SPI_OPCODE, GFIELD(cmd_arg, CMD53_OP_CODE));
-               cmd_reg = SFIELD(cmd_reg, SPI_STUFF0, (sd->data_xfer_count>>8));
-               cmd52data = (uint8)sd->data_xfer_count;
-
-               /* Set upper bit in byte count if necessary, but don't set it for 512 bytes. */
-               if ((sd->data_xfer_count > 255) && (sd->data_xfer_count < 512)) {
-                       cmd_reg |= 1;
-               }
-
-               if (GFIELD(cmd_reg, SPI_RW) == 1) { /* Write */
-                       spi_max_response_pad = 32;
-                       spi_datalen = (sd->data_xfer_count + spi_max_response_pad) & 0xFFFC;
-               } else { /* Read */
-
-                       spi_max_response_pad = 32;
-                       spi_datalen = (sd->data_xfer_count + spi_max_response_pad) & 0xFFFC;
-               }
-               sd_trace(("%s: CMD53: %s F:%d @0x%04x len=0x%02x\n",
-                         __FUNCTION__,
-                         (GFIELD(cmd_reg, SPI_RW) == 1 ? "Wr" : "Rd"),
-                         GFIELD(cmd_arg, CMD53_FUNCTION),
-                         GFIELD(cmd_arg, CMD53_REG_ADDR),
-                         cmd52data));
-               break;
-
-       default:
-               sd_err(("%s: Unknown command %d\n", __FUNCTION__, cmd));
-               return ERROR;
-       }
-
-       /* Set up and issue the SDIO command */
-       memset(spi_databuf, SDSPI_IDLE_PAD, spi_datalen);
-       spi_databuf[spi_pre_cmd_pad + 0] = (cmd_reg & 0xFF000000) >> 24;
-       spi_databuf[spi_pre_cmd_pad + 1] = (cmd_reg & 0x00FF0000) >> 16;
-       spi_databuf[spi_pre_cmd_pad + 2] = (cmd_reg & 0x0000FF00) >> 8;
-       spi_databuf[spi_pre_cmd_pad + 3] = (cmd_reg & 0x000000FF);
-       spi_databuf[spi_pre_cmd_pad + 4] = cmd52data;
-
-       /* Generate CRC7 for command, if CRC is enabled, otherwise, a
-        * default CRC7 of 0x95, which is correct for CMD0, is used.
-        */
-       if (sd_crc) {
-               cmd_crc = sdspi_crc7(&spi_databuf[spi_pre_cmd_pad], 5);
-       }
-       spi_databuf[spi_pre_cmd_pad + 5] = cmd_crc;
-#define SPI_STOP_TRAN          0xFD
-
-       /* for CMD53 Write, put the data into the output buffer  */
-       if ((cmd == SDIOH_CMD_53) && (GFIELD(cmd_arg, CMD53_RW_FLAG) == 1)) {
-               if (datalen != 0) {
-                       spi_databuf[spi_pre_cmd_pad + 9] = SDSPI_IDLE_PAD;
-                       spi_databuf[spi_pre_cmd_pad + 10] = SDSPI_START_BLOCK;
-
-                       for (i = 0; i < sd->data_xfer_count; i++) {
-                               spi_databuf[i + 11 + spi_pre_cmd_pad] = ((uint8 *)data)[i];
-                       }
-                       if (sd_crc) {
-                               dat_crc = sdspi_crc16(&spi_databuf[spi_pre_cmd_pad+11], i);
-                       } else {
-                               dat_crc = 0xAAAA;
-                       }
-                       spi_databuf[i + 11 + spi_pre_cmd_pad] = (dat_crc >> 8) & 0xFF;
-                       spi_databuf[i + 12 + spi_pre_cmd_pad] = dat_crc & 0xFF;
-               } else if (sd->data_xfer_count == 2) {
-                       spi_databuf[spi_pre_cmd_pad + 9] = SDSPI_IDLE_PAD;
-                       spi_databuf[spi_pre_cmd_pad + 10] = SDSPI_START_BLOCK;
-                       spi_databuf[spi_pre_cmd_pad + 11]  = sd->cmd53_wr_data & 0xFF;
-                       spi_databuf[spi_pre_cmd_pad + 12] = (sd->cmd53_wr_data & 0x0000FF00) >> 8;
-                       if (sd_crc) {
-                               dat_crc = sdspi_crc16(&spi_databuf[spi_pre_cmd_pad+11], 2);
-                       } else {
-                               dat_crc = 0x22AA;
-                       }
-                       spi_databuf[spi_pre_cmd_pad + 13] = (dat_crc >> 8) & 0xFF;
-                       spi_databuf[spi_pre_cmd_pad + 14] = (dat_crc & 0xFF);
-               } else if (sd->data_xfer_count == 4) {
-                       spi_databuf[spi_pre_cmd_pad + 9] = SDSPI_IDLE_PAD;
-                       spi_databuf[spi_pre_cmd_pad + 10] = SDSPI_START_BLOCK;
-                       spi_databuf[spi_pre_cmd_pad + 11]  = sd->cmd53_wr_data & 0xFF;
-                       spi_databuf[spi_pre_cmd_pad + 12] = (sd->cmd53_wr_data & 0x0000FF00) >> 8;
-                       spi_databuf[spi_pre_cmd_pad + 13] = (sd->cmd53_wr_data & 0x00FF0000) >> 16;
-                       spi_databuf[spi_pre_cmd_pad + 14] = (sd->cmd53_wr_data & 0xFF000000) >> 24;
-                       if (sd_crc) {
-                               dat_crc = sdspi_crc16(&spi_databuf[spi_pre_cmd_pad+11], 4);
-                       } else {
-                               dat_crc = 0x44AA;
-                       }
-                       spi_databuf[spi_pre_cmd_pad + 15] = (dat_crc >> 8) & 0xFF;
-                       spi_databuf[spi_pre_cmd_pad + 16] = (dat_crc & 0xFF);
-               } else {
-                       printf("CMD53 Write: size %d unsupported\n", sd->data_xfer_count);
-               }
-       }
-
-       spi_sendrecv(sd, spi_databuf, spi_rspbuf, spi_datalen);
-
-       for (i = spi_pre_cmd_pad + SDSPI_COMMAND_LEN; i < spi_max_response_pad; i++) {
-               if ((spi_rspbuf[i] & SDSPI_START_BIT_MASK) == 0) {
-                       break;
-               }
-       }
-
-       if (i == spi_max_response_pad) {
-               sd_err(("%s: Did not get a response for CMD%d\n", __FUNCTION__, cmd));
-               return ERROR;
-       }
-
-       /* Extract the response. */
-       sd->card_response = spi_rspbuf[i];
-
-       /* for CMD53 Read, find the start of the response data... */
-       if ((cmd == SDIOH_CMD_53) && (GFIELD(cmd_arg, CMD52_RW_FLAG) == 0)) {
-               for (; i < spi_max_response_pad; i++) {
-                       if (spi_rspbuf[i] == SDSPI_START_BLOCK) {
-                               break;
-                       }
-               }
-
-               if (i == spi_max_response_pad) {
-                       printf("Did not get a start of data phase for CMD%d\n", cmd);
-                       max_errors++;
-                       sdspi_abort(sd, GFIELD(cmd_arg, CMD53_FUNCTION));
-               }
-               sd->card_rsp_data = spi_rspbuf[i+1];
-               sd->card_rsp_data |= spi_rspbuf[i+2] << 8;
-               sd->card_rsp_data |= spi_rspbuf[i+3] << 16;
-               sd->card_rsp_data |= spi_rspbuf[i+4] << 24;
-
-               if (datalen != 0) {
-                       i++;
-                       for (j = 0; j < sd->data_xfer_count; j++) {
-                               ((uint8 *)data)[j] = spi_rspbuf[i+j];
-                       }
-                       if (sd_crc) {
-                               uint16 recv_crc;
-
-                               recv_crc = spi_rspbuf[i+j] << 8 | spi_rspbuf[i+j+1];
-                               dat_crc = sdspi_crc16((uint8 *)data, datalen);
-                               if (dat_crc != recv_crc) {
-                                       sd_err(("%s: Incorrect data CRC: expected 0x%04x, "
-                                               "received 0x%04x\n",
-                                               __FUNCTION__, dat_crc, recv_crc));
-                               }
-                       }
-               }
-               return SUCCESS;
-       }
-
-       sd->card_rsp_data = spi_rspbuf[i+4];
-       sd->card_rsp_data |= spi_rspbuf[i+3] << 8;
-       sd->card_rsp_data |= spi_rspbuf[i+2] << 16;
-       sd->card_rsp_data |= spi_rspbuf[i+1] << 24;
-
-       /* Display trace for byte read */
-       if ((cmd == SDIOH_CMD_52) && (GFIELD(cmd_arg, CMD52_RW_FLAG) == 0)) {
-               sd_trace(("%s: CMD52: Rd F:%d @0x%04x=%02x\n",
-                         __FUNCTION__,
-                         GFIELD(cmd_arg, CMD53_FUNCTION),
-                         GFIELD(cmd_arg, CMD53_REG_ADDR),
-                         sd->card_rsp_data >> 24));
-       }
-
-       return SUCCESS;
-}
-
-/*
- * On entry: if single-block or non-block, buffer size <= block size.
- * If multi-block, buffer size is unlimited.
- * Question is how to handle the left-overs in either single- or multi-block.
- * I think the caller should break the buffer up so this routine will always
- * use block size == buffer size to handle the end piece of the buffer
- */
-
-static int
-sdspi_card_buf(sdioh_info_t *sd, int rw, int func, bool fifo, uint32 addr, int nbytes, uint32 *data)
-{
-       int status;
-       uint32 cmd_arg;
-       uint32 rsp5;
-       int num_blocks, blocksize;
-       bool local_blockmode, local_dma;
-       bool read = rw == SDIOH_READ ? 1 : 0;
-
-       ASSERT(nbytes);
-
-       cmd_arg = 0;
-       sd_data(("%s: %s 53 func %d, %s, addr 0x%x, len %d bytes, r_cnt %d t_cnt %d\n",
-                __FUNCTION__, read ? "Rd" : "Wr", func, fifo ? "FIXED" : "INCR",
-                addr, nbytes, sd->r_cnt, sd->t_cnt));
-
-       if (read) sd->r_cnt++; else sd->t_cnt++;
-
-       local_blockmode = sd->sd_blockmode;
-       local_dma = sd->sd_use_dma;
-
-       /* Don't bother with block mode on small xfers */
-       if (nbytes < sd->client_block_size[func]) {
-               sd_info(("setting local blockmode to false: nbytes (%d) != block_size (%d)\n",
-                        nbytes, sd->client_block_size[func]));
-               local_blockmode = FALSE;
-               local_dma = FALSE;
-       }
-
-       if (local_blockmode) {
-               blocksize = MIN(sd->client_block_size[func], nbytes);
-               num_blocks = nbytes/blocksize;
-               cmd_arg = SFIELD(cmd_arg, CMD53_BYTE_BLK_CNT, num_blocks);
-               cmd_arg = SFIELD(cmd_arg, CMD53_BLK_MODE, 1);
-       } else {
-               num_blocks =  1;
-               blocksize = nbytes;
-               cmd_arg = SFIELD(cmd_arg, CMD53_BYTE_BLK_CNT, nbytes);
-               cmd_arg = SFIELD(cmd_arg, CMD53_BLK_MODE, 0);
-       }
-
-       if (fifo)
-               cmd_arg = SFIELD(cmd_arg, CMD53_OP_CODE, 0);
-       else
-               cmd_arg = SFIELD(cmd_arg, CMD53_OP_CODE, 1);
-
-       cmd_arg = SFIELD(cmd_arg, CMD53_FUNCTION, func);
-       cmd_arg = SFIELD(cmd_arg, CMD53_REG_ADDR, addr);
-       if (read)
-               cmd_arg = SFIELD(cmd_arg, CMD53_RW_FLAG, SDIOH_XFER_TYPE_READ);
-       else
-               cmd_arg = SFIELD(cmd_arg, CMD53_RW_FLAG, SDIOH_XFER_TYPE_WRITE);
-
-       sd->data_xfer_count = nbytes;
-       if ((func == 2) && (fifo == 1)) {
-               sd_data(("%s: %s 53 func %d, %s, addr 0x%x, len %d bytes, r_cnt %d t_cnt %d\n",
-                        __FUNCTION__, read ? "Rd" : "Wr", func, fifo ? "FIXED" : "INCR",
-                        addr, nbytes, sd->r_cnt, sd->t_cnt));
-       }
-
-       /* sdspi_cmd_issue() returns with the command complete bit
-        * in the ISR already cleared
-        */
-       if ((status = sdspi_cmd_issue(sd, local_dma,
-                                     SDIOH_CMD_53, cmd_arg,
-                                     data, nbytes)) != SUCCESS) {
-               sd_err(("%s: cmd_issue failed for %s\n", __FUNCTION__, (read ? "read" : "write")));
-               return status;
-       }
-
-       sdspi_cmd_getrsp(sd, &rsp5, 1);
-
-       if (rsp5 != 0x00) {
-               sd_err(("%s: rsp5 flags = 0x%x, expecting 0x00\n",
-                       __FUNCTION__,  rsp5));
-               return ERROR;
-       }
-
-       return SUCCESS;
-}
-
-static int
-set_client_block_size(sdioh_info_t *sd, int func, int block_size)
-{
-       int base;
-       int err = 0;
-
-       sd_err(("%s: Setting block size %d, func %d\n", __FUNCTION__, block_size, func));
-       sd->client_block_size[func] = block_size;
-
-       /* Set the block size in the SDIO Card register */
-       base = func * SDIOD_FBR_SIZE;
-       err = sdspi_card_regwrite(sd, 0, base + SDIOD_CCCR_BLKSIZE_0, 1, block_size & 0xff);
-       if (!err) {
-               err = sdspi_card_regwrite(sd, 0, base + SDIOD_CCCR_BLKSIZE_1, 1,
-                                         (block_size >> 8) & 0xff);
-       }
-
-       /*
-        * Do not set the block size in the SDIO Host register; that
-        * is func dependent and will get done on an individual
-        * transaction basis.
-        */
-
-       return (err ? BCME_SDIO_ERROR : 0);
-}
-
-/* Reset and re-initialize the device */
-int
-sdioh_sdio_reset(sdioh_info_t *si)
-{
-       si->card_init_done = FALSE;
-       return sdspi_client_init(si);
-}
-
-#define CRC7_POLYNOM   0x09
-#define CRC7_CRCHIGHBIT        0x40
-
-static uint8 sdspi_crc7(unsigned char* p, uint32 len)
-{
-       uint8 c, j, bit, crc = 0;
-       uint32 i;
-
-       for (i = 0; i < len; i++) {
-               c = *p++;
-               for (j = 0x80; j; j >>= 1) {
-                       bit = crc & CRC7_CRCHIGHBIT;
-                       crc <<= 1;
-                       if (c & j) bit ^= CRC7_CRCHIGHBIT;
-                       if (bit) crc ^= CRC7_POLYNOM;
-               }
-       }
-
-       /* Convert the CRC7 to an 8-bit SD CRC */
-       crc = (crc << 1) | 1;
-
-       return (crc);
-}
-
-#define CRC16_POLYNOM  0x1021
-#define CRC16_CRCHIGHBIT       0x8000
-
-static uint16 sdspi_crc16(unsigned char* p, uint32 len)
-{
-       uint32 i;
-       uint16 j, c, bit;
-       uint16 crc = 0;
-
-       for (i = 0; i < len; i++) {
-               c = *p++;
-               for (j = 0x80; j; j >>= 1) {
-                       bit = crc & CRC16_CRCHIGHBIT;
-                       crc <<= 1;
-                       if (c & j) bit ^= CRC16_CRCHIGHBIT;
-                       if (bit) crc ^= CRC16_POLYNOM;
-               }
-       }
-
-       return (crc);
-}
diff --git a/drivers/net/wireless/bcm4319/bcmsdspi_linux.c b/drivers/net/wireless/bcm4319/bcmsdspi_linux.c
deleted file mode 100644 (file)
index e2e0ca6..0000000
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Broadcom SPI Host Controller Driver - Linux Per-port
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdspi_linux.c,v 1.7.2.1.4.3 2008/06/30 21:09:36 Exp $
- */
-
-#include <typedefs.h>
-#include <pcicfg.h>
-#include <bcmutils.h>
-
-#include <sdio.h>              /* SDIO Specs */
-#include <bcmsdbus.h>          /* bcmsdh to/from specific controller APIs */
-#include <sdiovar.h>           /* to get msglevel bit values */
-
-#include <linux/sched.h>       /* request_irq(), free_irq() */
-
-#include <bcmsdspi.h>
-#include <bcmspi.h>
-
-extern uint sd_crc;
-module_param(sd_crc, uint, 0);
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-#define KERNEL26
-#endif
-
-struct sdos_info {
-       sdioh_info_t *sd;
-       spinlock_t lock;
-       wait_queue_head_t intr_wait_queue;
-};
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-#define BLOCKABLE()    (!in_atomic())
-#else
-#define BLOCKABLE()    (!in_interrupt())
-#endif
-
-/* Interrupt handler */
-static irqreturn_t
-sdspi_isr(int irq, void *dev_id
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
-, struct pt_regs *ptregs
-#endif
-)
-{
-       sdioh_info_t *sd;
-       struct sdos_info *sdos;
-       bool ours;
-
-       sd = (sdioh_info_t *)dev_id;
-       sd->local_intrcount++;
-
-       if (!sd->card_init_done) {
-               sd_err(("%s: Hey Bogus intr...not even initted: irq %d\n", __FUNCTION__, irq));
-               return IRQ_RETVAL(FALSE);
-       } else {
-               ours = spi_check_client_intr(sd, NULL);
-
-               /* For local interrupts, wake the waiting process */
-               if (ours && sd->got_hcint) {
-                       sdos = (struct sdos_info *)sd->sdos_info;
-                       wake_up_interruptible(&sdos->intr_wait_queue);
-               }
-
-               return IRQ_RETVAL(ours);
-       }
-}
-
-/* Register with Linux for interrupts */
-int
-spi_register_irq(sdioh_info_t *sd, uint irq)
-{
-       sd_trace(("Entering %s: irq == %d\n", __FUNCTION__, irq));
-       if (request_irq(irq, sdspi_isr, IRQF_SHARED, "bcmsdspi", sd) < 0) {
-               sd_err(("%s: request_irq() failed\n", __FUNCTION__));
-               return ERROR;
-       }
-       return SUCCESS;
-}
-
-/* Free Linux irq */
-void
-spi_free_irq(uint irq, sdioh_info_t *sd)
-{
-       free_irq(irq, sd);
-}
-
-/* Map Host controller registers */
-
-uint32 *
-spi_reg_map(osl_t *osh, uintptr addr, int size)
-{
-       return (uint32 *)REG_MAP(addr, size);
-}
-
-void
-spi_reg_unmap(osl_t *osh, uintptr addr, int size)
-{
-       REG_UNMAP((void*)(uintptr)addr);
-}
-
-int
-spi_osinit(sdioh_info_t *sd)
-{
-       struct sdos_info *sdos;
-
-       sdos = (struct sdos_info*)MALLOC(sd->osh, sizeof(struct sdos_info));
-       sd->sdos_info = (void*)sdos;
-       if (sdos == NULL)
-               return BCME_NOMEM;
-
-       sdos->sd = sd;
-       spin_lock_init(&sdos->lock);
-       init_waitqueue_head(&sdos->intr_wait_queue);
-       return BCME_OK;
-}
-
-void
-spi_osfree(sdioh_info_t *sd)
-{
-       struct sdos_info *sdos;
-       ASSERT(sd && sd->sdos_info);
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       MFREE(sd->osh, sdos, sizeof(struct sdos_info));
-}
-
-/* Interrupt enable/disable */
-SDIOH_API_RC
-sdioh_interrupt_set(sdioh_info_t *sd, bool enable)
-{
-       ulong flags;
-       struct sdos_info *sdos;
-
-       sd_trace(("%s: %s\n", __FUNCTION__, enable ? "Enabling" : "Disabling"));
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       ASSERT(sdos);
-
-       if (!(sd->host_init_done && sd->card_init_done)) {
-               sd_err(("%s: Card & Host are not initted - bailing\n", __FUNCTION__));
-               return SDIOH_API_RC_FAIL;
-       }
-
-       if (enable && !(sd->intr_handler && sd->intr_handler_arg)) {
-               sd_err(("%s: no handler registered, will not enable\n", __FUNCTION__));
-               return SDIOH_API_RC_FAIL;
-       }
-
-       /* Ensure atomicity for enable/disable calls */
-       spin_lock_irqsave(&sdos->lock, flags);
-
-       sd->client_intr_enabled = enable;
-       if (enable && !sd->lockcount)
-               spi_devintr_on(sd);
-       else
-               spi_devintr_off(sd);
-
-       spin_unlock_irqrestore(&sdos->lock, flags);
-
-       return SDIOH_API_RC_SUCCESS;
-}
-
-/* Protect against reentrancy (disable device interrupts while executing) */
-void
-spi_lock(sdioh_info_t *sd)
-{
-       ulong flags;
-       struct sdos_info *sdos;
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       ASSERT(sdos);
-
-       sd_trace(("%s: %d\n", __FUNCTION__, sd->lockcount));
-
-       spin_lock_irqsave(&sdos->lock, flags);
-       if (sd->lockcount) {
-               sd_err(("%s: Already locked!\n", __FUNCTION__));
-               ASSERT(sd->lockcount == 0);
-       }
-       spi_devintr_off(sd);
-       sd->lockcount++;
-       spin_unlock_irqrestore(&sdos->lock, flags);
-}
-
-/* Enable client interrupt */
-void
-spi_unlock(sdioh_info_t *sd)
-{
-       ulong flags;
-       struct sdos_info *sdos;
-
-       sd_trace(("%s: %d, %d\n", __FUNCTION__, sd->lockcount, sd->client_intr_enabled));
-       ASSERT(sd->lockcount > 0);
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       ASSERT(sdos);
-
-       spin_lock_irqsave(&sdos->lock, flags);
-       if (--sd->lockcount == 0 && sd->client_intr_enabled) {
-               spi_devintr_on(sd);
-       }
-       spin_unlock_irqrestore(&sdos->lock, flags);
-}
-
-void spi_waitbits(sdioh_info_t *sd, bool yield)
-{
-       struct sdos_info *sdos;
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-
-#ifndef BCMSDYIELD
-       ASSERT(!yield);
-#endif
-       sd_trace(("%s: yield %d canblock %d\n",
-                 __FUNCTION__, yield, BLOCKABLE()));
-
-       /* Clear the "interrupt happened" flag and last intrstatus */
-       sd->got_hcint = FALSE;
-
-#ifdef BCMSDYIELD
-       if (yield && BLOCKABLE()) {
-               /* Wait for the indication, the interrupt will be masked when the ISR fires. */
-               wait_event_interruptible(sdos->intr_wait_queue, (sd->got_hcint));
-       } else
-#endif /* BCMSDYIELD */
-       {
-               spi_spinbits(sd);
-       }
-
-}
diff --git a/drivers/net/wireless/bcm4319/bcmsdstd.c b/drivers/net/wireless/bcm4319/bcmsdstd.c
deleted file mode 100644 (file)
index 0b1b575..0000000
+++ /dev/null
@@ -1,3130 +0,0 @@
-/*
- *  'Standard' SDIO HOST CONTROLLER driver
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdstd.c,v 1.64.4.1.4.4.2.17 2010/03/10 03:09:48 Exp $
- */
-
-#include <typedefs.h>
-
-#include <bcmdevs.h>
-#include <bcmendian.h>
-#include <bcmutils.h>
-#include <osl.h>
-#include <siutils.h>
-#include <sdio.h>      /* SDIO Device and Protocol Specs */
-#include <sdioh.h>     /* SDIO Host Controller Specification */
-#include <bcmsdbus.h>  /* bcmsdh to/from specific controller APIs */
-#include <sdiovar.h>   /* ioctl/iovars */
-#include <pcicfg.h>
-
-
-#define SD_PAGE_BITS   12
-#define SD_PAGE        (1 << SD_PAGE_BITS)
-
-#include <bcmsdstd.h>
-
-/* Globals */
-uint sd_msglevel = SDH_ERROR_VAL;
-uint sd_hiok = TRUE;                   /* Use hi-speed mode if available? */
-uint sd_sdmode = SDIOH_MODE_SD4;       /* Use SD4 mode by default */
-uint sd_f2_blocksize = 64;             /* Default blocksize */
-
-#ifdef BCMSDYIELD
-bool sd_yieldcpu = TRUE;               /* Allow CPU yielding for buffer requests */
-uint sd_minyield = 0;                  /* Minimum xfer size to allow CPU yield */
-bool sd_forcerb = FALSE;               /* Force sync readback in intrs_on/off */
-#endif
-
-uint sd_divisor = 2;                   /* Default 48MHz/2 = 24MHz */
-
-uint sd_power = 1;             /* Default to SD Slot powered ON */
-uint sd_clock = 1;             /* Default to SD Clock turned ON */
-uint sd_pci_slot = 0xFFFFffff; /* Used to force selection of a particular PCI slot */
-uint8 sd_dma_mode = DMA_MODE_SDMA; /* Default to SDMA for now */
-
-uint sd_toctl = 7;
-
-static bool trap_errs = FALSE;
-
-static const char *dma_mode_description[] = { "PIO", "SDMA", "ADMA1", "32b ADMA2", "64b ADMA2" };
-
-/* Prototypes */
-static bool sdstd_start_clock(sdioh_info_t *sd, uint16 divisor);
-static bool sdstd_start_power(sdioh_info_t *sd);
-static bool sdstd_bus_width(sdioh_info_t *sd, int width);
-static int sdstd_set_highspeed_mode(sdioh_info_t *sd, bool HSMode);
-static int sdstd_set_dma_mode(sdioh_info_t *sd, int8 dma_mode);
-static int sdstd_card_enablefuncs(sdioh_info_t *sd);
-static void sdstd_cmd_getrsp(sdioh_info_t *sd, uint32 *rsp_buffer, int count);
-static int sdstd_cmd_issue(sdioh_info_t *sd, bool use_dma, uint32 cmd, uint32 arg);
-static int sdstd_card_regread(sdioh_info_t *sd, int func, uint32 regaddr,
-                              int regsize, uint32 *data);
-static int sdstd_card_regwrite(sdioh_info_t *sd, int func, uint32 regaddr,
-                               int regsize, uint32 data);
-static int sdstd_driver_init(sdioh_info_t *sd);
-static bool sdstd_reset(sdioh_info_t *sd, bool host_reset, bool client_reset);
-static int sdstd_card_buf(sdioh_info_t *sd, int rw, int func, bool fifo,
-                          uint32 addr, int nbytes, uint32 *data);
-static int sdstd_abort(sdioh_info_t *sd, uint func);
-static int sdstd_check_errs(sdioh_info_t *sdioh_info, uint32 cmd, uint32 arg);
-static int set_client_block_size(sdioh_info_t *sd, int func, int blocksize);
-static void sd_map_dma(sdioh_info_t * sd);
-static void sd_unmap_dma(sdioh_info_t * sd);
-static void sd_clear_adma_dscr_buf(sdioh_info_t *sd);
-static void sd_fill_dma_data_buf(sdioh_info_t *sd, uint8 data);
-static void sd_create_adma_descriptor(sdioh_info_t *sd,
-                                      uint32 index, uint32 addr_phys,
-                                      uint16 length, uint16 flags);
-static void sd_dump_adma_dscr(sdioh_info_t *sd);
-static void sdstd_dumpregs(sdioh_info_t *sd);
-
-
-/*
- * Private register access routines.
- */
-
-/* 16 bit PCI regs */
-
-extern uint16 sdstd_rreg16(sdioh_info_t *sd, uint reg);
-uint16
-sdstd_rreg16(sdioh_info_t *sd, uint reg)
-{
-
-       volatile uint16 data = *(volatile uint16 *)(sd->mem_space + reg);
-       sd_ctrl(("16: R Reg 0x%02x, Data 0x%x\n", reg, data));
-       return data;
-}
-
-extern void sdstd_wreg16(sdioh_info_t *sd, uint reg, uint16 data);
-void
-sdstd_wreg16(sdioh_info_t *sd, uint reg, uint16 data)
-{
-       *(volatile uint16 *)(sd->mem_space + reg) = (volatile uint16) data;
-       sd_ctrl(("16: W Reg 0x%02x, Data 0x%x\n", reg, data));
-}
-
-static void
-sdstd_or_reg16(sdioh_info_t *sd, uint reg, uint16 val)
-{
-       volatile uint16 data = *(volatile uint16 *)(sd->mem_space + reg);
-       sd_ctrl(("16: OR Reg 0x%02x, Val 0x%x\n", reg, val));
-       data |= val;
-       *(volatile uint16 *)(sd->mem_space + reg) = (volatile uint16)data;
-
-}
-static void
-sdstd_mod_reg16(sdioh_info_t *sd, uint reg, int16 mask, uint16 val)
-{
-
-       volatile uint16 data = *(volatile uint16 *)(sd->mem_space + reg);
-       sd_ctrl(("16: MOD Reg 0x%02x, Mask 0x%x, Val 0x%x\n", reg, mask, val));
-       data &= ~mask;
-       data |= (val & mask);
-       *(volatile uint16 *)(sd->mem_space + reg) = (volatile uint16)data;
-}
-
-
-/* 32 bit PCI regs */
-static uint32
-sdstd_rreg(sdioh_info_t *sd, uint reg)
-{
-       volatile uint32 data = *(volatile uint32 *)(sd->mem_space + reg);
-       sd_ctrl(("32: R Reg 0x%02x, Data 0x%x\n", reg, data));
-       return data;
-}
-static inline void
-sdstd_wreg(sdioh_info_t *sd, uint reg, uint32 data)
-{
-       *(volatile uint32 *)(sd->mem_space + reg) = (volatile uint32)data;
-       sd_ctrl(("32: W Reg 0x%02x, Data 0x%x\n", reg, data));
-
-}
-
-/* 8 bit PCI regs */
-static inline void
-sdstd_wreg8(sdioh_info_t *sd, uint reg, uint8 data)
-{
-       *(volatile uint8 *)(sd->mem_space + reg) = (volatile uint8)data;
-       sd_ctrl(("08: W Reg 0x%02x, Data 0x%x\n", reg, data));
-}
-static uint8
-sdstd_rreg8(sdioh_info_t *sd, uint reg)
-{
-       volatile uint8 data = *(volatile uint8 *)(sd->mem_space + reg);
-       sd_ctrl(("08: R Reg 0x%02x, Data 0x%x\n", reg, data));
-       return data;
-}
-
-/*
- * Private work routines
- */
-
-sdioh_info_t *glob_sd;
-
-/*
- *  Public entry points & extern's
- */
-extern sdioh_info_t *
-sdioh_attach(osl_t *osh, void *bar0, uint irq)
-{
-       sdioh_info_t *sd;
-
-       sd_trace(("%s\n", __FUNCTION__));
-       if ((sd = (sdioh_info_t *)MALLOC(osh, sizeof(sdioh_info_t))) == NULL) {
-               sd_err(("sdioh_attach: out of memory, malloced %d bytes\n", MALLOCED(osh)));
-               return NULL;
-       }
-       bzero((char *)sd, sizeof(sdioh_info_t));
-       glob_sd = sd;
-       sd->osh = osh;
-       if (sdstd_osinit(sd) != 0) {
-               sd_err(("%s:sdstd_osinit() failed\n", __FUNCTION__));
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-               return NULL;
-       }
-       sd->mem_space = (volatile char *)sdstd_reg_map(osh, (uintptr)bar0, SDIOH_REG_WINSZ);
-       sd_init_dma(sd);
-       sd->irq = irq;
-       if (sd->mem_space == NULL) {
-               sd_err(("%s:ioremap() failed\n", __FUNCTION__));
-               sdstd_osfree(sd);
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-               return NULL;
-       }
-       sd_info(("%s:sd->mem_space = %p\n", __FUNCTION__, sd->mem_space));
-       sd->intr_handler = NULL;
-       sd->intr_handler_arg = NULL;
-       sd->intr_handler_valid = FALSE;
-
-       /* Set defaults */
-       sd->sd_blockmode = TRUE;
-       sd->use_client_ints = TRUE;
-       sd->sd_dma_mode = sd_dma_mode;
-
-       if (!sd->sd_blockmode)
-               sd->sd_dma_mode = DMA_MODE_NONE;
-
-       if (sdstd_driver_init(sd) != SUCCESS) {
-               /* If host CPU was reset without resetting SD bus or
-                  SD device, the device will still have its RCA but
-                  driver no longer knows what it is (since driver has been restarted).
-                  go through once to clear the RCA and a gain reassign it.
-                */
-               sd_info(("driver_init failed - Reset RCA and try again\n"));
-               if (sdstd_driver_init(sd) != SUCCESS) {
-                       sd_err(("%s:driver_init() failed()\n", __FUNCTION__));
-                       if (sd->mem_space) {
-                               sdstd_reg_unmap(osh, (uintptr)sd->mem_space, SDIOH_REG_WINSZ);
-                               sd->mem_space = NULL;
-                       }
-                       sdstd_osfree(sd);
-                       MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-                       return (NULL);
-               }
-       }
-
-       OSL_DMADDRWIDTH(osh, 32);
-
-       /* Always map DMA buffers, so we can switch between DMA modes. */
-       sd_map_dma(sd);
-
-       if (sdstd_register_irq(sd, irq) != SUCCESS) {
-               sd_err(("%s: sdstd_register_irq() failed for irq = %d\n", __FUNCTION__, irq));
-               sdstd_free_irq(sd->irq, sd);
-               if (sd->mem_space) {
-                       sdstd_reg_unmap(osh, (uintptr)sd->mem_space, SDIOH_REG_WINSZ);
-                       sd->mem_space = NULL;
-               }
-
-               sdstd_osfree(sd);
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-               return (NULL);
-       }
-
-       sd_trace(("%s: Done\n", __FUNCTION__));
-       return sd;
-}
-
-extern SDIOH_API_RC
-sdioh_detach(osl_t *osh, sdioh_info_t *sd)
-{
-       sd_trace(("%s\n", __FUNCTION__));
-       if (sd) {
-               sd_unmap_dma(sd);
-               sdstd_wreg16(sd, SD_IntrSignalEnable, 0);
-               sd_trace(("%s: freeing irq %d\n", __FUNCTION__, sd->irq));
-               sdstd_free_irq(sd->irq, sd);
-               if (sd->card_init_done)
-                       sdstd_reset(sd, 1, 1);
-               if (sd->mem_space) {
-                       sdstd_reg_unmap(osh, (uintptr)sd->mem_space, SDIOH_REG_WINSZ);
-                       sd->mem_space = NULL;
-               }
-
-               sdstd_osfree(sd);
-               MFREE(sd->osh, sd, sizeof(sdioh_info_t));
-       }
-       return SDIOH_API_RC_SUCCESS;
-}
-
-/* Configure callback to client when we recieve client interrupt */
-extern SDIOH_API_RC
-sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh)
-{
-       sd_trace(("%s: Entering\n", __FUNCTION__));
-       sd->intr_handler = fn;
-       sd->intr_handler_arg = argh;
-       sd->intr_handler_valid = TRUE;
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_interrupt_deregister(sdioh_info_t *sd)
-{
-       sd_trace(("%s: Entering\n", __FUNCTION__));
-       sd->intr_handler_valid = FALSE;
-       sd->intr_handler = NULL;
-       sd->intr_handler_arg = NULL;
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_interrupt_query(sdioh_info_t *sd, bool *onoff)
-{
-       sd_trace(("%s: Entering\n", __FUNCTION__));
-       *onoff = sd->client_intr_enabled;
-       return SDIOH_API_RC_SUCCESS;
-}
-
-#if defined(DHD_DEBUG)
-extern bool
-sdioh_interrupt_pending(sdioh_info_t *sd)
-{
-       uint16 intrstatus;
-       intrstatus = sdstd_rreg16(sd, SD_IntrStatus);
-       return !!(intrstatus & CLIENT_INTR);
-}
-#endif
-
-uint
-sdioh_query_iofnum(sdioh_info_t *sd)
-{
-       return sd->num_funcs;
-}
-
-/* IOVar table */
-enum {
-       IOV_MSGLEVEL = 1,
-       IOV_BLOCKMODE,
-       IOV_BLOCKSIZE,
-       IOV_DMA,
-       IOV_USEINTS,
-       IOV_NUMINTS,
-       IOV_NUMLOCALINTS,
-       IOV_HOSTREG,
-       IOV_DEVREG,
-       IOV_DIVISOR,
-       IOV_SDMODE,
-       IOV_HISPEED,
-       IOV_HCIREGS,
-       IOV_POWER,
-       IOV_YIELDCPU,
-       IOV_MINYIELD,
-       IOV_FORCERB,
-       IOV_CLOCK
-};
-
-const bcm_iovar_t sdioh_iovars[] = {
-       {"sd_msglevel", IOV_MSGLEVEL,   0,      IOVT_UINT32,    0 },
-       {"sd_blockmode", IOV_BLOCKMODE, 0,      IOVT_BOOL,      0 },
-       {"sd_blocksize", IOV_BLOCKSIZE, 0,      IOVT_UINT32,    0 }, /* ((fn << 16) | size) */
-       {"sd_dma",      IOV_DMA,        0,      IOVT_UINT32,    0 },
-#ifdef BCMSDYIELD
-       {"sd_yieldcpu", IOV_YIELDCPU,   0,      IOVT_BOOL,      0 },
-       {"sd_minyield", IOV_MINYIELD,   0,      IOVT_UINT32,    0 },
-       {"sd_forcerb",  IOV_FORCERB,    0,      IOVT_BOOL,      0 },
-#endif
-       {"sd_ints",     IOV_USEINTS,    0,      IOVT_BOOL,      0 },
-       {"sd_numints",  IOV_NUMINTS,    0,      IOVT_UINT32,    0 },
-       {"sd_numlocalints", IOV_NUMLOCALINTS, 0, IOVT_UINT32,   0 },
-       {"sd_hostreg",  IOV_HOSTREG,    0,      IOVT_BUFFER,    sizeof(sdreg_t) },
-       {"sd_devreg",   IOV_DEVREG,     0,      IOVT_BUFFER,    sizeof(sdreg_t) },
-       {"sd_divisor",  IOV_DIVISOR,    0,      IOVT_UINT32,    0 },
-       {"sd_power",    IOV_POWER,      0,      IOVT_UINT32,    0 },
-       {"sd_clock",    IOV_CLOCK,      0,      IOVT_UINT32,    0 },
-       {"sd_mode",     IOV_SDMODE,     0,      IOVT_UINT32,    100},
-       {"sd_highspeed",        IOV_HISPEED,    0,      IOVT_UINT32,    0},
-       {NULL, 0, 0, 0, 0 }
-};
-
-int
-sdioh_iovar_op(sdioh_info_t *si, const char *name,
-               void *params, int plen, void *arg, int len, bool set)
-{
-       const bcm_iovar_t *vi = NULL;
-       int bcmerror = 0;
-       int val_size;
-       int32 int_val = 0;
-       bool bool_val;
-       uint32 actionid;
-
-       ASSERT(name);
-       ASSERT(len >= 0);
-
-       /* Get must have return space; Set does not take qualifiers */
-       ASSERT(set || (arg && len));
-       ASSERT(!set || (!params && !plen));
-
-       sd_trace(("%s: Enter (%s %s)\n", __FUNCTION__, (set ? "set" : "get"), name));
-
-       if ((vi = bcm_iovar_lookup(sdioh_iovars, name)) == NULL) {
-               bcmerror = BCME_UNSUPPORTED;
-               goto exit;
-       }
-
-       if ((bcmerror = bcm_iovar_lencheck(vi, arg, len, set)) != 0)
-               goto exit;
-
-       /* Set up params so get and set can share the convenience variables */
-       if (params == NULL) {
-               params = arg;
-               plen = len;
-       }
-
-       if (vi->type == IOVT_VOID)
-               val_size = 0;
-       else if (vi->type == IOVT_BUFFER)
-               val_size = len;
-       else
-               val_size = sizeof(int);
-
-       if (plen >= (int)sizeof(int_val))
-               bcopy(params, &int_val, sizeof(int_val));
-
-       bool_val = (int_val != 0) ? TRUE : FALSE;
-
-       actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid);
-       switch (actionid) {
-       case IOV_GVAL(IOV_MSGLEVEL):
-               int_val = (int32)sd_msglevel;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_MSGLEVEL):
-               sd_msglevel = int_val;
-               break;
-
-       case IOV_GVAL(IOV_BLOCKMODE):
-               int_val = (int32)si->sd_blockmode;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_BLOCKMODE):
-               si->sd_blockmode = (bool)int_val;
-               /* Haven't figured out how to make non-block mode with DMA */
-               if (!si->sd_blockmode)
-                       si->sd_dma_mode = DMA_MODE_NONE;
-               break;
-
-#ifdef BCMSDYIELD
-       case IOV_GVAL(IOV_YIELDCPU):
-               int_val = sd_yieldcpu;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_YIELDCPU):
-               sd_yieldcpu = (bool)int_val;
-               break;
-
-       case IOV_GVAL(IOV_MINYIELD):
-               int_val = sd_minyield;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_MINYIELD):
-               sd_minyield = (bool)int_val;
-               break;
-
-       case IOV_GVAL(IOV_FORCERB):
-               int_val = sd_forcerb;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_FORCERB):
-               sd_forcerb = (bool)int_val;
-               break;
-#endif /* BCMSDYIELD */
-
-       case IOV_GVAL(IOV_BLOCKSIZE):
-               if ((uint32)int_val > si->num_funcs) {
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-               int_val = (int32)si->client_block_size[int_val];
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_BLOCKSIZE):
-       {
-               uint func = ((uint32)int_val >> 16);
-               uint blksize = (uint16)int_val;
-               uint maxsize;
-
-               if (func > si->num_funcs) {
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-
-               switch (func) {
-               case 0: maxsize = 32; break;
-               case 1: maxsize = BLOCK_SIZE_4318; break;
-               case 2: maxsize = BLOCK_SIZE_4328; break;
-               default: maxsize = 0;
-               }
-               if (blksize > maxsize) {
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-               if (!blksize) {
-                       blksize = maxsize;
-               }
-
-               /* Now set it */
-               sdstd_lock(si);
-               bcmerror = set_client_block_size(si, func, blksize);
-               sdstd_unlock(si);
-               break;
-       }
-
-       case IOV_GVAL(IOV_DMA):
-               int_val = (int32)si->sd_dma_mode;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_DMA):
-               si->sd_dma_mode = (char)int_val;
-               sdstd_set_dma_mode(si, si->sd_dma_mode);
-               break;
-
-       case IOV_GVAL(IOV_USEINTS):
-               int_val = (int32)si->use_client_ints;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_USEINTS):
-               si->use_client_ints = (bool)int_val;
-               if (si->use_client_ints)
-                       si->intmask |= CLIENT_INTR;
-               else
-                       si->intmask &= ~CLIENT_INTR;
-               break;
-
-       case IOV_GVAL(IOV_DIVISOR):
-               int_val = (uint32)sd_divisor;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_DIVISOR):
-               sd_divisor = int_val;
-               if (!sdstd_start_clock(si, (uint16)sd_divisor)) {
-                       sd_err(("set clock failed!\n"));
-                       bcmerror = BCME_ERROR;
-               }
-               break;
-
-       case IOV_GVAL(IOV_POWER):
-               int_val = (uint32)sd_power;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_POWER):
-               sd_power = int_val;
-               if (sd_power == 1) {
-                       if (sdstd_driver_init(si) != SUCCESS) {
-                               sd_err(("set SD Slot power failed!\n"));
-                               bcmerror = BCME_ERROR;
-                       } else {
-                               sd_err(("SD Slot Powered ON.\n"));
-                       }
-               } else {
-                       uint8 pwr = 0;
-
-                       pwr = SFIELD(pwr, PWR_BUS_EN, 0);
-                       sdstd_wreg8(si, SD_PwrCntrl, pwr); /* Set Voltage level */
-                       sd_err(("SD Slot Powered OFF.\n"));
-               }
-               break;
-
-       case IOV_GVAL(IOV_CLOCK):
-               int_val = (uint32)sd_clock;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_CLOCK):
-               sd_clock = int_val;
-               if (sd_clock == 1) {
-                       sd_info(("SD Clock turned ON.\n"));
-                       if (!sdstd_start_clock(si, (uint16)sd_divisor)) {
-                               sd_err(("sdstd_start_clock failed\n"));
-                               bcmerror = BCME_ERROR;
-                       }
-               } else {
-                       /* turn off HC clock */
-                       sdstd_wreg16(si, SD_ClockCntrl,
-                                    sdstd_rreg16(si, SD_ClockCntrl) & ~((uint16)0x4));
-
-                       sd_info(("SD Clock turned OFF.\n"));
-               }
-               break;
-
-       case IOV_GVAL(IOV_SDMODE):
-               int_val = (uint32)sd_sdmode;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_SDMODE):
-               sd_sdmode = int_val;
-
-               if (!sdstd_bus_width(si, sd_sdmode)) {
-                       sd_err(("sdstd_bus_width failed\n"));
-                       bcmerror = BCME_ERROR;
-               }
-               break;
-
-       case IOV_GVAL(IOV_HISPEED):
-               int_val = (uint32)sd_hiok;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_HISPEED):
-               sd_hiok = int_val;
-               bcmerror = sdstd_set_highspeed_mode(si, (bool)sd_hiok);
-               break;
-
-       case IOV_GVAL(IOV_NUMINTS):
-               int_val = (int32)si->intrcount;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_GVAL(IOV_NUMLOCALINTS):
-               int_val = (int32)si->local_intrcount;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_GVAL(IOV_HOSTREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-
-               if (sd_ptr->offset < SD_SysAddr || sd_ptr->offset > SD_MaxCurCap) {
-                       sd_err(("%s: bad offset 0x%x\n", __FUNCTION__, sd_ptr->offset));
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-
-               sd_trace(("%s: rreg%d at offset %d\n", __FUNCTION__,
-                         (sd_ptr->offset & 1) ? 8 : ((sd_ptr->offset & 2) ? 16 : 32),
-                         sd_ptr->offset));
-               if (sd_ptr->offset & 1)
-                       int_val = sdstd_rreg8(si, sd_ptr->offset);
-               else if (sd_ptr->offset & 2)
-                       int_val = sdstd_rreg16(si, sd_ptr->offset);
-               else
-                       int_val = sdstd_rreg(si, sd_ptr->offset);
-
-               bcopy(&int_val, arg, sizeof(int_val));
-               break;
-       }
-
-       case IOV_SVAL(IOV_HOSTREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-
-               if (sd_ptr->offset < SD_SysAddr || sd_ptr->offset > SD_MaxCurCap) {
-                       sd_err(("%s: bad offset 0x%x\n", __FUNCTION__, sd_ptr->offset));
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-
-               sd_trace(("%s: wreg%d value 0x%08x at offset %d\n", __FUNCTION__, sd_ptr->value,
-                         (sd_ptr->offset & 1) ? 8 : ((sd_ptr->offset & 2) ? 16 : 32),
-                         sd_ptr->offset));
-               if (sd_ptr->offset & 1)
-                       sdstd_wreg8(si, sd_ptr->offset, (uint8)sd_ptr->value);
-               else if (sd_ptr->offset & 2)
-                       sdstd_wreg16(si, sd_ptr->offset, (uint16)sd_ptr->value);
-               else
-                       sdstd_wreg(si, sd_ptr->offset, (uint32)sd_ptr->value);
-
-               break;
-       }
-
-       case IOV_GVAL(IOV_DEVREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-               uint8 data;
-
-               if (sdioh_cfg_read(si, sd_ptr->func, sd_ptr->offset, &data)) {
-                       bcmerror = BCME_SDIO_ERROR;
-                       break;
-               }
-
-               int_val = (int)data;
-               bcopy(&int_val, arg, sizeof(int_val));
-               break;
-       }
-
-       case IOV_SVAL(IOV_DEVREG):
-       {
-               sdreg_t *sd_ptr = (sdreg_t *)params;
-               uint8 data = (uint8)sd_ptr->value;
-
-               if (sdioh_cfg_write(si, sd_ptr->func, sd_ptr->offset, &data)) {
-                       bcmerror = BCME_SDIO_ERROR;
-                       break;
-               }
-               break;
-       }
-
-
-       default:
-               bcmerror = BCME_UNSUPPORTED;
-               break;
-       }
-exit:
-
-       return bcmerror;
-}
-
-extern SDIOH_API_RC
-sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, uint8 *data)
-{
-       SDIOH_API_RC status;
-       /* No lock needed since sdioh_request_byte does locking */
-       status = sdioh_request_byte(sd, SDIOH_READ, fnc_num, addr, data);
-       return status;
-}
-
-extern SDIOH_API_RC
-sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, uint32 addr, uint8 *data)
-{
-       /* No lock needed since sdioh_request_byte does locking */
-       SDIOH_API_RC status;
-       status = sdioh_request_byte(sd, SDIOH_WRITE, fnc_num, addr, data);
-       return status;
-}
-
-extern SDIOH_API_RC
-sdioh_cis_read(sdioh_info_t *sd, uint func, uint8 *cisd, uint32 length)
-{
-       uint32 count;
-       int offset;
-       uint32 foo;
-       uint8 *cis = cisd;
-
-       sd_trace(("%s: Func = %d\n", __FUNCTION__, func));
-
-       if (!sd->func_cis_ptr[func]) {
-               bzero(cis, length);
-               return SDIOH_API_RC_FAIL;
-       }
-
-       sdstd_lock(sd);
-       *cis = 0;
-       for (count = 0; count < length; count++) {
-               offset =  sd->func_cis_ptr[func] + count;
-               if (sdstd_card_regread(sd, 0, offset, 1, &foo)) {
-                       sd_err(("%s: regread failed: Can't read CIS\n", __FUNCTION__));
-                       sdstd_unlock(sd);
-                       return SDIOH_API_RC_FAIL;
-               }
-               *cis = (uint8)(foo & 0xff);
-               cis++;
-       }
-       sdstd_unlock(sd);
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_request_byte(sdioh_info_t *sd, uint rw, uint func, uint regaddr, uint8 *byte)
-{
-       int status;
-       uint32 cmd_arg;
-       uint32 rsp5;
-
-       sdstd_lock(sd);
-       cmd_arg = 0;
-       cmd_arg = SFIELD(cmd_arg, CMD52_FUNCTION, func);
-       cmd_arg = SFIELD(cmd_arg, CMD52_REG_ADDR, regaddr);
-       cmd_arg = SFIELD(cmd_arg, CMD52_RW_FLAG, rw == SDIOH_READ ? 0 : 1);
-       cmd_arg = SFIELD(cmd_arg, CMD52_RAW, 0);
-       cmd_arg = SFIELD(cmd_arg, CMD52_DATA, rw == SDIOH_READ ? 0 : *byte);
-
-       if ((status = sdstd_cmd_issue(sd, USE_DMA(sd), SDIOH_CMD_52, cmd_arg)) != SUCCESS) {
-               sdstd_unlock(sd);
-               return status;
-       }
-
-       sdstd_cmd_getrsp(sd, &rsp5, 1);
-       if (sdstd_rreg16 (sd, SD_ErrorIntrStatus) != 0) {
-               sd_err(("%s: 1: ErrorintrStatus 0x%x\n",
-                       __FUNCTION__, sdstd_rreg16(sd, SD_ErrorIntrStatus)));
-       }
-       if (GFIELD(rsp5, RSP5_FLAGS) != 0x10)
-               sd_err(("%s: rsp5 flags is 0x%x\t %d\n",
-                       __FUNCTION__, GFIELD(rsp5, RSP5_FLAGS), func));
-
-       if (GFIELD(rsp5, RSP5_STUFF))
-               sd_err(("%s: rsp5 stuff is 0x%x: should be 0\n",
-                       __FUNCTION__, GFIELD(rsp5, RSP5_STUFF)));
-
-       if (rw == SDIOH_READ)
-               *byte = GFIELD(rsp5, RSP5_DATA);
-
-       sdstd_unlock(sd);
-       return SDIOH_API_RC_SUCCESS;
-}
-
-extern SDIOH_API_RC
-sdioh_request_word(sdioh_info_t *sd, uint cmd_type, uint rw, uint func, uint addr,
-                   uint32 *word, uint nbytes)
-{
-       int status;
-       bool swap = FALSE;
-
-       sdstd_lock(sd);
-
-       if (rw == SDIOH_READ) {
-               status = sdstd_card_regread(sd, func, addr, nbytes, word);
-               if (swap)
-                       *word = BCMSWAP32(*word);
-       } else {
-               if (swap)
-                       *word = BCMSWAP32(*word);
-               status = sdstd_card_regwrite(sd, func, addr, nbytes, *word);
-       }
-
-       sdstd_unlock(sd);
-       return (status == SUCCESS ?  SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL);
-}
-
-extern SDIOH_API_RC
-sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint rw, uint func,
-                     uint addr, uint reg_width, uint buflen_u, uint8 *buffer, void *pkt)
-{
-       int len;
-       int buflen = (int)buflen_u;
-       bool fifo = (fix_inc == SDIOH_DATA_FIX);
-       uint8 *localbuf = NULL, *tmpbuf = NULL;
-       uint tmplen = 0;
-       bool local_blockmode = sd->sd_blockmode;
-
-       sdstd_lock(sd);
-
-       ASSERT(reg_width == 4);
-       ASSERT(buflen_u < (1 << 30));
-       ASSERT(sd->client_block_size[func]);
-
-       sd_data(("%s: %c len %d r_cnt %d t_cnt %d, pkt @0x%p\n",
-                __FUNCTION__, rw == SDIOH_READ ? 'R' : 'W',
-                buflen_u, sd->r_cnt, sd->t_cnt, pkt));
-
-       /* Break buffer down into blocksize chunks:
-        * Bytemode: 1 block at a time.
-        * Blockmode: Multiples of blocksizes at a time w/ max of SD_PAGE.
-        * Both: leftovers are handled last (will be sent via bytemode).
-        */
-       while (buflen > 0) {
-               if (local_blockmode) {
-                       /* Max xfer is Page size */
-                       len = MIN(SD_PAGE, buflen);
-
-                       /* Round down to a block boundry */
-                       if (buflen > sd->client_block_size[func])
-                               len = (len/sd->client_block_size[func]) *
-                                       sd->client_block_size[func];
-                       if ((func == SDIO_FUNC_1) && ((len % 4) == 3) && (rw == SDIOH_WRITE)) {
-                               tmplen = len;
-                               sd_err(("%s: Rounding up buffer to mod4 length.\n", __FUNCTION__));
-                               len++;
-                               tmpbuf = buffer;
-                               if ((localbuf = (uint8 *)MALLOC(sd->osh, len)) == NULL) {
-                                       sd_err(("out of memory, malloced %d bytes\n",
-                                               MALLOCED(sd->osh)));
-                                       sdstd_unlock(sd);
-                                       return SDIOH_API_RC_FAIL;
-                               }
-                               bcopy(buffer, localbuf, len);
-                               buffer = localbuf;
-                       }
-               } else {
-                       /* Byte mode: One block at a time */
-                       len = MIN(sd->client_block_size[func], buflen);
-               }
-
-               if (sdstd_card_buf(sd, rw, func, fifo, addr, len, (uint32 *)buffer) != SUCCESS) {
-                       sdstd_unlock(sd);
-                       return SDIOH_API_RC_FAIL;
-               }
-
-               if (local_blockmode) {
-                       if ((func == SDIO_FUNC_1) && ((tmplen % 4) == 3) && (rw == SDIOH_WRITE)) {
-                               if (localbuf)
-                                       MFREE(sd->osh, localbuf, len);
-                               len--;
-                               buffer = tmpbuf;
-                               sd_err(("%s: Restoring back buffer ptr and len.\n", __FUNCTION__));
-                       }
-               }
-
-               buffer += len;
-               buflen -= len;
-               if (!fifo)
-                       addr += len;
-       }
-       sdstd_unlock(sd);
-       return SDIOH_API_RC_SUCCESS;
-}
-
-static
-int sdstd_abort(sdioh_info_t *sd, uint func)
-{
-       int err = 0;
-       int retries;
-
-       uint16 cmd_reg;
-       uint32 cmd_arg;
-       uint32 rsp5;
-       uint8 rflags;
-
-       uint16 int_reg = 0;
-       uint16 plain_intstatus;
-
-       /* Argument is write to F0 (CCCR) IOAbort with function number */
-       cmd_arg = 0;
-       cmd_arg = SFIELD(cmd_arg, CMD52_FUNCTION, SDIO_FUNC_0);
-       cmd_arg = SFIELD(cmd_arg, CMD52_REG_ADDR, SDIOD_CCCR_IOABORT);
-       cmd_arg = SFIELD(cmd_arg, CMD52_RW_FLAG, SD_IO_OP_WRITE);
-       cmd_arg = SFIELD(cmd_arg, CMD52_RAW, 0);
-       cmd_arg = SFIELD(cmd_arg, CMD52_DATA, func);
-
-       /* Command is CMD52 write */
-       cmd_reg = 0;
-       cmd_reg = SFIELD(cmd_reg, CMD_RESP_TYPE, RESP_TYPE_48_BUSY);
-       cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 1);
-       cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 1);
-       cmd_reg = SFIELD(cmd_reg, CMD_DATA_EN, 0);
-       cmd_reg = SFIELD(cmd_reg, CMD_TYPE, CMD_TYPE_ABORT);
-       cmd_reg = SFIELD(cmd_reg, CMD_INDEX, SDIOH_CMD_52);
-
-       if (sd->sd_mode == SDIOH_MODE_SPI) {
-               cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 0);
-       }
-
-       /* Wait for CMD_INHIBIT to go away as per spec section 3.6.1.1 */
-       retries = RETRIES_SMALL;
-       while (GFIELD(sdstd_rreg(sd, SD_PresentState), PRES_CMD_INHIBIT)) {
-               if (retries == RETRIES_SMALL)
-                       sd_err(("%s: Waiting for Command Inhibit, state 0x%08x\n",
-                               __FUNCTION__, sdstd_rreg(sd, SD_PresentState)));
-               if (!--retries) {
-                       sd_err(("%s: Command Inhibit timeout, state 0x%08x\n",
-                               __FUNCTION__, sdstd_rreg(sd, SD_PresentState)));
-                       if (trap_errs)
-                               ASSERT(0);
-                       err = BCME_SDIO_ERROR;
-                       goto done;
-               }
-       }
-
-       /* Clear errors from any previous commands */
-       if ((plain_intstatus = sdstd_rreg16(sd, SD_ErrorIntrStatus)) != 0) {
-               sd_err(("abort: clearing errstat 0x%04x\n", plain_intstatus));
-               sdstd_wreg16(sd, SD_ErrorIntrStatus, plain_intstatus);
-       }
-       plain_intstatus = sdstd_rreg16(sd, SD_IntrStatus);
-       if (plain_intstatus & ~(SFIELD(0, INTSTAT_CARD_INT, 1))) {
-               sd_err(("abort: intstatus 0x%04x\n", plain_intstatus));
-               if (GFIELD(plain_intstatus, INTSTAT_CMD_COMPLETE)) {
-                       sd_err(("SDSTD_ABORT: CMD COMPLETE SET BEFORE COMMAND GIVEN!!!\n"));
-               }
-               if (GFIELD(plain_intstatus, INTSTAT_CARD_REMOVAL)) {
-                       sd_err(("SDSTD_ABORT: INTSTAT_CARD_REMOVAL\n"));
-                       err = BCME_NODEVICE;
-                       goto done;
-               }
-       }
-
-       /* Issue the command */
-       sdstd_wreg(sd, SD_Arg0, cmd_arg);
-       sdstd_wreg16(sd, SD_Command, cmd_reg);
-
-       /* In interrupt mode return, expect later CMD_COMPLETE interrupt */
-       if (!sd->polled_mode)
-               return err;
-
-       /* Otherwise, wait for the command to complete */
-       retries = RETRIES_LARGE;
-       do {
-               int_reg = sdstd_rreg16(sd, SD_IntrStatus);
-       } while (--retries &&
-                (GFIELD(int_reg, INTSTAT_ERROR_INT) == 0) &&
-                (GFIELD(int_reg, INTSTAT_CMD_COMPLETE) == 0));
-
-       /* If command completion fails, do a cmd reset and note the error */
-       if (!retries) {
-               sd_err(("%s: CMD_COMPLETE timeout: intr 0x%04x err 0x%04x state 0x%08x\n",
-                       __FUNCTION__, int_reg,
-                       sdstd_rreg16(sd, SD_ErrorIntrStatus),
-                       sdstd_rreg(sd, SD_PresentState)));
-
-               sdstd_wreg8(sd, SD_SoftwareReset, SFIELD(0, SW_RESET_CMD, 1));
-               retries = RETRIES_LARGE;
-               do {
-                       sd_trace(("%s: waiting for CMD line reset\n", __FUNCTION__));
-               } while ((GFIELD(sdstd_rreg8(sd, SD_SoftwareReset),
-                                SW_RESET_CMD)) && retries--);
-
-               if (!retries) {
-                       sd_err(("%s: Timeout waiting for CMD line reset\n", __FUNCTION__));
-               }
-
-               if (trap_errs)
-                       ASSERT(0);
-
-               err = BCME_SDIO_ERROR;
-       }
-
-       /* Clear Command Complete interrupt */
-       int_reg = SFIELD(0, INTSTAT_CMD_COMPLETE, 1);
-       sdstd_wreg16(sd, SD_IntrStatus, int_reg);
-
-       /* Check for Errors */
-       if ((plain_intstatus = sdstd_rreg16 (sd, SD_ErrorIntrStatus)) != 0) {
-               sd_err(("%s: ErrorintrStatus: 0x%x, "
-                       "(intrstatus = 0x%x, present state 0x%x) clearing\n",
-                       __FUNCTION__, plain_intstatus,
-                       sdstd_rreg16(sd, SD_IntrStatus),
-                       sdstd_rreg(sd, SD_PresentState)));
-
-               sdstd_wreg16(sd, SD_ErrorIntrStatus, plain_intstatus);
-
-               sdstd_wreg8(sd, SD_SoftwareReset, SFIELD(0, SW_RESET_DAT, 1));
-               retries = RETRIES_LARGE;
-               do {
-                       sd_trace(("%s: waiting for DAT line reset\n", __FUNCTION__));
-               } while ((GFIELD(sdstd_rreg8(sd, SD_SoftwareReset),
-                                SW_RESET_DAT)) && retries--);
-
-               if (!retries) {
-                       sd_err(("%s: Timeout waiting for DAT line reset\n", __FUNCTION__));
-               }
-
-               if (trap_errs)
-                       ASSERT(0);
-
-               /* ABORT is dataless, only cmd errs count */
-               if (plain_intstatus & ERRINT_CMD_ERRS)
-                       err = BCME_SDIO_ERROR;
-       }
-
-       /* If command failed don't bother looking at response */
-       if (err)
-               goto done;
-
-       /* Otherwise, check the response */
-       sdstd_cmd_getrsp(sd, &rsp5, 1);
-       rflags = GFIELD(rsp5, RSP5_FLAGS);
-
-       if (rflags & SD_RSP_R5_ERRBITS) {
-               sd_err(("%s: R5 flags include errbits: 0x%02x\n", __FUNCTION__, rflags));
-
-               /* The CRC error flag applies to the previous command */
-               if (rflags & (SD_RSP_R5_ERRBITS & ~SD_RSP_R5_COM_CRC_ERROR)) {
-                       err = BCME_SDIO_ERROR;
-                       goto done;
-               }
-       }
-
-       if (((rflags & (SD_RSP_R5_IO_CURRENTSTATE0 | SD_RSP_R5_IO_CURRENTSTATE1)) != 0x10) &&
-           ((rflags & (SD_RSP_R5_IO_CURRENTSTATE0 | SD_RSP_R5_IO_CURRENTSTATE1)) != 0x20)) {
-               sd_err(("%s: R5 flags has bad state: 0x%02x\n", __FUNCTION__, rflags));
-               err = BCME_SDIO_ERROR;
-               goto done;
-       }
-
-       if (GFIELD(rsp5, RSP5_STUFF)) {
-               sd_err(("%s: rsp5 stuff is 0x%x: should be 0\n",
-                       __FUNCTION__, GFIELD(rsp5, RSP5_STUFF)));
-               err = BCME_SDIO_ERROR;
-               goto done;
-       }
-
-done:
-       if (err == BCME_NODEVICE)
-               return err;
-
-       sdstd_wreg8(sd, SD_SoftwareReset,
-                   SFIELD(SFIELD(0, SW_RESET_DAT, 1), SW_RESET_CMD, 1));
-
-       retries = RETRIES_LARGE;
-       do {
-               rflags = sdstd_rreg8(sd, SD_SoftwareReset);
-               if (!GFIELD(rflags, SW_RESET_DAT) && !GFIELD(rflags, SW_RESET_CMD))
-                       break;
-       } while (--retries);
-
-       if (!retries) {
-               sd_err(("%s: Timeout waiting for DAT/CMD reset: 0x%02x\n",
-                       __FUNCTION__, rflags));
-               err = BCME_SDIO_ERROR;
-       }
-
-       return err;
-}
-
-extern int
-sdioh_abort(sdioh_info_t *sd, uint fnum)
-{
-       int ret;
-
-       sdstd_lock(sd);
-       ret = sdstd_abort(sd, fnum);
-       sdstd_unlock(sd);
-
-       return ret;
-}
-
-int
-sdioh_start(sdioh_info_t *sd, int stage)
-{
-       return SUCCESS;
-}
-
-int
-sdioh_stop(sdioh_info_t *sd)
-{
-       return SUCCESS;
-}
-
-static int
-sdstd_check_errs(sdioh_info_t *sdioh_info, uint32 cmd, uint32 arg)
-{
-       uint16 regval;
-       uint retries;
-       uint function = 0;
-
-       /* If no errors, we're done */
-       if ((regval = sdstd_rreg16(sdioh_info, SD_ErrorIntrStatus)) == 0)
-               return SUCCESS;
-
-       sd_info(("%s: ErrorIntrStatus 0x%04x (clearing), IntrStatus 0x%04x PresentState 0x%08x\n",
-               __FUNCTION__, regval, sdstd_rreg16(sdioh_info, SD_IntrStatus),
-               sdstd_rreg(sdioh_info, SD_PresentState)));
-       sdstd_wreg16(sdioh_info, SD_ErrorIntrStatus, regval);
-
-       /* On command error, issue CMD reset */
-       if (regval & ERRINT_CMD_ERRS) {
-               sd_trace(("%s: issuing CMD reset\n", __FUNCTION__));
-               sdstd_wreg8(sdioh_info, SD_SoftwareReset, SFIELD(0, SW_RESET_CMD, 1));
-               for (retries = RETRIES_LARGE; retries; retries--)
-                       if (!(GFIELD(sdstd_rreg8(sdioh_info, SD_SoftwareReset), SW_RESET_CMD)))
-                               break;
-               if (!retries) {
-                       sd_err(("%s: Timeout waiting for CMD line reset\n", __FUNCTION__));
-               }
-       }
-
-       /* On data error, issue DAT reset */
-       if (regval & ERRINT_DATA_ERRS) {
-               sd_trace(("%s: issuing DAT reset\n", __FUNCTION__));
-               sdstd_wreg8(sdioh_info, SD_SoftwareReset, SFIELD(0, SW_RESET_DAT, 1));
-               for (retries = RETRIES_LARGE; retries; retries--)
-                       if (!(GFIELD(sdstd_rreg8(sdioh_info, SD_SoftwareReset), SW_RESET_DAT)))
-                               break;
-               if (!retries) {
-                       sd_err(("%s: Timeout waiting for DAT line reset\n", __FUNCTION__));
-               }
-       }
-
-       /* For an IO command (CMD52 or CMD53) issue an abort to the appropriate function */
-       if (cmd == SDIOH_CMD_53)
-               function = GFIELD(arg, CMD53_FUNCTION);
-       else if (cmd == SDIOH_CMD_52)
-               function = GFIELD(arg, CMD52_FUNCTION);
-       if (function) {
-               sd_trace(("%s: requesting abort for function %d after cmd %d\n",
-                         __FUNCTION__, function, cmd));
-               sdstd_abort(sdioh_info, function);
-       }
-
-       if (trap_errs)
-               ASSERT(0);
-
-       return ERROR;
-}
-
-
-
-/*
- * Private/Static work routines
- */
-static bool
-sdstd_reset(sdioh_info_t *sd, bool host_reset, bool client_reset)
-{
-       int retries = RETRIES_LARGE;
-       uchar regval;
-
-       if (!sd)
-               return TRUE;
-
-       sdstd_lock(sd);
-       /* Reset client card */
-       if (client_reset && (sd->adapter_slot != -1)) {
-               if (sdstd_card_regwrite(sd, 0, SDIOD_CCCR_IOABORT, 1, 0x8) != SUCCESS)
-                       sd_err(("%s: Cannot write to card reg 0x%x\n",
-                               __FUNCTION__, SDIOD_CCCR_IOABORT));
-               else
-                       sd->card_rca = 0;
-       }
-
-       /* Reset host controller */
-       if (host_reset) {
-               regval = SFIELD(0, SW_RESET_ALL, 1);
-               sdstd_wreg8(sd, SD_SoftwareReset, regval);
-               do {
-                       sd_trace(("%s: waiting for reset\n", __FUNCTION__));
-               } while ((sdstd_rreg8(sd, SD_SoftwareReset) & regval) && retries--);
-
-               if (!retries) {
-                       sd_err(("%s: Timeout waiting for host reset\n", __FUNCTION__));
-                       sdstd_unlock(sd);
-                       return (FALSE);
-               }
-
-               /* A reset should reset bus back to 1 bit mode */
-               sd->sd_mode = SDIOH_MODE_SD1;
-               sdstd_set_dma_mode(sd, sd->sd_dma_mode);
-       }
-       sdstd_unlock(sd);
-       return TRUE;
-}
-
-/* Disable device interrupt */
-void
-sdstd_devintr_off(sdioh_info_t *sd)
-{
-       sd_trace(("%s: %d\n", __FUNCTION__, sd->use_client_ints));
-       if (sd->use_client_ints) {
-               sd->intmask &= ~CLIENT_INTR;
-               sdstd_wreg16(sd, SD_IntrSignalEnable, sd->intmask);
-               sdstd_rreg16(sd, SD_IntrSignalEnable); /* Sync readback */
-       }
-}
-
-/* Enable device interrupt */
-void
-sdstd_devintr_on(sdioh_info_t *sd)
-{
-       ASSERT(sd->lockcount == 0);
-       sd_trace(("%s: %d\n", __FUNCTION__, sd->use_client_ints));
-       if (sd->use_client_ints) {
-               uint16 status = sdstd_rreg16(sd, SD_IntrStatusEnable);
-               sdstd_wreg16(sd, SD_IntrStatusEnable, SFIELD(status, INTSTAT_CARD_INT, 0));
-               sdstd_wreg16(sd, SD_IntrStatusEnable, status);
-
-               sd->intmask |= CLIENT_INTR;
-               sdstd_wreg16(sd, SD_IntrSignalEnable, sd->intmask);
-               sdstd_rreg16(sd, SD_IntrSignalEnable); /* Sync readback */
-       }
-}
-
-#ifdef BCMSDYIELD
-/* Enable/disable other interrupts */
-void
-sdstd_intrs_on(sdioh_info_t *sd, uint16 norm, uint16 err)
-{
-       if (err) {
-               norm = SFIELD(norm, INTSTAT_ERROR_INT, 1);
-               sdstd_wreg16(sd, SD_ErrorIntrSignalEnable, err);
-       }
-
-       sd->intmask |= norm;
-       sdstd_wreg16(sd, SD_IntrSignalEnable, sd->intmask);
-       if (sd_forcerb)
-               sdstd_rreg16(sd, SD_IntrSignalEnable); /* Sync readback */
-}
-
-void
-sdstd_intrs_off(sdioh_info_t *sd, uint16 norm, uint16 err)
-{
-       if (err) {
-               norm = SFIELD(norm, INTSTAT_ERROR_INT, 1);
-               sdstd_wreg16(sd, SD_ErrorIntrSignalEnable, 0);
-       }
-
-       sd->intmask &= ~norm;
-       sdstd_wreg16(sd, SD_IntrSignalEnable, sd->intmask);
-       if (sd_forcerb)
-               sdstd_rreg16(sd, SD_IntrSignalEnable); /* Sync readback */
-}
-#endif /* BCMSDYIELD */
-
-static int
-sdstd_host_init(sdioh_info_t *sd)
-{
-       int             num_slots, full_slot;
-       uint8           reg8;
-
-       uint32          card_ins;
-       int                     slot, first_bar = 0;
-       bool            detect_slots = FALSE;
-       uint            bar;
-
-       /* Check for Arasan ID */
-       if ((OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_VID, 4) & 0xFFFF) == VENDOR_SI_IMAGE) {
-               sd_info(("%s: Found Arasan Standard SDIO Host Controller\n", __FUNCTION__));
-               sd->controller_type = SDIOH_TYPE_ARASAN_HDK;
-               detect_slots = TRUE;
-       } else if ((OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_VID, 4) & 0xFFFF) == VENDOR_BROADCOM) {
-               sd_info(("%s: Found Broadcom 27xx Standard SDIO Host Controller\n", __FUNCTION__));
-               sd->controller_type = SDIOH_TYPE_BCM27XX;
-               detect_slots = FALSE;
-       } else if ((OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_VID, 4) & 0xFFFF) == VENDOR_TI) {
-               sd_info(("%s: Found TI PCIxx21 Standard SDIO Host Controller\n", __FUNCTION__));
-               sd->controller_type = SDIOH_TYPE_TI_PCIXX21;
-               detect_slots = TRUE;
-       } else if ((OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_VID, 4) & 0xFFFF) == VENDOR_RICOH) {
-               sd_info(("%s: Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter\n",
-                       __FUNCTION__));
-               sd->controller_type = SDIOH_TYPE_RICOH_R5C822;
-               detect_slots = TRUE;
-       } else if ((OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_VID, 4) & 0xFFFF) == VENDOR_JMICRON) {
-               sd_info(("%s: JMicron Standard SDIO Host Controller\n",
-                       __FUNCTION__));
-               sd->controller_type = SDIOH_TYPE_JMICRON;
-               detect_slots = TRUE;
-       } else {
-               return ERROR;
-       }
-
-       /*
-        * Determine num of slots
-        * Search each slot
-        */
-
-       first_bar = OSL_PCI_READ_CONFIG(sd->osh, SD_SlotInfo, 4) & 0x7;
-       num_slots = (OSL_PCI_READ_CONFIG(sd->osh, SD_SlotInfo, 4) & 0xff) >> 4;
-       num_slots &= 7;
-       num_slots++;    /* map bits to num slots according to spec */
-
-       if (OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_VID, 4) ==
-           ((SDIOH_FPGA_ID << 16) | VENDOR_BROADCOM)) {
-               sd_err(("%s: Found Broadcom Standard SDIO Host Controller FPGA\n", __FUNCTION__));
-               /* Set BAR0 Window to SDIOSTH core */
-               OSL_PCI_WRITE_CONFIG(sd->osh, PCI_BAR0_WIN, 4, 0x18001000);
-
-               /* Set defaults particular to this controller. */
-               detect_slots = TRUE;
-               num_slots = 1;
-               first_bar = 0;
-
-               /* Controller supports ADMA2, so turn it on here. */
-               sd->sd_dma_mode = DMA_MODE_ADMA2;
-       }
-
-       /* Map in each slot on the board and query it to see if a
-        * card is inserted.  Use the first populated slot found.
-        */
-       if (sd->mem_space) {
-               sdstd_reg_unmap(sd->osh, (uintptr)sd->mem_space, SDIOH_REG_WINSZ);
-               sd->mem_space = NULL;
-       }
-
-       full_slot = -1;
-
-       for (slot = 0; slot < num_slots; slot++) {
-               bar = OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_BAR0 + (4*(slot + first_bar)), 4);
-               sd->mem_space = (volatile char *)sdstd_reg_map(sd->osh,
-                                                              (uintptr)bar, SDIOH_REG_WINSZ);
-
-               sd->adapter_slot = -1;
-
-               if (detect_slots) {
-                       card_ins = GFIELD(sdstd_rreg(sd, SD_PresentState), PRES_CARD_PRESENT);
-               } else {
-                       card_ins = TRUE;
-               }
-
-               if (card_ins) {
-                       sd_info(("%s: SDIO slot %d: Full\n", __FUNCTION__, slot));
-                       if (full_slot < 0)
-                               full_slot = slot;
-               } else {
-                       sd_info(("%s: SDIO slot %d: Empty\n", __FUNCTION__, slot));
-               }
-
-               if (sd->mem_space) {
-                       sdstd_reg_unmap(sd->osh, (uintptr)sd->mem_space, SDIOH_REG_WINSZ);
-                       sd->mem_space = NULL;
-               }
-       }
-
-       if (full_slot < 0) {
-               sd_err(("No slots on SDIO controller are populated\n"));
-               return -1;
-       }
-
-       bar = OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_BAR0 + (4*(full_slot + first_bar)), 4);
-       sd->mem_space = (volatile char *)sdstd_reg_map(sd->osh, (uintptr)bar, SDIOH_REG_WINSZ);
-
-       sd_err(("Using slot %d at BAR%d [0x%08x] mem_space 0x%p\n",
-               full_slot,
-               (full_slot + first_bar),
-               OSL_PCI_READ_CONFIG(sd->osh, PCI_CFG_BAR0 + (4*(full_slot + first_bar)), 4),
-               sd->mem_space));
-
-
-       sd->adapter_slot = full_slot;
-
-       sd->version = sdstd_rreg16(sd, SD_HostControllerVersion) & 0xFF;
-       switch (sd->version) {
-               case 0:
-                       sd_err(("Host Controller version 1.0, Vendor Revision: 0x%02x\n",
-                               sdstd_rreg16(sd, SD_HostControllerVersion) >> 8));
-                       break;
-               case 1:
-               case 2:
-                       sd_err(("Host Controller version 2.0, Vendor Revision: 0x%02x\n",
-                               sdstd_rreg16(sd, SD_HostControllerVersion) >> 8));
-                       break;
-               default:
-                       sd_err(("%s: Host Controller version 0x%02x not supported.\n",
-                           __FUNCTION__, sd->version));
-                       break;
-       }
-
-       sd->caps = sdstd_rreg(sd, SD_Capabilities);     /* Cache this for later use */
-       sd->curr_caps = sdstd_rreg(sd, SD_MaxCurCap);
-
-       sdstd_set_dma_mode(sd, sd->sd_dma_mode);
-
-
-       sdstd_reset(sd, 1, 0);
-
-       /* Read SD4/SD1 mode */
-       if ((reg8 = sdstd_rreg8(sd, SD_HostCntrl))) {
-               if (reg8 & SD4_MODE) {
-                       sd_err(("%s: Host cntrlr already in 4 bit mode: 0x%x\n",
-                               __FUNCTION__,  reg8));
-               }
-       }
-
-       /* Default power on mode is SD1 */
-       sd->sd_mode = SDIOH_MODE_SD1;
-       sd->polled_mode = TRUE;
-       sd->host_init_done = TRUE;
-       sd->card_init_done = FALSE;
-       sd->adapter_slot = full_slot;
-
-       return (SUCCESS);
-}
-#define CMD5_RETRIES 200
-static int
-get_ocr(sdioh_info_t *sd, uint32 *cmd_arg, uint32 *cmd_rsp)
-{
-       int retries, status;
-
-       /* Get the Card's Operation Condition.  Occasionally the board
-        * takes a while to become ready
-        */
-       retries = CMD5_RETRIES;
-       do {
-               *cmd_rsp = 0;
-               if ((status = sdstd_cmd_issue(sd, USE_DMA(sd), SDIOH_CMD_5, *cmd_arg))
-                   != SUCCESS) {
-                       sd_err(("%s: CMD5 failed\n", __FUNCTION__));
-                       return status;
-               }
-               sdstd_cmd_getrsp(sd, cmd_rsp, 1);
-               if (!GFIELD(*cmd_rsp, RSP4_CARD_READY))
-                       sd_trace(("%s: Waiting for card to become ready\n", __FUNCTION__));
-       } while ((!GFIELD(*cmd_rsp, RSP4_CARD_READY)) && --retries);
-       if (!retries)
-               return ERROR;
-
-       return (SUCCESS);
-}
-
-static int
-sdstd_client_init(sdioh_info_t *sd)
-{
-       uint32 cmd_arg, cmd_rsp;
-       int status;
-       uint8 fn_ints;
-
-
-       sd_trace(("%s: Powering up slot %d\n", __FUNCTION__, sd->adapter_slot));
-
-       /* Clear any pending ints */
-       sdstd_wreg16(sd, SD_IntrStatus, 0x1ff);
-       sdstd_wreg16(sd, SD_ErrorIntrStatus, 0x0fff);
-
-       /* Enable both Normal and Error Status.  This does not enable
-        * interrupts, it only enables the status bits to
-        * become 'live'
-        */
-       sdstd_wreg16(sd, SD_IntrStatusEnable, 0x1ff);
-       sdstd_wreg16(sd, SD_ErrorIntrStatusEnable, 0xffff);
-
-       sdstd_wreg16(sd, SD_IntrSignalEnable, 0);         /* Disable ints for now. */
-
-       /* Start at ~400KHz clock rate for initialization */
-       if (!sdstd_start_clock(sd, 128)) {
-               sd_err(("sdstd_start_clock failed\n"));
-               return ERROR;
-       }
-       if (!sdstd_start_power(sd)) {
-               sd_err(("sdstd_start_power failed\n"));
-               return ERROR;
-       }
-
-       if (sd->num_funcs == 0) {
-               sd_err(("%s: No IO funcs!\n", __FUNCTION__));
-               return ERROR;
-       }
-
-       /* In SPI mode, issue CMD0 first */
-       if (sd->sd_mode == SDIOH_MODE_SPI) {
-               cmd_arg = 0;
-               if ((status = sdstd_cmd_issue(sd, USE_DMA(sd), SDIOH_CMD_0, cmd_arg))
-                   != SUCCESS) {
-                       sd_err(("BCMSDIOH: cardinit: CMD0 failed!\n"));
-                       return status;
-               }
-       }
-
-       if (sd->sd_mode != SDIOH_MODE_SPI) {
-               uint16 rsp6_status;
-
-               /* Card is operational. Ask it to send an RCA */
-               cmd_arg = 0;
-               if ((status = sdstd_cmd_issue(sd, USE_DMA(sd), SDIOH_CMD_3, cmd_arg))
-                   != SUCCESS) {
-                       sd_err(("%s: CMD3 failed!\n", __FUNCTION__));
-                       return status;
-               }
-
-               /* Verify the card status returned with the cmd response */
-               sdstd_cmd_getrsp(sd, &cmd_rsp, 1);
-               rsp6_status = GFIELD(cmd_rsp, RSP6_STATUS);
-               if (GFIELD(rsp6_status, RSP6STAT_COM_CRC_ERROR) ||
-                   GFIELD(rsp6_status, RSP6STAT_ILLEGAL_CMD) ||
-                   GFIELD(rsp6_status, RSP6STAT_ERROR)) {
-                       sd_err(("%s: CMD3 response error. Response = 0x%x!\n",
-                               __FUNCTION__, rsp6_status));
-                       return ERROR;
-               }
-
-               /* Save the Card's RCA */
-               sd->card_rca = GFIELD(cmd_rsp, RSP6_IO_RCA);
-               sd_info(("RCA is 0x%x\n", sd->card_rca));
-
-               if (rsp6_status)
-                       sd_err(("raw status is 0x%x\n", rsp6_status));
-
-               /* Select the card */
-               cmd_arg = SFIELD(0, CMD7_RCA, sd->card_rca);
-               if ((status = sdstd_cmd_issue(sd, USE_DMA(sd), SDIOH_CMD_7, cmd_arg))
-                   != SUCCESS) {
-                       sd_err(("%s: CMD7 failed!\n", __FUNCTION__));
-                       return status;
-               }
-               sdstd_cmd_getrsp(sd, &cmd_rsp, 1);
-               if (cmd_rsp != SDIOH_CMD7_EXP_STATUS) {
-                       sd_err(("%s: CMD7 response error. Response = 0x%x!\n",
-                               __FUNCTION__, cmd_rsp));
-                       return ERROR;
-               }
-       }
-
-       sdstd_card_enablefuncs(sd);
-
-       if (!sdstd_bus_width(sd, sd_sdmode)) {
-               sd_err(("sdstd_bus_width failed\n"));
-               return ERROR;
-       }
-
-       set_client_block_size(sd, 1, BLOCK_SIZE_4318);
-       fn_ints = INTR_CTL_FUNC1_EN;
-
-       if (sd->num_funcs >= 2) {
-               set_client_block_size(sd, 2, sd_f2_blocksize /* BLOCK_SIZE_4328 */);
-               fn_ints |= INTR_CTL_FUNC2_EN;
-       }
-
-       /* Enable/Disable Client interrupts */
-       /* Turn on here but disable at host controller? */
-       if (sdstd_card_regwrite(sd, 0, SDIOD_CCCR_INTEN, 1,
-                               (fn_ints | INTR_CTL_MASTER_EN)) != SUCCESS) {
-               sd_err(("%s: Could not enable ints in CCCR\n", __FUNCTION__));
-               return ERROR;
-       }
-
-       /* Switch to High-speed clocking mode if both host and device support it */
-       sdstd_set_highspeed_mode(sd, (bool)sd_hiok);
-
-       /* After configuring for High-Speed mode, set the desired clock rate. */
-       if (!sdstd_start_clock(sd, (uint16)sd_divisor)) {
-               sd_err(("sdstd_start_clock failed\n"));
-               return ERROR;
-       }
-
-       sd->card_init_done = TRUE;
-
-       return SUCCESS;
-}
-
-static int
-sdstd_set_highspeed_mode(sdioh_info_t *sd, bool HSMode)
-{
-       uint32 regdata;
-       int status;
-       uint8 reg8;
-
-       reg8 = sdstd_rreg8(sd, SD_HostCntrl);
-
-
-       if (HSMode == TRUE) {
-               if (sd_hiok && (GFIELD(sd->caps, CAP_HIGHSPEED)) == 0) {
-                       sd_err(("Host Controller does not support hi-speed mode.\n"));
-                       return BCME_ERROR;
-               }
-
-               sd_info(("Attempting to enable High-Speed mode.\n"));
-
-               if ((status = sdstd_card_regread(sd, 0, SDIOD_CCCR_SPEED_CONTROL,
-                                                1, &regdata)) != SUCCESS) {
-                       return BCME_SDIO_ERROR;
-               }
-               if (regdata & SDIO_SPEED_SHS) {
-                       sd_info(("Device supports High-Speed mode.\n"));
-
-                       regdata |= SDIO_SPEED_EHS;
-
-                       sd_info(("Writing %08x to Card at %08x\n",
-                                regdata, SDIOD_CCCR_SPEED_CONTROL));
-                       if ((status = sdstd_card_regwrite(sd, 0, SDIOD_CCCR_SPEED_CONTROL,
-                                                         1, regdata)) != BCME_OK) {
-                               return BCME_SDIO_ERROR;
-                       }
-
-                       if ((status = sdstd_card_regread(sd, 0, SDIOD_CCCR_SPEED_CONTROL,
-                                                        1, &regdata)) != BCME_OK) {
-                               return BCME_SDIO_ERROR;
-                       }
-
-                       sd_info(("Read %08x to Card at %08x\n", regdata, SDIOD_CCCR_SPEED_CONTROL));
-
-                       reg8 = SFIELD(reg8, HOST_HI_SPEED_EN, 1);
-
-                       sd_err(("High-speed clocking mode enabled.\n"));
-               }
-               else {
-                       sd_err(("Device does not support High-Speed Mode.\n"));
-                       reg8 = SFIELD(reg8, HOST_HI_SPEED_EN, 0);
-               }
-       } else {
-               /* Force off device bit */
-               if ((status = sdstd_card_regread(sd, 0, SDIOD_CCCR_SPEED_CONTROL,
-                                                1, &regdata)) != BCME_OK) {
-                       return status;
-               }
-               if (regdata & SDIO_SPEED_EHS) {
-                       regdata &= ~SDIO_SPEED_EHS;
-                       if ((status = sdstd_card_regwrite(sd, 0, SDIOD_CCCR_SPEED_CONTROL,
-                                                         1, regdata)) != BCME_OK) {
-                               return status;
-                       }
-               }
-
-               sd_err(("High-speed clocking mode disabled.\n"));
-               reg8 = SFIELD(reg8, HOST_HI_SPEED_EN, 0);
-       }
-
-       sdstd_wreg8(sd, SD_HostCntrl, reg8);
-
-       return BCME_OK;
-}
-
-/* Select DMA Mode:
- * If dma_mode == DMA_MODE_AUTO, pick the "best" mode.
- * Otherwise, pick the selected mode if supported.
- * If not supported, use PIO mode.
- */
-static int
-sdstd_set_dma_mode(sdioh_info_t *sd, int8 dma_mode)
-{
-       uint8 reg8, dma_sel_bits = SDIOH_SDMA_MODE;
-       int8 prev_dma_mode = sd->sd_dma_mode;
-
-       switch (prev_dma_mode) {
-               case DMA_MODE_AUTO:
-                       sd_dma(("%s: Selecting best DMA mode supported by controller.\n",
-                                 __FUNCTION__));
-                       if (GFIELD(sd->caps, CAP_ADMA2)) {
-                               sd->sd_dma_mode = DMA_MODE_ADMA2;
-                               dma_sel_bits = SDIOH_ADMA2_MODE;
-                       } else if (GFIELD(sd->caps, CAP_ADMA1)) {
-                               sd->sd_dma_mode = DMA_MODE_ADMA1;
-                               dma_sel_bits = SDIOH_ADMA1_MODE;
-                       } else if (GFIELD(sd->caps, CAP_DMA)) {
-                               sd->sd_dma_mode = DMA_MODE_SDMA;
-                       } else {
-                               sd->sd_dma_mode = DMA_MODE_NONE;
-                       }
-                       break;
-               case DMA_MODE_NONE:
-                       sd->sd_dma_mode = DMA_MODE_NONE;
-                       break;
-               case DMA_MODE_SDMA:
-                       if (GFIELD(sd->caps, CAP_DMA)) {
-                               sd->sd_dma_mode = DMA_MODE_SDMA;
-                       } else {
-                               sd_err(("%s: SDMA not supported by controller.\n", __FUNCTION__));
-                               sd->sd_dma_mode = DMA_MODE_NONE;
-                       }
-                       break;
-               case DMA_MODE_ADMA1:
-                       if (GFIELD(sd->caps, CAP_ADMA1)) {
-                               sd->sd_dma_mode = DMA_MODE_ADMA1;
-                               dma_sel_bits = SDIOH_ADMA1_MODE;
-                       } else {
-                               sd_err(("%s: ADMA1 not supported by controller.\n", __FUNCTION__));
-                               sd->sd_dma_mode = DMA_MODE_NONE;
-                       }
-                       break;
-               case DMA_MODE_ADMA2:
-                       if (GFIELD(sd->caps, CAP_ADMA2)) {
-                               sd->sd_dma_mode = DMA_MODE_ADMA2;
-                               dma_sel_bits = SDIOH_ADMA2_MODE;
-                       } else {
-                               sd_err(("%s: ADMA2 not supported by controller.\n", __FUNCTION__));
-                               sd->sd_dma_mode = DMA_MODE_NONE;
-                       }
-                       break;
-               case DMA_MODE_ADMA2_64:
-                       sd_err(("%s: 64b ADMA2 not supported by driver.\n", __FUNCTION__));
-                       sd->sd_dma_mode = DMA_MODE_NONE;
-                       break;
-               default:
-                       sd_err(("%s: Unsupported DMA Mode %d requested.\n", __FUNCTION__,
-                               prev_dma_mode));
-                       sd->sd_dma_mode = DMA_MODE_NONE;
-                       break;
-       }
-
-       /* clear SysAddr, only used for SDMA */
-       sdstd_wreg(sd, SD_SysAddr, 0);
-
-       sd_err(("%s: %s mode selected.\n", __FUNCTION__, dma_mode_description[sd->sd_dma_mode]));
-
-       reg8 = sdstd_rreg8(sd, SD_HostCntrl);
-       reg8 = SFIELD(reg8, HOST_DMA_SEL, dma_sel_bits);
-       sdstd_wreg8(sd, SD_HostCntrl, reg8);
-       sd_dma(("%s: SD_HostCntrl=0x%02x\n", __FUNCTION__, reg8));
-
-       return BCME_OK;
-}
-
-
-bool
-sdstd_start_clock(sdioh_info_t *sd, uint16 new_sd_divisor)
-{
-       uint rc, count;
-       uint16 divisor;
-
-       /* turn off HC clock */
-       sdstd_wreg16(sd, SD_ClockCntrl,
-                    sdstd_rreg16(sd, SD_ClockCntrl) & ~((uint16)0x4)); /*  Disable the HC clock */
-
-       /* Set divisor */
-
-       divisor = (new_sd_divisor >> 1) << 8;
-
-       sd_info(("Clock control is 0x%x\n", sdstd_rreg16(sd, SD_ClockCntrl)));
-       sdstd_mod_reg16(sd, SD_ClockCntrl, 0xff00, divisor);
-       sd_info(("%s: Using clock divisor of %d (regval 0x%04x)\n", __FUNCTION__,
-                new_sd_divisor, divisor));
-
-       sd_info(("Primary Clock Freq = %d MHz\n", GFIELD(sd->caps, CAP_TO_CLKFREQ)));
-
-       if (GFIELD(sd->caps, CAP_TO_CLKFREQ) == 50) {
-               sd_info(("%s: Resulting SDIO clock is %d %s\n", __FUNCTION__,
-                       ((50 % new_sd_divisor) ? (50000 / new_sd_divisor) : (50 / new_sd_divisor)),
-                       ((50 % new_sd_divisor) ? "KHz" : "MHz")));
-       } else if (GFIELD(sd->caps, CAP_TO_CLKFREQ) == 48) {
-               sd_info(("%s: Resulting SDIO clock is %d %s\n", __FUNCTION__,
-                       ((48 % new_sd_divisor) ? (48000 / new_sd_divisor) : (48 / new_sd_divisor)),
-                       ((48 % new_sd_divisor) ? "KHz" : "MHz")));
-       } else if (GFIELD(sd->caps, CAP_TO_CLKFREQ) == 33) {
-               sd_info(("%s: Resulting SDIO clock is %d %s\n", __FUNCTION__,
-                       ((33 % new_sd_divisor) ? (33000 / new_sd_divisor) : (33 / new_sd_divisor)),
-                       ((33 % new_sd_divisor) ? "KHz" : "MHz")));
-
-       } else if (sd->controller_type == SDIOH_TYPE_BCM27XX) {
-       } else {
-               sd_err(("Need to determine divisor for %d MHz clocks\n",
-                       GFIELD(sd->caps, CAP_TO_CLKFREQ)));
-               sd_err(("Consult SD Host Controller Spec: Clock Control Register\n"));
-               return (FALSE);
-       }
-
-       sdstd_or_reg16(sd, SD_ClockCntrl, 0x1); /*  Enable the clock */
-
-       /* Wait for clock to stabilize */
-       rc = (sdstd_rreg16(sd, SD_ClockCntrl) & 2);
-       count = 0;
-       while (!rc) {
-               OSL_DELAY(1);
-               sd_info(("Waiting for clock to become stable 0x%x\n", rc));
-               rc = (sdstd_rreg16(sd, SD_ClockCntrl) & 2);
-               count++;
-               if (count > 10000) {
-                       sd_err(("%s:Clocks failed to stabilize after %u attempts",
-                               __FUNCTION__, count));
-                       return (FALSE);
-               }
-       }
-       /* Turn on clock */
-       sdstd_or_reg16(sd, SD_ClockCntrl, 0x4);
-
-       /* Set timeout control (adjust default value based on divisor).
-        * Disabling timeout interrupts during setting is advised by host spec.
-        */
-       {
-               uint16 regdata;
-               uint toval;
-
-               toval = sd_toctl;
-               divisor = new_sd_divisor;
-
-               while (toval && !(divisor & 1)) {
-                       toval -= 1;
-                       divisor >>= 1;
-               }
-
-               regdata = sdstd_rreg16(sd, SD_ErrorIntrStatusEnable);
-               sdstd_wreg16(sd, SD_ErrorIntrStatusEnable, (regdata & ~ERRINT_DATA_TIMEOUT_BIT));
-               sdstd_wreg8(sd, SD_TimeoutCntrl, (uint8)toval);
-               sdstd_wreg16(sd, SD_ErrorIntrStatusEnable, regdata);
-       }
-
-       OSL_DELAY(2);
-
-       sd_info(("Final Clock control is 0x%x\n", sdstd_rreg16(sd, SD_ClockCntrl)));
-
-       return TRUE;
-}
-
-bool
-sdstd_start_power(sdioh_info_t *sd)
-{
-       char *s;
-       uint32 cmd_arg;
-       uint32 cmd_rsp;
-       uint8 pwr = 0;
-       int volts;
-
-       volts = 0;
-       s = NULL;
-       if (GFIELD(sd->caps, CAP_VOLT_1_8)) {
-               volts = 5;
-               s = "1.8";
-       }
-       if (GFIELD(sd->caps, CAP_VOLT_3_0)) {
-               volts = 6;
-               s = "3.0";
-       }
-       if (GFIELD(sd->caps, CAP_VOLT_3_3)) {
-               volts = 7;
-               s = "3.3";
-       }
-
-       pwr = SFIELD(pwr, PWR_VOLTS, volts);
-       pwr = SFIELD(pwr, PWR_BUS_EN, 1);
-       sdstd_wreg8(sd, SD_PwrCntrl, pwr); /* Set Voltage level */
-       sd_info(("Setting Bus Power to %s Volts\n", s));
-
-       /* Wait for power to stabilize, Dongle takes longer than NIC. */
-       OSL_DELAY(250000);
-
-       /* Get the Card's Operation Condition.  Occasionally the board
-        * takes a while to become ready
-        */
-       cmd_arg = 0;
-       cmd_rsp = 0;
-       if (get_ocr(sd, &cmd_arg, &cmd_rsp) != SUCCESS) {
-               sd_err(("%s: Failed to get OCR bailing\n", __FUNCTION__));
-               sdstd_reset(sd, 0, 1);
-               return FALSE;
-       }
-
-       sd_info(("mem_present = %d\n", GFIELD(cmd_rsp, RSP4_MEM_PRESENT)));
-       sd_info(("num_funcs = %d\n", GFIELD(cmd_rsp, RSP4_NUM_FUNCS)));
-       sd_info(("card_ready = %d\n", GFIELD(cmd_rsp, RSP4_CARD_READY)));
-       sd_info(("OCR = 0x%x\n", GFIELD(cmd_rsp, RSP4_IO_OCR)));
-
-       /* Verify that the card supports I/O mode */
-       if (GFIELD(cmd_rsp, RSP4_NUM_FUNCS) == 0) {
-               sd_err(("%s: Card does not support I/O\n", __FUNCTION__));
-               return ERROR;
-       }
-       sd->num_funcs = GFIELD(cmd_rsp, RSP4_NUM_FUNCS);
-
-       /* Examine voltage: Arasan only supports 3.3 volts,
-        * so look for 3.2-3.3 Volts and also 3.3-3.4 volts.
-        */
-
-       if ((GFIELD(cmd_rsp, RSP4_IO_OCR) & (0x3 << 20)) == 0) {
-               sd_err(("This client does not support 3.3 volts!\n"));
-               return ERROR;
-       }
-       sd_info(("Leaving bus power at 3.3 Volts\n"));
-
-       cmd_arg = SFIELD(0, CMD5_OCR, 0xfff000);
-       cmd_rsp = 0;
-       get_ocr(sd, &cmd_arg, &cmd_rsp);
-       sd_info(("OCR = 0x%x\n", GFIELD(cmd_rsp, RSP4_IO_OCR)));
-       return TRUE;
-}
-
-bool
-sdstd_bus_width(sdioh_info_t *sd, int new_mode)
-{
-       uint32 regdata;
-       int status;
-       uint8 reg8;
-
-       sd_trace(("%s\n", __FUNCTION__));
-       if (sd->sd_mode == new_mode) {
-               sd_info(("%s: Already at width %d\n", __FUNCTION__, new_mode));
-               /* Could exit, but continue just in case... */
-       }
-
-       /* Set client side via reg 0x7 in CCCR */
-       if ((status = sdstd_card_regread (sd, 0, SDIOD_CCCR_BICTRL, 1, &regdata)) != SUCCESS)
-               return (bool)status;
-       regdata &= ~BUS_SD_DATA_WIDTH_MASK;
-       if (new_mode == SDIOH_MODE_SD4) {
-               sd_info(("Changing to SD4 Mode\n"));
-               regdata |= SD4_MODE;
-       } else if (new_mode == SDIOH_MODE_SD1) {
-               sd_info(("Changing to SD1 Mode\n"));
-       } else {
-               sd_err(("SPI Mode not supported by Standard Host Controller\n"));
-       }
-
-       if ((status = sdstd_card_regwrite (sd, 0, SDIOD_CCCR_BICTRL, 1, regdata)) != SUCCESS)
-               return (bool)status;
-
-       /* Set host side via Host reg */
-       reg8 = sdstd_rreg8(sd, SD_HostCntrl) & ~SD4_MODE;
-       if (new_mode == SDIOH_MODE_SD4)
-               reg8 |= SD4_MODE;
-       sdstd_wreg8(sd, SD_HostCntrl, reg8);
-
-       sd->sd_mode = new_mode;
-
-       return TRUE;
-}
-
-static int
-sdstd_driver_init(sdioh_info_t *sd)
-{
-       sd_trace(("%s\n", __FUNCTION__));
-       if ((sdstd_host_init(sd)) != SUCCESS) {
-               return ERROR;
-       }
-
-       if (sdstd_client_init(sd) != SUCCESS) {
-               return ERROR;
-       }
-
-       return SUCCESS;
-}
-
-static int
-sdstd_get_cisaddr(sdioh_info_t *sd, uint32 regaddr)
-{
-       /* read 24 bits and return valid 17 bit addr */
-       int i;
-       uint32 scratch, regdata;
-       uint8 *ptr = (uint8 *)&scratch;
-       for (i = 0; i < 3; i++) {
-               if ((sdstd_card_regread (sd, 0, regaddr, 1, &regdata)) != SUCCESS)
-                       sd_err(("%s: Can't read!\n", __FUNCTION__));
-
-               *ptr++ = (uint8) regdata;
-               regaddr++;
-       }
-       /* Only the lower 17-bits are valid */
-       scratch = ltoh32(scratch);
-       scratch &= 0x0001FFFF;
-       return (scratch);
-}
-
-static int
-sdstd_card_enablefuncs(sdioh_info_t *sd)
-{
-       int status;
-       uint32 regdata;
-       uint32 fbraddr;
-       uint8 func;
-
-       sd_trace(("%s\n", __FUNCTION__));
-
-       /* Get the Card's common CIS address */
-       sd->com_cis_ptr = sdstd_get_cisaddr(sd, SDIOD_CCCR_CISPTR_0);
-       sd->func_cis_ptr[0] = sd->com_cis_ptr;
-       sd_info(("%s: Card's Common CIS Ptr = 0x%x\n", __FUNCTION__, sd->com_cis_ptr));
-
-       /* Get the Card's function CIS (for each function) */
-       for (fbraddr = SDIOD_FBR_STARTADDR, func = 1;
-            func <= sd->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) {
-               sd->func_cis_ptr[func] = sdstd_get_cisaddr(sd, SDIOD_FBR_CISPTR_0 + fbraddr);
-               sd_info(("%s: Function %d CIS Ptr = 0x%x\n",
-                        __FUNCTION__, func, sd->func_cis_ptr[func]));
-       }
-
-       /* Enable function 1 on the card */
-       regdata = SDIO_FUNC_ENABLE_1;
-       if ((status = sdstd_card_regwrite(sd, 0, SDIOD_CCCR_IOEN, 1, regdata)) != SUCCESS)
-               return status;
-
-       return SUCCESS;
-}
-
-/* Read client card reg */
-static int
-sdstd_card_regread(sdioh_info_t *sd, int func, uint32 regaddr, int regsize, uint32 *data)
-{
-       int status;
-       uint32 cmd_arg;
-       uint32 rsp5;
-
-
-       cmd_arg = 0;
-
-       if ((func == 0) || (regsize == 1)) {
-               cmd_arg = SFIELD(cmd_arg, CMD52_FUNCTION, func);
-               cmd_arg = SFIELD(cmd_arg, CMD52_REG_ADDR, regaddr);
-               cmd_arg = SFIELD(cmd_arg, CMD52_RW_FLAG, SDIOH_XFER_TYPE_READ);
-               cmd_arg = SFIELD(cmd_arg, CMD52_RAW, 0);
-               cmd_arg = SFIELD(cmd_arg, CMD52_DATA, 0);
-
-               if ((status = sdstd_cmd_issue(sd, USE_DMA(sd), SDIOH_CMD_52, cmd_arg))
-                   != SUCCESS)
-                       return status;
-
-               sdstd_cmd_getrsp(sd, &rsp5, 1);
-               if (sdstd_rreg16(sd, SD_ErrorIntrStatus) != 0) {
-                       sd_err(("%s: 1: ErrorintrStatus 0x%x\n",
-                               __FUNCTION__, sdstd_rreg16(sd, SD_ErrorIntrStatus)));
-               }
-
-               if (GFIELD(rsp5, RSP5_FLAGS) != 0x10)
-                       sd_err(("%s: rsp5 flags is 0x%x\t %d\n",
-                               __FUNCTION__, GFIELD(rsp5, RSP5_FLAGS), func));
-
-               if (GFIELD(rsp5, RSP5_STUFF))
-                       sd_err(("%s: rsp5 stuff is 0x%x: should be 0\n",
-                               __FUNCTION__, GFIELD(rsp5, RSP5_STUFF)));
-               *data = GFIELD(rsp5, RSP5_DATA);
-       } else {
-               cmd_arg = SFIELD(cmd_arg, CMD53_BYTE_BLK_CNT, regsize);
-               cmd_arg = SFIELD(cmd_arg, CMD53_OP_CODE, 1);
-               cmd_arg = SFIELD(cmd_arg, CMD53_BLK_MODE, 0);
-               cmd_arg = SFIELD(cmd_arg, CMD53_FUNCTION, func);
-               cmd_arg = SFIELD(cmd_arg, CMD53_REG_ADDR, regaddr);
-               cmd_arg = SFIELD(cmd_arg, CMD53_RW_FLAG, SDIOH_XFER_TYPE_READ);
-
-               sd->data_xfer_count = regsize;
-
-               /* sdstd_cmd_issue() returns with the command complete bit
-                * in the ISR already cleared
-                */
-               if ((status = sdstd_cmd_issue(sd, USE_DMA(sd), SDIOH_CMD_53, cmd_arg))
-                   != SUCCESS)
-                       return status;
-
-               sdstd_cmd_getrsp(sd, &rsp5, 1);
-
-               if (GFIELD(rsp5, RSP5_FLAGS) != 0x10)
-                       sd_err(("%s: rsp5 flags is 0x%x\t %d\n",
-                               __FUNCTION__, GFIELD(rsp5, RSP5_FLAGS), func));
-
-               if (GFIELD(rsp5, RSP5_STUFF))
-                       sd_err(("%s: rsp5 stuff is 0x%x: should be 0\n",
-                               __FUNCTION__, GFIELD(rsp5, RSP5_STUFF)));
-
-               if (sd->polled_mode) {
-                       volatile uint16 int_reg;
-                       int retries = RETRIES_LARGE;
-
-                       /* Wait for Read Buffer to become ready */
-                       do {
-                               int_reg = sdstd_rreg16(sd, SD_IntrStatus);
-                       } while (--retries && (GFIELD(int_reg, INTSTAT_BUF_READ_READY) == 0));
-
-                       if (!retries) {
-                               sd_err(("%s: Timeout on Buf_Read_Ready: "
-                                       "intStat: 0x%x errint: 0x%x PresentState 0x%x\n",
-                                       __FUNCTION__, int_reg,
-                                       sdstd_rreg16(sd, SD_ErrorIntrStatus),
-                                       sdstd_rreg(sd, SD_PresentState)));
-                               sdstd_check_errs(sd, SDIOH_CMD_53, cmd_arg);
-                               return (ERROR);
-                       }
-
-                       /* Have Buffer Ready, so clear it and read the data */
-                       sdstd_wreg16(sd, SD_IntrStatus, SFIELD(0, INTSTAT_BUF_READ_READY, 1));
-                       if (regsize == 2)
-                               *data = sdstd_rreg16(sd, SD_BufferDataPort0);
-                       else
-                               *data = sdstd_rreg(sd, SD_BufferDataPort0);
-
-                       /* Check Status.
-                        * After the data is read, the Transfer Complete bit should be on
-                        */
-                       retries = RETRIES_LARGE;
-                       do {
-                               int_reg = sdstd_rreg16(sd, SD_IntrStatus);
-                       } while (--retries && (GFIELD(int_reg, INTSTAT_XFER_COMPLETE) == 0));
-
-                       /* Check for any errors from the data phase */
-                       if (sdstd_check_errs(sd, SDIOH_CMD_53, cmd_arg))
-                               return ERROR;
-
-                       if (!retries) {
-                               sd_err(("%s: Timeout on xfer complete: "
-                                       "intr 0x%04x err 0x%04x state 0x%08x\n",
-                                       __FUNCTION__, int_reg,
-                                       sdstd_rreg16(sd, SD_ErrorIntrStatus),
-                                       sdstd_rreg(sd, SD_PresentState)));
-                               return (ERROR);
-                       }
-
-                       sdstd_wreg16(sd, SD_IntrStatus, SFIELD(0, INTSTAT_XFER_COMPLETE, 1));
-               }
-       }
-       if (sd->polled_mode) {
-               if (regsize == 2)
-                       *data &= 0xffff;
-       }
-       return SUCCESS;
-}
-
-bool
-check_client_intr(sdioh_info_t *sd)
-{
-       uint16 raw_int, cur_int, old_int;
-
-       raw_int = sdstd_rreg16(sd, SD_IntrStatus);
-       cur_int = raw_int & sd->intmask;
-
-       if (!cur_int) {
-               /* Not an error -- might share interrupts... */
-               return FALSE;
-       }
-
-       if (GFIELD(cur_int, INTSTAT_CARD_INT)) {
-               old_int = sdstd_rreg16(sd, SD_IntrStatusEnable);
-               sdstd_wreg16(sd, SD_IntrStatusEnable, SFIELD(old_int, INTSTAT_CARD_INT, 0));
-
-               if (sd->client_intr_enabled && sd->use_client_ints) {
-                       sd->intrcount++;
-                       ASSERT(sd->intr_handler);
-                       ASSERT(sd->intr_handler_arg);
-                       (sd->intr_handler)(sd->intr_handler_arg);
-               } else {
-                       sd_err(("%s: Not ready for intr: enabled %d, handler %p\n",
-                               __FUNCTION__, sd->client_intr_enabled, sd->intr_handler));
-               }
-               sdstd_wreg16(sd, SD_IntrStatusEnable, old_int);
-       } else {
-               /* Local interrupt: disable, set flag, and save intrstatus */
-               sdstd_wreg16(sd, SD_IntrSignalEnable, 0);
-               sdstd_wreg16(sd, SD_ErrorIntrSignalEnable, 0);
-               sd->local_intrcount++;
-               sd->got_hcint = TRUE;
-               sd->last_intrstatus = cur_int;
-       }
-
-       return TRUE;
-}
-
-void
-sdstd_spinbits(sdioh_info_t *sd, uint16 norm, uint16 err)
-{
-       uint16 int_reg, err_reg;
-       int retries = RETRIES_LARGE;
-
-       do {
-               int_reg = sdstd_rreg16(sd, SD_IntrStatus);
-               err_reg = sdstd_rreg16(sd, SD_ErrorIntrStatus);
-       } while (--retries && !(int_reg & norm) && !(err_reg & err));
-
-       norm |= sd->intmask;
-       if (err_reg & err)
-               norm = SFIELD(norm, INTSTAT_ERROR_INT, 1);
-       sd->last_intrstatus = int_reg & norm;
-}
-
-/* write a client register */
-static int
-sdstd_card_regwrite(sdioh_info_t *sd, int func, uint32 regaddr, int regsize, uint32 data)
-{
-       int status;
-       uint32 cmd_arg, rsp5, flags;
-
-       cmd_arg = 0;
-
-       if ((func == 0) || (regsize == 1)) {
-               cmd_arg = SFIELD(cmd_arg, CMD52_FUNCTION, func);
-               cmd_arg = SFIELD(cmd_arg, CMD52_REG_ADDR, regaddr);
-               cmd_arg = SFIELD(cmd_arg, CMD52_RW_FLAG, SDIOH_XFER_TYPE_WRITE);
-               cmd_arg = SFIELD(cmd_arg, CMD52_RAW, 0);
-               cmd_arg = SFIELD(cmd_arg, CMD52_DATA, data & 0xff);
-               if ((status = sdstd_cmd_issue(sd, USE_DMA(sd), SDIOH_CMD_52, cmd_arg))
-                   != SUCCESS)
-                       return status;
-
-               sdstd_cmd_getrsp(sd, &rsp5, 1);
-               flags = GFIELD(rsp5, RSP5_FLAGS);
-               if (flags && (flags != 0x10))
-                       sd_err(("%s: rsp5.rsp5.flags = 0x%x, expecting 0x10\n",
-                               __FUNCTION__,  flags));
-       }
-       else {
-               cmd_arg = SFIELD(cmd_arg, CMD53_BYTE_BLK_CNT, regsize);
-               cmd_arg = SFIELD(cmd_arg, CMD53_OP_CODE, 1);
-               cmd_arg = SFIELD(cmd_arg, CMD53_BLK_MODE, 0);
-               cmd_arg = SFIELD(cmd_arg, CMD53_FUNCTION, func);
-               cmd_arg = SFIELD(cmd_arg, CMD53_REG_ADDR, regaddr);
-               cmd_arg = SFIELD(cmd_arg, CMD53_RW_FLAG, SDIOH_XFER_TYPE_WRITE);
-
-               sd->data_xfer_count = regsize;
-
-               /* sdstd_cmd_issue() returns with the command complete bit
-                * in the ISR already cleared
-                */
-               if ((status = sdstd_cmd_issue(sd, USE_DMA(sd), SDIOH_CMD_53, cmd_arg))
-                   != SUCCESS)
-                       return status;
-
-               sdstd_cmd_getrsp(sd, &rsp5, 1);
-
-               if (GFIELD(rsp5, RSP5_FLAGS) != 0x10)
-                       sd_err(("%s: rsp5 flags = 0x%x, expecting 0x10\n",
-                               __FUNCTION__,  GFIELD(rsp5, RSP5_FLAGS)));
-               if (GFIELD(rsp5, RSP5_STUFF))
-                       sd_err(("%s: rsp5 stuff is 0x%x: expecting 0\n",
-                               __FUNCTION__, GFIELD(rsp5, RSP5_STUFF)));
-
-               if (sd->polled_mode) {
-                       uint16 int_reg;
-                       int retries = RETRIES_LARGE;
-
-                       /* Wait for Write Buffer to become ready */
-                       do {
-                               int_reg = sdstd_rreg16(sd, SD_IntrStatus);
-                       } while (--retries && (GFIELD(int_reg, INTSTAT_BUF_WRITE_READY) == 0));
-
-                       if (!retries) {
-                               sd_err(("%s: Timeout on Buf_Write_Ready: intStat: 0x%x "
-                                       "errint: 0x%x PresentState 0x%x\n",
-                                       __FUNCTION__, int_reg,
-                                       sdstd_rreg16(sd, SD_ErrorIntrStatus),
-                                       sdstd_rreg(sd, SD_PresentState)));
-                               sdstd_check_errs(sd, SDIOH_CMD_53, cmd_arg);
-                               return (ERROR);
-                       }
-                       /* Clear Write Buf Ready bit */
-                       int_reg = 0;
-                       int_reg = SFIELD(int_reg, INTSTAT_BUF_WRITE_READY, 1);
-                       sdstd_wreg16(sd, SD_IntrStatus, int_reg);
-
-                       /* At this point we have Buffer Ready, so write the data */
-                       if (regsize == 2)
-                               sdstd_wreg16(sd, SD_BufferDataPort0, (uint16) data);
-                       else
-                               sdstd_wreg(sd, SD_BufferDataPort0, data);
-
-                       /* Wait for Transfer Complete */
-                       retries = RETRIES_LARGE;
-                       do {
-                               int_reg = sdstd_rreg16(sd, SD_IntrStatus);
-                       } while (--retries && (GFIELD(int_reg, INTSTAT_XFER_COMPLETE) == 0));
-
-                       /* Check for any errors from the data phase */
-                       if (sdstd_check_errs(sd, SDIOH_CMD_53, cmd_arg))
-                               return ERROR;
-
-                       if (retries == 0) {
-                               sd_err(("%s: Timeout for xfer complete; State = 0x%x, "
-                                       "intr state=0x%x, Errintstatus 0x%x rcnt %d, tcnt %d\n",
-                                       __FUNCTION__, sdstd_rreg(sd, SD_PresentState),
-                                       int_reg, sdstd_rreg16(sd, SD_ErrorIntrStatus),
-                                       sd->r_cnt, sd->t_cnt));
-                       }
-                       /* Clear the status bits */
-                       sdstd_wreg16(sd, SD_IntrStatus, SFIELD(int_reg, INTSTAT_CARD_INT, 0));
-               }
-       }
-       return SUCCESS;
-}
-
-void
-sdstd_cmd_getrsp(sdioh_info_t *sd, uint32 *rsp_buffer, int count /* num 32 bit words */)
-{
-       int rsp_count;
-       int respaddr = SD_Response0;
-
-       if (count > 4)
-               count = 4;
-
-       for (rsp_count = 0; rsp_count < count; rsp_count++) {
-               *rsp_buffer++ = sdstd_rreg(sd, respaddr);
-               respaddr += 4;
-       }
-}
-
-static int
-sdstd_cmd_issue(sdioh_info_t *sdioh_info, bool use_dma, uint32 cmd, uint32 arg)
-{
-       uint16 cmd_reg;
-       int retries;
-       uint32 cmd_arg;
-       uint16 xfer_reg = 0;
-
-
-       if ((sdioh_info->sd_mode == SDIOH_MODE_SPI) &&
-           ((cmd == SDIOH_CMD_3) || (cmd == SDIOH_CMD_7) || (cmd == SDIOH_CMD_15))) {
-               sd_err(("%s: Cmd %d is not for SPI\n", __FUNCTION__, cmd));
-               return ERROR;
-       }
-
-       retries = RETRIES_SMALL;
-       while ((GFIELD(sdstd_rreg(sdioh_info, SD_PresentState), PRES_CMD_INHIBIT)) && --retries) {
-               if (retries == RETRIES_SMALL)
-                       sd_err(("%s: Waiting for Command Inhibit cmd = %d 0x%x\n",
-                               __FUNCTION__, cmd, sdstd_rreg(sdioh_info, SD_PresentState)));
-       }
-       if (!retries) {
-               sd_err(("%s: Command Inhibit timeout\n", __FUNCTION__));
-               if (trap_errs)
-                       ASSERT(0);
-               return ERROR;
-       }
-
-
-       cmd_reg = 0;
-       switch (cmd) {
-       case SDIOH_CMD_0:       /* Set Card to Idle State - No Response */
-               sd_data(("%s: CMD%d\n", __FUNCTION__, cmd));
-               cmd_reg = SFIELD(cmd_reg, CMD_RESP_TYPE, RESP_TYPE_NONE);
-               cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_DATA_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_TYPE, CMD_TYPE_NORMAL);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX, cmd);
-               break;
-
-       case SDIOH_CMD_3:       /* Ask card to send RCA - Response R6 */
-               sd_data(("%s: CMD%d\n", __FUNCTION__, cmd));
-               cmd_reg = SFIELD(cmd_reg, CMD_RESP_TYPE, RESP_TYPE_48);
-               cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_DATA_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_TYPE, CMD_TYPE_NORMAL);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX, cmd);
-               break;
-
-       case SDIOH_CMD_5:       /* Send Operation condition - Response R4 */
-               sd_data(("%s: CMD%d\n", __FUNCTION__, cmd));
-               cmd_reg = SFIELD(cmd_reg, CMD_RESP_TYPE, RESP_TYPE_48);
-               cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_DATA_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_TYPE, CMD_TYPE_NORMAL);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX, cmd);
-               break;
-
-       case SDIOH_CMD_7:       /* Select card - Response R1 */
-               sd_data(("%s: CMD%d\n", __FUNCTION__, cmd));
-               cmd_reg = SFIELD(cmd_reg, CMD_RESP_TYPE, RESP_TYPE_48);
-               cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 1);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 1);
-               cmd_reg = SFIELD(cmd_reg, CMD_DATA_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_TYPE, CMD_TYPE_NORMAL);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX, cmd);
-               break;
-
-       case SDIOH_CMD_15:      /* Set card to inactive state - Response None */
-               sd_data(("%s: CMD%d\n", __FUNCTION__, cmd));
-               cmd_reg = SFIELD(cmd_reg, CMD_RESP_TYPE, RESP_TYPE_NONE);
-               cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_DATA_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_TYPE, CMD_TYPE_NORMAL);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX, cmd);
-               break;
-
-       case SDIOH_CMD_52:      /* IO R/W Direct (single byte) - Response R5 */
-
-               sd_data(("%s: CMD52 func(%d) addr(0x%x) %s data(0x%x)\n",
-                       __FUNCTION__,
-                       GFIELD(arg, CMD52_FUNCTION),
-                       GFIELD(arg, CMD52_REG_ADDR),
-                       GFIELD(arg, CMD52_RW_FLAG) ? "W" : "R",
-                       GFIELD(arg, CMD52_DATA)));
-
-               cmd_reg = SFIELD(cmd_reg, CMD_RESP_TYPE, RESP_TYPE_48);
-               cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 1);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 1);
-               cmd_reg = SFIELD(cmd_reg, CMD_DATA_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_TYPE, CMD_TYPE_NORMAL);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX, cmd);
-               break;
-
-       case SDIOH_CMD_53:      /* IO R/W Extended (multiple bytes/blocks) */
-
-               sd_data(("%s: CMD53 func(%d) addr(0x%x) %s mode(%s) cnt(%d), %s\n",
-                       __FUNCTION__,
-                       GFIELD(arg, CMD53_FUNCTION),
-                       GFIELD(arg, CMD53_REG_ADDR),
-                       GFIELD(arg, CMD53_RW_FLAG) ? "W" : "R",
-                       GFIELD(arg, CMD53_BLK_MODE) ? "Block" : "Byte",
-                       GFIELD(arg, CMD53_BYTE_BLK_CNT),
-                       GFIELD(arg, CMD53_OP_CODE) ? "Incrementing addr" : "Single addr"));
-
-               cmd_arg = arg;
-               xfer_reg = 0;
-
-               cmd_reg = SFIELD(cmd_reg, CMD_RESP_TYPE, RESP_TYPE_48);
-               cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 1);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 1);
-               cmd_reg = SFIELD(cmd_reg, CMD_DATA_EN, 1);
-               cmd_reg = SFIELD(cmd_reg, CMD_TYPE, CMD_TYPE_NORMAL);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX, cmd);
-
-               use_dma = USE_DMA(sdioh_info) && GFIELD(cmd_arg, CMD53_BLK_MODE);
-
-               if (GFIELD(cmd_arg, CMD53_BLK_MODE)) {
-                       uint16 blocksize;
-                       uint16 blockcount;
-                       int func;
-
-                       ASSERT(sdioh_info->sd_blockmode);
-
-                       func = GFIELD(cmd_arg, CMD53_FUNCTION);
-                       blocksize = MIN((int)sdioh_info->data_xfer_count,
-                                       sdioh_info->client_block_size[func]);
-                       blockcount = GFIELD(cmd_arg, CMD53_BYTE_BLK_CNT);
-
-                       /* data_xfer_cnt is already setup so that for multiblock mode,
-                        * it is the entire buffer length.  For non-block or single block,
-                        * it is < 64 bytes
-                        */
-                       if (use_dma) {
-                               switch (sdioh_info->sd_dma_mode) {
-                               case DMA_MODE_SDMA:
-                                       sd_dma(("%s: SDMA: SysAddr reg was 0x%x now 0x%x\n",
-                                             __FUNCTION__, sdstd_rreg(sdioh_info, SD_SysAddr),
-                                            (uint32)sdioh_info->dma_phys));
-                               sdstd_wreg(sdioh_info, SD_SysAddr, sdioh_info->dma_phys);
-                                       break;
-                               case DMA_MODE_ADMA1:
-                               case DMA_MODE_ADMA2:
-                                       sd_dma(("%s: ADMA: Using ADMA\n", __FUNCTION__));
-                                               sd_create_adma_descriptor(sdioh_info, 0,
-                                               sdioh_info->dma_phys, blockcount*blocksize,
-                                               ADMA2_ATTRIBUTE_VALID | ADMA2_ATTRIBUTE_END |
-                                               ADMA2_ATTRIBUTE_INT | ADMA2_ATTRIBUTE_ACT_TRAN);
-                                       /* Dump descriptor if DMA debugging is enabled. */
-                                       if (sd_msglevel & SDH_DMA_VAL) {
-                                               sd_dump_adma_dscr(sdioh_info);
-                                       }
-
-                                       sdstd_wreg(sdioh_info, SD_ADMA_SysAddr,
-                                                  sdioh_info->adma2_dscr_phys);
-                                       break;
-                               default:
-                                       sd_err(("%s: unsupported DMA mode %d.\n",
-                                               __FUNCTION__, sdioh_info->sd_dma_mode));
-                                       break;
-                               }
-                       }
-
-                       sd_trace(("%s: Setting block count %d, block size %d bytes\n",
-                                 __FUNCTION__, blockcount, blocksize));
-                       sdstd_wreg16(sdioh_info, SD_BlockSize, blocksize);
-                       sdstd_wreg16(sdioh_info, SD_BlockCount, blockcount);
-
-                       xfer_reg = SFIELD(xfer_reg, XFER_DMA_ENABLE, use_dma);
-
-                       if (sdioh_info->client_block_size[func] != blocksize)
-                               set_client_block_size(sdioh_info, 1, blocksize);
-
-                       if (blockcount > 1) {
-                               xfer_reg = SFIELD(xfer_reg, XFER_MULTI_BLOCK, 1);
-                               xfer_reg = SFIELD(xfer_reg, XFER_BLK_COUNT_EN, 1);
-                               xfer_reg = SFIELD(xfer_reg, XFER_CMD_12_EN, 0);
-                       } else {
-                               xfer_reg = SFIELD(xfer_reg, XFER_MULTI_BLOCK, 0);
-                               xfer_reg = SFIELD(xfer_reg, XFER_BLK_COUNT_EN, 0);
-                               xfer_reg = SFIELD(xfer_reg, XFER_CMD_12_EN, 0);
-                       }
-
-                       if (GFIELD(cmd_arg, CMD53_RW_FLAG) == SDIOH_XFER_TYPE_READ)
-                               xfer_reg = SFIELD(xfer_reg, XFER_DATA_DIRECTION, 1);
-                       else
-                               xfer_reg = SFIELD(xfer_reg, XFER_DATA_DIRECTION, 0);
-
-                       retries = RETRIES_SMALL;
-                       while (GFIELD(sdstd_rreg(sdioh_info, SD_PresentState),
-                                     PRES_DAT_INHIBIT) && --retries)
-                               sd_err(("%s: Waiting for Data Inhibit cmd = %d\n",
-                                       __FUNCTION__, cmd));
-                       if (!retries) {
-                               sd_err(("%s: Data Inhibit timeout\n", __FUNCTION__));
-                               if (trap_errs)
-                                       ASSERT(0);
-                               return ERROR;
-                       }
-                       sdstd_wreg16(sdioh_info, SD_TransferMode, xfer_reg);
-
-               } else {        /* Non block mode */
-                       uint16 bytes = GFIELD(cmd_arg, CMD53_BYTE_BLK_CNT);
-                       /* The byte/block count field only has 9 bits,
-                        * so, to do a 512-byte bytemode transfer, this
-                        * field will contain 0, but we need to tell the
-                        * controller we're transferring 512 bytes.
-                        */
-                       if (bytes == 0) bytes = 512;
-
-                       if (use_dma)
-                               sdstd_wreg(sdioh_info, SD_SysAddr, sdioh_info->dma_phys);
-
-                       /* PCI: Transfer Mode register 0x0c */
-                       xfer_reg = SFIELD(xfer_reg, XFER_DMA_ENABLE, bytes <= 4 ? 0 : use_dma);
-                       xfer_reg = SFIELD(xfer_reg, XFER_CMD_12_EN, 0);
-                       if (GFIELD(cmd_arg, CMD53_RW_FLAG) == SDIOH_XFER_TYPE_READ)
-                               xfer_reg = SFIELD(xfer_reg, XFER_DATA_DIRECTION, 1);
-                       else
-                               xfer_reg = SFIELD(xfer_reg, XFER_DATA_DIRECTION, 0);
-                       /* See table 2-8 Host Controller spec ver 1.00 */
-                       xfer_reg = SFIELD(xfer_reg, XFER_BLK_COUNT_EN, 0); /* Dont care */
-                       xfer_reg = SFIELD(xfer_reg, XFER_MULTI_BLOCK, 0);
-
-                       sdstd_wreg16(sdioh_info, SD_BlockSize,  bytes);
-
-                       sdstd_wreg16(sdioh_info, SD_BlockCount, 1);
-
-                       retries = RETRIES_SMALL;
-                       while (GFIELD(sdstd_rreg(sdioh_info, SD_PresentState),
-                                     PRES_DAT_INHIBIT) && --retries)
-                               sd_err(("%s: Waiting for Data Inhibit cmd = %d\n",
-                                       __FUNCTION__, cmd));
-                       if (!retries) {
-                               sd_err(("%s: Data Inhibit timeout\n", __FUNCTION__));
-                               if (trap_errs)
-                                       ASSERT(0);
-                               return ERROR;
-                       }
-                       sdstd_wreg16(sdioh_info, SD_TransferMode, xfer_reg);
-               }
-               break;
-
-       default:
-               sd_err(("%s: Unknown command\n", __FUNCTION__));
-               return ERROR;
-       }
-
-       if (sdioh_info->sd_mode == SDIOH_MODE_SPI) {
-               cmd_reg = SFIELD(cmd_reg, CMD_CRC_EN, 0);
-               cmd_reg = SFIELD(cmd_reg, CMD_INDEX_EN, 0);
-       }
-
-       /* Setup and issue the SDIO command */
-       sdstd_wreg(sdioh_info, SD_Arg0, arg);
-       sdstd_wreg16(sdioh_info, SD_Command, cmd_reg);
-
-       /* If we are in polled mode, wait for the command to complete.
-        * In interrupt mode, return immediately. The calling function will
-        * know that the command has completed when the CMDATDONE interrupt
-        * is asserted
-        */
-       if (sdioh_info->polled_mode) {
-               uint16 int_reg = 0;
-               int retries = RETRIES_LARGE;
-
-               do {
-                       int_reg = sdstd_rreg16(sdioh_info, SD_IntrStatus);
-               } while (--retries &&
-                        (GFIELD(int_reg, INTSTAT_ERROR_INT) == 0) &&
-                        (GFIELD(int_reg, INTSTAT_CMD_COMPLETE) == 0));
-
-               if (!retries) {
-                       sd_err(("%s: CMD_COMPLETE timeout: intrStatus: 0x%x "
-                               "error stat 0x%x state 0x%x\n",
-                               __FUNCTION__, int_reg,
-                               sdstd_rreg16(sdioh_info, SD_ErrorIntrStatus),
-                               sdstd_rreg(sdioh_info, SD_PresentState)));
-
-                       /* Attempt to reset CMD line when we get a CMD timeout */
-                       sdstd_wreg8(sdioh_info, SD_SoftwareReset, SFIELD(0, SW_RESET_CMD, 1));
-                       retries = RETRIES_LARGE;
-                       do {
-                               sd_trace(("%s: waiting for CMD line reset\n", __FUNCTION__));
-                       } while ((GFIELD(sdstd_rreg8(sdioh_info, SD_SoftwareReset),
-                                        SW_RESET_CMD)) && retries--);
-
-                       if (!retries) {
-                               sd_err(("%s: Timeout waiting for CMD line reset\n", __FUNCTION__));
-                       }
-
-                       if (trap_errs)
-                               ASSERT(0);
-                       return (ERROR);
-               }
-
-               /* Clear Command Complete interrupt */
-               int_reg = SFIELD(0, INTSTAT_CMD_COMPLETE, 1);
-               sdstd_wreg16(sdioh_info, SD_IntrStatus, int_reg);
-
-               /* Check for Errors */
-               if (sdstd_check_errs(sdioh_info, cmd, arg)) {
-                       if (trap_errs)
-                               ASSERT(0);
-                       return ERROR;
-               }
-       }
-       return SUCCESS;
-}
-
-
-static int
-sdstd_card_buf(sdioh_info_t *sd, int rw, int func, bool fifo, uint32 addr, int nbytes, uint32 *data)
-{
-       int status;
-       uint32 cmd_arg;
-       uint32 rsp5;
-       uint16 int_reg, int_bit;
-       uint flags;
-       int num_blocks, blocksize;
-       bool local_blockmode, local_dma;
-       bool read = rw == SDIOH_READ ? 1 : 0;
-       bool yield = FALSE;
-
-       ASSERT(nbytes);
-
-       cmd_arg = 0;
-
-       sd_data(("%s: %s 53 addr 0x%x, len %d bytes, r_cnt %d t_cnt %d\n",
-                __FUNCTION__, read ? "Rd" : "Wr", addr, nbytes, sd->r_cnt, sd->t_cnt));
-
-       if (read) sd->r_cnt++; else sd->t_cnt++;
-
-       local_blockmode = sd->sd_blockmode;
-       local_dma = USE_DMA(sd);
-
-       /* Don't bother with block mode on small xfers */
-       if (nbytes < sd->client_block_size[func]) {
-               sd_data(("setting local blockmode to false: nbytes (%d) != block_size (%d)\n",
-                        nbytes, sd->client_block_size[func]));
-               local_blockmode = FALSE;
-               local_dma = FALSE;
-       }
-
-       if (local_blockmode) {
-               blocksize = MIN(sd->client_block_size[func], nbytes);
-               num_blocks = nbytes/blocksize;
-               cmd_arg = SFIELD(cmd_arg, CMD53_BYTE_BLK_CNT, num_blocks);
-               cmd_arg = SFIELD(cmd_arg, CMD53_BLK_MODE, 1);
-       } else {
-               num_blocks =  1;
-               blocksize = nbytes;
-               cmd_arg = SFIELD(cmd_arg, CMD53_BYTE_BLK_CNT, nbytes);
-               cmd_arg = SFIELD(cmd_arg, CMD53_BLK_MODE, 0);
-       }
-
-       if (local_dma && !read) {
-               bcopy(data, sd->dma_buf, nbytes);
-               sd_sync_dma(sd, read, nbytes);
-       }
-
-       if (fifo)
-               cmd_arg = SFIELD(cmd_arg, CMD53_OP_CODE, 0);
-       else
-               cmd_arg = SFIELD(cmd_arg, CMD53_OP_CODE, 1);
-
-       cmd_arg = SFIELD(cmd_arg, CMD53_FUNCTION, func);
-       cmd_arg = SFIELD(cmd_arg, CMD53_REG_ADDR, addr);
-       if (read)
-               cmd_arg = SFIELD(cmd_arg, CMD53_RW_FLAG, SDIOH_XFER_TYPE_READ);
-       else
-               cmd_arg = SFIELD(cmd_arg, CMD53_RW_FLAG, SDIOH_XFER_TYPE_WRITE);
-
-       sd->data_xfer_count = nbytes;
-
-       /* sdstd_cmd_issue() returns with the command complete bit
-        * in the ISR already cleared
-        */
-       if ((status = sdstd_cmd_issue(sd, local_dma, SDIOH_CMD_53, cmd_arg)) != SUCCESS) {
-               sd_err(("%s: cmd_issue failed for %s\n", __FUNCTION__, (read ? "read" : "write")));
-               return status;
-       }
-
-       sdstd_cmd_getrsp(sd, &rsp5, 1);
-
-       if ((flags = GFIELD(rsp5, RSP5_FLAGS)) != 0x10) {
-               sd_err(("%s: Rsp5: nbytes %d, dma %d blockmode %d, read %d "
-                       "numblocks %d, blocksize %d\n",
-                       __FUNCTION__, nbytes, local_dma, local_dma, read, num_blocks, blocksize));
-
-               if (flags & 1)
-                       sd_err(("%s: rsp5: Command not accepted: arg out of range 0x%x, "
-                               "bytes %d dma %d\n",
-                               __FUNCTION__, flags, GFIELD(cmd_arg, CMD53_BYTE_BLK_CNT),
-                               GFIELD(cmd_arg, CMD53_BLK_MODE)));
-               if (flags & 0x8)
-                       sd_err(("%s: Rsp5: General Error\n", __FUNCTION__));
-
-               sd_err(("%s: rsp5 flags = 0x%x, expecting 0x10 returning error\n",
-                       __FUNCTION__,  flags));
-               if (trap_errs)
-                       ASSERT(0);
-               return ERROR;
-       }
-
-       if (GFIELD(rsp5, RSP5_STUFF))
-               sd_err(("%s: rsp5 stuff is 0x%x: expecting 0\n",
-                       __FUNCTION__, GFIELD(rsp5, RSP5_STUFF)));
-
-#ifdef BCMSDYIELD
-       yield = sd_yieldcpu && ((uint)nbytes >= sd_minyield);
-#endif
-
-       if (!local_dma) {
-               int bytes, i;
-               uint32 tmp;
-               for (i = 0; i < num_blocks; i++) {
-                       int words;
-
-                       /* Decide which status bit we're waiting for */
-                       if (read)
-                               int_bit = SFIELD(0, INTSTAT_BUF_READ_READY, 1);
-                       else
-                               int_bit = SFIELD(0, INTSTAT_BUF_WRITE_READY, 1);
-
-                       /* If not on, wait for it (or for xfer error) */
-                       int_reg = sdstd_rreg16(sd, SD_IntrStatus);
-                       if (!(int_reg & int_bit))
-                               int_reg = sdstd_waitbits(sd, int_bit, ERRINT_TRANSFER_ERRS, yield);
-
-                       /* Confirm we got the bit w/o error */
-                       if (!(int_reg & int_bit) || GFIELD(int_reg, INTSTAT_ERROR_INT)) {
-                               sd_err(("%s: Error or timeout for Buf_%s_Ready: intStat: 0x%x "
-                                       "errint: 0x%x PresentState 0x%x\n",
-                                       __FUNCTION__, read ? "Read" : "Write", int_reg,
-                                       sdstd_rreg16(sd, SD_ErrorIntrStatus),
-                                       sdstd_rreg(sd, SD_PresentState)));
-                               sdstd_dumpregs(sd);
-                               sdstd_check_errs(sd, SDIOH_CMD_53, cmd_arg);
-                               return (ERROR);
-                       }
-
-                       /* Clear Buf Ready bit */
-                       sdstd_wreg16(sd, SD_IntrStatus, int_bit);
-
-                       /* At this point we have Buffer Ready, write the data 4 bytes at a time */
-                       for (words = blocksize/4; words; words--) {
-                               if (read)
-                                       *data = sdstd_rreg(sd, SD_BufferDataPort0);
-                               else
-                                       sdstd_wreg(sd, SD_BufferDataPort0, *data);
-                               data++;
-                       }
-
-                       /* Handle < 4 bytes.  wlc_pio.c currently (as of 12/20/05) truncates buflen
-                        * to be evenly divisable by 4.  However dongle passes arbitrary lengths,
-                        * so handle it here
-                        */
-                       bytes = blocksize % 4;
-
-                       /* If no leftover bytes, go to next block */
-                       if (!bytes)
-                               continue;
-
-                       switch (bytes) {
-                       case 1:
-                               /* R/W 8 bits */
-                               if (read)
-                                       *(data++) = (uint32)(sdstd_rreg8(sd, SD_BufferDataPort0));
-                               else
-                                       sdstd_wreg8(sd, SD_BufferDataPort0,
-                                                   (uint8)(*(data++) & 0xff));
-                               break;
-                       case 2:
-                               /* R/W 16 bits */
-                               if (read)
-                                       *(data++) = (uint32)sdstd_rreg16(sd, SD_BufferDataPort0);
-                               else
-                                       sdstd_wreg16(sd, SD_BufferDataPort0, (uint16)(*(data++)));
-                               break;
-                       case 3:
-                               /* R/W 24 bits:
-                                * SD_BufferDataPort0[0-15] | SD_BufferDataPort1[16-23]
-                                */
-                               if (read) {
-                                       tmp = (uint32)sdstd_rreg16(sd, SD_BufferDataPort0);
-                                       tmp |= ((uint32)(sdstd_rreg8(sd,
-                                                                    SD_BufferDataPort1)) << 16);
-                                       *(data++) = tmp;
-                               } else {
-                                       tmp = *(data++);
-                                       sdstd_wreg16(sd, SD_BufferDataPort0, (uint16)tmp & 0xffff);
-                                       sdstd_wreg8(sd, SD_BufferDataPort1,
-                                                   (uint8)((tmp >> 16) & 0xff));
-                               }
-                               break;
-                       default:
-                               sd_err(("%s: Unexpected bytes leftover %d\n",
-                                       __FUNCTION__, bytes));
-                               ASSERT(0);
-                               break;
-                       }
-               }
-       }       /* End PIO processing */
-
-       /* Wait for Transfer Complete or Transfer Error */
-       int_bit = SFIELD(0, INTSTAT_XFER_COMPLETE, 1);
-
-       /* If not on, wait for it (or for xfer error) */
-       int_reg = sdstd_rreg16(sd, SD_IntrStatus);
-       if (!(int_reg & int_bit))
-               int_reg = sdstd_waitbits(sd, int_bit, ERRINT_TRANSFER_ERRS, yield);
-
-       /* Check for any errors from the data phase */
-       if (sdstd_check_errs(sd, SDIOH_CMD_53, cmd_arg))
-               return ERROR;
-
-       /* May have gotten a software timeout if not blocking? */
-       int_reg = sdstd_rreg16(sd, SD_IntrStatus);
-       if (!(int_reg & int_bit)) {
-               sd_err(("%s: Error or Timeout for xfer complete; %s, dma %d, State 0x%08x, "
-                       "intr 0x%04x, Err 0x%04x, len = %d, rcnt %d, tcnt %d\n",
-                       __FUNCTION__, read ? "R" : "W", local_dma,
-                       sdstd_rreg(sd, SD_PresentState), int_reg,
-                       sdstd_rreg16(sd, SD_ErrorIntrStatus), nbytes,
-                       sd->r_cnt, sd->t_cnt));
-               sdstd_dumpregs(sd);
-               return ERROR;
-       }
-
-       /* Clear the status bits */
-       int_reg = int_bit;
-       if (local_dma) {
-               /* DMA Complete */
-               /* Reads in particular don't have DMA_COMPLETE set */
-               int_reg = SFIELD(int_reg, INTSTAT_DMA_INT, 1);
-       }
-       sdstd_wreg16(sd, SD_IntrStatus, int_reg);
-
-       /* Fetch data */
-       if (local_dma && read) {
-               sd_sync_dma(sd, read, nbytes);
-               bcopy(sd->dma_buf, data, nbytes);
-       }
-       return SUCCESS;
-}
-
-static int
-set_client_block_size(sdioh_info_t *sd, int func, int block_size)
-{
-       int base;
-       int err = 0;
-
-
-       sd_err(("%s: Setting block size %d, func %d\n", __FUNCTION__, block_size, func));
-       sd->client_block_size[func] = block_size;
-
-       /* Set the block size in the SDIO Card register */
-       base = func * SDIOD_FBR_SIZE;
-       err = sdstd_card_regwrite(sd, 0, base+SDIOD_CCCR_BLKSIZE_0, 1, block_size & 0xff);
-       if (!err) {
-               err = sdstd_card_regwrite(sd, 0, base+SDIOD_CCCR_BLKSIZE_1, 1,
-                                         (block_size >> 8) & 0xff);
-       }
-
-       /* Do not set the block size in the SDIO Host register, that
-        * is func dependent and will get done on an individual
-        * transaction basis
-        */
-
-       return (err ? BCME_SDIO_ERROR : 0);
-}
-
-/* Reset and re-initialize the device */
-int sdioh_sdio_reset(sdioh_info_t *si)
-{
-       uint8 hreg;
-
-       /* Reset the attached device (use slower clock for safety) */
-       sdstd_start_clock(si, 128);
-       sdstd_reset(si, 0, 1);
-
-       /* Reset portions of the host state accordingly */
-       hreg = sdstd_rreg8(si, SD_HostCntrl);
-       hreg = SFIELD(hreg, HOST_HI_SPEED_EN, 0);
-       hreg = SFIELD(hreg, HOST_DATA_WIDTH, 0);
-       si->sd_mode = SDIOH_MODE_SD1;
-
-       /* Reinitialize the card */
-       si->card_init_done = FALSE;
-       return sdstd_client_init(si);
-}
-
-
-static void
-sd_map_dma(sdioh_info_t * sd)
-{
-
-       void *va;
-
-       if ((va = DMA_ALLOC_CONSISTENT(sd->osh, SD_PAGE,
-               &sd->dma_start_phys, 0x12, 12)) == NULL) {
-               sd->sd_dma_mode = DMA_MODE_NONE;
-               sd->dma_start_buf = 0;
-               sd->dma_buf = (void *)0;
-               sd->dma_phys = 0;
-               sd->alloced_dma_size = SD_PAGE;
-               sd_err(("%s: DMA_ALLOC failed. Disabling DMA support.\n", __FUNCTION__));
-       } else {
-               sd->dma_start_buf = va;
-               sd->dma_buf = (void *)ROUNDUP((uintptr)va, SD_PAGE);
-               sd->dma_phys = ROUNDUP((sd->dma_start_phys), SD_PAGE);
-               sd->alloced_dma_size = SD_PAGE;
-               sd_err(("%s: Mapped DMA Buffer %dbytes @virt/phys: %p/0x%lx\n",
-                       __FUNCTION__, sd->alloced_dma_size, sd->dma_buf, sd->dma_phys));
-               sd_fill_dma_data_buf(sd, 0xA5);
-       }
-
-       if ((va = DMA_ALLOC_CONSISTENT(sd->osh, SD_PAGE,
-               &sd->adma2_dscr_start_phys, 0x12, 12)) == NULL) {
-               sd->sd_dma_mode = DMA_MODE_NONE;
-               sd->adma2_dscr_start_buf = 0;
-               sd->adma2_dscr_buf = (void *)0;
-               sd->adma2_dscr_phys = 0;
-               sd->alloced_adma2_dscr_size = 0;
-               sd_err(("%s: DMA_ALLOC failed for descriptor buffer. "
-                       "Disabling DMA support.\n", __FUNCTION__));
-       } else {
-               sd->adma2_dscr_start_buf = va;
-               sd->adma2_dscr_buf = (void *)ROUNDUP((uintptr)va, SD_PAGE);
-               sd->adma2_dscr_phys = ROUNDUP((sd->adma2_dscr_start_phys), SD_PAGE);
-               sd->alloced_adma2_dscr_size = SD_PAGE;
-       }
-
-       sd_err(("%s: Mapped ADMA2 Descriptor Buffer %dbytes @virt/phys: %p/0x%lx\n",
-               __FUNCTION__, sd->alloced_adma2_dscr_size, sd->adma2_dscr_buf,
-               sd->adma2_dscr_phys));
-       sd_clear_adma_dscr_buf(sd);
-}
-
-static void
-sd_unmap_dma(sdioh_info_t * sd)
-{
-       if (sd->dma_start_buf) {
-               DMA_FREE_CONSISTENT(sd->osh, sd->dma_start_buf, sd->alloced_dma_size,
-                       sd->dma_start_phys, 0x12);
-       }
-
-       if (sd->adma2_dscr_start_buf) {
-               DMA_FREE_CONSISTENT(sd->osh, sd->adma2_dscr_start_buf, sd->alloced_adma2_dscr_size,
-                                   sd->adma2_dscr_start_phys, 0x12);
-       }
-}
-
-static void sd_clear_adma_dscr_buf(sdioh_info_t *sd)
-{
-       bzero((char *)sd->adma2_dscr_buf, SD_PAGE);
-       sd_dump_adma_dscr(sd);
-}
-
-static void sd_fill_dma_data_buf(sdioh_info_t *sd, uint8 data)
-{
-       memset((char *)sd->dma_buf, data, SD_PAGE);
-}
-
-
-static void sd_create_adma_descriptor(sdioh_info_t *sd, uint32 index,
-                                      uint32 addr_phys, uint16 length, uint16 flags)
-{
-       adma2_dscr_32b_t *adma2_dscr_table;
-       adma1_dscr_t *adma1_dscr_table;
-
-       adma2_dscr_table = sd->adma2_dscr_buf;
-       adma1_dscr_table = sd->adma2_dscr_buf;
-
-       switch (sd->sd_dma_mode) {
-               case DMA_MODE_ADMA2:
-                       sd_dma(("%s: creating ADMA2 descriptor for index %d\n",
-                               __FUNCTION__, index));
-
-                       adma2_dscr_table[index].phys_addr = addr_phys;
-                       adma2_dscr_table[index].len_attr = length << 16;
-                       adma2_dscr_table[index].len_attr |= flags;
-                       break;
-               case DMA_MODE_ADMA1:
-                       /* ADMA1 requires two descriptors, one for len
-                        * and the other for data transfer
-                        */
-                       index <<= 1;
-
-                       sd_dma(("%s: creating ADMA1 descriptor for index %d\n",
-                               __FUNCTION__, index));
-
-                       adma1_dscr_table[index].phys_addr_attr = length << 12;
-                       adma1_dscr_table[index].phys_addr_attr |= (ADMA1_ATTRIBUTE_ACT_SET |
-                                                                  ADMA2_ATTRIBUTE_VALID);
-                       adma1_dscr_table[index+1].phys_addr_attr = addr_phys & 0xFFFFF000;
-                       adma1_dscr_table[index+1].phys_addr_attr |= (flags & 0x3f);
-                       break;
-               default:
-                       sd_err(("%s: cannot create ADMA descriptor for DMA mode %d\n",
-                               __FUNCTION__, sd->sd_dma_mode));
-                       break;
-       }
-}
-
-
-static void sd_dump_adma_dscr(sdioh_info_t *sd)
-{
-       adma2_dscr_32b_t *adma2_dscr_table;
-       adma1_dscr_t *adma1_dscr_table;
-       uint32 i = 0;
-       uint16 flags;
-       char flags_str[32];
-
-       ASSERT(sd->adma2_dscr_buf != NULL);
-
-       adma2_dscr_table = sd->adma2_dscr_buf;
-       adma1_dscr_table = sd->adma2_dscr_buf;
-
-       switch (sd->sd_dma_mode) {
-               case DMA_MODE_ADMA2:
-                       sd_err(("ADMA2 Descriptor Table (%dbytes) @virt/phys: %p/0x%lx\n",
-                               SD_PAGE, sd->adma2_dscr_buf, sd->adma2_dscr_phys));
-                       sd_err((" #[Descr VA  ]  Buffer PA  | Len    | Flags  (5:4  2   1   0)"
-                               "     |\n"));
-                       while (adma2_dscr_table->len_attr & ADMA2_ATTRIBUTE_VALID) {
-                               flags = adma2_dscr_table->len_attr & 0xFFFF;
-                               sprintf(flags_str, "%s%s%s%s",
-                                       ((flags & ADMA2_ATTRIBUTE_ACT_LINK) ==
-                                       ADMA2_ATTRIBUTE_ACT_LINK) ? "LINK " :
-                                       ((flags & ADMA2_ATTRIBUTE_ACT_LINK) ==
-                                       ADMA2_ATTRIBUTE_ACT_TRAN) ? "TRAN " :
-                                       ((flags & ADMA2_ATTRIBUTE_ACT_LINK) ==
-                                       ADMA2_ATTRIBUTE_ACT_NOP) ? "NOP  " : "RSV  ",
-                                       (flags & ADMA2_ATTRIBUTE_INT ? "INT " : "    "),
-                                       (flags & ADMA2_ATTRIBUTE_END ? "END " : "    "),
-                                       (flags & ADMA2_ATTRIBUTE_VALID ? "VALID" : ""));
-                               sd_err(("%2d[0x%p]: 0x%08x | 0x%04x | 0x%04x (%s) |\n",
-                                       i, adma2_dscr_table, adma2_dscr_table->phys_addr,
-                                       adma2_dscr_table->len_attr >> 16, flags, flags_str));
-                               i++;
-
-                               /* Follow LINK descriptors or skip to next. */
-                               if ((flags & ADMA2_ATTRIBUTE_ACT_LINK) ==
-                                    ADMA2_ATTRIBUTE_ACT_LINK) {
-                                       adma2_dscr_table = phys_to_virt(
-                                           adma2_dscr_table->phys_addr);
-                               } else {
-                                       adma2_dscr_table++;
-                               }
-
-                       }
-                       break;
-               case DMA_MODE_ADMA1:
-                       sd_err(("ADMA1 Descriptor Table (%dbytes) @virt/phys: %p/0x%lx\n",
-                                SD_PAGE, sd->adma2_dscr_buf, sd->adma2_dscr_phys));
-                       sd_err((" #[Descr VA  ]  Buffer PA  | Flags  (5:4  2   1   0)     |\n"));
-
-                       for (i = 0; adma1_dscr_table->phys_addr_attr & ADMA2_ATTRIBUTE_VALID; i++) {
-                               flags = adma1_dscr_table->phys_addr_attr & 0x3F;
-                               sprintf(flags_str, "%s%s%s%s",
-                                       ((flags & ADMA2_ATTRIBUTE_ACT_LINK) ==
-                                       ADMA2_ATTRIBUTE_ACT_LINK) ? "LINK " :
-                                       ((flags & ADMA2_ATTRIBUTE_ACT_LINK) ==
-                                       ADMA2_ATTRIBUTE_ACT_TRAN) ? "TRAN " :
-                                       ((flags & ADMA2_ATTRIBUTE_ACT_LINK) ==
-                                       ADMA2_ATTRIBUTE_ACT_NOP) ? "NOP  " : "SET  ",
-                                       (flags & ADMA2_ATTRIBUTE_INT ? "INT " : "    "),
-                                       (flags & ADMA2_ATTRIBUTE_END ? "END " : "    "),
-                                       (flags & ADMA2_ATTRIBUTE_VALID ? "VALID" : ""));
-                               sd_err(("%2d[0x%p]: 0x%08x | 0x%04x | (%s) |\n",
-                                       i, adma1_dscr_table,
-                                       adma1_dscr_table->phys_addr_attr & 0xFFFFF000,
-                                       flags, flags_str));
-
-                               /* Follow LINK descriptors or skip to next. */
-                               if ((flags & ADMA2_ATTRIBUTE_ACT_LINK) ==
-                                    ADMA2_ATTRIBUTE_ACT_LINK) {
-                                       adma1_dscr_table = phys_to_virt(
-                                               adma1_dscr_table->phys_addr_attr & 0xFFFFF000);
-                               } else {
-                                       adma1_dscr_table++;
-                               }
-                       }
-                       break;
-               default:
-                       sd_err(("Unknown DMA Descriptor Table Format.\n"));
-                       break;
-       }
-}
-
-static void sdstd_dumpregs(sdioh_info_t *sd)
-{
-       sd_err(("IntrStatus:       0x%04x ErrorIntrStatus       0x%04x\n",
-                   sdstd_rreg16(sd, SD_IntrStatus),
-                   sdstd_rreg16(sd, SD_ErrorIntrStatus)));
-       sd_err(("IntrStatusEnable: 0x%04x ErrorIntrStatusEnable 0x%04x\n",
-                   sdstd_rreg16(sd, SD_IntrStatusEnable),
-                   sdstd_rreg16(sd, SD_ErrorIntrStatusEnable)));
-       sd_err(("IntrSignalEnable: 0x%04x ErrorIntrSignalEnable 0x%04x\n",
-                   sdstd_rreg16(sd, SD_IntrSignalEnable),
-                   sdstd_rreg16(sd, SD_ErrorIntrSignalEnable)));
-}
diff --git a/drivers/net/wireless/bcm4319/bcmsdstd_linux.c b/drivers/net/wireless/bcm4319/bcmsdstd_linux.c
deleted file mode 100644 (file)
index ad6d660..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- *  'Standard' SDIO HOST CONTROLLER driver - linux portion
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdstd_linux.c,v 1.11.18.2 2008/05/28 18:36:56 Exp $
- */
-
-#include <typedefs.h>
-#include <pcicfg.h>
-#include <bcmutils.h>
-#include <sdio.h>      /* SDIO Specs */
-#include <bcmsdbus.h>  /* bcmsdh to/from specific controller APIs */
-#include <sdiovar.h>   /* to get msglevel bit values */
-
-#include <linux/sched.h>       /* request_irq() */
-
-#include <bcmsdstd.h>
-
-struct sdos_info {
-       sdioh_info_t *sd;
-       spinlock_t lock;
-       wait_queue_head_t intr_wait_queue;
-};
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-#define BLOCKABLE()    (!in_atomic())
-#else
-#define BLOCKABLE()    (!in_interrupt())
-#endif
-
-/* Interrupt handler */
-static irqreturn_t
-sdstd_isr(int irq, void *dev_id
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
-, struct pt_regs *ptregs
-#endif
-)
-{
-       sdioh_info_t *sd;
-       struct sdos_info *sdos;
-       bool ours;
-
-       sd = (sdioh_info_t *)dev_id;
-
-       if (!sd->card_init_done) {
-               sd_err(("%s: Hey Bogus intr...not even initted: irq %d\n", __FUNCTION__, irq));
-               return IRQ_RETVAL(FALSE);
-       } else {
-               ours = check_client_intr(sd);
-
-               /* For local interrupts, wake the waiting process */
-               if (ours && sd->got_hcint) {
-                       sd_trace(("INTR->WAKE\n"));
-                       sdos = (struct sdos_info *)sd->sdos_info;
-                       wake_up_interruptible(&sdos->intr_wait_queue);
-               }
-               return IRQ_RETVAL(ours);
-       }
-}
-
-/* Register with Linux for interrupts */
-int
-sdstd_register_irq(sdioh_info_t *sd, uint irq)
-{
-       sd_trace(("Entering %s: irq == %d\n", __FUNCTION__, irq));
-       if (request_irq(irq, sdstd_isr, IRQF_SHARED, "bcmsdstd", sd) < 0) {
-               sd_err(("%s: request_irq() failed\n", __FUNCTION__));
-               return ERROR;
-       }
-       return SUCCESS;
-}
-
-/* Free Linux irq */
-void
-sdstd_free_irq(uint irq, sdioh_info_t *sd)
-{
-       free_irq(irq, sd);
-}
-
-/* Map Host controller registers */
-
-uint32 *
-sdstd_reg_map(osl_t *osh, int32 addr, int size)
-{
-       return (uint32 *)REG_MAP(addr, size);
-}
-
-void
-sdstd_reg_unmap(osl_t *osh, int32 addr, int size)
-{
-       REG_UNMAP((void*)(uintptr)addr);
-}
-
-int
-sdstd_osinit(sdioh_info_t *sd)
-{
-       struct sdos_info *sdos;
-
-       sdos = (struct sdos_info*)MALLOC(sd->osh, sizeof(struct sdos_info));
-       sd->sdos_info = (void*)sdos;
-       if (sdos == NULL)
-               return BCME_NOMEM;
-
-       sdos->sd = sd;
-       spin_lock_init(&sdos->lock);
-       init_waitqueue_head(&sdos->intr_wait_queue);
-       return BCME_OK;
-}
-
-void
-sdstd_osfree(sdioh_info_t *sd)
-{
-       struct sdos_info *sdos;
-       ASSERT(sd && sd->sdos_info);
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       MFREE(sd->osh, sdos, sizeof(struct sdos_info));
-}
-
-/* Interrupt enable/disable */
-SDIOH_API_RC
-sdioh_interrupt_set(sdioh_info_t *sd, bool enable)
-{
-       ulong flags;
-       struct sdos_info *sdos;
-
-       sd_trace(("%s: %s\n", __FUNCTION__, enable ? "Enabling" : "Disabling"));
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       ASSERT(sdos);
-
-       if (!(sd->host_init_done && sd->card_init_done)) {
-               sd_err(("%s: Card & Host are not initted - bailing\n", __FUNCTION__));
-               return SDIOH_API_RC_FAIL;
-       }
-
-       if (enable && !(sd->intr_handler && sd->intr_handler_arg)) {
-               sd_err(("%s: no handler registered, will not enable\n", __FUNCTION__));
-               return SDIOH_API_RC_FAIL;
-       }
-
-       /* Ensure atomicity for enable/disable calls */
-       spin_lock_irqsave(&sdos->lock, flags);
-
-       sd->client_intr_enabled = enable;
-       if (enable && !sd->lockcount)
-               sdstd_devintr_on(sd);
-       else
-               sdstd_devintr_off(sd);
-
-       spin_unlock_irqrestore(&sdos->lock, flags);
-
-       return SDIOH_API_RC_SUCCESS;
-}
-
-/* Protect against reentrancy (disable device interrupts while executing) */
-void
-sdstd_lock(sdioh_info_t *sd)
-{
-       ulong flags;
-       struct sdos_info *sdos;
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       ASSERT(sdos);
-
-       sd_trace(("%s: %d\n", __FUNCTION__, sd->lockcount));
-
-       spin_lock_irqsave(&sdos->lock, flags);
-       if (sd->lockcount) {
-               sd_err(("%s: Already locked!\n", __FUNCTION__));
-               ASSERT(sd->lockcount == 0);
-       }
-       sdstd_devintr_off(sd);
-       sd->lockcount++;
-       spin_unlock_irqrestore(&sdos->lock, flags);
-}
-
-/* Enable client interrupt */
-void
-sdstd_unlock(sdioh_info_t *sd)
-{
-       ulong flags;
-       struct sdos_info *sdos;
-
-       sd_trace(("%s: %d, %d\n", __FUNCTION__, sd->lockcount, sd->client_intr_enabled));
-       ASSERT(sd->lockcount > 0);
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-       ASSERT(sdos);
-
-       spin_lock_irqsave(&sdos->lock, flags);
-       if (--sd->lockcount == 0 && sd->client_intr_enabled) {
-               sdstd_devintr_on(sd);
-       }
-       spin_unlock_irqrestore(&sdos->lock, flags);
-}
-
-uint16
-sdstd_waitbits(sdioh_info_t *sd, uint16 norm, uint16 err, bool yield)
-{
-       struct sdos_info *sdos;
-
-       sdos = (struct sdos_info *)sd->sdos_info;
-
-#ifndef BCMSDYIELD
-       ASSERT(!yield);
-#endif
-       sd_trace(("%s: int 0x%02x err 0x%02x yield %d canblock %d\n",
-                 __FUNCTION__, norm, err, yield, BLOCKABLE()));
-
-       /* Clear the "interrupt happened" flag and last intrstatus */
-       sd->got_hcint = FALSE;
-       sd->last_intrstatus = 0;
-
-#ifdef BCMSDYIELD
-       if (yield && BLOCKABLE()) {
-               /* Enable interrupts, wait for the indication, then disable */
-               sdstd_intrs_on(sd, norm, err);
-               wait_event_interruptible(sdos->intr_wait_queue, (sd->got_hcint));
-               sdstd_intrs_off(sd, norm, err);
-       } else
-#endif /* BCMSDYIELD */
-       {
-               sdstd_spinbits(sd, norm, err);
-       }
-
-       sd_trace(("%s: last_intrstatus 0x%04x\n", __FUNCTION__, sd->last_intrstatus));
-
-       return sd->last_intrstatus;
-}
diff --git a/drivers/net/wireless/bcm4319/bcmutils.c b/drivers/net/wireless/bcm4319/bcmutils.c
deleted file mode 100644 (file)
index 43c04ee..0000000
+++ /dev/null
@@ -1,1838 +0,0 @@
-/*
- * Driver O/S-independent utility routines
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: bcmutils.c,v 1.210.4.5.2.4.6.19 2010/04/26 06:05:25 Exp $
- */
-
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <stdarg.h>
-#include <bcmutils.h>
-#ifdef BCMDRIVER
-#include <osl.h>
-#include <siutils.h>
-#else
-#include <stdio.h>
-#include <string.h>
-/* This case for external supplicant use */
-#if defined(BCMEXTSUP)
-#include <bcm_osl.h>
-#endif
-
-#endif /* BCMDRIVER */
-#include <bcmendian.h>
-#include <bcmdevs.h>
-#include <proto/ethernet.h>
-#include <proto/vlan.h>
-#include <proto/bcmip.h>
-#include <proto/802.1d.h>
-#include <proto/802.11.h>
-
-
-#ifdef BCMDRIVER
-
-
-/* copy a pkt buffer chain into a buffer */
-uint
-pktcopy(osl_t *osh, void *p, uint offset, int len, uchar *buf)
-{
-       uint n, ret = 0;
-
-       if (len < 0)
-               len = 4096;     /* "infinite" */
-
-       /* skip 'offset' bytes */
-       for (; p && offset; p = PKTNEXT(osh, p)) {
-               if (offset < (uint)PKTLEN(osh, p))
-                       break;
-               offset -= PKTLEN(osh, p);
-       }
-
-       if (!p)
-               return 0;
-
-       /* copy the data */
-       for (; p && len; p = PKTNEXT(osh, p)) {
-               n = MIN((uint)PKTLEN(osh, p) - offset, (uint)len);
-               bcopy(PKTDATA(osh, p) + offset, buf, n);
-               buf += n;
-               len -= n;
-               ret += n;
-               offset = 0;
-       }
-
-       return ret;
-}
-
-/* copy a buffer into a pkt buffer chain */
-uint
-pktfrombuf(osl_t *osh, void *p, uint offset, int len, uchar *buf)
-{
-       uint n, ret = 0;
-
-       /* skip 'offset' bytes */
-       for (; p && offset; p = PKTNEXT(osh, p)) {
-               if (offset < (uint)PKTLEN(osh, p))
-                       break;
-               offset -= PKTLEN(osh, p);
-       }
-
-       if (!p)
-               return 0;
-
-       /* copy the data */
-       for (; p && len; p = PKTNEXT(osh, p)) {
-               n = MIN((uint)PKTLEN(osh, p) - offset, (uint)len);
-               bcopy(buf, PKTDATA(osh, p) + offset, n);
-               buf += n;
-               len -= n;
-               ret += n;
-               offset = 0;
-       }
-
-       return ret;
-}
-
-
-
-/* return total length of buffer chain */
-uint
-pkttotlen(osl_t *osh, void *p)
-{
-       uint total;
-
-       total = 0;
-       for (; p; p = PKTNEXT(osh, p))
-               total += PKTLEN(osh, p);
-       return (total);
-}
-
-/* return the last buffer of chained pkt */
-void *
-pktlast(osl_t *osh, void *p)
-{
-       for (; PKTNEXT(osh, p); p = PKTNEXT(osh, p))
-               ;
-
-       return (p);
-}
-
-/* count segments of a chained packet */
-uint
-pktsegcnt(osl_t *osh, void *p)
-{
-       uint cnt;
-
-       for (cnt = 0; p; p = PKTNEXT(osh, p))
-               cnt++;
-
-       return cnt;
-}
-
-
-/*
- * osl multiple-precedence packet queue
- * hi_prec is always >= the number of the highest non-empty precedence
- */
-void *
-pktq_penq(struct pktq *pq, int prec, void *p)
-{
-       struct pktq_prec *q;
-
-       ASSERT(prec >= 0 && prec < pq->num_prec);
-       ASSERT(PKTLINK(p) == NULL);         /* queueing chains not allowed */
-
-       ASSERT(!pktq_full(pq));
-       ASSERT(!pktq_pfull(pq, prec));
-
-       q = &pq->q[prec];
-
-       if (q->head)
-               PKTSETLINK(q->tail, p);
-       else
-               q->head = p;
-
-       q->tail = p;
-       q->len++;
-
-       pq->len++;
-
-       if (pq->hi_prec < prec)
-               pq->hi_prec = (uint8)prec;
-
-       return p;
-}
-
-void *
-pktq_penq_head(struct pktq *pq, int prec, void *p)
-{
-       struct pktq_prec *q;
-
-       ASSERT(prec >= 0 && prec < pq->num_prec);
-       ASSERT(PKTLINK(p) == NULL);         /* queueing chains not allowed */
-
-       ASSERT(!pktq_full(pq));
-       ASSERT(!pktq_pfull(pq, prec));
-
-       q = &pq->q[prec];
-
-       if (q->head == NULL)
-               q->tail = p;
-
-       PKTSETLINK(p, q->head);
-       q->head = p;
-       q->len++;
-
-       pq->len++;
-
-       if (pq->hi_prec < prec)
-               pq->hi_prec = (uint8)prec;
-
-       return p;
-}
-
-void *
-pktq_pdeq(struct pktq *pq, int prec)
-{
-       struct pktq_prec *q;
-       void *p;
-
-       ASSERT(prec >= 0 && prec < pq->num_prec);
-
-       q = &pq->q[prec];
-
-       if ((p = q->head) == NULL)
-               return NULL;
-
-       if ((q->head = PKTLINK(p)) == NULL)
-               q->tail = NULL;
-
-       q->len--;
-
-       pq->len--;
-
-       PKTSETLINK(p, NULL);
-
-       return p;
-}
-
-void *
-pktq_pdeq_tail(struct pktq *pq, int prec)
-{
-       struct pktq_prec *q;
-       void *p, *prev;
-
-       ASSERT(prec >= 0 && prec < pq->num_prec);
-
-       q = &pq->q[prec];
-
-       if ((p = q->head) == NULL)
-               return NULL;
-
-       for (prev = NULL; p != q->tail; p = PKTLINK(p))
-               prev = p;
-
-       if (prev)
-               PKTSETLINK(prev, NULL);
-       else
-               q->head = NULL;
-
-       q->tail = prev;
-       q->len--;
-
-       pq->len--;
-
-       return p;
-}
-
-void
-pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir)
-{
-       struct pktq_prec *q;
-       void *p;
-
-       q = &pq->q[prec];
-       p = q->head;
-       while (p) {
-               q->head = PKTLINK(p);
-               PKTSETLINK(p, NULL);
-               PKTFREE(osh, p, dir);
-               q->len--;
-               pq->len--;
-               p = q->head;
-       }
-       ASSERT(q->len == 0);
-       q->tail = NULL;
-}
-
-bool
-pktq_pdel(struct pktq *pq, void *pktbuf, int prec)
-{
-       struct pktq_prec *q;
-       void *p;
-
-       ASSERT(prec >= 0 && prec < pq->num_prec);
-
-       if (!pktbuf)
-               return FALSE;
-
-       q = &pq->q[prec];
-
-       if (q->head == pktbuf) {
-               if ((q->head = PKTLINK(pktbuf)) == NULL)
-                       q->tail = NULL;
-       } else {
-               for (p = q->head; p && PKTLINK(p) != pktbuf; p = PKTLINK(p))
-                       ;
-               if (p == NULL)
-                       return FALSE;
-
-               PKTSETLINK(p, PKTLINK(pktbuf));
-               if (q->tail == pktbuf)
-                       q->tail = p;
-       }
-
-       q->len--;
-       pq->len--;
-       PKTSETLINK(pktbuf, NULL);
-       return TRUE;
-}
-
-void
-pktq_init(struct pktq *pq, int num_prec, int max_len)
-{
-       int prec;
-
-       ASSERT(num_prec > 0 && num_prec <= PKTQ_MAX_PREC);
-
-       /* pq is variable size; only zero out what's requested */
-       bzero(pq, OFFSETOF(struct pktq, q) + (sizeof(struct pktq_prec) * num_prec));
-
-       pq->num_prec = (uint16)num_prec;
-
-       pq->max = (uint16)max_len;
-
-       for (prec = 0; prec < num_prec; prec++)
-               pq->q[prec].max = pq->max;
-}
-
-void *
-pktq_deq(struct pktq *pq, int *prec_out)
-{
-       struct pktq_prec *q;
-       void *p;
-       int prec;
-
-       if (pq->len == 0)
-               return NULL;
-
-       while ((prec = pq->hi_prec) > 0 && pq->q[prec].head == NULL)
-               pq->hi_prec--;
-
-       q = &pq->q[prec];
-
-       if ((p = q->head) == NULL)
-               return NULL;
-
-       if ((q->head = PKTLINK(p)) == NULL)
-               q->tail = NULL;
-
-       q->len--;
-
-       pq->len--;
-
-       if (prec_out)
-               *prec_out = prec;
-
-       PKTSETLINK(p, NULL);
-
-       return p;
-}
-
-void *
-pktq_deq_tail(struct pktq *pq, int *prec_out)
-{
-       struct pktq_prec *q;
-       void *p, *prev;
-       int prec;
-
-       if (pq->len == 0)
-               return NULL;
-
-       for (prec = 0; prec < pq->hi_prec; prec++)
-               if (pq->q[prec].head)
-                       break;
-
-       q = &pq->q[prec];
-
-       if ((p = q->head) == NULL)
-               return NULL;
-
-       for (prev = NULL; p != q->tail; p = PKTLINK(p))
-               prev = p;
-
-       if (prev)
-               PKTSETLINK(prev, NULL);
-       else
-               q->head = NULL;
-
-       q->tail = prev;
-       q->len--;
-
-       pq->len--;
-
-       if (prec_out)
-               *prec_out = prec;
-
-       PKTSETLINK(p, NULL);
-
-       return p;
-}
-
-void *
-pktq_peek(struct pktq *pq, int *prec_out)
-{
-       int prec;
-
-       if (pq->len == 0)
-               return NULL;
-
-       while ((prec = pq->hi_prec) > 0 && pq->q[prec].head == NULL)
-               pq->hi_prec--;
-
-       if (prec_out)
-               *prec_out = prec;
-
-       return (pq->q[prec].head);
-}
-
-void *
-pktq_peek_tail(struct pktq *pq, int *prec_out)
-{
-       int prec;
-
-       if (pq->len == 0)
-               return NULL;
-
-       for (prec = 0; prec < pq->hi_prec; prec++)
-               if (pq->q[prec].head)
-                       break;
-
-       if (prec_out)
-               *prec_out = prec;
-
-       return (pq->q[prec].tail);
-}
-
-void
-pktq_flush(osl_t *osh, struct pktq *pq, bool dir)
-{
-       int prec;
-       for (prec = 0; prec < pq->num_prec; prec++)
-               pktq_pflush(osh, pq, prec, dir);
-       ASSERT(pq->len == 0);
-}
-
-/* Return sum of lengths of a specific set of precedences */
-int
-pktq_mlen(struct pktq *pq, uint prec_bmp)
-{
-       int prec, len;
-
-       len = 0;
-
-       for (prec = 0; prec <= pq->hi_prec; prec++)
-               if (prec_bmp & (1 << prec))
-                       len += pq->q[prec].len;
-
-       return len;
-}
-
-/* Priority dequeue from a specific set of precedences */
-void *
-pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
-{
-       struct pktq_prec *q;
-       void *p;
-       int prec;
-
-       if (pq->len == 0)
-               return NULL;
-
-       while ((prec = pq->hi_prec) > 0 && pq->q[prec].head == NULL)
-               pq->hi_prec--;
-
-       while ((prec_bmp & (1 << prec)) == 0 || pq->q[prec].head == NULL)
-               if (prec-- == 0)
-                       return NULL;
-
-       q = &pq->q[prec];
-
-       if ((p = q->head) == NULL)
-               return NULL;
-
-       if ((q->head = PKTLINK(p)) == NULL)
-               q->tail = NULL;
-
-       q->len--;
-
-       if (prec_out)
-               *prec_out = prec;
-
-       pq->len--;
-
-       PKTSETLINK(p, NULL);
-
-       return p;
-}
-#endif /* BCMDRIVER */
-
-
-
-const unsigned char bcm_ctype[] = {
-       _BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,                        /* 0-7 */
-       _BCM_C, _BCM_C|_BCM_S, _BCM_C|_BCM_S, _BCM_C|_BCM_S, _BCM_C|_BCM_S, _BCM_C|_BCM_S, _BCM_C,
-       _BCM_C, /* 8-15 */
-       _BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,                        /* 16-23 */
-       _BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,                        /* 24-31 */
-       _BCM_S|_BCM_SP,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,                /* 32-39 */
-       _BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,                        /* 40-47 */
-       _BCM_D,_BCM_D,_BCM_D,_BCM_D,_BCM_D,_BCM_D,_BCM_D,_BCM_D,                        /* 48-55 */
-       _BCM_D,_BCM_D,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,                        /* 56-63 */
-       _BCM_P, _BCM_U|_BCM_X, _BCM_U|_BCM_X, _BCM_U|_BCM_X, _BCM_U|_BCM_X, _BCM_U|_BCM_X,
-       _BCM_U|_BCM_X, _BCM_U, /* 64-71 */
-       _BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,                        /* 72-79 */
-       _BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,                        /* 80-87 */
-       _BCM_U,_BCM_U,_BCM_U,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,                        /* 88-95 */
-       _BCM_P, _BCM_L|_BCM_X, _BCM_L|_BCM_X, _BCM_L|_BCM_X, _BCM_L|_BCM_X, _BCM_L|_BCM_X,
-       _BCM_L|_BCM_X, _BCM_L, /* 96-103 */
-       _BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L, /* 104-111 */
-       _BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L, /* 112-119 */
-       _BCM_L,_BCM_L,_BCM_L,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_C, /* 120-127 */
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,         /* 128-143 */
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,         /* 144-159 */
-       _BCM_S|_BCM_SP, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P,
-       _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, /* 160-175 */
-       _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P,
-       _BCM_P, _BCM_P, _BCM_P, _BCM_P, _BCM_P, /* 176-191 */
-       _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U,
-       _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, /* 192-207 */
-       _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_P, _BCM_U, _BCM_U, _BCM_U,
-       _BCM_U, _BCM_U, _BCM_U, _BCM_U, _BCM_L, /* 208-223 */
-       _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L,
-       _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, /* 224-239 */
-       _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_P, _BCM_L, _BCM_L, _BCM_L,
-       _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L /* 240-255 */
-};
-
-ulong
-bcm_strtoul(char *cp, char **endp, uint base)
-{
-       ulong result, last_result = 0, value;
-       bool minus;
-
-       minus = FALSE;
-
-       while (bcm_isspace(*cp))
-               cp++;
-
-       if (cp[0] == '+')
-               cp++;
-       else if (cp[0] == '-') {
-               minus = TRUE;
-               cp++;
-       }
-
-       if (base == 0) {
-               if (cp[0] == '0') {
-                       if ((cp[1] == 'x') || (cp[1] == 'X')) {
-                               base = 16;
-                               cp = &cp[2];
-                       } else {
-                               base = 8;
-                               cp = &cp[1];
-                       }
-               } else
-                       base = 10;
-       } else if (base == 16 && (cp[0] == '0') && ((cp[1] == 'x') || (cp[1] == 'X'))) {
-               cp = &cp[2];
-       }
-
-       result = 0;
-
-       while (bcm_isxdigit(*cp) &&
-              (value = bcm_isdigit(*cp) ? *cp-'0' : bcm_toupper(*cp)-'A'+10) < base) {
-               result = result*base + value;
-               /* Detected overflow */
-               if (result < last_result && !minus)
-                       return (ulong)-1;
-               last_result = result;
-               cp++;
-       }
-
-       if (minus)
-               result = (ulong)(-(long)result);
-
-       if (endp)
-               *endp = (char *)cp;
-
-       return (result);
-}
-
-int
-bcm_atoi(char *s)
-{
-       return (int)bcm_strtoul(s, NULL, 10);
-}
-
-/* return pointer to location of substring 'needle' in 'haystack' */
-char*
-bcmstrstr(char *haystack, char *needle)
-{
-       int len, nlen;
-       int i;
-
-       if ((haystack == NULL) || (needle == NULL))
-               return (haystack);
-
-       nlen = strlen(needle);
-       len = strlen(haystack) - nlen + 1;
-
-       for (i = 0; i < len; i++)
-               if (memcmp(needle, &haystack[i], nlen) == 0)
-                       return (&haystack[i]);
-       return (NULL);
-}
-
-char*
-bcmstrcat(char *dest, const char *src)
-{
-       char *p;
-
-       p = dest + strlen(dest);
-
-       while ((*p++ = *src++) != '\0')
-               ;
-
-       return (dest);
-}
-
-char*
-bcmstrncat(char *dest, const char *src, uint size)
-{
-       char *endp;
-       char *p;
-
-       p = dest + strlen(dest);
-       endp = p + size;
-
-       while (p != endp && (*p++ = *src++) != '\0')
-               ;
-
-       return (dest);
-}
-
-
-/****************************************************************************
-* Function:   bcmstrtok
-*
-* Purpose:
-*  Tokenizes a string. This function is conceptually similiar to ANSI C strtok(),
-*  but allows strToken() to be used by different strings or callers at the same
-*  time. Each call modifies '*string' by substituting a NULL character for the
-*  first delimiter that is encountered, and updates 'string' to point to the char
-*  after the delimiter. Leading delimiters are skipped.
-*
-* Parameters:
-*  string      (mod) Ptr to string ptr, updated by token.
-*  delimiters  (in)  Set of delimiter characters.
-*  tokdelim    (out) Character that delimits the returned token. (May
-*                    be set to NULL if token delimiter is not required).
-*
-* Returns:  Pointer to the next token found. NULL when no more tokens are found.
-*****************************************************************************
-*/
-char *
-bcmstrtok(char **string, const char *delimiters, char *tokdelim)
-{
-       unsigned char *str;
-       unsigned long map[8];
-       int count;
-       char *nextoken;
-
-       if (tokdelim != NULL) {
-               /* Prime the token delimiter */
-               *tokdelim = '\0';
-       }
-
-       /* Clear control map */
-       for (count = 0; count < 8; count++) {
-               map[count] = 0;
-       }
-
-       /* Set bits in delimiter table */
-       do {
-               map[*delimiters >> 5] |= (1 << (*delimiters & 31));
-       }
-       while (*delimiters++);
-
-       str = (unsigned char*)*string;
-
-       /* Find beginning of token (skip over leading delimiters). Note that
-        * there is no token iff this loop sets str to point to the terminal
-        * null (*str == '\0')
-        */
-       while (((map[*str >> 5] & (1 << (*str & 31))) && *str) || (*str == ' ')) {
-               str++;
-       }
-
-       nextoken = (char*)str;
-
-       /* Find the end of the token. If it is not the end of the string,
-        * put a null there.
-        */
-       for (; *str; str++) {
-               if (map[*str >> 5] & (1 << (*str & 31))) {
-                       if (tokdelim != NULL) {
-                               *tokdelim = *str;
-                       }
-
-                       *str++ = '\0';
-                       break;
-               }
-       }
-
-       *string = (char*)str;
-
-       /* Determine if a token has been found. */
-       if (nextoken == (char *) str) {
-               return NULL;
-       }
-       else {
-               return nextoken;
-       }
-}
-
-
-#define xToLower(C) \
-       ((C >= 'A' && C <= 'Z') ? (char)((int)C - (int)'A' + (int)'a') : C)
-
-
-/****************************************************************************
-* Function:   bcmstricmp
-*
-* Purpose:    Compare to strings case insensitively.
-*
-* Parameters: s1 (in) First string to compare.
-*             s2 (in) Second string to compare.
-*
-* Returns:    Return 0 if the two strings are equal, -1 if t1 < t2 and 1 if
-*             t1 > t2, when ignoring case sensitivity.
-*****************************************************************************
-*/
-int
-bcmstricmp(const char *s1, const char *s2)
-{
-       char dc, sc;
-
-       while (*s2 && *s1) {
-               dc = xToLower(*s1);
-               sc = xToLower(*s2);
-               if (dc < sc) return -1;
-               if (dc > sc) return 1;
-               s1++;
-               s2++;
-       }
-
-       if (*s1 && !*s2) return 1;
-       if (!*s1 && *s2) return -1;
-       return 0;
-}
-
-
-/****************************************************************************
-* Function:   bcmstrnicmp
-*
-* Purpose:    Compare to strings case insensitively, upto a max of 'cnt'
-*             characters.
-*
-* Parameters: s1  (in) First string to compare.
-*             s2  (in) Second string to compare.
-*             cnt (in) Max characters to compare.
-*
-* Returns:    Return 0 if the two strings are equal, -1 if t1 < t2 and 1 if
-*             t1 > t2, when ignoring case sensitivity.
-*****************************************************************************
-*/
-int
-bcmstrnicmp(const char* s1, const char* s2, int cnt)
-{
-       char dc, sc;
-
-       while (*s2 && *s1 && cnt) {
-               dc = xToLower(*s1);
-               sc = xToLower(*s2);
-               if (dc < sc) return -1;
-               if (dc > sc) return 1;
-               s1++;
-               s2++;
-               cnt--;
-       }
-
-       if (!cnt) return 0;
-       if (*s1 && !*s2) return 1;
-       if (!*s1 && *s2) return -1;
-       return 0;
-}
-
-/* parse a xx:xx:xx:xx:xx:xx format ethernet address */
-int
-bcm_ether_atoe(char *p, struct ether_addr *ea)
-{
-       int i = 0;
-
-       for (;;) {
-               ea->octet[i++] = (char) bcm_strtoul(p, &p, 16);
-               if (!*p++ || i == 6)
-                       break;
-       }
-
-       return (i == 6);
-}
-
-
-#if defined(CONFIG_USBRNDIS_RETAIL) || defined(NDIS_MINIPORT_DRIVER)
-/* registry routine buffer preparation utility functions:
- * parameter order is like strncpy, but returns count
- * of bytes copied. Minimum bytes copied is null char(1)/wchar(2)
- */
-ulong
-wchar2ascii(char *abuf, ushort *wbuf, ushort wbuflen, ulong abuflen)
-{
-       ulong copyct = 1;
-       ushort i;
-
-       if (abuflen == 0)
-               return 0;
-
-       /* wbuflen is in bytes */
-       wbuflen /= sizeof(ushort);
-
-       for (i = 0; i < wbuflen; ++i) {
-               if (--abuflen == 0)
-                       break;
-               *abuf++ = (char) *wbuf++;
-               ++copyct;
-       }
-       *abuf = '\0';
-
-       return copyct;
-}
-#endif /* CONFIG_USBRNDIS_RETAIL || NDIS_MINIPORT_DRIVER */
-
-char *
-bcm_ether_ntoa(const struct ether_addr *ea, char *buf)
-{
-       static const char template[] = "%02x:%02x:%02x:%02x:%02x:%02x";
-       snprintf(buf, 18, template,
-               ea->octet[0]&0xff, ea->octet[1]&0xff, ea->octet[2]&0xff,
-               ea->octet[3]&0xff, ea->octet[4]&0xff, ea->octet[5]&0xff);
-       return (buf);
-}
-
-char *
-bcm_ip_ntoa(struct ipv4_addr *ia, char *buf)
-{
-       snprintf(buf, 16, "%d.%d.%d.%d",
-                ia->addr[0], ia->addr[1], ia->addr[2], ia->addr[3]);
-       return (buf);
-}
-
-#ifdef BCMDRIVER
-
-void
-bcm_mdelay(uint ms)
-{
-       uint i;
-
-       for (i = 0; i < ms; i++) {
-               OSL_DELAY(1000);
-       }
-}
-
-
-
-
-
-
-#if defined(DHD_DEBUG)
-/* pretty hex print a pkt buffer chain */
-void
-prpkt(const char *msg, osl_t *osh, void *p0)
-{
-       void *p;
-
-       if (msg && (msg[0] != '\0'))
-               printf("%s:\n", msg);
-
-       for (p = p0; p; p = PKTNEXT(osh, p))
-               prhex(NULL, PKTDATA(osh, p), PKTLEN(osh, p));
-}
-#endif 
-
-/* Takes an Ethernet frame and sets out-of-bound PKTPRIO.
- * Also updates the inplace vlan tag if requested.
- * For debugging, it returns an indication of what it did.
- */
-uint
-pktsetprio(void *pkt, bool update_vtag)
-{
-       struct ether_header *eh;
-       struct ethervlan_header *evh;
-       uint8 *pktdata;
-       int priority = 0;
-       int rc = 0;
-
-       pktdata = (uint8 *) PKTDATA(NULL, pkt);
-       ASSERT(ISALIGNED((uintptr)pktdata, sizeof(uint16)));
-
-       eh = (struct ether_header *) pktdata;
-
-       if (ntoh16(eh->ether_type) == ETHER_TYPE_8021Q) {
-               uint16 vlan_tag;
-               int vlan_prio, dscp_prio = 0;
-
-               evh = (struct ethervlan_header *)eh;
-
-               vlan_tag = ntoh16(evh->vlan_tag);
-               vlan_prio = (int) (vlan_tag >> VLAN_PRI_SHIFT) & VLAN_PRI_MASK;
-
-               if (ntoh16(evh->ether_type) == ETHER_TYPE_IP) {
-                       uint8 *ip_body = pktdata + sizeof(struct ethervlan_header);
-                       uint8 tos_tc = IP_TOS(ip_body);
-                       dscp_prio = (int)(tos_tc >> IPV4_TOS_PREC_SHIFT);
-               }
-
-               /* DSCP priority gets precedence over 802.1P (vlan tag) */
-               if (dscp_prio != 0) {
-                       priority = dscp_prio;
-                       rc |= PKTPRIO_VDSCP;
-               } else {
-                       priority = vlan_prio;
-                       rc |= PKTPRIO_VLAN;
-               }
-               /*
-                * If the DSCP priority is not the same as the VLAN priority,
-                * then overwrite the priority field in the vlan tag, with the
-                * DSCP priority value. This is required for Linux APs because
-                * the VLAN driver on Linux, overwrites the skb->priority field
-                * with the priority value in the vlan tag
-                */
-               if (update_vtag && (priority != vlan_prio)) {
-                       vlan_tag &= ~(VLAN_PRI_MASK << VLAN_PRI_SHIFT);
-                       vlan_tag |= (uint16)priority << VLAN_PRI_SHIFT;
-                       evh->vlan_tag = hton16(vlan_tag);
-                       rc |= PKTPRIO_UPD;
-               }
-       } else if (ntoh16(eh->ether_type) == ETHER_TYPE_IP) {
-               uint8 *ip_body = pktdata + sizeof(struct ether_header);
-               uint8 tos_tc = IP_TOS(ip_body);
-               priority = (int)(tos_tc >> IPV4_TOS_PREC_SHIFT);
-               rc |= PKTPRIO_DSCP;
-       }
-
-       ASSERT(priority >= 0 && priority <= MAXPRIO);
-       PKTSETPRIO(pkt, priority);
-       return (rc | priority);
-}
-
-static char bcm_undeferrstr[BCME_STRLEN];
-
-static const char *bcmerrorstrtable[] = BCMERRSTRINGTABLE;
-
-/* Convert the error codes into related error strings  */
-const char *
-bcmerrorstr(int bcmerror)
-{
-       /* check if someone added a bcmerror code but forgot to add errorstring */
-       ASSERT(ABS(BCME_LAST) == (ARRAYSIZE(bcmerrorstrtable) - 1));
-
-       if (bcmerror > 0 || bcmerror < BCME_LAST) {
-               snprintf(bcm_undeferrstr, BCME_STRLEN, "Undefined error %d", bcmerror);
-               return bcm_undeferrstr;
-       }
-
-       ASSERT(strlen(bcmerrorstrtable[-bcmerror]) < BCME_STRLEN);
-
-       return bcmerrorstrtable[-bcmerror];
-}
-
-
-
-/* iovar table lookup */
-const bcm_iovar_t*
-bcm_iovar_lookup(const bcm_iovar_t *table, const char *name)
-{
-       const bcm_iovar_t *vi;
-       const char *lookup_name;
-
-       /* skip any ':' delimited option prefixes */
-       lookup_name = strrchr(name, ':');
-       if (lookup_name != NULL)
-               lookup_name++;
-       else
-               lookup_name = name;
-
-       ASSERT(table != NULL);
-
-       for (vi = table; vi->name; vi++) {
-               if (!strcmp(vi->name, lookup_name))
-                       return vi;
-       }
-       /* ran to end of table */
-
-       return NULL; /* var name not found */
-}
-
-int
-bcm_iovar_lencheck(const bcm_iovar_t *vi, void *arg, int len, bool set)
-{
-       int bcmerror = 0;
-
-       /* length check on io buf */
-       switch (vi->type) {
-       case IOVT_BOOL:
-       case IOVT_INT8:
-       case IOVT_INT16:
-       case IOVT_INT32:
-       case IOVT_UINT8:
-       case IOVT_UINT16:
-       case IOVT_UINT32:
-               /* all integers are int32 sized args at the ioctl interface */
-               if (len < (int)sizeof(int)) {
-                       bcmerror = BCME_BUFTOOSHORT;
-               }
-               break;
-
-       case IOVT_BUFFER:
-               /* buffer must meet minimum length requirement */
-               if (len < vi->minlen) {
-                       bcmerror = BCME_BUFTOOSHORT;
-               }
-               break;
-
-       case IOVT_VOID:
-               if (!set) {
-                       /* Cannot return nil... */
-                       bcmerror = BCME_UNSUPPORTED;
-               } else if (len) {
-                       /* Set is an action w/o parameters */
-                       bcmerror = BCME_BUFTOOLONG;
-               }
-               break;
-
-       default:
-               /* unknown type for length check in iovar info */
-               ASSERT(0);
-               bcmerror = BCME_UNSUPPORTED;
-       }
-
-       return bcmerror;
-}
-
-#endif /* BCMDRIVER */
-
-/*******************************************************************************
- * crc8
- *
- * Computes a crc8 over the input data using the polynomial:
- *
- *       x^8 + x^7 +x^6 + x^4 + x^2 + 1
- *
- * The caller provides the initial value (either CRC8_INIT_VALUE
- * or the previous returned value) to allow for processing of
- * discontiguous blocks of data.  When generating the CRC the
- * caller is responsible for complementing the final return value
- * and inserting it into the byte stream.  When checking, a final
- * return value of CRC8_GOOD_VALUE indicates a valid CRC.
- *
- * Reference: Dallas Semiconductor Application Note 27
- *   Williams, Ross N., "A Painless Guide to CRC Error Detection Algorithms",
- *     ver 3, Aug 1993, ross@guest.adelaide.edu.au, Rocksoft Pty Ltd.,
- *     ftp://ftp.rocksoft.com/clients/rocksoft/papers/crc_v3.txt
- *
- * ****************************************************************************
- */
-
-STATIC const uint8 crc8_table[256] = {
-    0x00, 0xF7, 0xB9, 0x4E, 0x25, 0xD2, 0x9C, 0x6B,
-    0x4A, 0xBD, 0xF3, 0x04, 0x6F, 0x98, 0xD6, 0x21,
-    0x94, 0x63, 0x2D, 0xDA, 0xB1, 0x46, 0x08, 0xFF,
-    0xDE, 0x29, 0x67, 0x90, 0xFB, 0x0C, 0x42, 0xB5,
-    0x7F, 0x88, 0xC6, 0x31, 0x5A, 0xAD, 0xE3, 0x14,
-    0x35, 0xC2, 0x8C, 0x7B, 0x10, 0xE7, 0xA9, 0x5E,
-    0xEB, 0x1C, 0x52, 0xA5, 0xCE, 0x39, 0x77, 0x80,
-    0xA1, 0x56, 0x18, 0xEF, 0x84, 0x73, 0x3D, 0xCA,
-    0xFE, 0x09, 0x47, 0xB0, 0xDB, 0x2C, 0x62, 0x95,
-    0xB4, 0x43, 0x0D, 0xFA, 0x91, 0x66, 0x28, 0xDF,
-    0x6A, 0x9D, 0xD3, 0x24, 0x4F, 0xB8, 0xF6, 0x01,
-    0x20, 0xD7, 0x99, 0x6E, 0x05, 0xF2, 0xBC, 0x4B,
-    0x81, 0x76, 0x38, 0xCF, 0xA4, 0x53, 0x1D, 0xEA,
-    0xCB, 0x3C, 0x72, 0x85, 0xEE, 0x19, 0x57, 0xA0,
-    0x15, 0xE2, 0xAC, 0x5B, 0x30, 0xC7, 0x89, 0x7E,
-    0x5F, 0xA8, 0xE6, 0x11, 0x7A, 0x8D, 0xC3, 0x34,
-    0xAB, 0x5C, 0x12, 0xE5, 0x8E, 0x79, 0x37, 0xC0,
-    0xE1, 0x16, 0x58, 0xAF, 0xC4, 0x33, 0x7D, 0x8A,
-    0x3F, 0xC8, 0x86, 0x71, 0x1A, 0xED, 0xA3, 0x54,
-    0x75, 0x82, 0xCC, 0x3B, 0x50, 0xA7, 0xE9, 0x1E,
-    0xD4, 0x23, 0x6D, 0x9A, 0xF1, 0x06, 0x48, 0xBF,
-    0x9E, 0x69, 0x27, 0xD0, 0xBB, 0x4C, 0x02, 0xF5,
-    0x40, 0xB7, 0xF9, 0x0E, 0x65, 0x92, 0xDC, 0x2B,
-    0x0A, 0xFD, 0xB3, 0x44, 0x2F, 0xD8, 0x96, 0x61,
-    0x55, 0xA2, 0xEC, 0x1B, 0x70, 0x87, 0xC9, 0x3E,
-    0x1F, 0xE8, 0xA6, 0x51, 0x3A, 0xCD, 0x83, 0x74,
-    0xC1, 0x36, 0x78, 0x8F, 0xE4, 0x13, 0x5D, 0xAA,
-    0x8B, 0x7C, 0x32, 0xC5, 0xAE, 0x59, 0x17, 0xE0,
-    0x2A, 0xDD, 0x93, 0x64, 0x0F, 0xF8, 0xB6, 0x41,
-    0x60, 0x97, 0xD9, 0x2E, 0x45, 0xB2, 0xFC, 0x0B,
-    0xBE, 0x49, 0x07, 0xF0, 0x9B, 0x6C, 0x22, 0xD5,
-    0xF4, 0x03, 0x4D, 0xBA, 0xD1, 0x26, 0x68, 0x9F
-};
-
-#define CRC_INNER_LOOP(n, c, x) \
-       (c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff]
-
-uint8
-hndcrc8(
-       uint8 *pdata,   /* pointer to array of data to process */
-       uint  nbytes,   /* number of input data bytes to process */
-       uint8 crc       /* either CRC8_INIT_VALUE or previous return value */
-)
-{
-       /* hard code the crc loop instead of using CRC_INNER_LOOP macro
-        * to avoid the undefined and unnecessary (uint8 >> 8) operation.
-        */
-       while (nbytes-- > 0)
-               crc = crc8_table[(crc ^ *pdata++) & 0xff];
-
-       return crc;
-}
-
-/*******************************************************************************
- * crc16
- *
- * Computes a crc16 over the input data using the polynomial:
- *
- *       x^16 + x^12 +x^5 + 1
- *
- * The caller provides the initial value (either CRC16_INIT_VALUE
- * or the previous returned value) to allow for processing of
- * discontiguous blocks of data.  When generating the CRC the
- * caller is responsible for complementing the final return value
- * and inserting it into the byte stream.  When checking, a final
- * return value of CRC16_GOOD_VALUE indicates a valid CRC.
- *
- * Reference: Dallas Semiconductor Application Note 27
- *   Williams, Ross N., "A Painless Guide to CRC Error Detection Algorithms",
- *     ver 3, Aug 1993, ross@guest.adelaide.edu.au, Rocksoft Pty Ltd.,
- *     ftp://ftp.rocksoft.com/clients/rocksoft/papers/crc_v3.txt
- *
- * ****************************************************************************
- */
-
-static const uint16 crc16_table[256] = {
-    0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF,
-    0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7,
-    0x1081, 0x0108, 0x3393, 0x221A, 0x56A5, 0x472C, 0x75B7, 0x643E,
-    0x9CC9, 0x8D40, 0xBFDB, 0xAE52, 0xDAED, 0xCB64, 0xF9FF, 0xE876,
-    0x2102, 0x308B, 0x0210, 0x1399, 0x6726, 0x76AF, 0x4434, 0x55BD,
-    0xAD4A, 0xBCC3, 0x8E58, 0x9FD1, 0xEB6E, 0xFAE7, 0xC87C, 0xD9F5,
-    0x3183, 0x200A, 0x1291, 0x0318, 0x77A7, 0x662E, 0x54B5, 0x453C,
-    0xBDCB, 0xAC42, 0x9ED9, 0x8F50, 0xFBEF, 0xEA66, 0xD8FD, 0xC974,
-    0x4204, 0x538D, 0x6116, 0x709F, 0x0420, 0x15A9, 0x2732, 0x36BB,
-    0xCE4C, 0xDFC5, 0xED5E, 0xFCD7, 0x8868, 0x99E1, 0xAB7A, 0xBAF3,
-    0x5285, 0x430C, 0x7197, 0x601E, 0x14A1, 0x0528, 0x37B3, 0x263A,
-    0xDECD, 0xCF44, 0xFDDF, 0xEC56, 0x98E9, 0x8960, 0xBBFB, 0xAA72,
-    0x6306, 0x728F, 0x4014, 0x519D, 0x2522, 0x34AB, 0x0630, 0x17B9,
-    0xEF4E, 0xFEC7, 0xCC5C, 0xDDD5, 0xA96A, 0xB8E3, 0x8A78, 0x9BF1,
-    0x7387, 0x620E, 0x5095, 0x411C, 0x35A3, 0x242A, 0x16B1, 0x0738,
-    0xFFCF, 0xEE46, 0xDCDD, 0xCD54, 0xB9EB, 0xA862, 0x9AF9, 0x8B70,
-    0x8408, 0x9581, 0xA71A, 0xB693, 0xC22C, 0xD3A5, 0xE13E, 0xF0B7,
-    0x0840, 0x19C9, 0x2B52, 0x3ADB, 0x4E64, 0x5FED, 0x6D76, 0x7CFF,
-    0x9489, 0x8500, 0xB79B, 0xA612, 0xD2AD, 0xC324, 0xF1BF, 0xE036,
-    0x18C1, 0x0948, 0x3BD3, 0x2A5A, 0x5EE5, 0x4F6C, 0x7DF7, 0x6C7E,
-    0xA50A, 0xB483, 0x8618, 0x9791, 0xE32E, 0xF2A7, 0xC03C, 0xD1B5,
-    0x2942, 0x38CB, 0x0A50, 0x1BD9, 0x6F66, 0x7EEF, 0x4C74, 0x5DFD,
-    0xB58B, 0xA402, 0x9699, 0x8710, 0xF3AF, 0xE226, 0xD0BD, 0xC134,
-    0x39C3, 0x284A, 0x1AD1, 0x0B58, 0x7FE7, 0x6E6E, 0x5CF5, 0x4D7C,
-    0xC60C, 0xD785, 0xE51E, 0xF497, 0x8028, 0x91A1, 0xA33A, 0xB2B3,
-    0x4A44, 0x5BCD, 0x6956, 0x78DF, 0x0C60, 0x1DE9, 0x2F72, 0x3EFB,
-    0xD68D, 0xC704, 0xF59F, 0xE416, 0x90A9, 0x8120, 0xB3BB, 0xA232,
-    0x5AC5, 0x4B4C, 0x79D7, 0x685E, 0x1CE1, 0x0D68, 0x3FF3, 0x2E7A,
-    0xE70E, 0xF687, 0xC41C, 0xD595, 0xA12A, 0xB0A3, 0x8238, 0x93B1,
-    0x6B46, 0x7ACF, 0x4854, 0x59DD, 0x2D62, 0x3CEB, 0x0E70, 0x1FF9,
-    0xF78F, 0xE606, 0xD49D, 0xC514, 0xB1AB, 0xA022, 0x92B9, 0x8330,
-    0x7BC7, 0x6A4E, 0x58D5, 0x495C, 0x3DE3, 0x2C6A, 0x1EF1, 0x0F78
-};
-
-uint16
-hndcrc16(
-    uint8 *pdata,  /* pointer to array of data to process */
-    uint nbytes, /* number of input data bytes to process */
-    uint16 crc     /* either CRC16_INIT_VALUE or previous return value */
-)
-{
-       while (nbytes-- > 0)
-               CRC_INNER_LOOP(16, crc, *pdata++);
-       return crc;
-}
-
-STATIC const uint32 crc32_table[256] = {
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-    0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-};
-
-uint32
-hndcrc32(
-    uint8 *pdata,  /* pointer to array of data to process */
-    uint   nbytes, /* number of input data bytes to process */
-    uint32 crc     /* either CRC32_INIT_VALUE or previous return value */
-)
-{
-       uint8 *pend;
-#ifdef __mips__
-       uint8 tmp[4];
-       ulong *tptr = (ulong *)tmp;
-
-       /* in case the beginning of the buffer isn't aligned */
-       pend = (uint8 *)((uint)(pdata + 3) & 0xfffffffc);
-       nbytes -= (pend - pdata);
-       while (pdata < pend)
-               CRC_INNER_LOOP(32, crc, *pdata++);
-
-       /* handle bulk of data as 32-bit words */
-       pend = pdata + (nbytes & 0xfffffffc);
-       while (pdata < pend) {
-               *tptr = *(ulong *)pdata;
-               pdata += sizeof(ulong *);
-               CRC_INNER_LOOP(32, crc, tmp[0]);
-               CRC_INNER_LOOP(32, crc, tmp[1]);
-               CRC_INNER_LOOP(32, crc, tmp[2]);
-               CRC_INNER_LOOP(32, crc, tmp[3]);
-       }
-
-       /* 1-3 bytes at end of buffer */
-       pend = pdata + (nbytes & 0x03);
-       while (pdata < pend)
-               CRC_INNER_LOOP(32, crc, *pdata++);
-#else
-       pend = pdata + nbytes;
-       while (pdata < pend)
-               CRC_INNER_LOOP(32, crc, *pdata++);
-#endif /* __mips__ */
-
-       return crc;
-}
-
-#ifdef notdef
-#define CLEN   1499    /*  CRC Length */
-#define CBUFSIZ        (CLEN+4)
-#define CNBUFS         5 /* # of bufs */
-
-void testcrc32(void)
-{
-       uint j, k, l;
-       uint8 *buf;
-       uint len[CNBUFS];
-       uint32 crcr;
-       uint32 crc32tv[CNBUFS] =
-               {0xd2cb1faa, 0xd385c8fa, 0xf5b4f3f3, 0x55789e20, 0x00343110};
-
-       ASSERT((buf = MALLOC(CBUFSIZ*CNBUFS)) != NULL);
-
-       /* step through all possible alignments */
-       for (l = 0; l <= 4; l++) {
-               for (j = 0; j < CNBUFS; j++) {
-                       len[j] = CLEN;
-                       for (k = 0; k < len[j]; k++)
-                               *(buf + j*CBUFSIZ + (k+l)) = (j+k) & 0xff;
-               }
-
-               for (j = 0; j < CNBUFS; j++) {
-                       crcr = crc32(buf + j*CBUFSIZ + l, len[j], CRC32_INIT_VALUE);
-                       ASSERT(crcr == crc32tv[j]);
-               }
-       }
-
-       MFREE(buf, CBUFSIZ*CNBUFS);
-       return;
-}
-#endif /* notdef */
-
-/*
- * Advance from the current 1-byte tag/1-byte length/variable-length value
- * triple, to the next, returning a pointer to the next.
- * If the current or next TLV is invalid (does not fit in given buffer length),
- * NULL is returned.
- * *buflen is not modified if the TLV elt parameter is invalid, or is decremented
- * by the TLV parameter's length if it is valid.
- */
-bcm_tlv_t *
-bcm_next_tlv(bcm_tlv_t *elt, int *buflen)
-{
-       int len;
-
-       /* validate current elt */
-       if (!bcm_valid_tlv(elt, *buflen))
-               return NULL;
-
-       /* advance to next elt */
-       len = elt->len;
-       elt = (bcm_tlv_t*)(elt->data + len);
-       *buflen -= (2 + len);
-
-       /* validate next elt */
-       if (!bcm_valid_tlv(elt, *buflen))
-               return NULL;
-
-       return elt;
-}
-
-/*
- * Traverse a string of 1-byte tag/1-byte length/variable-length value
- * triples, returning a pointer to the substring whose first element
- * matches tag
- */
-bcm_tlv_t *
-bcm_parse_tlvs(void *buf, int buflen, uint key)
-{
-       bcm_tlv_t *elt;
-       int totlen;
-
-       elt = (bcm_tlv_t*)buf;
-       totlen = buflen;
-
-       /* find tagged parameter */
-       while (totlen >= 2) {
-               int len = elt->len;
-
-               /* validate remaining totlen */
-               if ((elt->id == key) && (totlen >= (len + 2)))
-                       return (elt);
-
-               elt = (bcm_tlv_t*)((uint8*)elt + (len + 2));
-               totlen -= (len + 2);
-       }
-
-       return NULL;
-}
-
-/*
- * Traverse a string of 1-byte tag/1-byte length/variable-length value
- * triples, returning a pointer to the substring whose first element
- * matches tag.  Stop parsing when we see an element whose ID is greater
- * than the target key.
- */
-bcm_tlv_t *
-bcm_parse_ordered_tlvs(void *buf, int buflen, uint key)
-{
-       bcm_tlv_t *elt;
-       int totlen;
-
-       elt = (bcm_tlv_t*)buf;
-       totlen = buflen;
-
-       /* find tagged parameter */
-       while (totlen >= 2) {
-               uint id = elt->id;
-               int len = elt->len;
-
-               /* Punt if we start seeing IDs > than target key */
-               if (id > key)
-                       return (NULL);
-
-               /* validate remaining totlen */
-               if ((id == key) && (totlen >= (len + 2)))
-                       return (elt);
-
-               elt = (bcm_tlv_t*)((uint8*)elt + (len + 2));
-               totlen -= (len + 2);
-       }
-       return NULL;
-}
-
-#if defined(WLMSG_PRHDRS) || defined(WLMSG_PRPKT) || defined(WLMSG_ASSOC) || \
-       defined(DHD_DEBUG)
-int
-bcm_format_flags(const bcm_bit_desc_t *bd, uint32 flags, char* buf, int len)
-{
-       int i;
-       char* p = buf;
-       char hexstr[16];
-       int slen = 0;
-       uint32 bit;
-       const char* name;
-
-       if (len < 2 || !buf)
-               return 0;
-
-       buf[0] = '\0';
-       len -= 1;
-
-       for (i = 0; flags != 0; i++) {
-               bit = bd[i].bit;
-               name = bd[i].name;
-               if (bit == 0 && flags) {
-                       /* print any unnamed bits */
-                       sprintf(hexstr, "0x%X", flags);
-                       name = hexstr;
-                       flags = 0;      /* exit loop */
-               } else if ((flags & bit) == 0)
-                       continue;
-               slen += strlen(name);
-               if (len < slen)
-                       break;
-               if (p != buf) p += sprintf(p, " "); /* btwn flag space */
-               strcat(p, name);
-               p += strlen(name);
-               flags &= ~bit;
-               len -= slen;
-               slen = 1;       /* account for btwn flag space */
-       }
-
-       /* indicate the str was too short */
-       if (flags != 0) {
-               if (len == 0)
-                       p--;    /* overwrite last char */
-               p += sprintf(p, ">");
-       }
-
-       return (int)(p - buf);
-}
-
-/* print bytes formatted as hex to a string. return the resulting string length */
-int
-bcm_format_hex(char *str, const void *bytes, int len)
-{
-       int i;
-       char *p = str;
-       const uint8 *src = (const uint8*)bytes;
-
-       for (i = 0; i < len; i++) {
-               p += sprintf(p, "%02X", *src);
-               src++;
-       }
-       return (int)(p - str);
-}
-
-/* pretty hex print a contiguous buffer */
-void
-prhex(const char *msg, uchar *buf, uint nbytes)
-{
-       char line[128], *p;
-       uint i;
-
-       if (msg && (msg[0] != '\0'))
-               printf("%s:\n", msg);
-
-       p = line;
-       for (i = 0; i < nbytes; i++) {
-               if (i % 16 == 0) {
-                       p += sprintf(p, "  %04d: ", i); /* line prefix */
-               }
-               p += sprintf(p, "%02x ", buf[i]);
-               if (i % 16 == 15) {
-                       printf("%s\n", line);           /* flush line */
-                       p = line;
-               }
-       }
-
-       /* flush last partial line */
-       if (p != line)
-               printf("%s\n", line);
-}
-#endif 
-
-
-/* Produce a human-readable string for boardrev */
-char *
-bcm_brev_str(uint32 brev, char *buf)
-{
-       if (brev < 0x100)
-               snprintf(buf, 8, "%d.%d", (brev & 0xf0) >> 4, brev & 0xf);
-       else
-               snprintf(buf, 8, "%c%03x", ((brev & 0xf000) == 0x1000) ? 'P' : 'A', brev & 0xfff);
-
-       return (buf);
-}
-
-#define BUFSIZE_TODUMP_ATONCE 512 /* Buffer size */
-
-/* dump large strings to console */
-void
-printbig(char *buf)
-{
-       uint len, max_len;
-       char c;
-
-       len = strlen(buf);
-
-       max_len = BUFSIZE_TODUMP_ATONCE;
-
-       while (len > max_len) {
-               c = buf[max_len];
-               buf[max_len] = '\0';
-               printf("%s", buf);
-               buf[max_len] = c;
-
-               buf += max_len;
-               len -= max_len;
-       }
-       /* print the remaining string */
-       printf("%s\n", buf);
-       return;
-}
-
-/* routine to dump fields in a fileddesc structure */
-uint
-bcmdumpfields(bcmutl_rdreg_rtn read_rtn, void *arg0, uint arg1, struct fielddesc *fielddesc_array,
-       char *buf, uint32 bufsize)
-{
-       uint  filled_len;
-       int len;
-       struct fielddesc *cur_ptr;
-
-       filled_len = 0;
-       cur_ptr = fielddesc_array;
-
-       while (bufsize > 1) {
-               if (cur_ptr->nameandfmt == NULL)
-                       break;
-               len = snprintf(buf, bufsize, cur_ptr->nameandfmt,
-                              read_rtn(arg0, arg1, cur_ptr->offset));
-               /* check for snprintf overflow or error */
-               if (len < 0 || (uint32)len >= bufsize)
-                       len = bufsize - 1;
-               buf += len;
-               bufsize -= len;
-               filled_len += len;
-               cur_ptr++;
-       }
-       return filled_len;
-}
-
-uint
-bcm_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen)
-{
-       uint len;
-
-       len = strlen(name) + 1;
-
-       if ((len + datalen) > buflen)
-               return 0;
-
-       strncpy(buf, name, buflen);
-
-       /* append data onto the end of the name string */
-       memcpy(&buf[len], data, datalen);
-       len += datalen;
-
-       return len;
-}
-
-/* Quarter dBm units to mW
- * Table starts at QDBM_OFFSET, so the first entry is mW for qdBm=153
- * Table is offset so the last entry is largest mW value that fits in
- * a uint16.
- */
-
-#define QDBM_OFFSET 153                /* Offset for first entry */
-#define QDBM_TABLE_LEN 40      /* Table size */
-
-/* Smallest mW value that will round up to the first table entry, QDBM_OFFSET.
- * Value is ( mW(QDBM_OFFSET - 1) + mW(QDBM_OFFSET) ) / 2
- */
-#define QDBM_TABLE_LOW_BOUND 6493 /* Low bound */
-
-/* Largest mW value that will round down to the last table entry,
- * QDBM_OFFSET + QDBM_TABLE_LEN-1.
- * Value is ( mW(QDBM_OFFSET + QDBM_TABLE_LEN - 1) + mW(QDBM_OFFSET + QDBM_TABLE_LEN) ) / 2.
- */
-#define QDBM_TABLE_HIGH_BOUND 64938 /* High bound */
-
-static const uint16 nqdBm_to_mW_map[QDBM_TABLE_LEN] = {
-/* qdBm:       +0      +1      +2      +3      +4      +5      +6      +7 */
-/* 153: */      6683,  7079,   7499,   7943,   8414,   8913,   9441,   10000,
-/* 161: */      10593, 11220,  11885,  12589,  13335,  14125,  14962,  15849,
-/* 169: */      16788, 17783,  18836,  19953,  21135,  22387,  23714,  25119,
-/* 177: */      26607, 28184,  29854,  31623,  33497,  35481,  37584,  39811,
-/* 185: */      42170, 44668,  47315,  50119,  53088,  56234,  59566,  63096
-};
-
-uint16
-bcm_qdbm_to_mw(uint8 qdbm)
-{
-       uint factor = 1;
-       int idx = qdbm - QDBM_OFFSET;
-
-       if (idx >= QDBM_TABLE_LEN) {
-               /* clamp to max uint16 mW value */
-               return 0xFFFF;
-       }
-
-       /* scale the qdBm index up to the range of the table 0-40
-        * where an offset of 40 qdBm equals a factor of 10 mW.
-        */
-       while (idx < 0) {
-               idx += 40;
-               factor *= 10;
-       }
-
-       /* return the mW value scaled down to the correct factor of 10,
-        * adding in factor/2 to get proper rounding.
-        */
-       return ((nqdBm_to_mW_map[idx] + factor/2) / factor);
-}
-
-uint8
-bcm_mw_to_qdbm(uint16 mw)
-{
-       uint8 qdbm;
-       int offset;
-       uint mw_uint = mw;
-       uint boundary;
-
-       /* handle boundary case */
-       if (mw_uint <= 1)
-               return 0;
-
-       offset = QDBM_OFFSET;
-
-       /* move mw into the range of the table */
-       while (mw_uint < QDBM_TABLE_LOW_BOUND) {
-               mw_uint *= 10;
-               offset -= 40;
-       }
-
-       for (qdbm = 0; qdbm < QDBM_TABLE_LEN-1; qdbm++) {
-               boundary = nqdBm_to_mW_map[qdbm] + (nqdBm_to_mW_map[qdbm+1] -
-                                                   nqdBm_to_mW_map[qdbm])/2;
-               if (mw_uint < boundary) break;
-       }
-
-       qdbm += (uint8)offset;
-
-       return (qdbm);
-}
-
-
-uint
-bcm_bitcount(uint8 *bitmap, uint length)
-{
-       uint bitcount = 0, i;
-       uint8 tmp;
-       for (i = 0; i < length; i++) {
-               tmp = bitmap[i];
-               while (tmp) {
-                       bitcount++;
-                       tmp &= (tmp - 1);
-               }
-       }
-       return bitcount;
-}
-
-#ifdef BCMDRIVER
-
-/* Initialization of bcmstrbuf structure */
-void
-bcm_binit(struct bcmstrbuf *b, char *buf, uint size)
-{
-       b->origsize = b->size = size;
-       b->origbuf = b->buf = buf;
-}
-
-/* Buffer sprintf wrapper to guard against buffer overflow */
-int
-bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...)
-{
-       va_list ap;
-       int r;
-
-       va_start(ap, fmt);
-       r = vsnprintf(b->buf, b->size, fmt, ap);
-
-       /* Non Ansi C99 compliant returns -1,
-        * Ansi compliant return r >= b->size,
-        * bcmstdlib returns 0, handle all
-        */
-       if ((r == -1) || (r >= (int)b->size) || (r == 0)) {
-               b->size = 0;
-       } else {
-               b->size -= r;
-               b->buf += r;
-       }
-
-       va_end(ap);
-
-       return r;
-}
-
-void
-bcm_inc_bytes(uchar *num, int num_bytes, uint8 amount)
-{
-       int i;
-
-       for (i = 0; i < num_bytes; i++) {
-               num[i] += amount;
-               if (num[i] >= amount)
-                       break;
-               amount = 1;
-       }
-}
-
-int
-bcm_cmp_bytes(uchar *arg1, uchar *arg2, uint8 nbytes)
-{
-       int i;
-
-       for (i = nbytes - 1; i >= 0; i--) {
-               if (arg1[i] != arg2[i])
-                       return (arg1[i] - arg2[i]);
-       }
-       return 0;
-}
-
-void
-bcm_print_bytes(char *name, const uchar *data, int len)
-{
-       int i;
-       int per_line = 0;
-
-       printf("%s: %d \n", name ? name : "", len);
-       for (i = 0; i < len; i++) {
-               printf("%02x ", *data++);
-               per_line++;
-               if (per_line == 16) {
-                       per_line = 0;
-                       printf("\n");
-               }
-       }
-       printf("\n");
-}
-
-/*
- * buffer length needed for wlc_format_ssid
- * 32 SSID chars, max of 4 chars for each SSID char "\xFF", plus NULL.
- */
-
-#if defined(WLTINYDUMP) || defined(WLMSG_INFORM) || defined(WLMSG_ASSOC) || \
-       defined(WLMSG_PRPKT) || defined(WLMSG_WSEC)
-int
-bcm_format_ssid(char* buf, const uchar ssid[], uint ssid_len)
-{
-       uint i, c;
-       char *p = buf;
-       char *endp = buf + SSID_FMT_BUF_LEN;
-
-       if (ssid_len > DOT11_MAX_SSID_LEN) ssid_len = DOT11_MAX_SSID_LEN;
-
-       for (i = 0; i < ssid_len; i++) {
-               c = (uint)ssid[i];
-               if (c == '\\') {
-                       *p++ = '\\';
-                       *p++ = '\\';
-               } else if (bcm_isprint((uchar)c)) {
-                       *p++ = (char)c;
-               } else {
-                       p += snprintf(p, (endp - p), "\\x%02X", c);
-               }
-       }
-       *p = '\0';
-       ASSERT(p < endp);
-
-       return (int)(p - buf);
-}
-#endif 
-
-#endif /* BCMDRIVER */
diff --git a/drivers/net/wireless/bcm4319/bcmwifi.c b/drivers/net/wireless/bcm4319/bcmwifi.c
deleted file mode 100644 (file)
index 803acf8..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Misc utility routines used by kernel or app-level.
- * Contents are wifi-specific, used by any kernel or app-level
- * software that might want wifi things as it grows.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: bcmwifi.c,v 1.18.24.2.4.1 2009/09/25 00:32:01 Exp $
- */
-
-
-#include <typedefs.h>
-
-#ifdef BCMDRIVER
-#include <osl.h>
-#include <bcmutils.h>
-#define strtoul(nptr, endptr, base) bcm_strtoul((nptr), (endptr), (base))
-#define tolower(c) (bcm_isupper((c)) ? ((c) + 'a' - 'A') : (c))
-#else
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#endif 
-#include <bcmwifi.h>
-
-#if defined(WIN32) && (defined(BCMDLL) || defined(WLMDLL))
-#include <bcmstdlib.h>         
-#endif
-
-
-
-
-
-char *
-wf_chspec_ntoa(chanspec_t chspec, char *buf)
-{
-       const char *band, *bw, *sb;
-       uint channel;
-
-       band = "";
-       bw = "";
-       sb = "";
-       channel = CHSPEC_CHANNEL(chspec);
-       
-       if ((CHSPEC_IS2G(chspec) && channel > CH_MAX_2G_CHANNEL) ||
-           (CHSPEC_IS5G(chspec) && channel <= CH_MAX_2G_CHANNEL))
-               band = (CHSPEC_IS2G(chspec)) ? "b" : "a";
-       if (CHSPEC_IS40(chspec)) {
-               if (CHSPEC_SB_UPPER(chspec)) {
-                       sb = "u";
-                       channel += CH_10MHZ_APART;
-               } else {
-                       sb = "l";
-                       channel -= CH_10MHZ_APART;
-               }
-       } else if (CHSPEC_IS10(chspec)) {
-               bw = "n";
-       }
-
-       
-       snprintf(buf, 6, "%d%s%s%s", channel, band, bw, sb);
-       return (buf);
-}
-
-
-chanspec_t
-wf_chspec_aton(char *a)
-{
-       char *endp = NULL;
-       uint channel, band, bw, ctl_sb;
-       char c;
-
-       channel = strtoul(a, &endp, 10);
-
-       
-       if (endp == a)
-               return 0;
-
-       if (channel > MAXCHANNEL)
-               return 0;
-
-       band = ((channel <= CH_MAX_2G_CHANNEL) ? WL_CHANSPEC_BAND_2G : WL_CHANSPEC_BAND_5G);
-       bw = WL_CHANSPEC_BW_20;
-       ctl_sb = WL_CHANSPEC_CTL_SB_NONE;
-
-       a = endp;
-
-       c = tolower(a[0]);
-       if (c == '\0')
-               goto done;
-
-       
-       if (c == 'a' || c == 'b') {
-               band = (c == 'a') ? WL_CHANSPEC_BAND_5G : WL_CHANSPEC_BAND_2G;
-               a++;
-               c = tolower(a[0]);
-               if (c == '\0')
-                       goto done;
-       }
-
-       
-       if (c == 'n') {
-               bw = WL_CHANSPEC_BW_10;
-       } else if (c == 'l') {
-               bw = WL_CHANSPEC_BW_40;
-               ctl_sb = WL_CHANSPEC_CTL_SB_LOWER;
-               
-               if (channel <= (MAXCHANNEL - CH_20MHZ_APART))
-                       channel += CH_10MHZ_APART;
-               else
-                       return 0;
-       } else if (c == 'u') {
-               bw = WL_CHANSPEC_BW_40;
-               ctl_sb = WL_CHANSPEC_CTL_SB_UPPER;
-               
-               if (channel > CH_20MHZ_APART)
-                       channel -= CH_10MHZ_APART;
-               else
-                       return 0;
-       } else {
-               return 0;
-       }
-
-done:
-       return (channel | band | bw | ctl_sb);
-}
-
-
-int
-wf_mhz2channel(uint freq, uint start_factor)
-{
-       int ch = -1;
-       uint base;
-       int offset;
-
-       
-       if (start_factor == 0) {
-               if (freq >= 2400 && freq <= 2500)
-                       start_factor = WF_CHAN_FACTOR_2_4_G;
-               else if (freq >= 5000 && freq <= 6000)
-                       start_factor = WF_CHAN_FACTOR_5_G;
-       }
-
-       if (freq == 2484 && start_factor == WF_CHAN_FACTOR_2_4_G)
-               return 14;
-
-       base = start_factor / 2;
-
-       
-       if ((freq < base) || (freq > base + 1000))
-               return -1;
-
-       offset = freq - base;
-       ch = offset / 5;
-
-       
-       if (offset != (ch * 5))
-               return -1;
-
-       
-       if (start_factor == WF_CHAN_FACTOR_2_4_G && (ch < 1 || ch > 13))
-               return -1;
-
-       return ch;
-}
-
-
-int
-wf_channel2mhz(uint ch, uint start_factor)
-{
-       int freq;
-
-       if ((start_factor == WF_CHAN_FACTOR_2_4_G && (ch < 1 || ch > 14)) ||
-           (ch <= 200))
-               freq = -1;
-       if ((start_factor == WF_CHAN_FACTOR_2_4_G) && (ch == 14))
-               freq = 2484;
-       else
-               freq = ch * 5 + start_factor / 2;
-
-       return freq;
-}
diff --git a/drivers/net/wireless/bcm4319/dhd.h b/drivers/net/wireless/bcm4319/dhd.h
deleted file mode 100644 (file)
index 09da65c..0000000
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * Header file describing the internal (inter-module) DHD interfaces.
- *
- * Provides type definitions and function prototypes used to link the
- * DHD OS, bus, and protocol modules.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhd.h,v 1.32.4.7.2.4.14.44 2010/06/03 21:27:48 Exp $
- */
-
-/****************
- * Common types *
- */
-
-#ifndef _dhd_h_
-#define _dhd_h_
-
-#if defined(LINUX)
-#if defined(CHROMIUMOS_COMPAT_WIRELESS)
-#include <linux/sched.h>
-#endif
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/random.h>
-#include <linux/spinlock.h>
-#include <linux/ethtool.h>
-#include <asm/uaccess.h>
-#include <asm/unaligned.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_HAS_WAKELOCK)
-#include <linux/wakelock.h>
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined (CONFIG_HAS_WAKELOCK) */
-/* The kernel threading is sdio-specific */
-#else /* LINUX */
-#define ENOMEM         1
-#define EFAULT      2
-#define EINVAL         3
-#define EIO                    4
-#define ETIMEDOUT      5
-#define ERESTARTSYS 6
-#endif /* LINUX */
-
-#include <wlioctl.h>
-
-
-/* Forward decls */
-struct dhd_bus;
-struct dhd_prot;
-struct dhd_info;
-
-/* The level of bus communication with the dongle */
-enum dhd_bus_state {
-       DHD_BUS_DOWN,           /* Not ready for frame transfers */
-       DHD_BUS_LOAD,           /* Download access only (CPU reset) */
-       DHD_BUS_DATA            /* Ready for frame transfers */
-};
-
-enum dhd_bus_wake_state {
-       WAKE_LOCK_OFF,
-       WAKE_LOCK_PRIV,
-       WAKE_LOCK_DPC,
-       WAKE_LOCK_IOCTL,
-       WAKE_LOCK_DOWNLOAD,
-       WAKE_LOCK_TMOUT,
-       WAKE_LOCK_WATCHDOG,
-       WAKE_LOCK_LINK_DOWN_TMOUT,
-       WAKE_LOCK_SOFTAP_SET,
-       WAKE_LOCK_SOFTAP_STOP,
-       WAKE_LOCK_SOFTAP_START,
-       WAKE_LOCK_MAX
-};
-enum dhd_prealloc_index {
-       DHD_PREALLOC_PROT = 0,
-       DHD_PREALLOC_RXBUF,
-       DHD_PREALLOC_DATABUF,
-       DHD_PREALLOC_OSL_BUF
-};
-#ifdef DHD_USE_STATIC_BUF
-extern void * dhd_os_prealloc(int section, unsigned long size);
-#endif
-/* Common structure for module and instance linkage */
-typedef struct dhd_pub {
-       /* Linkage ponters */
-       osl_t *osh;             /* OSL handle */
-       struct dhd_bus *bus;    /* Bus module handle */
-       struct dhd_prot *prot;  /* Protocol module handle */
-       struct dhd_info  *info; /* Info module handle */
-
-       /* Internal dhd items */
-       bool up;                /* Driver up/down (to OS) */
-       bool txoff;             /* Transmit flow-controlled */
-       bool dongle_reset;  /* TRUE = DEVRESET put dongle into reset */
-       enum dhd_bus_state busstate;
-       uint hdrlen;            /* Total DHD header length (proto + bus) */
-       uint maxctl;            /* Max size rxctl request from proto to bus */
-       uint rxsz;              /* Rx buffer size bus module should use */
-       uint8 wme_dp;   /* wme discard priority */
-
-       /* Dongle media info */
-       bool iswl;              /* Dongle-resident driver is wl */
-       ulong drv_version;      /* Version of dongle-resident driver */
-       struct ether_addr mac;  /* MAC address obtained from dongle */
-       dngl_stats_t dstats;    /* Stats for dongle-based data */
-
-       /* Additional stats for the bus level */
-       ulong tx_packets;       /* Data packets sent to dongle */
-       ulong tx_multicast;     /* Multicast data packets sent to dongle */
-       ulong tx_errors;        /* Errors in sending data to dongle */
-       ulong tx_ctlpkts;       /* Control packets sent to dongle */
-       ulong tx_ctlerrs;       /* Errors sending control frames to dongle */
-       ulong rx_packets;       /* Packets sent up the network interface */
-       ulong rx_multicast;     /* Multicast packets sent up the network interface */
-       ulong rx_errors;        /* Errors processing rx data packets */
-       ulong rx_ctlpkts;       /* Control frames processed from dongle */
-       ulong rx_ctlerrs;       /* Errors in processing rx control frames */
-       ulong rx_dropped;       /* Packets dropped locally (no memory) */
-       ulong rx_flushed;  /* Packets flushed due to unscheduled sendup thread */
-       ulong wd_dpc_sched;   /* Number of times dhd dpc scheduled by watchdog timer */
-
-       ulong rx_readahead_cnt; /* Number of packets where header read-ahead was used. */
-       ulong tx_realloc;       /* Number of tx packets we had to realloc for headroom */
-       ulong fc_packets;       /* Number of flow control pkts recvd */
-
-       /* Last error return */
-       int bcmerror;
-       uint tickcnt;
-
-       /* Last error from dongle */
-       int dongle_error;
-
-       /* Pkt filter defination */
-       char * pktfilter[100];
-       int pktfilter_count;
-
-       uint8 country_code[WLC_CNTRY_BUF_SZ];
-       char eventmask[WL_EVENTING_MASK_LEN];
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_HAS_WAKELOCK)
-       struct wake_lock        wakelock[WAKE_LOCK_MAX];
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined (CONFIG_HAS_WAKELOCK) */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       struct mutex    wl_start_stop_lock; /* lock/unlock for Android start/stop */
-       struct mutex    wl_softap_lock;          /* lock/unlock for any SoftAP/STA settings */
-#endif 
-} dhd_pub_t;
-
-
-       #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP)
-
-       #define DHD_PM_RESUME_WAIT_INIT(a) DECLARE_WAIT_QUEUE_HEAD(a);
-       #define _DHD_PM_RESUME_WAIT(a, b) do {\
-                       int retry = 0; \
-                       while (dhd_mmc_suspend && retry++ != b) { \
-                               wait_event_timeout(a, FALSE, HZ/100); \
-                       } \
-               }       while (0)
-       #define DHD_PM_RESUME_WAIT(a)                   _DHD_PM_RESUME_WAIT(a, 30)
-       #define DHD_PM_RESUME_WAIT_FOREVER(a)   _DHD_PM_RESUME_WAIT(a, ~0)
-       #define DHD_PM_RESUME_RETURN_ERROR(a)   do { if (dhd_mmc_suspend) return a; } while (0)
-       #define DHD_PM_RESUME_RETURN            do { if (dhd_mmc_suspend) return; } while (0)
-
-       #define DHD_SPINWAIT_SLEEP_INIT(a) DECLARE_WAIT_QUEUE_HEAD(a);
-       #define SPINWAIT_SLEEP(a, exp, us) do { \
-               uint countdown = (us) + 9999; \
-               while ((exp) && (countdown >= 10000)) { \
-                       wait_event_timeout(a, FALSE, HZ/100); \
-                       countdown -= 10000; \
-               } \
-       } while (0)
-
-       #else
-
-       #define DHD_PM_RESUME_WAIT_INIT(a)
-       #define DHD_PM_RESUME_WAIT(a)
-       #define DHD_PM_RESUME_WAIT_FOREVER(a)
-       #define DHD_PM_RESUME_RETURN_ERROR(a)
-       #define DHD_PM_RESUME_RETURN
-
-       #define DHD_SPINWAIT_SLEEP_INIT(a)
-       #define SPINWAIT_SLEEP(a, exp, us)  do { \
-               uint countdown = (us) + 9; \
-               while ((exp) && (countdown >= 10)) { \
-                       OSL_DELAY(10);  \
-                       countdown -= 10;  \
-               } \
-       } while (0)
-
-       #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) */
-#define DHD_IF_VIF     0x01    /* Virtual IF (Hidden from user) */
-
-inline static void MUTEX_LOCK_INIT(dhd_pub_t * dhdp)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       mutex_init(&dhdp->wl_start_stop_lock);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-inline static void MUTEX_LOCK(dhd_pub_t * dhdp)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       mutex_lock(&dhdp->wl_start_stop_lock);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-inline static void MUTEX_UNLOCK(dhd_pub_t * dhdp)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       mutex_unlock(&dhdp->wl_start_stop_lock);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-inline static void MUTEX_LOCK_SOFTAP_SET_INIT(dhd_pub_t * dhdp)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       mutex_init(&dhdp->wl_softap_lock);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-inline static void MUTEX_LOCK_SOFTAP_SET(dhd_pub_t * dhdp)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       mutex_lock(&dhdp->wl_softap_lock);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-inline static void MUTEX_UNLOCK_SOFTAP_SET(dhd_pub_t * dhdp)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       mutex_unlock(&dhdp->wl_softap_lock);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-extern struct mutex  g_wl_ss_scan_lock;                 /* lock/unlock for Scan/Cache settings */
-#endif 
-
-inline static void MUTEX_LOCK_WL_SCAN_SET_INIT(void)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       mutex_init(&g_wl_ss_scan_lock);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-inline static void MUTEX_LOCK_WL_SCAN_SET(void)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       mutex_lock(&g_wl_ss_scan_lock);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-inline static void MUTEX_UNLOCK_WL_SCAN_SET(void)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       mutex_unlock(&g_wl_ss_scan_lock);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-inline static void WAKE_LOCK_INIT(dhd_pub_t * dhdp, int index, char * y)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_HAS_WAKELOCK)
-       wake_lock_init(&dhdp->wakelock[index], WAKE_LOCK_SUSPEND, y);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined (CONFIG_HAS_WAKELOCK) */
-}
-
-inline static void WAKE_LOCK(dhd_pub_t * dhdp, int index)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_HAS_WAKELOCK)
-       wake_lock(&dhdp->wakelock[index]);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined (CONFIG_HAS_WAKELOCK) */
-}
-
-inline static void WAKE_UNLOCK(dhd_pub_t * dhdp, int index)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_HAS_WAKELOCK)
-       wake_unlock(&dhdp->wakelock[index]);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined (CONFIG_HAS_WAKELOCK) */
-}
-
-inline static void WAKE_LOCK_TIMEOUT(dhd_pub_t * dhdp, int index, long time)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_HAS_WAKELOCK)
-       wake_lock_timeout(&dhdp->wakelock[index], time);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined (CONFIG_HAS_WAKELOCK) */
-}
-
-inline static void WAKE_LOCK_DESTROY(dhd_pub_t * dhdp, int index)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_HAS_WAKELOCK)
-       wake_lock_destroy(&dhdp->wakelock[index]);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined (CONFIG_HAS_WAKELOCK) */
-}
-
-
-typedef struct dhd_if_event {
-       uint8 ifidx;
-       uint8 action;
-       uint8 flags;
-       uint8 bssidx;
-} dhd_if_event_t;
-
-/*
- * Exported from dhd OS modules (dhd_linux/dhd_ndis)
- */
-
-/* To allow osl_attach/detach calls from os-independent modules */
-osl_t *dhd_osl_attach(void *pdev, uint bustype);
-void dhd_osl_detach(osl_t *osh);
-
-/* Indication from bus module regarding presence/insertion of dongle.
- * Return dhd_pub_t pointer, used as handle to OS module in later calls.
- * Returned structure should have bus and prot pointers filled in.
- * bus_hdrlen specifies required headroom for bus module header.
- */
-extern dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen);
-extern int dhd_net_attach(dhd_pub_t *dhdp, int idx);
-
-/* Indication from bus module regarding removal/absence of dongle */
-extern void dhd_detach(dhd_pub_t *dhdp);
-
-/* Indication from bus module to change flow-control state */
-extern void dhd_txflowcontrol(dhd_pub_t *dhdp, int ifidx, bool on);
-
-extern bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec);
-
-/* Receive frame for delivery to OS.  Callee disposes of rxp. */
-extern void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *rxp, int numpkt);
-
-/* Return pointer to interface name */
-extern char *dhd_ifname(dhd_pub_t *dhdp, int idx);
-
-/* Request scheduling of the bus dpc */
-extern void dhd_sched_dpc(dhd_pub_t *dhdp);
-
-/* Notify tx completion */
-extern void dhd_txcomplete(dhd_pub_t *dhdp, void *txp, bool success);
-
-/* Query ioctl */
-extern int  dhdcdc_query_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len);
-
-/* OS independent layer functions */
-extern int dhd_os_proto_block(dhd_pub_t * pub);
-extern int dhd_os_proto_unblock(dhd_pub_t * pub);
-extern int dhd_os_ioctl_resp_wait(dhd_pub_t * pub, uint * condition, bool * pending);
-extern int dhd_os_ioctl_resp_wake(dhd_pub_t * pub);
-extern unsigned int dhd_os_get_ioctl_resp_timeout(void);
-extern void dhd_os_set_ioctl_resp_timeout(unsigned int timeout_msec);
-extern void * dhd_os_open_image(char * filename);
-extern int dhd_os_get_image_block(char * buf, int len, void * image);
-extern void dhd_os_close_image(void * image);
-extern void dhd_os_wd_timer(void *bus, uint wdtick);
-extern void dhd_os_sdlock(dhd_pub_t * pub);
-extern void dhd_os_sdunlock(dhd_pub_t * pub);
-extern void dhd_os_sdlock_txq(dhd_pub_t * pub);
-extern void dhd_os_sdunlock_txq(dhd_pub_t * pub);
-extern void dhd_os_sdlock_rxq(dhd_pub_t * pub);
-extern void dhd_os_sdunlock_rxq(dhd_pub_t * pub);
-extern void dhd_os_sdlock_sndup_rxq(dhd_pub_t * pub);
-extern void dhd_customer_gpio_wlan_ctrl(int onoff);
-extern int     dhd_custom_get_mac_address(unsigned char *buf);
-extern void dhd_os_sdunlock_sndup_rxq(dhd_pub_t * pub);
-extern void dhd_os_sdlock_eventq(dhd_pub_t * pub);
-extern void dhd_os_sdunlock_eventq(dhd_pub_t * pub);
-#ifdef DHD_DEBUG
-extern int write_to_file(dhd_pub_t *dhd, uint8 *buf, int size);
-#endif /* DHD_DEBUG */
-#if defined(OOB_INTR_ONLY)
-extern int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr);
-#endif /* defined(OOB_INTR_ONLY) */
-extern void dhd_os_sdtxlock(dhd_pub_t * pub);
-extern void dhd_os_sdtxunlock(dhd_pub_t * pub);
-
-int setScheduler(struct task_struct *p, int policy, struct sched_param *param);
-
-typedef struct {
-       uint32 limit;           /* Expiration time (usec) */
-       uint32 increment;       /* Current expiration increment (usec) */
-       uint32 elapsed;         /* Current elapsed time (usec) */
-       uint32 tick;            /* O/S tick time (usec) */
-} dhd_timeout_t;
-
-extern void dhd_timeout_start(dhd_timeout_t *tmo, uint usec);
-extern int dhd_timeout_expired(dhd_timeout_t *tmo);
-
-extern int dhd_ifname2idx(struct dhd_info *dhd, char *name);
-extern uint8 *dhd_bssidx2bssid(dhd_pub_t *dhd, int idx);
-extern int wl_host_event(struct dhd_info *dhd, int *idx, void *pktdata,
-                         wl_event_msg_t *, void **data_ptr);
-extern void wl_event_to_host_order(wl_event_msg_t * evt);
-
-extern void dhd_common_init(void);
-
-extern int dhd_add_if(struct dhd_info *dhd, int ifidx, void *handle,
-       char *name, uint8 *mac_addr, uint32 flags, uint8 bssidx);
-extern void dhd_del_if(struct dhd_info *dhd, int ifidx);
-
-extern void dhd_vif_add(struct dhd_info *dhd, int ifidx, char * name);
-extern void dhd_vif_del(struct dhd_info *dhd, int ifidx);
-
-extern void dhd_event(struct dhd_info *dhd, char *evpkt, int evlen, int ifidx);
-extern void dhd_vif_sendup(struct dhd_info *dhd, int ifidx, uchar *cp, int len);
-
-
-/* Send packet to dongle via data channel */
-extern int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, void *pkt);
-
-/* Send event to host */
-extern void dhd_sendup_event(dhd_pub_t *dhdp, wl_event_msg_t *event, void *data);
-extern int dhd_bus_devreset(dhd_pub_t *dhdp, uint8 flag);
-extern uint dhd_bus_status(dhd_pub_t *dhdp);
-extern int  dhd_bus_start(dhd_pub_t *dhdp);
-
-extern void print_buf(void *pbuf, int len, int bytes_per_line);
-
-
-typedef enum cust_gpio_modes {
-       WLAN_RESET_ON,
-       WLAN_RESET_OFF,
-       WLAN_POWER_ON,
-       WLAN_POWER_OFF
-} cust_gpio_modes_t;
-extern int wl_iw_iscan_set_scan_broadcast_prep(struct net_device *dev, uint flag);
-extern int wl_iw_send_priv_event(struct net_device *dev, char *flag);
-/*
- * Insmod parameters for debug/test
- */
-
-/* Watchdog timer interval */
-extern uint dhd_watchdog_ms;
-
-#if defined(DHD_DEBUG)
-/* Console output poll interval */
-extern uint dhd_console_ms;
-#endif /* defined(DHD_DEBUG) */
-
-/* Use interrupts */
-extern uint dhd_intr;
-
-/* Use polling */
-extern uint dhd_poll;
-
-/* ARP offload agent mode */
-extern uint dhd_arp_mode;
-
-/* ARP offload enable */
-extern uint dhd_arp_enable;
-
-/* Pkt filte enable control */
-extern uint dhd_pkt_filter_enable;
-
-/*  Pkt filter init setup */
-extern uint dhd_pkt_filter_init;
-
-/* Pkt filter mode control */
-extern uint dhd_master_mode;
-
-/* Roaming mode control */
-extern uint dhd_roam;
-
-/* Roaming mode control */
-extern uint dhd_radio_up;
-
-/* Initial idletime ticks (may be -1 for immediate idle, 0 for no idle) */
-extern int dhd_idletime;
-#define DHD_IDLETIME_TICKS 1
-
-/* SDIO Drive Strength */
-extern uint dhd_sdiod_drive_strength;
-
-/* Override to force tx queueing all the time */
-extern uint dhd_force_tx_queueing;
-
-#ifdef SDTEST
-/* Echo packet generator (SDIO), pkts/s */
-extern uint dhd_pktgen;
-
-/* Echo packet len (0 => sawtooth, max 1800) */
-extern uint dhd_pktgen_len;
-#define MAX_PKTGEN_LEN 1800
-#endif
-
-
-/* optionally set by a module_param_string() */
-#define MOD_PARAM_PATHLEN      2048
-extern char fw_path[MOD_PARAM_PATHLEN];
-extern char nv_path[MOD_PARAM_PATHLEN];
-
-/* For supporting multiple interfaces */
-#define DHD_MAX_IFS    16
-#define DHD_DEL_IF     -0xe
-#define DHD_BAD_IF     -0xf
-
-#ifdef APSTA_PINGTEST
-#define MAX_GUEST 8
-#endif
-
-extern void dhd_wait_for_event(dhd_pub_t *dhd, bool *lockvar);
-extern void dhd_wait_event_wakeup(dhd_pub_t*dhd);
-
-//hojie: for wifi power control
-#define ANDROID_POWER_SAVE 1
-
-#ifndef CONFIG_BCM4319_FW_PATH
-#define CONFIG_BCM4319_FW_PATH       "/etc/firmware/sdio-g-cdc-full11n-reclaim-roml-wme.bin"
-#endif
-#ifndef CONFIG_BCM4319_NVRAM_PATH
-#define CONFIG_BCM4319_NVRAM_PATH    "/etc/firmware/nvram_4319_201008.txt"
-#endif
-
-#endif /* _dhd_h_ */
diff --git a/drivers/net/wireless/bcm4319/dhd_bus.h b/drivers/net/wireless/bcm4319/dhd_bus.h
deleted file mode 100644 (file)
index 9e29fb9..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Header file describing the internal (inter-module) DHD interfaces.
- *
- * Provides type definitions and function prototypes used to link the
- * DHD OS, bus, and protocol modules.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhd_bus.h,v 1.4.6.3.2.3.6.6 2010/05/17 18:18:13 Exp $
- */
-
-#ifndef _dhd_bus_h_
-#define _dhd_bus_h_
-
-/*
- * Exported from dhd bus module (dhd_usb, dhd_sdio)
- */
-
-/* Indicate (dis)interest in finding dongles. */
-extern int dhd_bus_register(void);
-extern void dhd_bus_unregister(void);
-
-/* Download firmware image and nvram image */
-extern bool dhd_bus_download_firmware(struct dhd_bus *bus, osl_t *osh,
-       char *fw_path, char *nv_path);
-
-/* Stop bus module: clear pending frames, disable data flow */
-extern void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex);
-
-/* Initialize bus module: prepare for communication w/dongle */
-extern int dhd_bus_init(dhd_pub_t *dhdp, bool enforce_mutex);
-
-/* Send a data frame to the dongle.  Callee disposes of txp. */
-extern int dhd_bus_txdata(struct dhd_bus *bus, void *txp);
-
-/* Send/receive a control message to/from the dongle.
- * Expects caller to enforce a single outstanding transaction.
- */
-extern int dhd_bus_txctl(struct dhd_bus *bus, uchar *msg, uint msglen);
-extern int dhd_bus_rxctl(struct dhd_bus *bus, uchar *msg, uint msglen);
-
-/* Watchdog timer function */
-extern bool dhd_bus_watchdog(dhd_pub_t *dhd);
-
-#ifdef DHD_DEBUG
-/* Device console input function */
-extern int dhd_bus_console_in(dhd_pub_t *dhd, uchar *msg, uint msglen);
-#endif
-
-/* Deferred processing for the bus, return TRUE requests reschedule */
-extern bool dhd_bus_dpc(struct dhd_bus *bus);
-extern void dhd_bus_isr(bool * InterruptRecognized, bool * QueueMiniportHandleInterrupt, void *arg);
-
-
-/* Check for and handle local prot-specific iovar commands */
-extern int dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name,
-                            void *params, int plen, void *arg, int len, bool set);
-
-/* Add bus dump output to a buffer */
-extern void dhd_bus_dump(dhd_pub_t *dhdp, struct bcmstrbuf *strbuf);
-
-/* Clear any bus counters */
-extern void dhd_bus_clearcounts(dhd_pub_t *dhdp);
-
-/* return the dongle chipid */
-extern uint dhd_bus_chip(struct dhd_bus *bus);
-
-/* Set user-specified nvram parameters. */
-extern void dhd_bus_set_nvram_params(struct dhd_bus * bus, const char *nvram_params);
-
-extern void *dhd_bus_pub(struct dhd_bus *bus);
-extern void *dhd_bus_txq(struct dhd_bus *bus);
-extern uint dhd_bus_hdrlen(struct dhd_bus *bus);
-
-#endif /* _dhd_bus_h_ */
diff --git a/drivers/net/wireless/bcm4319/dhd_cdc.c b/drivers/net/wireless/bcm4319/dhd_cdc.c
deleted file mode 100644 (file)
index 3abfbf8..0000000
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * DHD Protocol Module for CDC and BDC.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhd_cdc.c,v 1.22.4.2.4.7.2.41 2010/06/23 19:58:18 Exp $
- *
- * BDC is like CDC, except it includes a header for data packets to convey
- * packet priority over the bus, and flags (e.g. to indicate checksum status
- * for dongle offload).
- */
-
-#include <typedefs.h>
-#include <osl.h>
-
-#include <bcmutils.h>
-#include <bcmcdc.h>
-#include <bcmendian.h>
-
-#include <dngl_stats.h>
-#include <dhd.h>
-#include <dhd_proto.h>
-#include <dhd_bus.h>
-#include <dhd_dbg.h>
-#ifdef CUSTOMER_HW2
-int wifi_get_mac_addr(unsigned char *buf);
-#endif
-
-extern int dhd_preinit_ioctls(dhd_pub_t *dhd);
-
-
-/* Packet alignment for most efficient SDIO (can change based on platform) */
-#ifndef DHD_SDALIGN
-#define DHD_SDALIGN    32
-#endif
-#if !ISPOWEROF2(DHD_SDALIGN)
-#error DHD_SDALIGN is not a power of 2!
-#endif
-
-#define RETRIES 2              /* # of retries to retrieve matching ioctl response */
-#define BUS_HEADER_LEN (16+DHD_SDALIGN)        /* Must be atleast SDPCM_RESERVE
-                                * defined in dhd_sdio.c (amount of header tha might be added)
-                                * plus any space that might be needed for alignment padding.
-                                */
-#define ROUND_UP_MARGIN        2048    /* Biggest SDIO block size possible for
-                                * round off at the end of buffer
-                                */
-
-typedef struct dhd_prot {
-       uint16 reqid;
-       uint8 pending;
-       uint32 lastcmd;
-       uint8 bus_header[BUS_HEADER_LEN];
-       cdc_ioctl_t msg;
-       unsigned char buf[WLC_IOCTL_MAXLEN + ROUND_UP_MARGIN];
-} dhd_prot_t;
-
-static int
-dhdcdc_msg(dhd_pub_t *dhd)
-{
-       dhd_prot_t *prot = dhd->prot;
-       int len = ltoh32(prot->msg.len) + sizeof(cdc_ioctl_t);
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       /* 
-        * NOTE : cdc->msg.len holds the desired length of the buffer to be
-        *        returned. Only up to CDC_MAX_MSG_SIZE of this buffer area
-        *        is actually sent to the dongle
-        */
-       if (len > CDC_MAX_MSG_SIZE)
-               len = CDC_MAX_MSG_SIZE;
-
-       /* Send request */
-       return dhd_bus_txctl(dhd->bus, (uchar*)&prot->msg, len);
-}
-
-static int
-dhdcdc_cmplt(dhd_pub_t *dhd, uint32 id, uint32 len)
-{
-       int ret;
-       dhd_prot_t *prot = dhd->prot;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       do {
-               ret = dhd_bus_rxctl(dhd->bus, (uchar*)&prot->msg, len+sizeof(cdc_ioctl_t));
-               if (ret < 0)
-                       break;
-       } while (CDC_IOC_ID(ltoh32(prot->msg.flags)) != id);
-
-       return ret;
-}
-
-int
-dhdcdc_query_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len)
-{
-       dhd_prot_t *prot = dhd->prot;
-       cdc_ioctl_t *msg = &prot->msg;
-       void *info;
-       int ret = 0, retries = 0;
-       uint32 id, flags = 0;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-       DHD_CTL(("%s: cmd %d len %d\n", __FUNCTION__, cmd, len));
-
-
-       /* Respond "bcmerror" and "bcmerrorstr" with local cache */
-       if (cmd == WLC_GET_VAR && buf)
-       {
-               if (!strcmp((char *)buf, "bcmerrorstr"))
-               {
-                       strncpy((char *)buf, bcmerrorstr(dhd->dongle_error), BCME_STRLEN);
-                       goto done;
-               }
-               else if (!strcmp((char *)buf, "bcmerror"))
-               {
-                       *(int *)buf = dhd->dongle_error;
-                       goto done;
-               }
-       }
-
-       memset(msg, 0, sizeof(cdc_ioctl_t));
-
-       msg->cmd = htol32(cmd);
-       msg->len = htol32(len);
-       msg->flags = (++prot->reqid << CDCF_IOC_ID_SHIFT);
-       CDC_SET_IF_IDX(msg, ifidx);
-       msg->flags = htol32(msg->flags);
-
-       if (buf)
-               memcpy(prot->buf, buf, len);
-
-       if ((ret = dhdcdc_msg(dhd)) < 0) {
-               DHD_ERROR(("dhdcdc_query_ioctl: dhdcdc_msg failed w/status %d\n", ret));
-               goto done;
-       }
-
-retry:
-       /* wait for interrupt and get first fragment */
-       if ((ret = dhdcdc_cmplt(dhd, prot->reqid, len)) < 0)
-               goto done;
-
-       flags = ltoh32(msg->flags);
-       id = (flags & CDCF_IOC_ID_MASK) >> CDCF_IOC_ID_SHIFT;
-
-       if ((id < prot->reqid) && (++retries < RETRIES))
-               goto retry;
-       if (id != prot->reqid) {
-               DHD_ERROR(("%s: %s: unexpected request id %d (expected %d)\n",
-                          dhd_ifname(dhd, ifidx), __FUNCTION__, id, prot->reqid));
-               ret = -EINVAL;
-               goto done;
-       }
-
-       /* Check info buffer */
-       info = (void*)&msg[1];
-
-       /* Copy info buffer */
-       if (buf)
-       {
-               if (ret < (int)len)
-                       len = ret;
-               memcpy(buf, info, len);
-       }
-
-       /* Check the ERROR flag */
-       if (flags & CDCF_IOC_ERROR)
-       {
-               ret = ltoh32(msg->status);
-               /* Cache error from dongle */
-               dhd->dongle_error = ret;
-       }
-
-done:
-       return ret;
-}
-
-int
-dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len)
-{
-       dhd_prot_t *prot = dhd->prot;
-       cdc_ioctl_t *msg = &prot->msg;
-       int ret = 0;
-       uint32 flags, id;
-       
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-       DHD_CTL(("%s: cmd %d len %d\n", __FUNCTION__, cmd, len));
-
-       memset(msg, 0, sizeof(cdc_ioctl_t));
-
-       msg->cmd = htol32(cmd);
-       msg->len = htol32(len);
-       msg->flags = (++prot->reqid << CDCF_IOC_ID_SHIFT) | CDCF_IOC_SET;
-       CDC_SET_IF_IDX(msg, ifidx);
-       msg->flags = htol32(msg->flags);
-
-       if (buf)
-               memcpy(prot->buf, buf, len);
-
-       if ((ret = dhdcdc_msg(dhd)) < 0)
-               goto done;
-
-       if ((ret = dhdcdc_cmplt(dhd, prot->reqid, len)) < 0)
-               goto done;
-
-       flags = ltoh32(msg->flags);
-       id = (flags & CDCF_IOC_ID_MASK) >> CDCF_IOC_ID_SHIFT;
-
-       if (id != prot->reqid) {
-               DHD_ERROR(("%s: %s: unexpected request id %d (expected %d)\n",
-                          dhd_ifname(dhd, ifidx), __FUNCTION__, id, prot->reqid));
-               ret = -EINVAL;
-               goto done;
-       }
-
-       /* Check the ERROR flag */
-       if (flags & CDCF_IOC_ERROR)
-       {
-               ret = ltoh32(msg->status);
-               /* Cache error from dongle */
-               dhd->dongle_error = ret;
-       }
-
-done:
-       return ret;
-}
-
-extern int dhd_bus_interface(struct dhd_bus *bus, uint arg, void* arg2);
-int
-dhd_prot_ioctl(dhd_pub_t *dhd, int ifidx, wl_ioctl_t * ioc, void * buf, int len)
-{
-       dhd_prot_t *prot = dhd->prot;
-       int ret = -1;
-       
-       if (dhd->busstate == DHD_BUS_DOWN) {
-               DHD_ERROR(("%s : bus is down. we have nothing to do\n", __FUNCTION__));
-               return ret;
-       }
-       dhd_os_proto_block(dhd);
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       ASSERT(len <= WLC_IOCTL_MAXLEN);
-
-       if (len > WLC_IOCTL_MAXLEN)
-               goto done;
-
-       if (prot->pending == TRUE) {
-               DHD_TRACE(("CDC packet is pending!!!! cmd=0x%x (%lu) lastcmd=0x%x (%lu)\n",
-                       ioc->cmd, (unsigned long)ioc->cmd, prot->lastcmd,
-                       (unsigned long)prot->lastcmd));
-               if ((ioc->cmd == WLC_SET_VAR) || (ioc->cmd == WLC_GET_VAR)) {
-                       DHD_TRACE(("iovar cmd=%s\n", (char*)buf));
-               }
-               goto done;
-       }
-
-       prot->pending = TRUE;
-       prot->lastcmd = ioc->cmd;
-       if (ioc->set)
-               ret = dhdcdc_set_ioctl(dhd, ifidx, ioc->cmd, buf, len);
-       else {
-               ret = dhdcdc_query_ioctl(dhd, ifidx, ioc->cmd, buf, len);
-               if (ret > 0)
-                       ioc->used = ret - sizeof(cdc_ioctl_t);
-       }
-
-       /* Too many programs assume ioctl() returns 0 on success */
-       if (ret >= 0)
-               ret = 0;
-       else {
-               cdc_ioctl_t *msg = &prot->msg;
-               ioc->needed = ltoh32(msg->len); /* len == needed when set/query fails from dongle */
-       }
-
-       /* Intercept the wme_dp ioctl here */
-       if ((!ret) && (ioc->cmd == WLC_SET_VAR) && (!strcmp(buf, "wme_dp"))) {
-               int slen, val = 0;
-
-               slen = strlen("wme_dp") + 1;
-               if (len >= (int)(slen + sizeof(int)))
-                       bcopy(((char *)buf + slen), &val, sizeof(int));
-               dhd->wme_dp = (uint8) ltoh32(val);
-       }
-
-       prot->pending = FALSE;
-
-done:
-       dhd_os_proto_unblock(dhd);
-
-       return ret;
-}
-
-int
-dhd_prot_iovar_op(dhd_pub_t *dhdp, const char *name,
-                  void *params, int plen, void *arg, int len, bool set)
-{
-       return BCME_UNSUPPORTED;
-}
-
-void
-dhd_prot_dump(dhd_pub_t *dhdp, struct bcmstrbuf *strbuf)
-{
-       bcm_bprintf(strbuf, "Protocol CDC: reqid %d\n", dhdp->prot->reqid);
-}
-
-#ifdef APSTA_PINGTEST
-extern struct ether_addr guest_eas[MAX_GUEST];
-#endif
-
-void
-dhd_prot_hdrpush(dhd_pub_t *dhd, int ifidx, void *pktbuf)
-{
-#ifdef BDC
-       struct bdc_header *h;
-#ifdef APSTA_PINGTEST
-       struct  ether_header *eh;
-       int i;
-#ifdef DHD_DEBUG
-       char eabuf1[ETHER_ADDR_STR_LEN];
-       char eabuf2[ETHER_ADDR_STR_LEN];
-#endif /* DHD_DEBUG */
-#endif /* APSTA_PINGTEST */
-#endif /* BDC */
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-#ifdef BDC
-       /* Push BDC header used to convey priority for buses that don't */
-
-#ifdef APSTA_PINGTEST
-       eh = (struct ether_header *)PKTDATA(dhd->osh, pktbuf);
-#endif
-
-       PKTPUSH(dhd->osh, pktbuf, BDC_HEADER_LEN);
-
-       h = (struct bdc_header *)PKTDATA(dhd->osh, pktbuf);
-
-       h->flags = (BDC_PROTO_VER << BDC_FLAG_VER_SHIFT);
-       if (PKTSUMNEEDED(pktbuf))
-               h->flags |= BDC_FLAG_SUM_NEEDED;
-
-
-       h->priority = (PKTPRIO(pktbuf) & BDC_PRIORITY_MASK);
-       h->flags2 = 0;
-#ifdef APSTA_PINGTEST
-       for (i = 0; i < MAX_GUEST; ++i) {
-               if (!ETHER_ISNULLADDR(eh->ether_dhost) &&
-                   bcmp(eh->ether_dhost, guest_eas[i].octet, ETHER_ADDR_LEN) == 0) {
-                       DHD_TRACE(("send on if 1; sa %s, da %s\n",
-                              bcm_ether_ntoa((struct ether_addr *)(eh->ether_shost), eabuf1),
-                              bcm_ether_ntoa((struct ether_addr *)(eh->ether_dhost), eabuf2)));
-                       /* assume all guest STAs are on interface 1 */
-                       h->flags2 = 1;
-                       break;
-               }
-       }
-#endif /* APSTA_PINGTEST */
-       h->rssi = 0;
-#endif /* BDC */
-       BDC_SET_IF_IDX(h, ifidx);
-}
-
-
-bool
-dhd_proto_fcinfo(dhd_pub_t *dhd, void *pktbuf, uint8 *fcbits)
-{
-#ifdef BDC
-       struct bdc_header *h;
-
-       if (PKTLEN(dhd->osh, pktbuf) < BDC_HEADER_LEN) {
-               DHD_ERROR(("%s: rx data too short (%d < %d)\n",
-                       __FUNCTION__, PKTLEN(dhd->osh, pktbuf), BDC_HEADER_LEN));
-               return BCME_ERROR;
-       }
-
-       h = (struct bdc_header *)PKTDATA(dhd->osh, pktbuf);
-
-       *fcbits = h->priority >> BDC_PRIORITY_FC_SHIFT;
-       if ((h->flags2 & BDC_FLAG2_FC_FLAG) == BDC_FLAG2_FC_FLAG)
-               return TRUE;
-#endif
-       return FALSE;
-}
-
-
-int
-dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, void *pktbuf)
-{
-#ifdef BDC
-       struct bdc_header *h;
-#endif
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-#ifdef BDC
-       /* Pop BDC header used to convey priority for buses that don't */
-
-       if (PKTLEN(dhd->osh, pktbuf) < BDC_HEADER_LEN) {
-               DHD_ERROR(("%s: rx data too short (%d < %d)\n", __FUNCTION__,
-                          PKTLEN(dhd->osh, pktbuf), BDC_HEADER_LEN));
-               return BCME_ERROR;
-       }
-
-       h = (struct bdc_header *)PKTDATA(dhd->osh, pktbuf);
-
-       if ((*ifidx = BDC_GET_IF_IDX(h)) >= DHD_MAX_IFS) {
-               DHD_ERROR(("%s: rx data ifnum out of range (%d)\n",
-                          __FUNCTION__, *ifidx));
-               return BCME_ERROR;
-       }
-
-       if (((h->flags & BDC_FLAG_VER_MASK) >> BDC_FLAG_VER_SHIFT) != BDC_PROTO_VER) {
-               DHD_ERROR(("%s: non-BDC packet received, flags 0x%x\n",
-                          dhd_ifname(dhd, *ifidx), h->flags));
-               return BCME_ERROR;
-       }
-
-       if (h->flags & BDC_FLAG_SUM_GOOD) {
-               DHD_INFO(("%s: BDC packet received with good rx-csum, flags 0x%x\n",
-                         dhd_ifname(dhd, *ifidx), h->flags));
-               PKTSETSUMGOOD(pktbuf, TRUE);
-       }
-
-       PKTSETPRIO(pktbuf, (h->priority & BDC_PRIORITY_MASK));
-
-       PKTPULL(dhd->osh, pktbuf, BDC_HEADER_LEN);
-#endif /* BDC */
-
-       return 0;
-}
-
-int
-dhd_prot_attach(dhd_pub_t *dhd)
-{
-       dhd_prot_t *cdc;
-
-#ifndef DHD_USE_STATIC_BUF
-       if (!(cdc = (dhd_prot_t *)MALLOC(dhd->osh, sizeof(dhd_prot_t)))) {
-               DHD_ERROR(("%s: kmalloc failed\n", __FUNCTION__));
-               goto fail;
-       }
-#else
-       if (!(cdc = (dhd_prot_t *)dhd_os_prealloc(DHD_PREALLOC_PROT, sizeof(dhd_prot_t)))) {
-               DHD_ERROR(("%s: kmalloc failed\n", __FUNCTION__));
-               goto fail;
-       }
-#endif /* DHD_USE_STATIC_BUF */
-       memset(cdc, 0, sizeof(dhd_prot_t));
-
-       /* ensure that the msg buf directly follows the cdc msg struct */
-       if ((uintptr)(&cdc->msg + 1) != (uintptr)cdc->buf) {
-               DHD_ERROR(("dhd_prot_t is not correctly defined\n"));
-               goto fail;
-       }
-
-       dhd->prot = cdc;
-#ifdef BDC
-       dhd->hdrlen += BDC_HEADER_LEN;
-#endif
-       dhd->maxctl = WLC_IOCTL_MAXLEN + sizeof(cdc_ioctl_t) + ROUND_UP_MARGIN;
-       return 0;
-
-fail:
-#ifndef DHD_USE_STATIC_BUF
-       if (cdc != NULL)
-               MFREE(dhd->osh, cdc, sizeof(dhd_prot_t));
-#endif
-       return BCME_NOMEM;
-}
-
-/* ~NOTE~ What if another thread is waiting on the semaphore?  Holding it? */
-void
-dhd_prot_detach(dhd_pub_t *dhd)
-{
-#ifndef DHD_USE_STATIC_BUF
-       MFREE(dhd->osh, dhd->prot, sizeof(dhd_prot_t));
-#endif
-       dhd->prot = NULL;
-}
-
-void
-dhd_prot_dstats(dhd_pub_t *dhd)
-{
-       /* No stats from dongle added yet, copy bus stats */
-       dhd->dstats.tx_packets = dhd->tx_packets;
-       dhd->dstats.tx_errors = dhd->tx_errors;
-       dhd->dstats.rx_packets = dhd->rx_packets;
-       dhd->dstats.rx_errors = dhd->rx_errors;
-       dhd->dstats.rx_dropped = dhd->rx_dropped;
-       dhd->dstats.multicast = dhd->rx_multicast;
-       return;
-}
-
-int
-dhd_prot_init(dhd_pub_t *dhd)
-{
-       int ret = 0;
-       char buf[128];
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       dhd_os_proto_block(dhd);
-
-       /* Get the device MAC address */
-       strcpy(buf, "cur_etheraddr");
-       ret = dhdcdc_query_ioctl(dhd, 0, WLC_GET_VAR, buf, sizeof(buf));
-       if (ret < 0) {
-               dhd_os_proto_unblock(dhd);
-               return ret;
-       }
-       memcpy(dhd->mac.octet, buf, ETHER_ADDR_LEN);
-
-       dhd_os_proto_unblock(dhd);
-
-#ifdef EMBEDDED_PLATFORM
-       ret = dhd_preinit_ioctls(dhd);
-#endif /* EMBEDDED_PLATFORM */
-
-       /* Always assumes wl for now */
-       dhd->iswl = TRUE;
-
-       return ret;
-}
-
-void
-dhd_prot_stop(dhd_pub_t *dhd)
-{
-       /* Nothing to do for CDC */
-}
diff --git a/drivers/net/wireless/bcm4319/dhd_common.c b/drivers/net/wireless/bcm4319/dhd_common.c
deleted file mode 100644 (file)
index 3800c3d..0000000
+++ /dev/null
@@ -1,1990 +0,0 @@
-/*
- * Broadcom Dongle Host Driver (DHD), common DHD core.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhd_common.c,v 1.5.6.8.2.6.6.65 2010/07/07 00:05:07 Exp $
- */
-#include <typedefs.h>
-#include <osl.h>
-
-#include <epivers.h>
-#include <bcmutils.h>
-
-#include <bcmendian.h>
-#include <dngl_stats.h>
-#include <dhd.h>
-#include <dhd_bus.h>
-#include <dhd_proto.h>
-#include <dhd_dbg.h>
-#include <msgtrace.h>
-
-
-#include <wlioctl.h>
-
-int dhd_msg_level;
-
-
-#if defined(CSCAN)
-#include <wl_iw.h>
-#endif 
-
-char fw_path[MOD_PARAM_PATHLEN];
-char nv_path[MOD_PARAM_PATHLEN];
-
-/* Last connection success/failure status */
-uint32 dhd_conn_event;
-uint32 dhd_conn_status;
-uint32 dhd_conn_reason;
-
-#define htod32(i) i
-#define htod16(i) i
-#define dtoh32(i) i
-#define dtoh16(i) i
-
-extern int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len);
-extern void dhd_ind_scan_confirm(void *h, bool status);
-extern int dhd_wl_ioctl(dhd_pub_t *dhd, uint cmd, char *buf, uint buflen);
-void dhd_iscan_lock(void);
-void dhd_iscan_unlock(void);
-
-/* Packet alignment for most efficient SDIO (can change based on platform) */
-#ifndef DHD_SDALIGN
-#define DHD_SDALIGN    32
-#endif
-#if !ISPOWEROF2(DHD_SDALIGN)
-#error DHD_SDALIGN is not a power of 2!
-#endif
-
-#ifdef DHD_DEBUG
-const char dhd_version[] = "Dongle Host Driver, version " EPI_VERSION_STR "\nCompiled on "
-       __DATE__ " at " __TIME__;
-#else
-const char dhd_version[] = "Dongle Host Driver, version " EPI_VERSION_STR;
-#endif
-
-void dhd_set_timer(void *bus, uint wdtick);
-
-/* IOVar table */
-enum {
-       IOV_VERSION = 1,
-       IOV_MSGLEVEL,
-       IOV_BCMERRORSTR,
-       IOV_BCMERROR,
-       IOV_WDTICK,
-       IOV_DUMP,
-#ifdef DHD_DEBUG
-       IOV_CONS,
-       IOV_DCONSOLE_POLL,
-#endif
-       IOV_CLEARCOUNTS,
-       IOV_LOGDUMP,
-       IOV_LOGCAL,
-       IOV_LOGSTAMP,
-       IOV_GPIOOB,
-       IOV_IOCTLTIMEOUT,
-       IOV_LAST
-};
-
-const bcm_iovar_t dhd_iovars[] = {
-       {"version",     IOV_VERSION,    0,      IOVT_BUFFER,    sizeof(dhd_version) },
-#ifdef DHD_DEBUG
-       {"msglevel",    IOV_MSGLEVEL,   0,      IOVT_UINT32,    0 },
-#endif /* DHD_DEBUG */
-       {"bcmerrorstr", IOV_BCMERRORSTR, 0, IOVT_BUFFER,        BCME_STRLEN },
-       {"bcmerror",    IOV_BCMERROR,   0,      IOVT_INT8,      0 },
-       {"wdtick",      IOV_WDTICK, 0,  IOVT_UINT32,    0 },
-       {"dump",        IOV_DUMP,       0,      IOVT_BUFFER,    DHD_IOCTL_MAXLEN },
-#ifdef DHD_DEBUG
-       {"dconpoll",    IOV_DCONSOLE_POLL, 0,   IOVT_UINT32,    0 },
-       {"cons",        IOV_CONS,       0,      IOVT_BUFFER,    0 },
-#endif
-       {"clearcounts", IOV_CLEARCOUNTS, 0, IOVT_VOID,  0 },
-       {"gpioob",      IOV_GPIOOB,     0,      IOVT_UINT32,    0 },
-       {"ioctl_timeout",       IOV_IOCTLTIMEOUT,       0,      IOVT_UINT32,    0 },
-       {NULL, 0, 0, 0, 0 }
-};
-
-void
-dhd_common_init(void)
-{
-       /* Init global variables at run-time, not as part of the declaration.
-        * This is required to support init/de-init of the driver. Initialization
-        * of globals as part of the declaration results in non-deterministic
-        * behaviour since the value of the globals may be different on the
-        * first time that the driver is initialized vs subsequent initializations.
-        */
-       dhd_msg_level = DHD_ERROR_VAL;
-#ifdef CONFIG_BCM4319_FW_PATH
-       strncpy(fw_path, CONFIG_BCM4319_FW_PATH, MOD_PARAM_PATHLEN-1);
-#else
-       fw_path[0] = '\0';
-#endif
-#ifdef CONFIG_BCM4319_NVRAM_PATH
-       strncpy(nv_path, CONFIG_BCM4319_NVRAM_PATH, MOD_PARAM_PATHLEN-1);
-#else
-       nv_path[0] = '\0';
-#endif
-}
-
-static int
-dhd_dump(dhd_pub_t *dhdp, char *buf, int buflen)
-{
-       char eabuf[ETHER_ADDR_STR_LEN];
-
-       struct bcmstrbuf b;
-       struct bcmstrbuf *strbuf = &b;
-
-       bcm_binit(strbuf, buf, buflen);
-
-       /* Base DHD info */
-       bcm_bprintf(strbuf, "%s\n", dhd_version);
-       bcm_bprintf(strbuf, "\n");
-       bcm_bprintf(strbuf, "pub.up %d pub.txoff %d pub.busstate %d\n",
-                   dhdp->up, dhdp->txoff, dhdp->busstate);
-       bcm_bprintf(strbuf, "pub.hdrlen %d pub.maxctl %d pub.rxsz %d\n",
-                   dhdp->hdrlen, dhdp->maxctl, dhdp->rxsz);
-       bcm_bprintf(strbuf, "pub.iswl %d pub.drv_version %ld pub.mac %s\n",
-                   dhdp->iswl, dhdp->drv_version, bcm_ether_ntoa(&dhdp->mac, eabuf));
-       bcm_bprintf(strbuf, "pub.bcmerror %d tickcnt %d\n", dhdp->bcmerror, dhdp->tickcnt);
-
-       bcm_bprintf(strbuf, "dongle stats:\n");
-       bcm_bprintf(strbuf, "tx_packets %ld tx_bytes %ld tx_errors %ld tx_dropped %ld\n",
-                   dhdp->dstats.tx_packets, dhdp->dstats.tx_bytes,
-                   dhdp->dstats.tx_errors, dhdp->dstats.tx_dropped);
-       bcm_bprintf(strbuf, "rx_packets %ld rx_bytes %ld rx_errors %ld rx_dropped %ld\n",
-                   dhdp->dstats.rx_packets, dhdp->dstats.rx_bytes,
-                   dhdp->dstats.rx_errors, dhdp->dstats.rx_dropped);
-       bcm_bprintf(strbuf, "multicast %ld\n", dhdp->dstats.multicast);
-
-       bcm_bprintf(strbuf, "bus stats:\n");
-       bcm_bprintf(strbuf, "tx_packets %ld tx_multicast %ld tx_errors %ld\n",
-                   dhdp->tx_packets, dhdp->tx_multicast, dhdp->tx_errors);
-       bcm_bprintf(strbuf, "tx_ctlpkts %ld tx_ctlerrs %ld\n",
-                   dhdp->tx_ctlpkts, dhdp->tx_ctlerrs);
-       bcm_bprintf(strbuf, "rx_packets %ld rx_multicast %ld rx_errors %ld \n",
-                   dhdp->rx_packets, dhdp->rx_multicast, dhdp->rx_errors);
-       bcm_bprintf(strbuf, "rx_ctlpkts %ld rx_ctlerrs %ld rx_dropped %ld rx_flushed %ld\n",
-                   dhdp->rx_ctlpkts, dhdp->rx_ctlerrs, dhdp->rx_dropped, dhdp->rx_flushed);
-       bcm_bprintf(strbuf, "rx_readahead_cnt %ld tx_realloc %ld fc_packets %ld\n",
-                   dhdp->rx_readahead_cnt, dhdp->tx_realloc, dhdp->fc_packets);
-       bcm_bprintf(strbuf, "wd_dpc_sched %ld\n", dhdp->wd_dpc_sched);
-       bcm_bprintf(strbuf, "\n");
-
-       /* Add any prot info */
-       dhd_prot_dump(dhdp, strbuf);
-       bcm_bprintf(strbuf, "\n");
-
-       /* Add any bus info */
-       dhd_bus_dump(dhdp, strbuf);
-
-       return (!strbuf->size ? BCME_BUFTOOSHORT : 0);
-}
-
-static int
-dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, uint32 actionid, const char *name,
-            void *params, int plen, void *arg, int len, int val_size)
-{
-       int bcmerror = 0;
-       int32 int_val = 0;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if ((bcmerror = bcm_iovar_lencheck(vi, arg, len, IOV_ISSET(actionid))) != 0)
-               goto exit;
-
-       if (plen >= (int)sizeof(int_val))
-               bcopy(params, &int_val, sizeof(int_val));
-
-       switch (actionid) {
-       case IOV_GVAL(IOV_VERSION):
-               /* Need to have checked buffer length */
-               strncpy((char*)arg, dhd_version, len);
-               break;
-
-       case IOV_GVAL(IOV_MSGLEVEL):
-               int_val = (int32)dhd_msg_level;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_MSGLEVEL):
-               dhd_msg_level = int_val;
-               break;
-
-
-       case IOV_GVAL(IOV_BCMERRORSTR):
-               strncpy((char *)arg, bcmerrorstr(dhd_pub->bcmerror), BCME_STRLEN);
-               ((char *)arg)[BCME_STRLEN - 1] = 0x00;
-               break;
-
-       case IOV_GVAL(IOV_BCMERROR):
-               int_val = (int32)dhd_pub->bcmerror;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_GVAL(IOV_WDTICK):
-               int_val = (int32)dhd_watchdog_ms;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_WDTICK):
-               if (!dhd_pub->up) {
-                       bcmerror = BCME_NOTUP;
-                       break;
-               }
-               dhd_os_wd_timer(dhd_pub, (uint)int_val);
-               break;
-
-       case IOV_GVAL(IOV_DUMP):
-               bcmerror = dhd_dump(dhd_pub, arg, len);
-               break;
-
-#ifdef DHD_DEBUG
-       case IOV_GVAL(IOV_DCONSOLE_POLL):
-               int_val = (int32)dhd_console_ms;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_DCONSOLE_POLL):
-               dhd_console_ms = (uint)int_val;
-               break;
-
-       case IOV_SVAL(IOV_CONS):
-               if (len > 0)
-                       bcmerror = dhd_bus_console_in(dhd_pub, arg, len - 1);
-               break;
-#endif
-
-       case IOV_SVAL(IOV_CLEARCOUNTS):
-               dhd_pub->tx_packets = dhd_pub->rx_packets = 0;
-               dhd_pub->tx_errors = dhd_pub->rx_errors = 0;
-               dhd_pub->tx_ctlpkts = dhd_pub->rx_ctlpkts = 0;
-               dhd_pub->tx_ctlerrs = dhd_pub->rx_ctlerrs = 0;
-               dhd_pub->rx_dropped = 0;
-               dhd_pub->rx_readahead_cnt = 0;
-               dhd_pub->tx_realloc = 0;
-               dhd_pub->wd_dpc_sched = 0;
-               memset(&dhd_pub->dstats, 0, sizeof(dhd_pub->dstats));
-               dhd_bus_clearcounts(dhd_pub);
-               break;
-
-
-       case IOV_GVAL(IOV_IOCTLTIMEOUT): {
-               int_val = (int32)dhd_os_get_ioctl_resp_timeout();
-               bcopy(&int_val, arg, sizeof(int_val));
-               break;
-       }
-
-       case IOV_SVAL(IOV_IOCTLTIMEOUT): {
-               if (int_val <= 0)
-                       bcmerror = BCME_BADARG;
-               else
-                       dhd_os_set_ioctl_resp_timeout((unsigned int)int_val);
-               break;
-       }
-
-
-       default:
-               bcmerror = BCME_UNSUPPORTED;
-               break;
-       }
-
-exit:
-       return bcmerror;
-}
-
-/* Store the status of a connection attempt for later retrieval by an iovar */
-void
-dhd_store_conn_status(uint32 event, uint32 status, uint32 reason)
-{
-       /* Do not overwrite a WLC_E_PRUNE with a WLC_E_SET_SSID
-        * because an encryption/rsn mismatch results in both events, and
-        * the important information is in the WLC_E_PRUNE.
-        */
-       if (!(event == WLC_E_SET_SSID && status == WLC_E_STATUS_FAIL &&
-             dhd_conn_event == WLC_E_PRUNE)) {
-               dhd_conn_event = event;
-               dhd_conn_status = status;
-               dhd_conn_reason = reason;
-       }
-}
-
-bool
-dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec)
-{
-       void *p;
-       int eprec = -1;         /* precedence to evict from */
-       bool discard_oldest;
-
-       /* Fast case, precedence queue is not full and we are also not
-        * exceeding total queue length
-        */
-       if (!pktq_pfull(q, prec) && !pktq_full(q)) {
-               pktq_penq(q, prec, pkt);
-               return TRUE;
-       }
-
-       /* Determine precedence from which to evict packet, if any */
-       if (pktq_pfull(q, prec))
-               eprec = prec;
-       else if (pktq_full(q)) {
-               p = pktq_peek_tail(q, &eprec);
-               ASSERT(p);
-               if (eprec > prec)
-                       return FALSE;
-       }
-
-       /* Evict if needed */
-       if (eprec >= 0) {
-               /* Detect queueing to unconfigured precedence */
-               ASSERT(!pktq_pempty(q, eprec));
-               discard_oldest = AC_BITMAP_TST(dhdp->wme_dp, eprec);
-               if (eprec == prec && !discard_oldest)
-                       return FALSE;           /* refuse newer (incoming) packet */
-               /* Evict packet according to discard policy */
-               p = discard_oldest ? pktq_pdeq(q, eprec) : pktq_pdeq_tail(q, eprec);
-               if (p == NULL) {
-                       DHD_ERROR(("%s: pktq_penq() failed, oldest %d.",
-                               __FUNCTION__, discard_oldest));
-                       ASSERT(p);
-               }
-
-               PKTFREE(dhdp->osh, p, TRUE);
-       }
-
-       /* Enqueue */
-       p = pktq_penq(q, prec, pkt);
-       if (p == NULL) {
-               DHD_ERROR(("%s: pktq_penq() failed.", __FUNCTION__));
-               ASSERT(p);
-       }
-
-       return TRUE;
-}
-
-static int
-dhd_iovar_op(dhd_pub_t *dhd_pub, const char *name,
-             void *params, int plen, void *arg, int len, bool set)
-{
-       int bcmerror = 0;
-       int val_size;
-       const bcm_iovar_t *vi = NULL;
-       uint32 actionid;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       ASSERT(name);
-       ASSERT(len >= 0);
-
-       /* Get MUST have return space */
-       ASSERT(set || (arg && len));
-
-       /* Set does NOT take qualifiers */
-       ASSERT(!set || (!params && !plen));
-
-       if ((vi = bcm_iovar_lookup(dhd_iovars, name)) == NULL) {
-               bcmerror = BCME_UNSUPPORTED;
-               goto exit;
-       }
-
-       DHD_CTL(("%s: %s %s, len %d plen %d\n", __FUNCTION__,
-                name, (set ? "set" : "get"), len, plen));
-
-       /* set up 'params' pointer in case this is a set command so that
-        * the convenience int and bool code can be common to set and get
-        */
-       if (params == NULL) {
-               params = arg;
-               plen = len;
-       }
-
-       if (vi->type == IOVT_VOID)
-               val_size = 0;
-       else if (vi->type == IOVT_BUFFER)
-               val_size = len;
-       else
-               /* all other types are integer sized */
-               val_size = sizeof(int);
-
-       actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid);
-       bcmerror = dhd_doiovar(dhd_pub, vi, actionid, name, params, plen, arg, len, val_size);
-
-exit:
-       return bcmerror;
-}
-
-int
-dhd_ioctl(dhd_pub_t *dhd_pub, dhd_ioctl_t *ioc, void *buf, uint buflen)
-{
-       int bcmerror = 0;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (!buf) return BCME_BADARG;
-
-       switch (ioc->cmd) {
-       case DHD_GET_MAGIC:
-               if (buflen < sizeof(int))
-                       bcmerror = BCME_BUFTOOSHORT;
-               else
-                       *(int*)buf = DHD_IOCTL_MAGIC;
-               break;
-
-       case DHD_GET_VERSION:
-               if (buflen < sizeof(int))
-                       bcmerror = -BCME_BUFTOOSHORT;
-               else
-                       *(int*)buf = DHD_IOCTL_VERSION;
-               break;
-
-       case DHD_GET_VAR:
-       case DHD_SET_VAR: {
-               char *arg;
-               uint arglen;
-
-               /* scan past the name to any arguments */
-               for (arg = buf, arglen = buflen; *arg && arglen; arg++, arglen--);
-
-               if (*arg) {
-                       bcmerror = BCME_BUFTOOSHORT;
-                       break;
-               }
-
-               /* account for the NUL terminator */
-               arg++, arglen--;
-
-               /* call with the appropriate arguments */
-               if (ioc->cmd == DHD_GET_VAR)
-                       bcmerror = dhd_iovar_op(dhd_pub, buf, arg, arglen,
-                       buf, buflen, IOV_GET);
-               else
-                       bcmerror = dhd_iovar_op(dhd_pub, buf, NULL, 0, arg, arglen, IOV_SET);
-               if (bcmerror != BCME_UNSUPPORTED)
-                       break;
-
-               /* not in generic table, try protocol module */
-               if (ioc->cmd == DHD_GET_VAR)
-                       bcmerror = dhd_prot_iovar_op(dhd_pub, buf, arg,
-                                                    arglen, buf, buflen, IOV_GET);
-               else
-                       bcmerror = dhd_prot_iovar_op(dhd_pub, buf,
-                                                    NULL, 0, arg, arglen, IOV_SET);
-               if (bcmerror != BCME_UNSUPPORTED)
-                       break;
-
-               /* if still not found, try bus module */
-               if (ioc->cmd == DHD_GET_VAR)
-                       bcmerror = dhd_bus_iovar_op(dhd_pub, buf,
-                                                   arg, arglen, buf, buflen, IOV_GET);
-               else
-                       bcmerror = dhd_bus_iovar_op(dhd_pub, buf,
-                                                   NULL, 0, arg, arglen, IOV_SET);
-
-               break;
-       }
-
-       default:
-               bcmerror = BCME_UNSUPPORTED;
-       }
-
-       return bcmerror;
-}
-
-#ifdef APSTA_PINGTEST
-struct ether_addr guest_eas[MAX_GUEST];
-#endif
-
-#ifdef SHOW_EVENTS
-static void
-wl_show_host_event(wl_event_msg_t *event, void *event_data)
-{
-       uint i, status, reason;
-       bool group = FALSE, flush_txq = FALSE, link = FALSE;
-       char *auth_str, *event_name;
-       uchar *buf;
-       char err_msg[256], eabuf[ETHER_ADDR_STR_LEN];
-       static struct {uint event; char *event_name;} event_names[] = {
-               {WLC_E_SET_SSID, "SET_SSID"},
-               {WLC_E_JOIN, "JOIN"},
-               {WLC_E_START, "START"},
-               {WLC_E_AUTH, "AUTH"},
-               {WLC_E_AUTH_IND, "AUTH_IND"},
-               {WLC_E_DEAUTH, "DEAUTH"},
-               {WLC_E_DEAUTH_IND, "DEAUTH_IND"},
-               {WLC_E_ASSOC, "ASSOC"},
-               {WLC_E_ASSOC_IND, "ASSOC_IND"},
-               {WLC_E_REASSOC, "REASSOC"},
-               {WLC_E_REASSOC_IND, "REASSOC_IND"},
-               {WLC_E_DISASSOC, "DISASSOC"},
-               {WLC_E_DISASSOC_IND, "DISASSOC_IND"},
-               {WLC_E_QUIET_START, "START_QUIET"},
-               {WLC_E_QUIET_END, "END_QUIET"},
-               {WLC_E_BEACON_RX, "BEACON_RX"},
-               {WLC_E_LINK, "LINK"},
-               {WLC_E_MIC_ERROR, "MIC_ERROR"},
-               {WLC_E_NDIS_LINK, "NDIS_LINK"},
-               {WLC_E_ROAM, "ROAM"},
-               {WLC_E_TXFAIL, "TXFAIL"},
-               {WLC_E_PMKID_CACHE, "PMKID_CACHE"},
-               {WLC_E_RETROGRADE_TSF, "RETROGRADE_TSF"},
-               {WLC_E_PRUNE, "PRUNE"},
-               {WLC_E_AUTOAUTH, "AUTOAUTH"},
-               {WLC_E_EAPOL_MSG, "EAPOL_MSG"},
-               {WLC_E_SCAN_COMPLETE, "SCAN_COMPLETE"},
-               {WLC_E_ADDTS_IND, "ADDTS_IND"},
-               {WLC_E_DELTS_IND, "DELTS_IND"},
-               {WLC_E_BCNSENT_IND, "BCNSENT_IND"},
-               {WLC_E_BCNRX_MSG, "BCNRX_MSG"},
-               {WLC_E_BCNLOST_MSG, "BCNLOST_MSG"},
-               {WLC_E_ROAM_PREP, "ROAM_PREP"},
-               {WLC_E_PFN_NET_FOUND, "PNO_NET_FOUND"},
-               {WLC_E_PFN_NET_LOST, "PNO_NET_LOST"},
-               {WLC_E_RESET_COMPLETE, "RESET_COMPLETE"},
-               {WLC_E_JOIN_START, "JOIN_START"},
-               {WLC_E_ROAM_START, "ROAM_START"},
-               {WLC_E_ASSOC_START, "ASSOC_START"},
-               {WLC_E_IBSS_ASSOC, "IBSS_ASSOC"},
-               {WLC_E_RADIO, "RADIO"},
-               {WLC_E_PSM_WATCHDOG, "PSM_WATCHDOG"},
-               {WLC_E_PROBREQ_MSG, "PROBREQ_MSG"},
-               {WLC_E_SCAN_CONFIRM_IND, "SCAN_CONFIRM_IND"},
-               {WLC_E_PSK_SUP, "PSK_SUP"},
-               {WLC_E_COUNTRY_CODE_CHANGED, "COUNTRY_CODE_CHANGED"},
-               {WLC_E_EXCEEDED_MEDIUM_TIME, "EXCEEDED_MEDIUM_TIME"},
-               {WLC_E_ICV_ERROR, "ICV_ERROR"},
-               {WLC_E_UNICAST_DECODE_ERROR, "UNICAST_DECODE_ERROR"},
-               {WLC_E_MULTICAST_DECODE_ERROR, "MULTICAST_DECODE_ERROR"},
-               {WLC_E_TRACE, "TRACE"},
-               {WLC_E_ACTION_FRAME, "ACTION FRAME"},
-               {WLC_E_ACTION_FRAME_COMPLETE, "ACTION FRAME TX COMPLETE"},
-               {WLC_E_IF, "IF"},
-               {WLC_E_RSSI, "RSSI"},
-               {WLC_E_PFN_SCAN_COMPLETE, "SCAN_COMPLETE"}
-       };
-       uint event_type, flags, auth_type, datalen;
-       event_type = ntoh32(event->event_type);
-       flags = ntoh16(event->flags);
-       status = ntoh32(event->status);
-       reason = ntoh32(event->reason);
-       auth_type = ntoh32(event->auth_type);
-       datalen = ntoh32(event->datalen);
-       /* debug dump of event messages */
-       sprintf(eabuf, "%02x:%02x:%02x:%02x:%02x:%02x",
-               (uchar)event->addr.octet[0]&0xff,
-               (uchar)event->addr.octet[1]&0xff,
-               (uchar)event->addr.octet[2]&0xff,
-               (uchar)event->addr.octet[3]&0xff,
-               (uchar)event->addr.octet[4]&0xff,
-               (uchar)event->addr.octet[5]&0xff);
-
-       event_name = "UNKNOWN";
-       for (i = 0; i < ARRAYSIZE(event_names); i++) {
-               if (event_names[i].event == event_type)
-                       event_name = event_names[i].event_name;
-       }
-
-       DHD_EVENT(("EVENT: %s, event ID = %d\n", event_name, event_type));
-
-       if (flags & WLC_EVENT_MSG_LINK)
-               link = TRUE;
-       if (flags & WLC_EVENT_MSG_GROUP)
-               group = TRUE;
-       if (flags & WLC_EVENT_MSG_FLUSHTXQ)
-               flush_txq = TRUE;
-
-       switch (event_type) {
-       case WLC_E_START:
-       case WLC_E_DEAUTH:
-       case WLC_E_DISASSOC:
-               DHD_EVENT(("MACEVENT: %s, MAC %s\n", event_name, eabuf));
-               break;
-
-       case WLC_E_ASSOC_IND:
-       case WLC_E_REASSOC_IND:
-#ifdef APSTA_PINGTEST
-               {
-                       int i;
-                       for (i = 0; i < MAX_GUEST; ++i)
-                               if (ETHER_ISNULLADDR(&guest_eas[i]))
-                                       break;
-                       if (i < MAX_GUEST)
-                               bcopy(event->addr.octet, guest_eas[i].octet, ETHER_ADDR_LEN);
-               }
-#endif /* APSTA_PINGTEST */
-               DHD_EVENT(("MACEVENT: %s, MAC %s\n", event_name, eabuf));
-               break;
-
-       case WLC_E_ASSOC:
-       case WLC_E_REASSOC:
-               if (status == WLC_E_STATUS_SUCCESS) {
-                       DHD_EVENT(("MACEVENT: %s, MAC %s, SUCCESS\n", event_name, eabuf));
-               } else if (status == WLC_E_STATUS_TIMEOUT) {
-                       DHD_EVENT(("MACEVENT: %s, MAC %s, TIMEOUT\n", event_name, eabuf));
-               } else if (status == WLC_E_STATUS_FAIL) {
-                       DHD_EVENT(("MACEVENT: %s, MAC %s, FAILURE, reason %d\n",
-                              event_name, eabuf, (int)reason));
-               } else {
-                       DHD_EVENT(("MACEVENT: %s, MAC %s, unexpected status %d\n",
-                              event_name, eabuf, (int)status));
-               }
-               break;
-
-       case WLC_E_DEAUTH_IND:
-       case WLC_E_DISASSOC_IND:
-#ifdef APSTA_PINGTEST
-               {
-                       int i;
-                       for (i = 0; i < MAX_GUEST; ++i) {
-                               if (bcmp(guest_eas[i].octet, event->addr.octet,
-                                        ETHER_ADDR_LEN) == 0) {
-                                       bzero(guest_eas[i].octet, ETHER_ADDR_LEN);
-                                       break;
-                               }
-                       }
-               }
-#endif /* APSTA_PINGTEST */
-               DHD_EVENT(("MACEVENT: %s, MAC %s, reason %d\n", event_name, eabuf, (int)reason));
-               break;
-
-       case WLC_E_AUTH:
-       case WLC_E_AUTH_IND:
-               if (auth_type == DOT11_OPEN_SYSTEM)
-                       auth_str = "Open System";
-               else if (auth_type == DOT11_SHARED_KEY)
-                       auth_str = "Shared Key";
-               else {
-                       sprintf(err_msg, "AUTH unknown: %d", (int)auth_type);
-                       auth_str = err_msg;
-               }
-               if (event_type == WLC_E_AUTH_IND) {
-                       DHD_EVENT(("MACEVENT: %s, MAC %s, %s\n", event_name, eabuf, auth_str));
-               } else if (status == WLC_E_STATUS_SUCCESS) {
-                       DHD_EVENT(("MACEVENT: %s, MAC %s, %s, SUCCESS\n",
-                               event_name, eabuf, auth_str));
-               } else if (status == WLC_E_STATUS_TIMEOUT) {
-                       DHD_EVENT(("MACEVENT: %s, MAC %s, %s, TIMEOUT\n",
-                               event_name, eabuf, auth_str));
-               } else if (status == WLC_E_STATUS_FAIL) {
-                       DHD_EVENT(("MACEVENT: %s, MAC %s, %s, FAILURE, reason %d\n",
-                              event_name, eabuf, auth_str, (int)reason));
-               }
-
-               break;
-
-       case WLC_E_JOIN:
-       case WLC_E_ROAM:
-       case WLC_E_SET_SSID:
-               if (status == WLC_E_STATUS_SUCCESS) {
-                       DHD_EVENT(("MACEVENT: %s, MAC %s\n", event_name, eabuf));
-               } else if (status == WLC_E_STATUS_FAIL) {
-                       DHD_EVENT(("MACEVENT: %s, failed\n", event_name));
-               } else if (status == WLC_E_STATUS_NO_NETWORKS) {
-                       DHD_EVENT(("MACEVENT: %s, no networks found\n", event_name));
-               } else {
-                       DHD_EVENT(("MACEVENT: %s, unexpected status %d\n",
-                               event_name, (int)status));
-               }
-               break;
-
-       case WLC_E_BEACON_RX:
-               if (status == WLC_E_STATUS_SUCCESS) {
-                       DHD_EVENT(("MACEVENT: %s, SUCCESS\n", event_name));
-               } else if (status == WLC_E_STATUS_FAIL) {
-                       DHD_EVENT(("MACEVENT: %s, FAIL\n", event_name));
-               } else {
-                       DHD_EVENT(("MACEVENT: %s, status %d\n", event_name, status));
-               }
-               break;
-
-       case WLC_E_LINK:
-               DHD_EVENT(("MACEVENT: %s %s\n", event_name, link?"UP":"DOWN"));
-               break;
-
-       case WLC_E_MIC_ERROR:
-               DHD_EVENT(("MACEVENT: %s, MAC %s, Group %d, Flush %d\n",
-                      event_name, eabuf, group, flush_txq));
-               break;
-
-       case WLC_E_ICV_ERROR:
-       case WLC_E_UNICAST_DECODE_ERROR:
-       case WLC_E_MULTICAST_DECODE_ERROR:
-               DHD_EVENT(("MACEVENT: %s, MAC %s\n",
-                      event_name, eabuf));
-               break;
-
-       case WLC_E_TXFAIL:
-               DHD_EVENT(("MACEVENT: %s, RA %s\n", event_name, eabuf));
-               break;
-
-       case WLC_E_SCAN_COMPLETE:
-       case WLC_E_PMKID_CACHE:
-               DHD_EVENT(("MACEVENT: %s\n", event_name));
-               break;
-
-       case WLC_E_PFN_NET_FOUND:
-       case WLC_E_PFN_NET_LOST:
-       case WLC_E_PFN_SCAN_COMPLETE:
-               DHD_EVENT(("PNOEVENT: %s\n", event_name));
-               break;
-
-       case WLC_E_PSK_SUP:
-       case WLC_E_PRUNE:
-               DHD_EVENT(("MACEVENT: %s, status %d, reason %d\n",
-                          event_name, (int)status, (int)reason));
-               break;
-
-       case WLC_E_TRACE:
-               {
-                       static uint32 seqnum_prev = 0;
-                       msgtrace_hdr_t hdr;
-                       uint32 nblost;
-                       char *s, *p;
-
-                       buf = (uchar *) event_data;
-                       memcpy(&hdr, buf, MSGTRACE_HDRLEN);
-
-                       if (hdr.version != MSGTRACE_VERSION) {
-                               printf("\nMACEVENT: %s [unsupported version --> "
-                                      "dhd version:%d dongle version:%d]\n",
-                                      event_name, MSGTRACE_VERSION, hdr.version);
-                               /* Reset datalen to avoid display below */
-                               datalen = 0;
-                               break;
-                       }
-
-                       /* There are 2 bytes available at the end of data */
-                       buf[MSGTRACE_HDRLEN + ntoh16(hdr.len)] = '\0';
-
-                       if (ntoh32(hdr.discarded_bytes) || ntoh32(hdr.discarded_printf)) {
-                               printf("\nWLC_E_TRACE: [Discarded traces in dongle -->"
-                                      "discarded_bytes %d discarded_printf %d]\n",
-                                      ntoh32(hdr.discarded_bytes), ntoh32(hdr.discarded_printf));
-                       }
-
-                       nblost = ntoh32(hdr.seqnum) - seqnum_prev - 1;
-                       if (nblost > 0) {
-                               printf("\nWLC_E_TRACE: [Event lost --> seqnum %d nblost %d\n",
-                                       ntoh32(hdr.seqnum), nblost);
-                       }
-                       seqnum_prev = ntoh32(hdr.seqnum);
-
-                       /* Display the trace buffer. Advance from \n to \n to avoid display big
-                        * printf (issue with Linux printk )
-                        */
-                       p = (char *)&buf[MSGTRACE_HDRLEN];
-                       while ((s = strstr(p, "\n")) != NULL) {
-                               *s = '\0';
-                               printf("%s\n", p);
-                               p = s + 1;
-                       }
-                       printf("%s\n", p);
-
-                       /* Reset datalen to avoid display below */
-                       datalen = 0;
-               }
-               break;
-
-
-       case WLC_E_RSSI:
-               DHD_EVENT(("MACEVENT: %s %d\n", event_name, ntoh32(*((int *)event_data))));
-               break;
-
-       default:
-               DHD_EVENT(("MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d\n",
-                      event_name, event_type, eabuf, (int)status, (int)reason,
-                      (int)auth_type));
-               break;
-       }
-
-       /* show any appended data */
-       if (datalen) {
-               buf = (uchar *) event_data;
-               DHD_EVENT((" data (%d) : ", datalen));
-               for (i = 0; i < datalen; i++)
-                       DHD_EVENT((" 0x%02x ", *buf++));
-               DHD_EVENT(("\n"));
-       }
-}
-#endif /* SHOW_EVENTS */
-
-int
-wl_host_event(struct dhd_info *dhd, int *ifidx, void *pktdata,
-              wl_event_msg_t *event, void **data_ptr)
-{
-       /* check whether packet is a BRCM event pkt */
-       bcm_event_t *pvt_data = (bcm_event_t *)pktdata;
-       char *event_data;
-       uint32 type, status;
-       uint16 flags;
-       int evlen;
-
-       if (bcmp(BRCM_OUI, &pvt_data->bcm_hdr.oui[0], DOT11_OUI_LEN)) {
-               DHD_ERROR(("%s: mismatched OUI, bailing\n", __FUNCTION__));
-               return (BCME_ERROR);
-       }
-
-       /* BRCM event pkt may be unaligned - use xxx_ua to load user_subtype. */
-       if (ntoh16_ua((void *)&pvt_data->bcm_hdr.usr_subtype) != BCMILCP_BCM_SUBTYPE_EVENT) {
-               DHD_ERROR(("%s: mismatched subtype, bailing\n", __FUNCTION__));
-               return (BCME_ERROR);
-       }
-
-       *data_ptr = &pvt_data[1];
-       event_data = *data_ptr;
-
-       /* memcpy since BRCM event pkt may be unaligned. */
-       memcpy(event, &pvt_data->event, sizeof(wl_event_msg_t));
-
-       type = ntoh32_ua((void *)&event->event_type);
-       flags = ntoh16_ua((void *)&event->flags);
-       status = ntoh32_ua((void *)&event->status);
-       evlen = ntoh32_ua((void *)&event->datalen) + sizeof(bcm_event_t);
-
-       switch (type) {
-               case WLC_E_IF:
-                       {
-                               dhd_if_event_t *ifevent = (dhd_if_event_t *)event_data;
-                               DHD_TRACE(("%s: if event\n", __FUNCTION__));
-
-                               if (ifevent->ifidx > 0 && ifevent->ifidx < DHD_MAX_IFS)
-                               {
-                                       if (ifevent->action == WLC_E_IF_ADD)
-                                               dhd_add_if(dhd, ifevent->ifidx,
-                                                       NULL, event->ifname,
-                                                       pvt_data->eth.ether_dhost,
-                                                       ifevent->flags, ifevent->bssidx);
-                                       else
-                                               dhd_del_if(dhd, ifevent->ifidx);
-                               } else {
-                                       DHD_ERROR(("%s: Invalid ifidx %d for %s\n",
-                                               __FUNCTION__, ifevent->ifidx, event->ifname));
-                               }
-                       }
-                       /* send up the if event: btamp user needs it */
-                       *ifidx = dhd_ifname2idx(dhd, event->ifname);
-                       /* push up to external supp/auth */
-                       dhd_event(dhd, (char *)pvt_data, evlen, *ifidx);
-                       break;
-
-
-#ifdef P2P
-               case WLC_E_NDIS_LINK:
-                       break;
-#endif
-               /* fall through */
-               /* These are what external supplicant/authenticator wants */
-               case WLC_E_LINK:
-               case WLC_E_ASSOC_IND:
-               case WLC_E_REASSOC_IND:
-               case WLC_E_DISASSOC_IND:
-               case WLC_E_MIC_ERROR:
-               default:
-               /* Fall through: this should get _everything_  */
-
-                       *ifidx = dhd_ifname2idx(dhd, event->ifname);
-                       /* push up to external supp/auth */
-                       dhd_event(dhd, (char *)pvt_data, evlen, *ifidx);
-                       DHD_TRACE(("%s: MAC event %d, flags %x, status %x\n",
-                                  __FUNCTION__, type, flags, status));
-
-                       /* put it back to WLC_E_NDIS_LINK */
-                       if (type == WLC_E_NDIS_LINK) {
-                               uint32 temp;
-
-                               temp = ntoh32_ua((void *)&event->event_type);
-                               DHD_TRACE(("Converted to WLC_E_LINK type %d\n", temp));
-
-                               temp = ntoh32(WLC_E_NDIS_LINK);
-                               memcpy((void *)(&pvt_data->event.event_type), &temp,
-                                       sizeof(pvt_data->event.event_type));
-                       }
-                       break;
-       }
-
-#ifdef SHOW_EVENTS
-       wl_show_host_event(event, event_data);
-#endif /* SHOW_EVENTS */
-
-       return (BCME_OK);
-}
-
-
-void
-wl_event_to_host_order(wl_event_msg_t *evt)
-{
-       /* Event struct members passed from dongle to host are stored in network
-        * byte order. Convert all members to host-order.
-        */
-       evt->event_type = ntoh32(evt->event_type);
-       evt->flags = ntoh16(evt->flags);
-       evt->status = ntoh32(evt->status);
-       evt->reason = ntoh32(evt->reason);
-       evt->auth_type = ntoh32(evt->auth_type);
-       evt->datalen = ntoh32(evt->datalen);
-       evt->version = ntoh16(evt->version);
-}
-
-void print_buf(void *pbuf, int len, int bytes_per_line)
-{
-       int i, j = 0;
-       unsigned char *buf = pbuf;
-
-       if (bytes_per_line == 0) {
-               bytes_per_line = len;
-       }
-
-       for (i = 0; i < len; i++) {
-               printf("%2.2x", *buf++);
-               j++;
-               if (j == bytes_per_line) {
-                       printf("\n");
-                       j = 0;
-               } else {
-                       printf(":");
-               }
-       }
-       printf("\n");
-}
-
-#define strtoul(nptr, endptr, base) bcm_strtoul((nptr), (endptr), (base))
-
-/* Convert user's input in hex pattern to byte-size mask */
-static int
-wl_pattern_atoh(char *src, char *dst)
-{
-       int i;
-       if (strncmp(src, "0x", 2) != 0 &&
-           strncmp(src, "0X", 2) != 0) {
-               DHD_ERROR(("Mask invalid format. Needs to start with 0x\n"));
-               return -1;
-       }
-       src = src + 2; /* Skip past 0x */
-       if (strlen(src) % 2 != 0) {
-               DHD_ERROR(("Mask invalid format. Needs to be of even length\n"));
-               return -1;
-       }
-       for (i = 0; *src != '\0'; i++) {
-               char num[3];
-               strncpy(num, src, 2);
-               num[2] = '\0';
-               dst[i] = (uint8)strtoul(num, NULL, 16);
-               src += 2;
-       }
-       return i;
-}
-
-void
-dhd_pktfilter_offload_enable(dhd_pub_t * dhd, char *arg, int enable, int master_mode)
-{
-       char                            *argv[8];
-       int                                     i = 0;
-       const char                      *str;
-       int                                     buf_len;
-       int                                     str_len;
-       char                            *arg_save = 0, *arg_org = 0;
-       int                                     rc;
-       char                            buf[128];
-       wl_pkt_filter_enable_t  enable_parm;
-       wl_pkt_filter_enable_t  * pkt_filterp;
-
-       if (!(arg_save = MALLOC(dhd->osh, strlen(arg) + 1))) {
-               DHD_ERROR(("%s: kmalloc failed\n", __FUNCTION__));
-               goto fail;
-       }
-       arg_org = arg_save;
-       memcpy(arg_save, arg, strlen(arg) + 1);
-
-       argv[i] = bcmstrtok(&arg_save, " ", 0);
-
-       i = 0;
-       if (NULL == argv[i]) {
-               DHD_ERROR(("No args provided\n"));
-               goto fail;
-       }
-
-       str = "pkt_filter_enable";
-       str_len = strlen(str);
-       strncpy(buf, str, str_len);
-       buf[str_len] = '\0';
-       buf_len = str_len + 1;
-
-       pkt_filterp = (wl_pkt_filter_enable_t *)(buf + str_len + 1);
-
-       /* Parse packet filter id. */
-       enable_parm.id = htod32(strtoul(argv[i], NULL, 0));
-
-       /* Parse enable/disable value. */
-       enable_parm.enable = htod32(enable);
-
-       buf_len += sizeof(enable_parm);
-       memcpy((char *)pkt_filterp,
-              &enable_parm,
-              sizeof(enable_parm));
-
-       /* Enable/disable the specified filter. */
-       rc = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, buf, buf_len);
-       rc = rc >= 0 ? 0 : rc;
-       if (rc)
-               DHD_TRACE(("%s: failed to add pktfilter %s, retcode = %d\n",
-               __FUNCTION__, arg, rc));
-       else
-               DHD_TRACE(("%s: successfully added pktfilter %s\n",
-               __FUNCTION__, arg));
-
-       /* Contorl the master mode */
-       bcm_mkiovar("pkt_filter_mode", (char *)&master_mode, 4, buf, sizeof(buf));
-       rc = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, buf, sizeof(buf));
-       rc = rc >= 0 ? 0 : rc;
-       if (rc)
-               DHD_TRACE(("%s: failed to add pktfilter %s, retcode = %d\n",
-               __FUNCTION__, arg, rc));
-
-fail:
-       if (arg_org)
-               MFREE(dhd->osh, arg_org, strlen(arg) + 1);
-}
-
-void
-dhd_pktfilter_offload_set(dhd_pub_t * dhd, char *arg)
-{
-       const char                      *str;
-       wl_pkt_filter_t         pkt_filter;
-       wl_pkt_filter_t         *pkt_filterp;
-       int                                     buf_len;
-       int                                     str_len;
-       int                             rc;
-       uint32                          mask_size;
-       uint32                          pattern_size;
-       char                            *argv[8], * buf = 0;
-       int                                     i = 0;
-       char                            *arg_save = 0, *arg_org = 0;
-#define BUF_SIZE               2048
-
-       if (!(arg_save = MALLOC(dhd->osh, strlen(arg) + 1))) {
-               DHD_ERROR(("%s: kmalloc failed\n", __FUNCTION__));
-               goto fail;
-       }
-
-       arg_org = arg_save;
-
-       if (!(buf = MALLOC(dhd->osh, BUF_SIZE))) {
-               DHD_ERROR(("%s: kmalloc failed\n", __FUNCTION__));
-               goto fail;
-       }
-
-       memcpy(arg_save, arg, strlen(arg) + 1);
-
-       if (strlen(arg) > BUF_SIZE) {
-               DHD_ERROR(("Not enough buffer %d < %d\n", (int)strlen(arg), (int)sizeof(buf)));
-               goto fail;
-       }
-
-       argv[i] = bcmstrtok(&arg_save, " ", 0);
-       while (argv[i++])
-               argv[i] = bcmstrtok(&arg_save, " ", 0);
-
-       i = 0;
-       if (NULL == argv[i]) {
-               DHD_ERROR(("No args provided\n"));
-               goto fail;
-       }
-
-       str = "pkt_filter_add";
-       str_len = strlen(str);
-       strncpy(buf, str, str_len);
-       buf[ str_len ] = '\0';
-       buf_len = str_len + 1;
-
-       pkt_filterp = (wl_pkt_filter_t *) (buf + str_len + 1);
-
-       /* Parse packet filter id. */
-       pkt_filter.id = htod32(strtoul(argv[i], NULL, 0));
-
-       if (NULL == argv[++i]) {
-               DHD_ERROR(("Polarity not provided\n"));
-               goto fail;
-       }
-
-       /* Parse filter polarity. */
-       pkt_filter.negate_match = htod32(strtoul(argv[i], NULL, 0));
-
-       if (NULL == argv[++i]) {
-               DHD_ERROR(("Filter type not provided\n"));
-               goto fail;
-       }
-
-       /* Parse filter type. */
-       pkt_filter.type = htod32(strtoul(argv[i], NULL, 0));
-
-       if (NULL == argv[++i]) {
-               DHD_ERROR(("Offset not provided\n"));
-               goto fail;
-       }
-
-       /* Parse pattern filter offset. */
-       pkt_filter.u.pattern.offset = htod32(strtoul(argv[i], NULL, 0));
-
-       if (NULL == argv[++i]) {
-               DHD_ERROR(("Bitmask not provided\n"));
-               goto fail;
-       }
-
-       /* Parse pattern filter mask. */
-       mask_size =
-               htod32(wl_pattern_atoh(argv[i], (char *) pkt_filterp->u.pattern.mask_and_pattern));
-
-       if (NULL == argv[++i]) {
-               DHD_ERROR(("Pattern not provided\n"));
-               goto fail;
-       }
-
-       /* Parse pattern filter pattern. */
-       pattern_size =
-               htod32(wl_pattern_atoh(argv[i],
-                (char *) &pkt_filterp->u.pattern.mask_and_pattern[mask_size]));
-
-       if (mask_size != pattern_size) {
-               DHD_ERROR(("Mask and pattern not the same size\n"));
-               goto fail;
-       }
-
-       pkt_filter.u.pattern.size_bytes = mask_size;
-       buf_len += WL_PKT_FILTER_FIXED_LEN;
-       buf_len += (WL_PKT_FILTER_PATTERN_FIXED_LEN + 2 * mask_size);
-
-       /* Keep-alive attributes are set in local       variable (keep_alive_pkt), and
-       ** then memcpy'ed into buffer (keep_alive_pktp) since there is no
-       ** guarantee that the buffer is properly aligned.
-       */
-       memcpy((char *)pkt_filterp,
-              &pkt_filter,
-              WL_PKT_FILTER_FIXED_LEN + WL_PKT_FILTER_PATTERN_FIXED_LEN);
-
-       rc = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, buf, buf_len);
-       rc = rc >= 0 ? 0 : rc;
-
-       if (rc)
-               DHD_TRACE(("%s: failed to add pktfilter %s, retcode = %d\n",
-               __FUNCTION__, arg, rc));
-       else
-               DHD_TRACE(("%s: successfully added pktfilter %s\n",
-               __FUNCTION__, arg));
-
-fail:
-       if (arg_org)
-               MFREE(dhd->osh, arg_org, strlen(arg) + 1);
-
-       if (buf)
-               MFREE(dhd->osh, buf, BUF_SIZE);
-}
-
-void
-dhd_arp_offload_set(dhd_pub_t * dhd, int arp_mode)
-{
-       char iovbuf[32];
-       int retcode;
-
-       bcm_mkiovar("arp_ol", (char *)&arp_mode, 4, iovbuf, sizeof(iovbuf));
-       retcode = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-       retcode = retcode >= 0 ? 0 : retcode;
-       if (retcode)
-               DHD_TRACE(("%s: failed to set ARP offload mode to 0x%x, retcode = %d\n",
-               __FUNCTION__, arp_mode, retcode));
-       else
-               DHD_TRACE(("%s: successfully set ARP offload mode to 0x%x\n",
-               __FUNCTION__, arp_mode));
-}
-
-void
-dhd_arp_offload_enable(dhd_pub_t * dhd, int arp_enable)
-{
-       char iovbuf[32];
-       int retcode;
-
-       bcm_mkiovar("arpoe", (char *)&arp_enable, 4, iovbuf, sizeof(iovbuf));
-       retcode = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-       retcode = retcode >= 0 ? 0 : retcode;
-       if (retcode)
-               DHD_TRACE(("%s: failed to enabe ARP offload to %d, retcode = %d\n",
-               __FUNCTION__, arp_enable, retcode));
-       else
-               DHD_TRACE(("%s: successfully enabed ARP offload to %d\n",
-               __FUNCTION__, arp_enable));
-}
-
-int
-dhd_preinit_ioctls(dhd_pub_t *dhd)
-{
-       char iovbuf[WL_EVENTING_MASK_LEN + 12]; /*  Room for "event_msgs" + '\0' + bitvec  */
-       uint up = 0;
-       char buf[128], *ptr;
-       uint power_mode = PM_FAST;
-       uint32 dongle_align = DHD_SDALIGN;
-       uint32 glom = 0;
-       uint bcn_timeout = 3;
-       int scan_assoc_time = 40;
-       int scan_unassoc_time = 80;
-#ifdef GET_CUSTOM_MAC_ENABLE
-       int ret = 0;
-       struct ether_addr ea_addr;
-#endif /* GET_CUSTOM_MAC_ENABLE */
-
-       dhd_os_proto_block(dhd);
-
-#ifdef GET_CUSTOM_MAC_ENABLE
-       /* Read MAC address from external customer place
-       ** NOTE that default mac address has to be present in otp or nvram file to bring up
-       ** firmware but unique per board mac address maybe provided by customer code
-       */
-       ret = dhd_custom_get_mac_address(ea_addr.octet);
-       if (!ret) {
-               bcm_mkiovar("cur_etheraddr", (void *)&ea_addr, ETHER_ADDR_LEN, buf, sizeof(buf));
-               ret = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, buf, sizeof(buf));
-               if (ret < 0) {
-                       DHD_ERROR(("%s: can't set MAC address , error=%d\n", __FUNCTION__, ret));
-               }
-               else
-                       memcpy(dhd->mac.octet, (void *)&ea_addr, ETHER_ADDR_LEN);
-       }
-#endif  /* GET_CUSTOM_MAC_ENABLE */
-
-       /*
-        * Initially, country code maybe US, in this situation,
-        * Just 11 channels are supported, but 13 channels should be supported
-        * in China, so we change contry code to EU (Eurapor). -- Yongle Lai
-        */
-       strcpy(dhd->country_code, "EU");
-       dhd->country_code[2] = '\0';
-       
-       /*
-        * Set Country code.
-        */
-       if (dhd->country_code[0] != 0) {
-               if (dhdcdc_set_ioctl(dhd, 0, WLC_SET_COUNTRY,
-                       dhd->country_code, sizeof(dhd->country_code)) < 0) {
-                       DHD_ERROR(("%s: country code setting failed\n", __FUNCTION__));
-               }
-       }
-
-       //dhdcdc_query_ioctl(dhd, 0, WLC_GET_COUNTRY,
-       //                      dhd->country_code, sizeof(dhd->country_code));
-       //printk("============>%s: Current country code: %s\n", __func__, dhd->country_code);
-       
-       /* query for 'ver' to get version info from firmware */
-       memset(buf, 0, sizeof(buf));
-       ptr = buf;
-       bcm_mkiovar("ver", 0, 0, buf, sizeof(buf));
-       dhdcdc_query_ioctl(dhd, 0, WLC_GET_VAR, buf, sizeof(buf));
-       bcmstrtok(&ptr, "\n", 0);
-       /* Print fw version info */
-       DHD_ERROR(("Firmware version = %s\n", buf));
-
-       /* Set PowerSave mode */
-       dhdcdc_set_ioctl(dhd, 0, WLC_SET_PM, (char *)&power_mode, sizeof(power_mode));
-
-       /* Match Host and Dongle rx alignment */
-       bcm_mkiovar("bus:txglomalign", (char *)&dongle_align, 4, iovbuf, sizeof(iovbuf));
-       dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-
-       /* disable glom option per default */
-       bcm_mkiovar("bus:txglom", (char *)&glom, 4, iovbuf, sizeof(iovbuf));
-       dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-
-       /* Setup timeout if Beacons are lost and roam is off to report link down */
-       bcm_mkiovar("bcn_timeout", (char *)&bcn_timeout, 4, iovbuf, sizeof(iovbuf));
-       dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-
-       /* Enable/Disable build-in roaming to allowed ext supplicant to take of romaing */
-       bcm_mkiovar("roam_off", (char *)&dhd_roam, 4, iovbuf, sizeof(iovbuf));
-       dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-
-       /* Force STA UP */
-       if (dhd_radio_up)
-               dhdcdc_set_ioctl(dhd, 0, WLC_UP, (char *)&up, sizeof(up));
-
-       /* Setup event_msgs */
-       bcm_mkiovar("event_msgs", dhd->eventmask, WL_EVENTING_MASK_LEN, iovbuf, sizeof(iovbuf));
-       dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-
-       dhdcdc_set_ioctl(dhd, 0, WLC_SET_SCAN_CHANNEL_TIME, (char *)&scan_assoc_time,
-               sizeof(scan_assoc_time));
-       dhdcdc_set_ioctl(dhd, 0, WLC_SET_SCAN_UNASSOC_TIME, (char *)&scan_unassoc_time,
-               sizeof(scan_unassoc_time));
-
-#ifdef ARP_OFFLOAD_SUPPORT
-       /* Set and enable ARP offload feature */
-       if (dhd_arp_enable)
-               dhd_arp_offload_set(dhd, dhd_arp_mode);
-       dhd_arp_offload_enable(dhd, dhd_arp_enable);
-#endif /* ARP_OFFLOAD_SUPPORT */
-
-#ifdef PKT_FILTER_SUPPORT
-       {
-               int i;
-               /* Set up pkt filter */
-               if (dhd_pkt_filter_enable) {
-                       for (i = 0; i < dhd->pktfilter_count; i++) {
-                               dhd_pktfilter_offload_set(dhd, dhd->pktfilter[i]);
-                               dhd_pktfilter_offload_enable(dhd, dhd->pktfilter[i],
-                                       dhd_pkt_filter_init, dhd_master_mode);
-                       }
-               }
-       }
-#endif /* PKT_FILTER_SUPPORT */
-
-       dhd_os_proto_unblock(dhd);
-
-       return 0;
-}
-
-#ifdef SIMPLE_ISCAN
-
-uint iscan_thread_id;
-iscan_buf_t * iscan_chain = 0;
-
-iscan_buf_t *
-dhd_iscan_allocate_buf(dhd_pub_t *dhd, iscan_buf_t **iscanbuf)
-{
-       iscan_buf_t *iscanbuf_alloc = 0;
-       iscan_buf_t *iscanbuf_head;
-
-       dhd_iscan_lock();
-
-       iscanbuf_alloc = (iscan_buf_t*)MALLOC(dhd->osh, sizeof(iscan_buf_t));
-       if (iscanbuf_alloc == NULL)
-               goto fail;
-
-       iscanbuf_alloc->next = NULL;
-       iscanbuf_head = *iscanbuf;
-
-       DHD_ISCAN(("%s: addr of allocated node = 0x%X, addr of iscanbuf_head \
-               = 0x%X dhd = 0x%X\n", __FUNCTION__, iscanbuf_alloc,
-               iscanbuf_head, dhd));
-
-       if (iscanbuf_head == NULL) {
-               *iscanbuf = iscanbuf_alloc;
-               DHD_ISCAN(("%s: Head is allocated\n", __FUNCTION__));
-               goto fail;
-       }
-
-       while (iscanbuf_head->next)
-               iscanbuf_head = iscanbuf_head->next;
-
-       iscanbuf_head->next = iscanbuf_alloc;
-
-fail:
-       dhd_iscan_unlock();
-       return iscanbuf_alloc;
-}
-
-void
-dhd_iscan_free_buf(void *dhdp, iscan_buf_t *iscan_delete)
-{
-       iscan_buf_t *iscanbuf_free = 0;
-       iscan_buf_t *iscanbuf_prv = 0;
-       iscan_buf_t *iscanbuf_cur = iscan_chain;
-       dhd_pub_t *dhd = dhd_bus_pub(dhdp);
-
-       dhd_iscan_lock();
-       /* If iscan_delete is null then delete the entire 
-        * chain or else delete specific one provided
-        */
-       if (!iscan_delete) {
-               while (iscanbuf_cur) {
-                       iscanbuf_free = iscanbuf_cur;
-                       iscanbuf_cur = iscanbuf_cur->next;
-                       iscanbuf_free->next = 0;
-                       MFREE(dhd->osh, iscanbuf_free, sizeof(iscan_buf_t));
-               }
-               iscan_chain = 0;
-       } else {
-               while (iscanbuf_cur) {
-                       if (iscanbuf_cur == iscan_delete)
-                               break;
-                       iscanbuf_prv = iscanbuf_cur;
-                       iscanbuf_cur = iscanbuf_cur->next;
-               }
-               if (iscanbuf_prv)
-                       iscanbuf_prv->next = iscan_delete->next;
-
-               iscan_delete->next = 0;
-               MFREE(dhd->osh, iscan_delete, sizeof(iscan_buf_t));
-
-               if (!iscanbuf_prv)
-                       iscan_chain = 0;
-       }
-       dhd_iscan_unlock();
-}
-
-iscan_buf_t *
-dhd_iscan_result_buf(void)
-{
-       return iscan_chain;
-}
-
-
-
-/*
-* print scan cache
-* print partial iscan_skip list differently
-*/
-int
-dhd_iscan_print_cache(iscan_buf_t *iscan_skip)
-{
-       int i = 0, l = 0;
-       iscan_buf_t *iscan_cur;
-       wl_iscan_results_t *list;
-       wl_scan_results_t *results;
-       wl_bss_info_t UNALIGNED *bi;
-
-       dhd_iscan_lock();
-
-       iscan_cur = dhd_iscan_result_buf();
-
-       while (iscan_cur) {
-               list = (wl_iscan_results_t *)iscan_cur->iscan_buf;
-               if (!list)
-                       break;
-
-               results = (wl_scan_results_t *)&list->results;
-               if (!results)
-                       break;
-
-               if (results->version != WL_BSS_INFO_VERSION) {
-                       DHD_ISCAN(("%s: results->version %d != WL_BSS_INFO_VERSION\n",
-                               __FUNCTION__, results->version));
-                       goto done;
-               }
-
-               bi = results->bss_info;
-               for (i = 0; i < results->count; i++) {
-                       if (!bi)
-                               break;
-
-                       DHD_ISCAN(("%s[%2.2d:%2.2d] %X:%X:%X:%X:%X:%X\n",
-                               iscan_cur != iscan_skip?"BSS":"bss", l, i,
-                               bi->BSSID.octet[0], bi->BSSID.octet[1], bi->BSSID.octet[2],
-                               bi->BSSID.octet[3], bi->BSSID.octet[4], bi->BSSID.octet[5]));
-
-                       bi = (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length));
-               }
-               iscan_cur = iscan_cur->next;
-               l++;
-       }
-
-done:
-       dhd_iscan_unlock();
-       return 0;
-}
-
-/*
-* delete disappeared AP from specific scan cache but skip partial list in iscan_skip
-*/
-int
-dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip)
-{
-       int i = 0, j = 0, l = 0;
-       iscan_buf_t *iscan_cur;
-       wl_iscan_results_t *list;
-       wl_scan_results_t *results;
-       wl_bss_info_t UNALIGNED *bi, *bi_new, *bi_next;
-
-       uchar *s_addr = addr;
-
-       dhd_iscan_lock();
-       DHD_ISCAN(("%s: BSS to remove %X:%X:%X:%X:%X:%X\n",
-               __FUNCTION__, s_addr[0], s_addr[1], s_addr[2],
-               s_addr[3], s_addr[4], s_addr[5]));
-
-       iscan_cur = dhd_iscan_result_buf();
-
-       while (iscan_cur) {
-               if (iscan_cur != iscan_skip) {
-                       list = (wl_iscan_results_t *)iscan_cur->iscan_buf;
-                       if (!list)
-                               break;
-
-                       results = (wl_scan_results_t *)&list->results;
-                       if (!results)
-                               break;
-
-                       if (results->version != WL_BSS_INFO_VERSION) {
-                               DHD_ERROR(("%s: results->version %d != WL_BSS_INFO_VERSION\n",
-                               __FUNCTION__, results->version));
-                               goto done;
-                       }
-
-                       bi = results->bss_info;
-                       for (i = 0; i < results->count; i++) {
-                               if (!bi)
-                                       break;
-
-                               if (!memcmp(bi->BSSID.octet, addr, ETHER_ADDR_LEN)) {
-                                       DHD_ISCAN(("%s: Del BSS[%2.2d:%2.2d] %X:%X:%X:%X:%X:%X\n", \
-                                       __FUNCTION__, l, i, bi->BSSID.octet[0], \
-                                       bi->BSSID.octet[1], bi->BSSID.octet[2], \
-                                       bi->BSSID.octet[3], bi->BSSID.octet[4], \
-                                       bi->BSSID.octet[5]));
-
-                                       bi_new = bi;
-                                       bi = (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length));
-/*
-                                       if(bi && bi_new) {
-                                               bcopy(bi, bi_new, results->buflen -
-                                               dtoh32(bi_new->length));
-                                               results->buflen -= dtoh32(bi_new->length);
-                                       }
-*/
-                                       results->buflen -= dtoh32(bi_new->length);
-                                       results->count--;
-
-                                       for (j = i; j < results->count; j++) {
-                                               if (bi && bi_new) {
-                                                       DHD_ISCAN(("%s: Moved up BSS[%2.2d:%2.2d] \
-                                                       %X:%X:%X:%X:%X:%X\n",
-                                                       __FUNCTION__, l, j, bi->BSSID.octet[0],
-                                                       bi->BSSID.octet[1], bi->BSSID.octet[2],
-                                                       bi->BSSID.octet[3], bi->BSSID.octet[4],
-                                                       bi->BSSID.octet[5]));
-
-                                                       bi_next = (wl_bss_info_t *)((uintptr)bi +
-                                                               dtoh32(bi->length));
-                                                       bcopy(bi, bi_new, dtoh32(bi->length));
-                                                       bi_new = (wl_bss_info_t *)((uintptr)bi_new +
-                                                               dtoh32(bi_new->length));
-                                                       bi = bi_next;
-                                               }
-                                       }
-
-                                       if (results->count == 0) {
-                                               /* Prune now empty partial scan list */
-                                               dhd_iscan_free_buf(dhdp, iscan_cur);
-                                               goto done;
-                                       }
-                                       break;
-                               }
-                               bi = (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length));
-                       }
-               }
-               iscan_cur = iscan_cur->next;
-               l++;
-       }
-
-done:
-       dhd_iscan_unlock();
-       return 0;
-}
-
-int
-dhd_iscan_remove_duplicates(void * dhdp, iscan_buf_t *iscan_cur)
-{
-       int i = 0;
-       wl_iscan_results_t *list;
-       wl_scan_results_t *results;
-       wl_bss_info_t UNALIGNED *bi, *bi_new, *bi_next;
-
-       dhd_iscan_lock();
-
-       DHD_ISCAN(("%s: Scan cache before delete\n",
-               __FUNCTION__));
-       dhd_iscan_print_cache(iscan_cur);
-
-       if (!iscan_cur)
-               goto done;
-
-       list = (wl_iscan_results_t *)iscan_cur->iscan_buf;
-       if (!list)
-               goto done;
-
-       results = (wl_scan_results_t *)&list->results;
-       if (!results)
-               goto done;
-
-       if (results->version != WL_BSS_INFO_VERSION) {
-               DHD_ERROR(("%s: results->version %d != WL_BSS_INFO_VERSION\n",
-                       __FUNCTION__, results->version));
-               goto done;
-       }
-
-       bi = results->bss_info;
-       for (i = 0; i < results->count; i++) {
-               if (!bi)
-                       break;
-
-               DHD_ISCAN(("%s: Find dups for BSS[%2.2d] %X:%X:%X:%X:%X:%X\n",
-                       __FUNCTION__, i, bi->BSSID.octet[0], bi->BSSID.octet[1], bi->BSSID.octet[2],
-                       bi->BSSID.octet[3], bi->BSSID.octet[4], bi->BSSID.octet[5]));
-
-               dhd_iscan_delete_bss(dhdp, bi->BSSID.octet, iscan_cur);
-
-               bi = (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length));
-       }
-
-done:
-       DHD_ISCAN(("%s: Scan cache after delete\n", __FUNCTION__));
-       dhd_iscan_print_cache(iscan_cur);
-       dhd_iscan_unlock();
-       return 0;
-}
-
-void
-dhd_iscan_ind_scan_confirm(void *dhdp, bool status)
-{
-
-       dhd_ind_scan_confirm(dhdp, status);
-}
-
-int
-dhd_iscan_request(void * dhdp, uint16 action)
-{
-       int rc;
-       wl_iscan_params_t params;
-       dhd_pub_t *dhd = dhd_bus_pub(dhdp);
-       char buf[WLC_IOCTL_SMLEN];
-
-
-       memset(&params, 0, sizeof(wl_iscan_params_t));
-       memcpy(&params.params.bssid, &ether_bcast, ETHER_ADDR_LEN);
-
-       params.params.bss_type = DOT11_BSSTYPE_ANY;
-       params.params.scan_type = DOT11_SCANTYPE_ACTIVE;
-
-       params.params.nprobes = htod32(-1);
-       params.params.active_time = htod32(-1);
-       params.params.passive_time = htod32(-1);
-       params.params.home_time = htod32(-1);
-       params.params.channel_num = htod32(0);
-
-       params.version = htod32(ISCAN_REQ_VERSION);
-       params.action = htod16(action);
-       params.scan_duration = htod16(0);
-
-       bcm_mkiovar("iscan", (char *)&params, sizeof(wl_iscan_params_t), buf, WLC_IOCTL_SMLEN);
-       rc = dhd_wl_ioctl(dhdp, WLC_SET_VAR, buf, WLC_IOCTL_SMLEN);
-
-       return rc;
-}
-
-static int
-dhd_iscan_get_partial_result(void *dhdp, uint *scan_count)
-{
-       wl_iscan_results_t *list_buf;
-       wl_iscan_results_t list;
-       wl_scan_results_t *results;
-       iscan_buf_t *iscan_cur;
-       int status = -1;
-       dhd_pub_t *dhd = dhd_bus_pub(dhdp);
-       int rc;
-
-
-       iscan_cur = dhd_iscan_allocate_buf(dhd, &iscan_chain);
-       if (!iscan_cur) {
-               DHD_ERROR(("%s: Failed to allocate node\n", __FUNCTION__));
-               dhd_iscan_free_buf(dhdp, 0);
-               dhd_iscan_request(dhdp, WL_SCAN_ACTION_ABORT);
-               goto fail;
-       }
-
-       dhd_iscan_lock();
-
-       memset(iscan_cur->iscan_buf, 0, WLC_IW_ISCAN_MAXLEN);
-       list_buf = (wl_iscan_results_t*)iscan_cur->iscan_buf;
-       results = &list_buf->results;
-       results->buflen = WL_ISCAN_RESULTS_FIXED_SIZE;
-       results->version = 0;
-       results->count = 0;
-
-       memset(&list, 0, sizeof(list));
-       list.results.buflen = htod32(WLC_IW_ISCAN_MAXLEN);
-       bcm_mkiovar("iscanresults", (char *)&list, WL_ISCAN_RESULTS_FIXED_SIZE,
-               iscan_cur->iscan_buf, WLC_IW_ISCAN_MAXLEN);
-       rc = dhd_wl_ioctl(dhdp, WLC_GET_VAR, iscan_cur->iscan_buf, WLC_IW_ISCAN_MAXLEN);
-
-       results->buflen = dtoh32(results->buflen);
-       results->version = dtoh32(results->version);
-       *scan_count = results->count = dtoh32(results->count);
-       status = dtoh32(list_buf->status);
-
-       dhd_iscan_unlock();
-
-       if (!(*scan_count))
-               dhd_iscan_free_buf(dhdp, iscan_cur);
-       else
-               dhd_iscan_remove_duplicates(dhdp, iscan_cur);
-
-
-fail:
-       return status;
-}
-
-#endif 
-
-/* Android ComboSCAN support */
-#if defined(CSCAN)
-
-/*
- *  data parsing from ComboScan tlv list
-*/
-int
-wl_iw_parse_data_tlv(char** list_str, void *dst, int dst_size, const char token, \
-                       int input_size, int *bytes_left)
-{
-       char* str = *list_str;
-       uint16 short_temp;
-       uint32 int_temp;
-
-       if ((list_str == NULL) || (*list_str == NULL) ||(bytes_left == NULL) || (*bytes_left < 0)) {
-               DHD_ERROR(("%s error paramters\n", __FUNCTION__));
-               return -1;
-       }
-
-       /* Clean all dest bytes */
-       memset(dst, 0, dst_size);
-       while (*bytes_left > 0) {
-
-               if (str[0] != token) {
-                       DHD_TRACE(("%s NOT Type=%d get=%d left_parse=%d \n", __FUNCTION__, \
-                                               token, str[0], *bytes_left));
-                       return -1;
-               }
-
-               *bytes_left -= 1;
-               str += 1;
-
-               if (input_size == 1) {
-                       memcpy(dst, str, input_size);
-               }
-               else if (input_size == 2) {
-                       memcpy(dst, (char *)htod16(memcpy(&short_temp, str, input_size)), \
-                                input_size);
-               }
-               else if (input_size == 4) {
-                       memcpy(dst, (char *)htod32(memcpy(&int_temp, str, input_size)), \
-                               input_size);
-               }
-
-               *bytes_left -= input_size;
-               str += input_size;
-               *list_str = str;
-               return 1;
-       }
-       return 1;
-}
-
-/*
- *  channel list parsing from cscan tlv list
-*/
-int
-wl_iw_parse_channel_list_tlv(char** list_str, uint16* channel_list, \
-                               int channel_num, int *bytes_left)
-{
-       char* str = *list_str;
-       int idx = 0;
-
-       if ((list_str == NULL) || (*list_str == NULL) ||(bytes_left == NULL) || (*bytes_left < 0)) {
-               DHD_ERROR(("%s error paramters\n", __FUNCTION__));
-               return -1;
-       }
-
-       while (*bytes_left > 0) {
-
-               if (str[0] != CSCAN_TLV_TYPE_CHANNEL_IE) {
-                       *list_str = str;
-                       DHD_TRACE(("End channel=%d left_parse=%d %d\n", idx, *bytes_left, str[0]));
-                       return idx;
-               }
-               /* Get proper CSCAN_TLV_TYPE_CHANNEL_IE */
-               *bytes_left -= 1;
-               str += 1;
-
-               if (str[0] == 0) {
-                       /* All channels */
-                       channel_list[idx] = 0x0;
-               }
-               else {
-                       channel_list[idx] = (uint16)str[0];
-                       DHD_TRACE(("%s channel=%d \n", __FUNCTION__,  channel_list[idx]));
-               }
-               *bytes_left -= 1;
-               str += 1;
-
-               if (idx++ > 255) {
-                       DHD_ERROR(("%s Too many channels \n", __FUNCTION__));
-                       return -1;
-               }
-       }
-
-       *list_str = str;
-       return idx;
-}
-
-/*
- *  SSIDs list parsing from cscan tlv list
- */
-int
-wl_iw_parse_ssid_list_tlv(char** list_str, wlc_ssid_t* ssid, int max, int *bytes_left)
-{
-       char* str =  *list_str;
-       int idx = 0;
-
-       if ((list_str == NULL) || (*list_str == NULL) || (*bytes_left < 0)) {
-               DHD_ERROR(("%s error paramters\n", __FUNCTION__));
-               return -1;
-       }
-
-       while (*bytes_left > 0) {
-
-               if (str[0] != CSCAN_TLV_TYPE_SSID_IE) {
-                       *list_str = str;
-                       DHD_TRACE(("nssid=%d left_parse=%d %d\n", idx, *bytes_left, str[0]));
-                       return idx;
-               }
-
-               /* Get proper CSCAN_TLV_TYPE_SSID_IE */
-               *bytes_left -= 1;
-               str += 1;
-
-               if (str[0] == 0) {
-                       /* Broadcast SSID */
-                       ssid[idx].SSID_len = 0;
-                       memset((char*)ssid[idx].SSID, 0x0, DOT11_MAX_SSID_LEN);
-                       *bytes_left -= 1;
-                       str += 1;
-
-                       DHD_TRACE(("BROADCAST SCAN  left=%d\n", *bytes_left));
-               }
-               else if (str[0] <= DOT11_MAX_SSID_LEN) {
-                       /* Get proper SSID size */
-                       ssid[idx].SSID_len = str[0];
-                       *bytes_left -= 1;
-                       str += 1;
-
-                       /* Get SSID */
-                       if (ssid[idx].SSID_len > *bytes_left) {
-                               DHD_ERROR(("%s out of memory range len=%d but left=%d\n", \
-                               __FUNCTION__, ssid[idx].SSID_len, *bytes_left));
-                               return -1;
-                       }
-
-                       memcpy((char*)ssid[idx].SSID, str, ssid[idx].SSID_len);
-
-                       *bytes_left -= ssid[idx].SSID_len;
-                       str += ssid[idx].SSID_len;
-
-                       DHD_TRACE(("%s :size=%d left=%d\n", (char*)ssid[idx].SSID, \
-                               ssid[idx].SSID_len, *bytes_left));
-               }
-               else {
-                       DHD_ERROR(("### SSID size more that %d\n", str[0]));
-                       return -1;
-               }
-
-               if (idx++ >  max) {
-                       DHD_ERROR(("%s number of SSIDs more that %d\n", __FUNCTION__, idx));
-                       return -1;
-               }
-       }
-
-       *list_str = str;
-       return idx;
-}
-
-/* Parse a comma-separated list from list_str into ssid array, starting
- * at index idx.  Max specifies size of the ssid array.  Parses ssids
- * and returns updated idx; if idx >= max not all fit, the excess have
- * not been copied.  Returns -1 on empty string, or on ssid too long.
- */
-int
-wl_iw_parse_ssid_list(char** list_str, wlc_ssid_t* ssid, int idx, int max)
-{
-       char* str, *ptr;
-
-       if ((list_str == NULL) || (*list_str == NULL))
-               return -1;
-
-       for (str = *list_str; str != NULL; str = ptr) {
-
-               /* check for next TAG */
-               if (!strncmp(str, GET_CHANNEL, strlen(GET_CHANNEL))) {
-                       *list_str        = str + strlen(GET_CHANNEL);
-                       return idx;
-               }
-
-               if ((ptr = strchr(str, ',')) != NULL) {
-                       *ptr++ = '\0';
-               }
-
-               if (strlen(str) > DOT11_MAX_SSID_LEN) {
-                       DHD_ERROR(("ssid <%s> exceeds %d\n", str, DOT11_MAX_SSID_LEN));
-                       return -1;
-               }
-
-               if (strlen(str) == 0)
-                       ssid[idx].SSID_len = 0;
-
-               if (idx < max) {
-                       strcpy((char*)ssid[idx].SSID, str);
-                       ssid[idx].SSID_len = strlen(str);
-               }
-               idx++;
-       }
-       return idx;
-}
-
-/*
- * Parse channel list from iwpriv CSCAN
- */
-int
-wl_iw_parse_channel_list(char** list_str, uint16* channel_list, int channel_num)
-{
-       int num;
-       int val;
-       char* str;
-       char* endptr = NULL;
-
-       if ((list_str == NULL)||(*list_str == NULL))
-               return -1;
-
-       str = *list_str;
-       num = 0;
-       while (strncmp(str, GET_NPROBE, strlen(GET_NPROBE))) {
-               val = (int)strtoul(str, &endptr, 0);
-               if (endptr == str) {
-                       printf("could not parse channel number starting at"
-                               " substring \"%s\" in list:\n%s\n",
-                               str, *list_str);
-                       return -1;
-               }
-               str = endptr + strspn(endptr, " ,");
-
-               if (num == channel_num) {
-                       DHD_ERROR(("too many channels (more than %d) in channel list:\n%s\n",
-                               channel_num, *list_str));
-                       return -1;
-               }
-
-               channel_list[num++] = (uint16)val;
-       }
-       *list_str = str;
-       return num;
-}
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/dhd_custom_gpio.c b/drivers/net/wireless/bcm4319/dhd_custom_gpio.c
deleted file mode 100644 (file)
index d4d7e06..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-* Customer code to add GPIO control during WLAN start/stop
-* Copyright (C) 1999-2010, Broadcom Corporation
-* 
-*      Unless you and Broadcom execute a separate written software license
-* agreement governing use of this software, this software is licensed to you
-* under the terms of the GNU General Public License version 2 (the "GPL"),
-* available at http://www.broadcom.com/licenses/GPLv2.php, with the
-* following added to such license:
-* 
-*      As a special exception, the copyright holders of this software give you
-* permission to link this software with independent modules, and to copy and
-* distribute the resulting executable under terms of your choice, provided that
-* you also meet, for each linked independent module, the terms and conditions of
-* the license of that module.  An independent module is a module which is not
-* derived from this software.  The special exception does not apply to any
-* modifications of the software.
-* 
-*      Notwithstanding the above, under no circumstances may you combine this
-* software in any way with any other Broadcom software provided under a license
-* other than the GPL, without Broadcom's express prior written consent.
-*
-* $Id: dhd_custom_gpio.c,v 1.1.4.7 2010/06/03 21:27:48 Exp $
-*/
-
-
-#include <typedefs.h>
-#include <linuxver.h>
-#include <osl.h>
-#include <bcmutils.h>
-
-#include <dngl_stats.h>
-#include <dhd.h>
-
-#include <wlioctl.h>
-#include <wl_iw.h>
-#include <dhd_dbg.h>
-
-#define WL_ERROR(x) DHD_ERROR(x)
-#define WL_TRACE(x)
-
-#ifdef CUSTOMER_HW
-extern  void bcm_wlan_power_off(int);
-extern  void bcm_wlan_power_on(int);
-#endif /* CUSTOMER_HW */
-#ifdef CUSTOMER_HW2
-int wifi_set_carddetect(int on);
-int wifi_set_power(int on, unsigned long msec);
-int wifi_get_irq_number(unsigned long *irq_flags_ptr);
-#endif
-
-#if defined(OOB_INTR_ONLY)
-
-#if defined(BCMLXSDMMC)
-extern int sdioh_mmc_irq(int irq);
-#endif /* (BCMLXSDMMC)  */
-
-#ifdef CUSTOMER_HW3
-#include <mach/gpio.h>
-#endif
-
-/* Customer specific Host GPIO defintion  */
-static int dhd_oob_gpio_num = -1; /* GG 19 */
-
-module_param(dhd_oob_gpio_num, int, 0644);
-MODULE_PARM_DESC(dhd_oob_gpio_num, "DHD oob gpio number");
-
-int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr)
-{
-       int  host_oob_irq = 0;
-
-#ifdef CUSTOMER_HW2
-       host_oob_irq = wifi_get_irq_number(irq_flags_ptr);
-
-#else /* for NOT  CUSTOMER_HW2 */
-#if defined(CUSTOM_OOB_GPIO_NUM)
-       if (dhd_oob_gpio_num < 0) {
-               dhd_oob_gpio_num = CUSTOM_OOB_GPIO_NUM;
-       }
-#endif
-       *irq_flags_ptr = IRQF_TRIGGER_FALLING;
-       if (dhd_oob_gpio_num < 0) {
-               WL_ERROR(("%s: ERROR customer specific Host GPIO is NOT defined \n",
-                       __FUNCTION__));
-               return (dhd_oob_gpio_num);
-       }
-
-       WL_ERROR(("%s: customer specific Host GPIO number is (%d)\n",
-                __FUNCTION__, dhd_oob_gpio_num));
-
-#if defined CUSTOMER_HW
-       host_oob_irq = MSM_GPIO_TO_INT(dhd_oob_gpio_num);
-#elif defined CUSTOMER_HW3
-       gpio_request(dhd_oob_gpio_num, "oob irq");
-       host_oob_irq = gpio_to_irq(dhd_oob_gpio_num);
-       gpio_direction_input(dhd_oob_gpio_num);
-#endif /* CUSTOMER_HW */
-#endif /* CUSTOMER_HW2 */
-
-       return (host_oob_irq);
-}
-#endif /* defined(OOB_INTR_ONLY) */
-
-/* Customer function to control hw specific wlan gpios */
-void
-dhd_customer_gpio_wlan_ctrl(int onoff)
-{
-       switch (onoff) {
-               case WLAN_RESET_OFF:
-                       WL_TRACE(("%s: call customer specific GPIO to insert WLAN RESET\n",
-                               __FUNCTION__));
-#ifdef CUSTOMER_HW
-                       bcm_wlan_power_off(2);
-#endif /* CUSTOMER_HW */
-#ifdef CUSTOMER_HW2
-                       wifi_set_power(0, 0);
-#endif
-                       WL_ERROR(("=========== WLAN placed in RESET ========\n"));
-               break;
-
-               case WLAN_RESET_ON:
-                       WL_TRACE(("%s: callc customer specific GPIO to remove WLAN RESET\n",
-                               __FUNCTION__));
-#ifdef CUSTOMER_HW
-                       bcm_wlan_power_on(2);
-#endif /* CUSTOMER_HW */
-#ifdef CUSTOMER_HW2
-                       wifi_set_power(1, 0);
-#endif
-                       WL_ERROR(("=========== WLAN going back to live  ========\n"));
-               break;
-
-               case WLAN_POWER_OFF:
-                       WL_TRACE(("%s: call customer specific GPIO to turn off WL_REG_ON\n",
-                               __FUNCTION__));
-#ifdef CUSTOMER_HW
-                       bcm_wlan_power_off(1);
-#endif /* CUSTOMER_HW */
-               break;
-
-               case WLAN_POWER_ON:
-                       WL_TRACE(("%s: call customer specific GPIO to turn on WL_REG_ON\n",
-                               __FUNCTION__));
-#ifdef CUSTOMER_HW
-                       bcm_wlan_power_on(1);
-#endif /* CUSTOMER_HW */
-                       /* Lets customer power to get stable */
-                       OSL_DELAY(500);
-               break;
-       }
-}
-
-#ifdef GET_CUSTOM_MAC_ENABLE
-/* Function to get custom MAC address */
-int
-dhd_custom_get_mac_address(unsigned char *buf)
-{
-       WL_TRACE(("%s Enter\n", __FUNCTION__));
-       if (!buf)
-               return -EINVAL;
-
-       /* Customer access to MAC address stored outside of DHD driver */
-
-#ifdef EXAMPLE_GET_MAC
-       /* EXAMPLE code */
-       {
-               struct ether_addr ea_example = {{0x00, 0x11, 0x22, 0x33, 0x44, 0xFF}};
-               bcopy((char *)&ea_example, buf, sizeof(struct ether_addr));
-       }
-#endif /* EXAMPLE_GET_MAC */
-
-       return 0;
-}
-#endif /* GET_CUSTOM_MAC_ENABLE */
diff --git a/drivers/net/wireless/bcm4319/dhd_dbg.h b/drivers/net/wireless/bcm4319/dhd_dbg.h
deleted file mode 100644 (file)
index 9f09ce7..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Debug/trace/assert driver definitions for Dongle Host Driver.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhd_dbg.h,v 1.5.6.2.4.2.14.10 2010/05/21 21:49:38 Exp $
- */
-
-#ifndef _dhd_dbg_
-#define _dhd_dbg_
-
-#if 0 || (defined DHD_DEBUG)
-
-#define DHD_ERROR(args)               do {if ((dhd_msg_level & DHD_ERROR_VAL) && (net_ratelimit())) \
-                                                               printf args;} while (0)
-#define DHD_TRACE(args)                do {if (dhd_msg_level & DHD_TRACE_VAL) printf args;} while (0)
-#define DHD_INFO(args)         do {if (dhd_msg_level & DHD_INFO_VAL) printf args;} while (0)
-#define DHD_DATA(args)         do {if (dhd_msg_level & DHD_DATA_VAL) printf args;} while (0)
-#define DHD_CTL(args)          do {if (dhd_msg_level & DHD_CTL_VAL) printf args;} while (0)
-#define DHD_TIMER(args)                do {if (dhd_msg_level & DHD_TIMER_VAL) printf args;} while (0)
-#define DHD_HDRS(args)         do {if (dhd_msg_level & DHD_HDRS_VAL) printf args;} while (0)
-#define DHD_BYTES(args)                do {if (dhd_msg_level & DHD_BYTES_VAL) printf args;} while (0)
-#define DHD_INTR(args)         do {if (dhd_msg_level & DHD_INTR_VAL) printf args;} while (0)
-#define DHD_GLOM(args)         do {if (dhd_msg_level & DHD_GLOM_VAL) printf args;} while (0)
-#define DHD_EVENT(args)                do {if (dhd_msg_level & DHD_EVENT_VAL) printf args;} while (0)
-#define DHD_BTA(args)          do {if (dhd_msg_level & DHD_BTA_VAL) printf args;} while (0)
-#define DHD_ISCAN(args)                do {if (dhd_msg_level & DHD_ISCAN_VAL) printf args;} while (0)
-
-#define DHD_ERROR_ON()         (dhd_msg_level & DHD_ERROR_VAL)
-#define DHD_TRACE_ON()         (dhd_msg_level & DHD_TRACE_VAL)
-#define DHD_INFO_ON()          (dhd_msg_level & DHD_INFO_VAL)
-#define DHD_DATA_ON()          (dhd_msg_level & DHD_DATA_VAL)
-#define DHD_CTL_ON()           (dhd_msg_level & DHD_CTL_VAL)
-#define DHD_TIMER_ON()         (dhd_msg_level & DHD_TIMER_VAL)
-#define DHD_HDRS_ON()          (dhd_msg_level & DHD_HDRS_VAL)
-#define DHD_BYTES_ON()         (dhd_msg_level & DHD_BYTES_VAL)
-#define DHD_INTR_ON()          (dhd_msg_level & DHD_INTR_VAL)
-#define DHD_GLOM_ON()          (dhd_msg_level & DHD_GLOM_VAL)
-#define DHD_EVENT_ON()         (dhd_msg_level & DHD_EVENT_VAL)
-#define DHD_BTA_ON()           (dhd_msg_level & DHD_BTA_VAL)
-#define DHD_ISCAN_ON()         (dhd_msg_level & DHD_ISCAN_VAL)
-
-#else /* (defined BCMDBG) || (defined DHD_DEBUG) */
-
-#define DHD_ERROR(args)        do {if (net_ratelimit()) printf args;} while (0)
-#define DHD_TRACE(args)
-#define DHD_INFO(args)
-#define DHD_DATA(args)
-#define DHD_CTL(args)
-#define DHD_TIMER(args)
-#define DHD_HDRS(args)
-#define DHD_BYTES(args)
-#define DHD_INTR(args)
-#define DHD_GLOM(args)
-#define DHD_EVENT(args)
-#define DHD_BTA(args)
-#define DHD_ISCAN(args)
-
-#define DHD_ERROR_ON()         0
-#define DHD_TRACE_ON()         0
-#define DHD_INFO_ON()          0
-#define DHD_DATA_ON()          0
-#define DHD_CTL_ON()           0
-#define DHD_TIMER_ON()         0
-#define DHD_HDRS_ON()          0
-#define DHD_BYTES_ON()         0
-#define DHD_INTR_ON()          0
-#define DHD_GLOM_ON()          0
-#define DHD_EVENT_ON()         0
-#define DHD_BTA_ON()           0
-#define DHD_ISCAN_ON()         0
-#endif 
-
-#define DHD_LOG(args)
-
-#define DHD_NONE(args)
-extern int dhd_msg_level;
-
-/* Defines msg bits */
-#include <dhdioctl.h>
-
-#endif /* _dhd_dbg_ */
diff --git a/drivers/net/wireless/bcm4319/dhd_linux.c b/drivers/net/wireless/bcm4319/dhd_linux.c
deleted file mode 100644 (file)
index 275407f..0000000
+++ /dev/null
@@ -1,3013 +0,0 @@
-/*
- * Broadcom Dongle Host Driver (DHD), Linux-specific network interface
- * Basically selected code segments from usb-cdc.c and usb-rndis.c
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhd_linux.c,v 1.65.4.9.2.12.2.89 2010/07/21 18:07:11 Exp $
- */
-
-
-#ifdef CONFIG_WIFI_CONTROL_FUNC_BCM4319
-#include <linux/platform_device.h>
-#endif
-#include <typedefs.h>
-#include <linuxver.h>
-#include <osl.h>
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/random.h>
-#include <linux/spinlock.h>
-#include <linux/ethtool.h>
-#include <linux/fcntl.h>
-#include <linux/fs.h>
-
-#include <asm/uaccess.h>
-#include <asm/unaligned.h>
-
-#include <epivers.h>
-#include <bcmutils.h>
-#include <bcmendian.h>
-
-#include <proto/ethernet.h>
-#include <dngl_stats.h>
-#include <dhd.h>
-#include <dhd_bus.h>
-#include <dhd_proto.h>
-#include <dhd_dbg.h>
-
-#include <linux/mmc/card.h>
-#include <linux/mmc/sdio_func.h>
-#include <linux/mmc/sdio_ids.h>
-#include <linux/mmc/host.h>
-
-int wifi_func_removed = 0;
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP)
-#include <linux/suspend.h>
-volatile bool dhd_mmc_suspend = FALSE;
-DECLARE_WAIT_QUEUE_HEAD(dhd_dpc_wait);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) */
-
-#if defined(OOB_INTR_ONLY)
-extern void dhd_enable_oob_intr(struct dhd_bus *bus, bool enable);
-#endif /* defined(OOB_INTR_ONLY) */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-MODULE_LICENSE("GPL v2");
-#endif /* LinuxVer */
-
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 15)
-const char *
-print_tainted()
-{
-       return "";
-}
-#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 15) */
-
-/* Linux wireless extension support */
-#if defined(CONFIG_WIRELESS_EXT)
-#include <wl_iw.h>
-#endif /* defined(CONFIG_WIRELESS_EXT) */
-
-#if defined(CONFIG_HAS_EARLYSUSPEND)
-#include <linux/earlysuspend.h>
-extern int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len);
-extern void dhd_pktfilter_offload_set(dhd_pub_t * dhd, char *arg);
-extern void dhd_pktfilter_offload_enable(dhd_pub_t * dhd, char *arg, int enable, int master_mode);
-#endif /* defined(CONFIG_HAS_EARLYSUSPEND) */
-
-/* Interface control information */
-typedef struct dhd_if {
-       struct dhd_info *info;                  /* back pointer to dhd_info */
-       /* OS/stack specifics */
-       struct net_device *net;
-       struct net_device_stats stats;
-       int                     idx;                    /* iface idx in dongle */
-       int                     state;                  /* interface state */
-       uint                    subunit;                /* subunit */
-       uint8                   mac_addr[ETHER_ADDR_LEN];       /* assigned MAC address */
-       bool                    attached;               /* Delayed attachment when unset */
-       bool                    txflowcontrol;  /* Per interface flow control indicator */
-       char                    name[IFNAMSIZ+1]; /* linux interface name */
-} dhd_if_t;
-
-/* Local private structure (extension of pub) */
-typedef struct dhd_info {
-#if defined(CONFIG_WIRELESS_EXT)
-       wl_iw_t         iw;             /* wireless extensions state (must be first) */
-#endif /* defined(CONFIG_WIRELESS_EXT) */
-
-       dhd_pub_t pub;
-
-       /* OS/stack specifics */
-       dhd_if_t *iflist[DHD_MAX_IFS];
-
-       struct semaphore proto_sem;
-       wait_queue_head_t ioctl_resp_wait;
-       struct timer_list timer;
-       bool wd_timer_valid;
-       struct tasklet_struct tasklet;
-       spinlock_t      sdlock;
-       spinlock_t      txqlock;
-       /* Thread based operation */
-       bool threads_only;
-       struct semaphore sdsem;
-       long watchdog_pid;
-       struct semaphore watchdog_sem;
-       struct completion watchdog_exited;
-       long dpc_pid;
-       struct semaphore dpc_sem;
-       struct completion dpc_exited;
-
-       /* Thread to issue ioctl for multicast */
-       long sysioc_pid;
-       struct semaphore sysioc_sem;
-       struct completion sysioc_exited;
-       bool set_multicast;
-       bool set_macaddress;
-       struct ether_addr macvalue;
-       wait_queue_head_t ctrl_wait;
-       atomic_t pend_8021x_cnt;
-
-#ifdef CONFIG_HAS_EARLYSUSPEND
-       struct early_suspend early_suspend;
-#endif /* CONFIG_HAS_EARLYSUSPEND */
-} dhd_info_t;
-
-/* Definitions to provide path to the firmware and nvram
- * example nvram_path[MOD_PARAM_PATHLEN]="/projects/wlan/nvram.txt"
- */
-char firmware_path[MOD_PARAM_PATHLEN] = "/etc/firmware/sdio-g-cdc-full11n-reclaim-roml-wme.bin";
-char nvram_path[MOD_PARAM_PATHLEN] = "/etc/firmware/nvram_4319_201008.txt";
-
-extern int      wl_control_wl_start(struct net_device *dev);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-struct semaphore dhd_registration_sem;
-#define DHD_REGISTRATION_TIMEOUT  8000  /* msec : allowed time to finished dhd registration */
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-/* load firmware and/or nvram values from the filesystem */
-module_param_string(firmware_path, firmware_path, MOD_PARAM_PATHLEN, 0);
-module_param_string(nvram_path, nvram_path, MOD_PARAM_PATHLEN, 0);
-
-/* Error bits */
-module_param(dhd_msg_level, int, 0);
-
-/* Spawn a thread for system ioctls (set mac, set mcast) */
-uint dhd_sysioc = TRUE;
-module_param(dhd_sysioc, uint, 0);
-
-/* Watchdog interval */
-uint dhd_watchdog_ms = 10;
-module_param(dhd_watchdog_ms, uint, 0);
-
-#ifdef DHD_DEBUG
-/* Console poll interval */
-uint dhd_console_ms = 0;
-module_param(dhd_console_ms, uint, 0);
-#endif /* DHD_DEBUG */
-
-/* ARP offload agent mode : Enable ARP Host Auto-Reply and ARP Peer Auto-Reply */
-uint dhd_arp_mode = 0xb;
-module_param(dhd_arp_mode, uint, 0);
-
-/* ARP offload enable */
-uint dhd_arp_enable = TRUE;
-module_param(dhd_arp_enable, uint, 0);
-
-/* Global Pkt filter enable control */
-uint dhd_pkt_filter_enable = TRUE;
-module_param(dhd_pkt_filter_enable, uint, 0);
-
-/*  Pkt filter init setup */
-uint dhd_pkt_filter_init = 0;
-module_param(dhd_pkt_filter_init, uint, 0);
-
-/* Pkt filter mode control */
-uint dhd_master_mode = TRUE;
-module_param(dhd_master_mode, uint, 1);
-
-/* Watchdog thread priority, -1 to use kernel timer */
-int dhd_watchdog_prio = 97;
-module_param(dhd_watchdog_prio, int, 0);
-
-/* DPC thread priority, -1 to use tasklet */
-int dhd_dpc_prio = 98;
-module_param(dhd_dpc_prio, int, 0);
-
-/* DPC thread priority, -1 to use tasklet */
-extern int dhd_dongle_memsize;
-module_param(dhd_dongle_memsize, int, 0);
-
-/* Contorl fw roaming */
-#ifdef CUSTOMER_HW2
-uint dhd_roam = 0;
-#else
-uint dhd_roam = 1;
-#endif
-
-/* Control radio state */
-uint dhd_radio_up = 1;
-
-/* Network inteface name */
-char iface_name[IFNAMSIZ];
-module_param_string(iface_name, iface_name, IFNAMSIZ, 0);
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-#define DAEMONIZE(a) daemonize(a); \
-       allow_signal(SIGKILL); \
-       allow_signal(SIGTERM);
-#else /* Linux 2.4 (w/o preemption patch) */
-#define RAISE_RX_SOFTIRQ() \
-       cpu_raise_softirq(smp_processor_id(), NET_RX_SOFTIRQ)
-#define DAEMONIZE(a) daemonize(); \
-       do { if (a) \
-               strncpy(current->comm, a, MIN(sizeof(current->comm), (strlen(a) + 1))); \
-       } while (0);
-#endif /* LINUX_VERSION_CODE  */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-#define BLOCKABLE()    (!in_atomic())
-#else
-#define BLOCKABLE()    (!in_interrupt())
-#endif
-
-/* The following are specific to the SDIO dongle */
-
-/* IOCTL response timeout */
-int dhd_ioctl_timeout_msec = IOCTL_RESP_TIMEOUT;
-
-/* Idle timeout for backplane clock */
-int dhd_idletime = DHD_IDLETIME_TICKS;
-module_param(dhd_idletime, int, 0);
-
-/* Use polling */
-uint dhd_poll = FALSE;
-module_param(dhd_poll, uint, 0);
-
-/* Use interrupts */
-uint dhd_intr = TRUE;
-module_param(dhd_intr, uint, 0);
-
-/* SDIO Drive Strength (in milliamps) */
-uint dhd_sdiod_drive_strength = 6;
-module_param(dhd_sdiod_drive_strength, uint, 0);
-
-/* Tx/Rx bounds */
-extern uint dhd_txbound;
-extern uint dhd_rxbound;
-module_param(dhd_txbound, uint, 0);
-module_param(dhd_rxbound, uint, 0);
-
-/* Deferred transmits */
-extern uint dhd_deferred_tx;
-module_param(dhd_deferred_tx, uint, 0);
-
-
-
-#ifdef SDTEST
-/* Echo packet generator (pkts/s) */
-uint dhd_pktgen = 0;
-module_param(dhd_pktgen, uint, 0);
-
-/* Echo packet len (0 => sawtooth, max 2040) */
-uint dhd_pktgen_len = 0;
-module_param(dhd_pktgen_len, uint, 0);
-#endif
-
-
-/* Version string to report */
-#ifdef DHD_DEBUG
-#define DHD_COMPILED "\nCompiled in " SRCBASE
-#else
-#define DHD_COMPILED
-#endif
-
-static char dhd_version[] = "Dongle Host Driver, version " EPI_VERSION_STR
-#ifdef DHD_DEBUG
-"\nCompiled in " SRCBASE " on " __DATE__ " at " __TIME__
-#endif
-;
-
-
-#if defined(CONFIG_WIRELESS_EXT)
-struct iw_statistics *dhd_get_wireless_stats(struct net_device *dev);
-#endif /* defined(CONFIG_WIRELESS_EXT) */
-
-static void dhd_dpc(ulong data);
-/* forward decl */
-extern int dhd_wait_pend8021x(struct net_device *dev);
-
-#ifdef TOE
-#ifndef BDC
-#error TOE requires BDC
-#endif /* !BDC */
-static int dhd_toe_get(dhd_info_t *dhd, int idx, uint32 *toe_ol);
-static int dhd_toe_set(dhd_info_t *dhd, int idx, uint32 toe_ol);
-#endif /* TOE */
-
-static int dhd_wl_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata,
-                             wl_event_msg_t *event_ptr, void **data_ptr);
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) && 1
-static int dhd_sleep_pm_callback(struct notifier_block *nfb, unsigned long action, void *ignored)
-{
-       switch (action)
-       {
-               case PM_HIBERNATION_PREPARE:
-               case PM_SUSPEND_PREPARE:
-                       dhd_mmc_suspend = TRUE;
-                       return NOTIFY_OK;
-               case PM_POST_HIBERNATION:
-               case PM_POST_SUSPEND:
-                       dhd_mmc_suspend = FALSE;
-               return NOTIFY_OK;
-       }
-       return 0;
-}
-
-static struct notifier_block dhd_sleep_pm_notifier = {
-       .notifier_call = dhd_sleep_pm_callback,
-       .priority = 0
-};
-extern int register_pm_notifier(struct notifier_block *nb);
-extern int unregister_pm_notifier(struct notifier_block *nb);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) */
-       /* && defined(DHD_GPL) */
-
-
-#if defined(CONFIG_HAS_EARLYSUSPEND)
-
-int dhd_set_suspend(int value, dhd_pub_t *dhd)
-{
-       int power_mode = PM_MAX;
-       /* wl_pkt_filter_enable_t       enable_parm; */
-       char iovbuf[32];
-       int bcn_li_dtim = 3;
-#ifdef CUSTOMER_HW2
-       uint roamvar = 1;
-#endif /* CUSTOMER_HW2 */
-       int i;
-
-#define htod32(i) i
-
-       if (dhd && dhd->up) {
-               dhd_os_proto_block(dhd);
-               if (value) {
-
-                       /* Kernel suspended */
-                       dhdcdc_set_ioctl(dhd, 0, WLC_SET_PM,
-                               (char *)&power_mode, sizeof(power_mode));
-
-                       /* Enable packet filter, only allow unicast packet to send up */
-                       if (dhd_pkt_filter_enable) {
-                               for (i = 0; i < dhd->pktfilter_count; i++) {
-                                       dhd_pktfilter_offload_set(dhd, dhd->pktfilter[i]);
-                                       dhd_pktfilter_offload_enable(dhd, dhd->pktfilter[i],
-                                               1, dhd_master_mode);
-                               }
-                       }
-
-                       /* set bcn_li_dtim */
-                       bcm_mkiovar("bcn_li_dtim", (char *)&bcn_li_dtim,
-                               4, iovbuf, sizeof(iovbuf));
-                       dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-#ifdef CUSTOMER_HW2
-                       /* Disable build-in roaming to allowed ext supplicant to take of romaing */
-                       bcm_mkiovar("roam_off", (char *)&roamvar, 4, iovbuf, sizeof(iovbuf));
-                       dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-#endif /* CUSTOMER_HW2 */
-               } else {
-
-                       /* Kernel resumed  */
-                       power_mode = PM_FAST;
-                       dhdcdc_set_ioctl(dhd, 0, WLC_SET_PM, (char *)&power_mode,
-                               sizeof(power_mode));
-
-                       /* disable pkt filter */
-                       if (dhd_pkt_filter_enable) {
-                               for (i = 0; i < dhd->pktfilter_count; i++) {
-                                       dhd_pktfilter_offload_set(dhd, dhd->pktfilter[i]);
-                                       dhd_pktfilter_offload_enable(dhd, dhd->pktfilter[i],
-                                               0, dhd_master_mode);
-                               }
-                       }
-
-                       /* set bcn_li_dtim */
-                       bcn_li_dtim = 0;
-                       bcm_mkiovar("bcn_li_dtim", (char *)&bcn_li_dtim,
-                               4, iovbuf, sizeof(iovbuf));
-                       dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-#ifdef CUSTOMER_HW2
-                       roamvar = 0;
-                       bcm_mkiovar("roam_off", (char *)&roamvar, 4, iovbuf, sizeof(iovbuf));
-                       dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
-#endif /* CUSTOMER_HW2 */
-               }
-               dhd_os_proto_unblock(dhd);
-       }
-
-       return 0;
-}
-
-static void dhd_early_suspend(struct early_suspend *h)
-{
-       struct dhd_info *dhdp;
-       dhdp = container_of(h, struct dhd_info, early_suspend);
-
-       DHD_TRACE(("%s: enter\n", __FUNCTION__));
-
-       dhd_set_suspend(1, &dhdp->pub);
-}
-
-static void dhd_late_resume(struct early_suspend *h)
-{
-       struct dhd_info *dhdp;
-       dhdp = container_of(h, struct dhd_info, early_suspend);
-
-       DHD_TRACE(("%s: enter\n", __FUNCTION__));
-
-       dhd_set_suspend(0, &dhdp->pub);
-}
-#endif /* defined(CONFIG_HAS_EARLYSUSPEND) */
-
-/*
- * Generalized timeout mechanism.  Uses spin sleep with exponential back-off until
- * the sleep time reaches one jiffy, then switches over to task delay.  Usage:
- *
- *      dhd_timeout_start(&tmo, usec);
- *      while (!dhd_timeout_expired(&tmo))
- *              if (poll_something())
- *                      break;
- *      if (dhd_timeout_expired(&tmo))
- *              fatal();
- */
-
-void
-dhd_timeout_start(dhd_timeout_t *tmo, uint usec)
-{
-       tmo->limit = usec;
-       tmo->increment = 0;
-       tmo->elapsed = 0;
-       tmo->tick = 1000000 / HZ;
-}
-
-int
-dhd_timeout_expired(dhd_timeout_t *tmo)
-{
-       /* Does nothing the first call */
-       if (tmo->increment == 0) {
-               tmo->increment = 1;
-               return 0;
-       }
-
-       if (tmo->elapsed >= tmo->limit)
-               return 1;
-
-       /* Add the delay that's about to take place */
-       tmo->elapsed += tmo->increment;
-
-       if (tmo->increment < tmo->tick) {
-               OSL_DELAY(tmo->increment);
-               tmo->increment *= 2;
-               if (tmo->increment > tmo->tick)
-                       tmo->increment = tmo->tick;
-       } else {
-               wait_queue_head_t delay_wait;
-               DECLARE_WAITQUEUE(wait, current);
-               int pending;
-               init_waitqueue_head(&delay_wait);
-               add_wait_queue(&delay_wait, &wait);
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(1);
-               pending = signal_pending(current);
-               remove_wait_queue(&delay_wait, &wait);
-               set_current_state(TASK_RUNNING);
-               if (pending)
-                       return 1;       /* Interrupted */
-       }
-
-       return 0;
-}
-
-static int
-dhd_net2idx(dhd_info_t *dhd, struct net_device *net)
-{
-       int i = 0;
-
-       ASSERT(dhd);
-       while (i < DHD_MAX_IFS) {
-               if (dhd->iflist[i] && (dhd->iflist[i]->net == net))
-                       return i;
-               i++;
-       }
-
-       return DHD_BAD_IF;
-}
-
-int
-dhd_ifname2idx(dhd_info_t *dhd, char *name)
-{
-       int i = DHD_MAX_IFS;
-
-       ASSERT(dhd);
-
-       if (name == NULL || *name == '\0')
-               return 0;
-
-       while (--i > 0)
-               if (dhd->iflist[i] && !strncmp(dhd->iflist[i]->name, name, IFNAMSIZ))
-                               break;
-
-       DHD_TRACE(("%s: return idx %d for \"%s\"\n", __FUNCTION__, i, name));
-
-       return i;       /* default - the primary interface */
-}
-
-char *
-dhd_ifname(dhd_pub_t *dhdp, int ifidx)
-{
-       dhd_info_t *dhd = (dhd_info_t *)dhdp->info;
-
-       ASSERT(dhd);
-
-       if (ifidx < 0 || ifidx >= DHD_MAX_IFS) {
-               DHD_ERROR(("%s: ifidx %d out of range\n", __FUNCTION__, ifidx));
-               return "<if_bad>";
-       }
-
-       if (dhd->iflist[ifidx] == NULL) {
-               DHD_ERROR(("%s: null i/f %d\n", __FUNCTION__, ifidx));
-               return "<if_null>";
-       }
-
-       if (dhd->iflist[ifidx]->net)
-               return dhd->iflist[ifidx]->net->name;
-
-       return "<if_none>";
-}
-
-static void
-_dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
-{
-       struct net_device *dev;
-       struct dev_mc_list *mclist;
-       uint32 allmulti, cnt;
-
-       wl_ioctl_t ioc;
-       char *buf, *bufp;
-       uint buflen;
-       int ret;
-
-       ASSERT(dhd && dhd->iflist[ifidx]);
-       dev = dhd->iflist[ifidx]->net;
-       mclist = dev->mc_list;
-       cnt = dev->mc_count;
-
-       /* Determine initial value of allmulti flag */
-       allmulti = (dev->flags & IFF_ALLMULTI) ? TRUE : FALSE;
-
-       /* Send down the multicast list first. */
-
-
-       buflen = sizeof("mcast_list") + sizeof(cnt) + (cnt * ETHER_ADDR_LEN);
-       if (!(bufp = buf = MALLOC(dhd->pub.osh, buflen))) {
-               DHD_ERROR(("%s: out of memory for mcast_list, cnt %d\n",
-                          dhd_ifname(&dhd->pub, ifidx), cnt));
-               return;
-       }
-
-       strcpy(bufp, "mcast_list");
-       bufp += strlen("mcast_list") + 1;
-
-       cnt = htol32(cnt);
-       memcpy(bufp, &cnt, sizeof(cnt));
-       bufp += sizeof(cnt);
-
-       for (cnt = 0; mclist && (cnt < dev->mc_count); cnt++, mclist = mclist->next) {
-               memcpy(bufp, (void *)mclist->dmi_addr, ETHER_ADDR_LEN);
-               bufp += ETHER_ADDR_LEN;
-       }
-
-       memset(&ioc, 0, sizeof(ioc));
-       ioc.cmd = WLC_SET_VAR;
-       ioc.buf = buf;
-       ioc.len = buflen;
-       ioc.set = TRUE;
-
-       ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len);
-       if (ret < 0) {
-               DHD_ERROR(("%s: set mcast_list failed, cnt %d\n",
-                       dhd_ifname(&dhd->pub, ifidx), cnt));
-               allmulti = cnt ? TRUE : allmulti;
-       }
-
-       MFREE(dhd->pub.osh, buf, buflen);
-
-       /* Now send the allmulti setting.  This is based on the setting in the
-        * net_device flags, but might be modified above to be turned on if we
-        * were trying to set some addresses and dongle rejected it...
-        */
-
-       buflen = sizeof("allmulti") + sizeof(allmulti);
-       if (!(buf = MALLOC(dhd->pub.osh, buflen))) {
-               DHD_ERROR(("%s: out of memory for allmulti\n", dhd_ifname(&dhd->pub, ifidx)));
-               return;
-       }
-       allmulti = htol32(allmulti);
-
-       if (!bcm_mkiovar("allmulti", (void*)&allmulti, sizeof(allmulti), buf, buflen)) {
-               DHD_ERROR(("%s: mkiovar failed for allmulti, datalen %d buflen %u\n",
-                          dhd_ifname(&dhd->pub, ifidx), (int)sizeof(allmulti), buflen));
-               MFREE(dhd->pub.osh, buf, buflen);
-               return;
-       }
-
-
-       memset(&ioc, 0, sizeof(ioc));
-       ioc.cmd = WLC_SET_VAR;
-       ioc.buf = buf;
-       ioc.len = buflen;
-       ioc.set = TRUE;
-
-       ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len);
-       if (ret < 0) {
-               DHD_ERROR(("%s: set allmulti %d failed\n",
-                          dhd_ifname(&dhd->pub, ifidx), ltoh32(allmulti)));
-       }
-
-       MFREE(dhd->pub.osh, buf, buflen);
-
-       /* Finally, pick up the PROMISC flag as well, like the NIC driver does */
-
-       allmulti = (dev->flags & IFF_PROMISC) ? TRUE : FALSE;
-       allmulti = htol32(allmulti);
-
-       memset(&ioc, 0, sizeof(ioc));
-       ioc.cmd = WLC_SET_PROMISC;
-       ioc.buf = &allmulti;
-       ioc.len = sizeof(allmulti);
-       ioc.set = TRUE;
-
-       ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len);
-       if (ret < 0) {
-               DHD_ERROR(("%s: set promisc %d failed\n",
-                          dhd_ifname(&dhd->pub, ifidx), ltoh32(allmulti)));
-       }
-}
-
-static int
-_dhd_set_mac_address(dhd_info_t *dhd, int ifidx, struct ether_addr *addr)
-{
-       char buf[32];
-       wl_ioctl_t ioc;
-       int ret;
-
-       DHD_TRACE(("%s enter\n", __FUNCTION__));
-       if (!bcm_mkiovar("cur_etheraddr", (char*)addr, ETHER_ADDR_LEN, buf, 32)) {
-               DHD_ERROR(("%s: mkiovar failed for cur_etheraddr\n", dhd_ifname(&dhd->pub, ifidx)));
-               return -1;
-       }
-       memset(&ioc, 0, sizeof(ioc));
-       ioc.cmd = WLC_SET_VAR;
-       ioc.buf = buf;
-       ioc.len = 32;
-       ioc.set = TRUE;
-
-       ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len);
-       if (ret < 0) {
-               DHD_ERROR(("%s: set cur_etheraddr failed\n", dhd_ifname(&dhd->pub, ifidx)));
-       } else {
-               memcpy(dhd->iflist[ifidx]->net->dev_addr, addr, ETHER_ADDR_LEN);
-       }
-
-       return ret;
-}
-
-#ifdef SOFTAP
-extern struct net_device *ap_net_dev;
-#endif
-
-static void
-dhd_op_if(dhd_if_t *ifp)
-{
-       dhd_info_t      *dhd;
-       int                     ret = 0, err = 0;
-
-       ASSERT(ifp && ifp->info && ifp->idx);   /* Virtual interfaces only */
-
-       dhd = ifp->info;
-
-       DHD_TRACE(("%s: idx %d, state %d\n", __FUNCTION__, ifp->idx, ifp->state));
-
-       switch (ifp->state) {
-       case WLC_E_IF_ADD:
-               /*
-                * Delete the existing interface before overwriting it
-                * in case we missed the WLC_E_IF_DEL event.
-                */
-               if (ifp->net != NULL) {
-                       DHD_ERROR(("%s: ERROR: netdev:%s already exists, try free & unregister \n",
-                        __FUNCTION__, ifp->net->name));
-                       netif_stop_queue(ifp->net);
-                       unregister_netdev(ifp->net);
-                       free_netdev(ifp->net);
-               }
-               /* Allocate etherdev, including space for private structure */
-               if (!(ifp->net = alloc_etherdev(sizeof(dhd)))) {
-                       DHD_ERROR(("%s: OOM - alloc_etherdev\n", __FUNCTION__));
-                       ret = -ENOMEM;
-               }
-               if (ret == 0) {
-                       strcpy(ifp->net->name, ifp->name);
-                       memcpy(netdev_priv(ifp->net), &dhd, sizeof(dhd));
-                       if ((err = dhd_net_attach(&dhd->pub, ifp->idx)) != 0) {
-                               DHD_ERROR(("%s: dhd_net_attach failed, err %d\n",
-                                       __FUNCTION__, err));
-                               ret = -EOPNOTSUPP;
-                       } else {
-#ifdef SOFTAP
-                                /* semaphore that the soft AP CODE waits on */
-                               extern struct semaphore  ap_eth_sema;
-
-                               /* save ptr to wl0.1 netdev for use in wl_iw.c  */
-                               ap_net_dev = ifp->net;
-                                /* signal to the SOFTAP 'sleeper' thread, wl0.1 is ready */
-                               up(&ap_eth_sema);
-#endif
-                               DHD_TRACE(("\n ==== pid:%x, net_device for if:%s created ===\n\n",
-                                       current->pid, ifp->net->name));
-                               ifp->state = 0;
-                       }
-               }
-               break;
-       case WLC_E_IF_DEL:
-               if (ifp->net != NULL) {
-                   DHD_TRACE(("\n%s: got 'WLC_E_IF_DEL' state\n", __FUNCTION__));
-                       netif_stop_queue(ifp->net);
-                       unregister_netdev(ifp->net);
-                       ret = DHD_DEL_IF;       /* Make sure the free_netdev() is called */
-               }
-               break;
-       default:
-               DHD_ERROR(("%s: bad op %d\n", __FUNCTION__, ifp->state));
-               ASSERT(!ifp->state);
-               break;
-       }
-
-       if (ret < 0) {
-               if (ifp->net) {
-                       free_netdev(ifp->net);
-               }
-               dhd->iflist[ifp->idx] = NULL;
-               MFREE(dhd->pub.osh, ifp, sizeof(*ifp));
-#ifdef SOFTAP
-               if (ifp->net == ap_net_dev)
-                       ap_net_dev = NULL;   /*  NULL  SOFTAP global wl0.1 as well */
-#endif /*  SOFTAP */
-       }
-}
-
-static int
-_dhd_sysioc_thread(void *data)
-{
-       dhd_info_t *dhd = (dhd_info_t *)data;
-       int i;
-#ifdef SOFTAP
-       bool in_ap = FALSE;
-#endif
-
-       DAEMONIZE("dhd_sysioc");
-
-       while (down_interruptible(&dhd->sysioc_sem) == 0) {
-               for (i = 0; i < DHD_MAX_IFS; i++) {
-                       if (dhd->iflist[i]) {
-#ifdef SOFTAP
-                               in_ap = (ap_net_dev != NULL);
-#endif /* SOFTAP */
-                               if (dhd->iflist[i]->state)
-                                       dhd_op_if(dhd->iflist[i]);
-#ifdef SOFTAP
-                               if (dhd->iflist[i] == NULL) {
-                                       DHD_TRACE(("\n\n %s: interface %d just been removed,"
-                                               "!\n\n", __FUNCTION__, i));
-                                       continue;
-                               }
-
-                               if (in_ap && dhd->set_macaddress)  {
-                                       DHD_TRACE(("attempt to set MAC for %s in AP Mode,"
-                                               "blocked. \n", dhd->iflist[i]->net->name));
-                                       dhd->set_macaddress = FALSE;
-                                       continue;
-                               }
-
-                               if (in_ap && dhd->set_multicast)  {
-                                       DHD_TRACE(("attempt to set MULTICAST list for %s"
-                                        "in AP Mode, blocked. \n", dhd->iflist[i]->net->name));
-                                       dhd->set_multicast = FALSE;
-                                       continue;
-                               }
-#endif /* SOFTAP */
-                               if (dhd->set_multicast) {
-                                       dhd->set_multicast = FALSE;
-                                       _dhd_set_multicast_list(dhd, i);
-                               }
-                               if (dhd->set_macaddress) {
-                                       dhd->set_macaddress = FALSE;
-                                       _dhd_set_mac_address(dhd, i, &dhd->macvalue);
-                               }
-                       }
-               }
-       }
-       complete_and_exit(&dhd->sysioc_exited, 0);
-}
-
-static int
-dhd_set_mac_address(struct net_device *dev, void *addr)
-{
-       int ret = 0;
-
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
-       struct sockaddr *sa = (struct sockaddr *)addr;
-       int ifidx;
-
-       ifidx = dhd_net2idx(dhd, dev);
-       if (ifidx == DHD_BAD_IF)
-               return -1;
-
-       ASSERT(dhd->sysioc_pid >= 0);
-       memcpy(&dhd->macvalue, sa->sa_data, ETHER_ADDR_LEN);
-       dhd->set_macaddress = TRUE;
-       up(&dhd->sysioc_sem);
-
-       return ret;
-}
-
-static void
-dhd_set_multicast_list(struct net_device *dev)
-{
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
-       int ifidx;
-
-       ifidx = dhd_net2idx(dhd, dev);
-       if (ifidx == DHD_BAD_IF)
-               return;
-
-       ASSERT(dhd->sysioc_pid >= 0);
-       dhd->set_multicast = TRUE;
-       up(&dhd->sysioc_sem);
-}
-
-int
-dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, void *pktbuf)
-{
-       int ret;
-       dhd_info_t *dhd = (dhd_info_t *)(dhdp->info);
-
-       /* Reject if down */
-       if (!dhdp->up || (dhdp->busstate == DHD_BUS_DOWN)) {
-               return -ENODEV;
-       }
-
-       /* Update multicast statistic */
-       if (PKTLEN(dhdp->osh, pktbuf) >= ETHER_ADDR_LEN) {
-               uint8 *pktdata = (uint8 *)PKTDATA(dhdp->osh, pktbuf);
-               struct ether_header *eh = (struct ether_header *)pktdata;
-
-               if (ETHER_ISMULTI(eh->ether_dhost))
-                       dhdp->tx_multicast++;
-               if (ntoh16(eh->ether_type) == ETHER_TYPE_802_1X)
-                       atomic_inc(&dhd->pend_8021x_cnt);
-       }
-
-       /* Look into the packet and update the packet priority */
-       if ((PKTPRIO(pktbuf) == 0))
-               pktsetprio(pktbuf, FALSE);
-
-       /* If the protocol uses a data header, apply it */
-       dhd_prot_hdrpush(dhdp, ifidx, pktbuf);
-
-       /* Use bus module to send data frame */
-#ifdef BCMDBUS
-       ret = dbus_send_pkt(dhdp->dbus, pktbuf, NULL /* pktinfo */);
-#else
-       WAKE_LOCK_TIMEOUT(dhdp, WAKE_LOCK_TMOUT, 25);
-       ret = dhd_bus_txdata(dhdp->bus, pktbuf);
-#endif /* BCMDBUS */
-
-       return ret;
-}
-
-static int
-dhd_start_xmit(struct sk_buff *skb, struct net_device *net)
-{
-       int ret;
-       void *pktbuf;
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(net);
-       int ifidx;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       /* Reject if down */
-       if (!dhd->pub.up || (dhd->pub.busstate == DHD_BUS_DOWN)) {
-               DHD_ERROR(("%s: xmit rejected pub.up=%d busstate=%d \n",
-                       __FUNCTION__, dhd->pub.up, dhd->pub.busstate));
-               netif_stop_queue(net);
-               /* Send Event when bus down detected during data session */
-               if (dhd->pub.busstate == DHD_BUS_DOWN)  {
-                       DHD_ERROR(("%s: Event RELOAD send up\n", __FUNCTION__));
-                       wl_iw_send_priv_event(net, "RELOAD");
-               }
-               return -ENODEV;
-       }
-
-       ifidx = dhd_net2idx(dhd, net);
-       if (ifidx == DHD_BAD_IF) {
-               DHD_ERROR(("%s: bad ifidx %d\n", __FUNCTION__, ifidx));
-               netif_stop_queue(net);
-               return -ENODEV;
-       }
-
-       /* Make sure there's enough room for any header */
-       if (skb_headroom(skb) < dhd->pub.hdrlen) {
-               struct sk_buff *skb2;
-
-               DHD_INFO(("%s: insufficient headroom\n",
-                         dhd_ifname(&dhd->pub, ifidx)));
-               dhd->pub.tx_realloc++;
-               skb2 = skb_realloc_headroom(skb, dhd->pub.hdrlen);
-               dev_kfree_skb(skb);
-               if ((skb = skb2) == NULL) {
-                       DHD_ERROR(("%s: skb_realloc_headroom failed\n",
-                                  dhd_ifname(&dhd->pub, ifidx)));
-                       ret = -ENOMEM;
-                       goto done;
-               }
-       }
-
-       /* Convert to packet */
-       if (!(pktbuf = PKTFRMNATIVE(dhd->pub.osh, skb))) {
-               DHD_ERROR(("%s: PKTFRMNATIVE failed\n",
-                          dhd_ifname(&dhd->pub, ifidx)));
-               dev_kfree_skb_any(skb);
-               ret = -ENOMEM;
-               goto done;
-       }
-
-       ret = dhd_sendpkt(&dhd->pub, ifidx, pktbuf);
-
-
-done:
-       if (ret)
-               dhd->pub.dstats.tx_dropped++;
-       else
-               dhd->pub.tx_packets++;
-
-       /* Return ok: we always eat the packet */
-       return 0;
-}
-
-void
-dhd_txflowcontrol(dhd_pub_t *dhdp, int ifidx, bool state)
-{
-       struct net_device *net;
-       dhd_info_t *dhd = dhdp->info;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       dhdp->txoff = state;
-       ASSERT(dhd && dhd->iflist[ifidx]);
-       net = dhd->iflist[ifidx]->net;
-       if (state == ON)
-               netif_stop_queue(net);
-       else
-               netif_wake_queue(net);
-}
-
-void
-dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *pktbuf, int numpkt)
-{
-       dhd_info_t *dhd = (dhd_info_t *)dhdp->info;
-       struct sk_buff *skb;
-       uchar *eth;
-       uint len;
-       void * data, *pnext, *save_pktbuf;
-       int i;
-       dhd_if_t *ifp;
-       wl_event_msg_t event;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       save_pktbuf = pktbuf;
-
-       for (i = 0; pktbuf && i < numpkt; i++, pktbuf = pnext) {
-
-               pnext = PKTNEXT(dhdp->osh, pktbuf);
-               PKTSETNEXT(wl->sh.osh, pktbuf, NULL);
-
-
-               skb = PKTTONATIVE(dhdp->osh, pktbuf);
-
-               /* Get the protocol, maintain skb around eth_type_trans()
-                * The main reason for this hack is for the limitation of
-                * Linux 2.4 where 'eth_type_trans' uses the 'net->hard_header_len'
-                * to perform skb_pull inside vs ETH_HLEN. Since to avoid
-                * coping of the packet coming from the network stack to add
-                * BDC, Hardware header etc, during network interface registration
-                * we set the 'net->hard_header_len' to ETH_HLEN + extra space required
-                * for BDC, Hardware header etc. and not just the ETH_HLEN
-                */
-               eth = skb->data;
-               len = skb->len;
-
-               ifp = dhd->iflist[ifidx];
-               if (ifp == NULL)
-                       ifp = dhd->iflist[0];
-
-               ASSERT(ifp);
-               skb->dev = ifp->net;
-               skb->protocol = eth_type_trans(skb, skb->dev);
-
-               if (skb->pkt_type == PACKET_MULTICAST) {
-                       dhd->pub.rx_multicast++;
-               }
-
-               skb->data = eth;
-               skb->len = len;
-
-               /* Strip header, count, deliver upward */
-               skb_pull(skb, ETH_HLEN);
-
-               /* Process special event packets and then discard them */
-               if (ntoh16(skb->protocol) == ETHER_TYPE_BRCM)
-                       dhd_wl_host_event(dhd, &ifidx,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
-                       skb->mac_header,
-#else
-                       skb->mac.raw,
-#endif
-                       &event,
-                       &data);
-
-               ASSERT(ifidx < DHD_MAX_IFS && dhd->iflist[ifidx]);
-               if (dhd->iflist[ifidx] && !dhd->iflist[ifidx]->state)
-                       ifp = dhd->iflist[ifidx];
-
-               if (ifp->net)
-                       ifp->net->last_rx = jiffies;
-
-               dhdp->dstats.rx_bytes += skb->len;
-               dhdp->rx_packets++; /* Local count */
-
-               if (in_interrupt()) {
-                       netif_rx(skb);
-               } else {
-                       /* If the receive is not processed inside an ISR,
-                        * the softirqd must be woken explicitly to service
-                        * the NET_RX_SOFTIRQ.  In 2.6 kernels, this is handled
-                        * by netif_rx_ni(), but in earlier kernels, we need
-                        * to do it manually.
-                        */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-                       netif_rx_ni(skb);
-#else
-                       ulong flags;
-                       netif_rx(skb);
-                       local_irq_save(flags);
-                       RAISE_RX_SOFTIRQ();
-                       local_irq_restore(flags);
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) */
-               }
-       }
-}
-
-void
-dhd_event(struct dhd_info *dhd, char *evpkt, int evlen, int ifidx)
-{
-       /* Linux version has nothing to do */
-       return;
-}
-
-void
-dhd_txcomplete(dhd_pub_t *dhdp, void *txp, bool success)
-{
-       uint ifidx;
-       dhd_info_t *dhd = (dhd_info_t *)(dhdp->info);
-       struct ether_header *eh;
-       uint16 type;
-
-       dhd_prot_hdrpull(dhdp, &ifidx, txp);
-
-       eh = (struct ether_header *)PKTDATA(dhdp->osh, txp);
-       type  = ntoh16(eh->ether_type);
-
-       if (type == ETHER_TYPE_802_1X)
-               atomic_dec(&dhd->pend_8021x_cnt);
-
-}
-
-static struct net_device_stats *
-dhd_get_stats(struct net_device *net)
-{
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(net);
-       dhd_if_t *ifp;
-       int ifidx;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       ifidx = dhd_net2idx(dhd, net);
-       if (ifidx == DHD_BAD_IF)
-               return NULL;
-
-       ifp = dhd->iflist[ifidx];
-       ASSERT(dhd && ifp);
-
-       if (dhd->pub.up) {
-               /* Use the protocol to get dongle stats */
-               dhd_prot_dstats(&dhd->pub);
-       }
-
-       /* Copy dongle stats to net device stats */
-       ifp->stats.rx_packets = dhd->pub.dstats.rx_packets;
-       ifp->stats.tx_packets = dhd->pub.dstats.tx_packets;
-       ifp->stats.rx_bytes = dhd->pub.dstats.rx_bytes;
-       ifp->stats.tx_bytes = dhd->pub.dstats.tx_bytes;
-       ifp->stats.rx_errors = dhd->pub.dstats.rx_errors;
-       ifp->stats.tx_errors = dhd->pub.dstats.tx_errors;
-       ifp->stats.rx_dropped = dhd->pub.dstats.rx_dropped;
-       ifp->stats.tx_dropped = dhd->pub.dstats.tx_dropped;
-       ifp->stats.multicast = dhd->pub.dstats.multicast;
-
-       return &ifp->stats;
-}
-
-static int
-dhd_watchdog_thread(void *data)
-{
-       dhd_info_t *dhd = (dhd_info_t *)data;
-       WAKE_LOCK_INIT(&dhd->pub, WAKE_LOCK_WATCHDOG, "dhd_watchdog_thread");
-
-       /* This thread doesn't need any user-level access,
-        * so get rid of all our resources
-        */
-#ifdef DHD_SCHED
-       if (dhd_watchdog_prio > 0) {
-               struct sched_param param;
-               param.sched_priority = (dhd_watchdog_prio < MAX_RT_PRIO)?
-                       dhd_watchdog_prio:(MAX_RT_PRIO-1);
-               setScheduler(current, SCHED_FIFO, &param);
-       }
-#endif /* DHD_SCHED */
-
-       DAEMONIZE("dhd_watchdog");
-
-       /* Run until signal received */
-       while (1) {
-               if (down_interruptible (&dhd->watchdog_sem) == 0) {
-                       if (dhd->pub.dongle_reset == FALSE) {
-                               WAKE_LOCK(&dhd->pub, WAKE_LOCK_WATCHDOG);
-                               /* Call the bus module watchdog */
-                               dhd_bus_watchdog(&dhd->pub);
-                               WAKE_UNLOCK(&dhd->pub, WAKE_LOCK_WATCHDOG);
-                       }
-                       /* Count the tick for reference */
-                       dhd->pub.tickcnt++;
-
-                       /* Reschedule the watchdog */
-                       if (dhd->wd_timer_valid) {
-                               mod_timer(&dhd->timer, jiffies + dhd_watchdog_ms * HZ / 1000);
-                       }
-               }
-               else
-                       break;
-       }
-
-       WAKE_LOCK_DESTROY(&dhd->pub, WAKE_LOCK_WATCHDOG);
-       complete_and_exit(&dhd->watchdog_exited, 0);
-}
-
-static void
-dhd_watchdog(ulong data)
-{
-       dhd_info_t *dhd = (dhd_info_t *)data;
-
-       if (dhd->watchdog_pid >= 0) {
-               up(&dhd->watchdog_sem);
-               return;
-       }
-
-       /* Call the bus module watchdog */
-       dhd_bus_watchdog(&dhd->pub);
-
-       /* Count the tick for reference */
-       dhd->pub.tickcnt++;
-
-       /* Reschedule the watchdog */
-       if (dhd->wd_timer_valid)
-               mod_timer(&dhd->timer, jiffies + dhd_watchdog_ms * HZ / 1000);
-}
-
-static int
-dhd_dpc_thread(void *data)
-{
-       dhd_info_t *dhd = (dhd_info_t *)data;
-
-       WAKE_LOCK_INIT(&dhd->pub, WAKE_LOCK_DPC, "dhd_dpc_thread");
-       /* This thread doesn't need any user-level access,
-        * so get rid of all our resources
-        */
-#ifdef DHD_SCHED
-       if (dhd_dpc_prio > 0)
-       {
-               struct sched_param param;
-               param.sched_priority = (dhd_dpc_prio < MAX_RT_PRIO)?dhd_dpc_prio:(MAX_RT_PRIO-1);
-               setScheduler(current, SCHED_FIFO, &param);
-       }
-#endif /* DHD_SCHED */
-
-       DAEMONIZE("dhd_dpc");
-
-       /* Run until signal received */
-       while (1) {
-               if (down_interruptible(&dhd->dpc_sem) == 0) {
-                       /* Call bus dpc unless it indicated down (then clean stop) */
-                       if (dhd->pub.busstate != DHD_BUS_DOWN) {
-                               WAKE_LOCK(&dhd->pub, WAKE_LOCK_DPC);
-                               if (dhd_bus_dpc(dhd->pub.bus)) {
-                                       up(&dhd->dpc_sem);
-                                       WAKE_LOCK_TIMEOUT(&dhd->pub, WAKE_LOCK_TMOUT, 25);
-                               }
-                               WAKE_UNLOCK(&dhd->pub, WAKE_LOCK_DPC);
-                       } else {
-                               dhd_bus_stop(dhd->pub.bus, TRUE);
-                       }
-               }
-               else
-                       break;
-       }
-
-       WAKE_LOCK_DESTROY(&dhd->pub, WAKE_LOCK_DPC);
-
-       complete_and_exit(&dhd->dpc_exited, 0);
-}
-
-static void
-dhd_dpc(ulong data)
-{
-       dhd_info_t *dhd;
-
-       dhd = (dhd_info_t *)data;
-
-       /* Call bus dpc unless it indicated down (then clean stop) */
-       if (dhd->pub.busstate != DHD_BUS_DOWN) {
-               if (dhd_bus_dpc(dhd->pub.bus))
-                       tasklet_schedule(&dhd->tasklet);
-       } else {
-               dhd_bus_stop(dhd->pub.bus, TRUE);
-       }
-}
-
-void
-dhd_sched_dpc(dhd_pub_t *dhdp)
-{
-       dhd_info_t *dhd = (dhd_info_t *)dhdp->info;
-
-       if (dhd->dpc_pid >= 0) {
-               up(&dhd->dpc_sem);
-               return;
-       }
-
-       tasklet_schedule(&dhd->tasklet);
-}
-
-#ifdef TOE
-/* Retrieve current toe component enables, which are kept as a bitmap in toe_ol iovar */
-static int
-dhd_toe_get(dhd_info_t *dhd, int ifidx, uint32 *toe_ol)
-{
-       wl_ioctl_t ioc;
-       char buf[32];
-       int ret;
-
-       memset(&ioc, 0, sizeof(ioc));
-
-       ioc.cmd = WLC_GET_VAR;
-       ioc.buf = buf;
-       ioc.len = (uint)sizeof(buf);
-       ioc.set = FALSE;
-
-       strcpy(buf, "toe_ol");
-       if ((ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len)) < 0) {
-               /* Check for older dongle image that doesn't support toe_ol */
-               if (ret == -EIO) {
-                       DHD_ERROR(("%s: toe not supported by device\n",
-                               dhd_ifname(&dhd->pub, ifidx)));
-                       return -EOPNOTSUPP;
-               }
-
-               DHD_INFO(("%s: could not get toe_ol: ret=%d\n", dhd_ifname(&dhd->pub, ifidx), ret));
-               return ret;
-       }
-
-       memcpy(toe_ol, buf, sizeof(uint32));
-       return 0;
-}
-
-/* Set current toe component enables in toe_ol iovar, and set toe global enable iovar */
-static int
-dhd_toe_set(dhd_info_t *dhd, int ifidx, uint32 toe_ol)
-{
-       wl_ioctl_t ioc;
-       char buf[32];
-       int toe, ret;
-
-       memset(&ioc, 0, sizeof(ioc));
-
-       ioc.cmd = WLC_SET_VAR;
-       ioc.buf = buf;
-       ioc.len = (uint)sizeof(buf);
-       ioc.set = TRUE;
-
-       /* Set toe_ol as requested */
-
-       strcpy(buf, "toe_ol");
-       memcpy(&buf[sizeof("toe_ol")], &toe_ol, sizeof(uint32));
-
-       if ((ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len)) < 0) {
-               DHD_ERROR(("%s: could not set toe_ol: ret=%d\n",
-                       dhd_ifname(&dhd->pub, ifidx), ret));
-               return ret;
-       }
-
-       /* Enable toe globally only if any components are enabled. */
-
-       toe = (toe_ol != 0);
-
-       strcpy(buf, "toe");
-       memcpy(&buf[sizeof("toe")], &toe, sizeof(uint32));
-
-       if ((ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len)) < 0) {
-               DHD_ERROR(("%s: could not set toe: ret=%d\n", dhd_ifname(&dhd->pub, ifidx), ret));
-               return ret;
-       }
-
-       return 0;
-}
-#endif /* TOE */
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
-static void dhd_ethtool_get_drvinfo(struct net_device *net,
-                                    struct ethtool_drvinfo *info)
-{
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(net);
-
-       sprintf(info->driver, "wl");
-       sprintf(info->version, "%lu", dhd->pub.drv_version);
-}
-
-struct ethtool_ops dhd_ethtool_ops = {
-       .get_drvinfo = dhd_ethtool_get_drvinfo
-};
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) */
-
-
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 2)
-static int
-dhd_ethtool(dhd_info_t *dhd, void *uaddr)
-{
-       struct ethtool_drvinfo info;
-       char drvname[sizeof(info.driver)];
-       uint32 cmd;
-#ifdef TOE
-       struct ethtool_value edata;
-       uint32 toe_cmpnt, csum_dir;
-       int ret;
-#endif
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       /* all ethtool calls start with a cmd word */
-       if (copy_from_user(&cmd, uaddr, sizeof (uint32)))
-               return -EFAULT;
-
-       switch (cmd) {
-       case ETHTOOL_GDRVINFO:
-               /* Copy out any request driver name */
-               if (copy_from_user(&info, uaddr, sizeof(info)))
-                       return -EFAULT;
-               strncpy(drvname, info.driver, sizeof(info.driver));
-               drvname[sizeof(info.driver)-1] = '\0';
-
-               /* clear struct for return */
-               memset(&info, 0, sizeof(info));
-               info.cmd = cmd;
-
-               /* if dhd requested, identify ourselves */
-               if (strcmp(drvname, "?dhd") == 0) {
-                       sprintf(info.driver, "dhd");
-                       strcpy(info.version, EPI_VERSION_STR);
-               }
-
-               /* otherwise, require dongle to be up */
-               else if (!dhd->pub.up) {
-                       DHD_ERROR(("%s: dongle is not up\n", __FUNCTION__));
-                       return -ENODEV;
-               }
-
-               /* finally, report dongle driver type */
-               else if (dhd->pub.iswl)
-                       sprintf(info.driver, "wl");
-               else
-                       sprintf(info.driver, "xx");
-
-               sprintf(info.version, "%lu", dhd->pub.drv_version);
-               if (copy_to_user(uaddr, &info, sizeof(info)))
-                       return -EFAULT;
-               DHD_CTL(("%s: given %*s, returning %s\n", __FUNCTION__,
-                        (int)sizeof(drvname), drvname, info.driver));
-               break;
-
-#ifdef TOE
-       /* Get toe offload components from dongle */
-       case ETHTOOL_GRXCSUM:
-       case ETHTOOL_GTXCSUM:
-               if ((ret = dhd_toe_get(dhd, 0, &toe_cmpnt)) < 0)
-                       return ret;
-
-               csum_dir = (cmd == ETHTOOL_GTXCSUM) ? TOE_TX_CSUM_OL : TOE_RX_CSUM_OL;
-
-               edata.cmd = cmd;
-               edata.data = (toe_cmpnt & csum_dir) ? 1 : 0;
-
-               if (copy_to_user(uaddr, &edata, sizeof(edata)))
-                       return -EFAULT;
-               break;
-
-       /* Set toe offload components in dongle */
-       case ETHTOOL_SRXCSUM:
-       case ETHTOOL_STXCSUM:
-               if (copy_from_user(&edata, uaddr, sizeof(edata)))
-                       return -EFAULT;
-
-               /* Read the current settings, update and write back */
-               if ((ret = dhd_toe_get(dhd, 0, &toe_cmpnt)) < 0)
-                       return ret;
-
-               csum_dir = (cmd == ETHTOOL_STXCSUM) ? TOE_TX_CSUM_OL : TOE_RX_CSUM_OL;
-
-               if (edata.data != 0)
-                       toe_cmpnt |= csum_dir;
-               else
-                       toe_cmpnt &= ~csum_dir;
-
-               if ((ret = dhd_toe_set(dhd, 0, toe_cmpnt)) < 0)
-                       return ret;
-
-               /* If setting TX checksum mode, tell Linux the new mode */
-               if (cmd == ETHTOOL_STXCSUM) {
-                       if (edata.data)
-                               dhd->iflist[0]->net->features |= NETIF_F_IP_CSUM;
-                       else
-                               dhd->iflist[0]->net->features &= ~NETIF_F_IP_CSUM;
-               }
-
-               break;
-#endif /* TOE */
-
-       default:
-               return -EOPNOTSUPP;
-       }
-
-       return 0;
-}
-#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 2) */
-
-static int
-dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)
-{
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(net);
-       dhd_ioctl_t ioc;
-       int bcmerror = 0;
-       int buflen = 0;
-       void *buf = NULL;
-       uint driver = 0;
-       int ifidx;
-       bool is_set_key_cmd;
-       
-       ifidx = dhd_net2idx(dhd, net);
-       DHD_TRACE(("%s: ifidx %d, cmd 0x%04x\n", __FUNCTION__, ifidx, cmd));
-
-       if (ifidx == DHD_BAD_IF)
-               return -1;
-
-#if defined(CONFIG_WIRELESS_EXT)
-       /* linux wireless extensions */
-       if ((cmd >= SIOCIWFIRST) && (cmd <= SIOCIWLAST)) {
-               /* may recurse, do NOT lock */
-               return wl_iw_ioctl(net, ifr, cmd);
-       }
-#endif /* defined(CONFIG_WIRELESS_EXT) */
-
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 2)
-       if (cmd == SIOCETHTOOL)
-               return (dhd_ethtool(dhd, (void*)ifr->ifr_data));
-#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 2) */
-
-       if (cmd != SIOCDEVPRIVATE)
-               return -EOPNOTSUPP;
-
-       memset(&ioc, 0, sizeof(ioc));
-
-       /* Copy the ioc control structure part of ioctl request */
-       if (copy_from_user(&ioc, ifr->ifr_data, sizeof(wl_ioctl_t))) {
-               bcmerror = -BCME_BADADDR;
-               goto done;
-       }
-
-       /* Copy out any buffer passed */
-       if (ioc.buf) {
-               buflen = MIN(ioc.len, DHD_IOCTL_MAXLEN);
-               /* optimization for direct ioctl calls from kernel */
-               /*
-               if (segment_eq(get_fs(), KERNEL_DS)) {
-                       buf = ioc.buf;
-               } else {
-               */
-               {
-                       if (!(buf = (char*)MALLOC(dhd->pub.osh, buflen))) {
-                               bcmerror = -BCME_NOMEM;
-                               goto done;
-                       }
-                       if (copy_from_user(buf, ioc.buf, buflen)) {
-                               bcmerror = -BCME_BADADDR;
-                               goto done;
-                       }
-               }
-       }
-
-       /* To differentiate between wl and dhd read 4 more byes */
-       if ((copy_from_user(&driver, (char *)ifr->ifr_data + sizeof(wl_ioctl_t),
-               sizeof(uint)) != 0)) {
-               bcmerror = -BCME_BADADDR;
-               goto done;
-       }
-
-       if (!capable(CAP_NET_ADMIN)) {
-               bcmerror = -BCME_EPERM;
-               goto done;
-       }
-
-       /* check for local dhd ioctl and handle it */
-       if (driver == DHD_IOCTL_MAGIC) {
-               printk("%s: Is local dhd ioctl\n", __func__);
-               bcmerror = dhd_ioctl((void *)&dhd->pub, &ioc, buf, buflen);
-               if (bcmerror)
-                       dhd->pub.bcmerror = bcmerror;
-               goto done;
-       }
-
-       /* send to dongle (must be up, and wl) */
-       if (
-                       (dhd->pub.busstate != DHD_BUS_DATA)) {
-               DHD_ERROR(("%s DONGLE_DOWN,__FUNCTION__\n", __FUNCTION__));
-               bcmerror = BCME_DONGLE_DOWN;
-               goto done;
-       }
-
-       if (!dhd->pub.iswl) {
-               bcmerror = BCME_DONGLE_DOWN;
-               goto done;
-       }
-
-       /* Intercept WLC_SET_KEY IOCTL - serialize M4 send and set key IOCTL to
-        * prevent M4 encryption.
-        */
-       is_set_key_cmd = ((ioc.cmd == WLC_SET_KEY) ||
-                        ((ioc.cmd == WLC_SET_VAR) &&
-                               !(strncmp("wsec_key", ioc.buf, 9))) ||
-                        ((ioc.cmd == WLC_SET_VAR) &&
-                               !(strncmp("bsscfg:wsec_key", ioc.buf, 15))));
-       if (is_set_key_cmd) {
-               dhd_wait_pend8021x(net);
-       }
-       WAKE_LOCK_INIT(&dhd->pub, WAKE_LOCK_IOCTL, "dhd_ioctl_entry");
-       WAKE_LOCK(&dhd->pub, WAKE_LOCK_IOCTL);
-
-       bcmerror = dhd_prot_ioctl(&dhd->pub, ifidx, (wl_ioctl_t *)&ioc, buf, buflen);
-
-       WAKE_UNLOCK(&dhd->pub, WAKE_LOCK_IOCTL);
-       WAKE_LOCK_DESTROY(&dhd->pub, WAKE_LOCK_IOCTL);
-       if (bcmerror == -ETIMEDOUT) {
-               DHD_ERROR(("%s: Event RELOAD send up\n", __FUNCTION__));
-               wl_iw_send_priv_event(net, "RELOAD");
-       }
-done:
-       if (!bcmerror && buf && ioc.buf) {
-               if (copy_to_user(ioc.buf, buf, buflen))
-                       bcmerror = -EFAULT;
-       }
-
-       if (buf)
-               MFREE(dhd->pub.osh, buf, buflen);
-
-       return OSL_ERROR(bcmerror);
-}
-
-static int
-dhd_stop(struct net_device *net)
-{
-#if !defined(IGNORE_ETH0_DOWN)
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(net);
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-       if (dhd->pub.up == 0) {
-               return 0;
-       }
-
-       /* Set state and stop OS transmissions */
-       dhd->pub.up = 0;
-       netif_stop_queue(net);
-#else
-       DHD_ERROR(("BYPASS %s:due to BRCM compilation : under investigation ...\n", __FUNCTION__));
-#endif /* !defined(IGNORE_ETH0_DOWN) */
-
-       OLD_MOD_DEC_USE_COUNT;
-       return 0;
-}
-
-static int
-dhd_open(struct net_device *net)
-{
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(net);
-#ifdef TOE
-       uint32 toe_ol;
-#endif
-       int ifidx = dhd_net2idx(dhd, net);
-       int32 ret = 0;
-
-       DHD_TRACE(("%s: ifidx %d\n", __FUNCTION__, ifidx));
-
-       /*  Force start if ifconfig_up gets called before START command */
-       wl_control_wl_start(net);
-
-       if (ifidx == 0) { /* do it only for primary eth0 */
-
-               atomic_set(&dhd->pend_8021x_cnt, 0);
-
-       memcpy(net->dev_addr, dhd->pub.mac.octet, ETHER_ADDR_LEN);
-
-#ifdef TOE
-       /* Get current TOE mode from dongle */
-       if (dhd_toe_get(dhd, ifidx, &toe_ol) >= 0 && (toe_ol & TOE_TX_CSUM_OL) != 0)
-               dhd->iflist[ifidx]->net->features |= NETIF_F_IP_CSUM;
-       else
-               dhd->iflist[ifidx]->net->features &= ~NETIF_F_IP_CSUM;
-#endif
-       }
-       /* Allow transmit calls */
-       netif_start_queue(net);
-       dhd->pub.up = 1;
-
-
-       OLD_MOD_INC_USE_COUNT;
-       return ret;
-}
-
-osl_t *
-dhd_osl_attach(void *pdev, uint bustype)
-{
-       return osl_attach(pdev, bustype, TRUE);
-}
-
-void
-dhd_osl_detach(osl_t *osh)
-{
-       if (MALLOCED(osh)) {
-               DHD_ERROR(("%s: MEMORY LEAK %d bytes\n", __FUNCTION__, MALLOCED(osh)));
-       }
-       osl_detach(osh);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       up(&dhd_registration_sem);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-}
-
-int
-dhd_add_if(dhd_info_t *dhd, int ifidx, void *handle, char *name,
-       uint8 *mac_addr, uint32 flags, uint8 bssidx)
-{
-       dhd_if_t *ifp;
-
-       DHD_TRACE(("%s: idx %d, handle->%p\n", __FUNCTION__, ifidx, handle));
-
-       ASSERT(dhd && (ifidx < DHD_MAX_IFS));
-
-       ifp = dhd->iflist[ifidx];
-       if (!ifp && !(ifp = MALLOC(dhd->pub.osh, sizeof(dhd_if_t)))) {
-               DHD_ERROR(("%s: OOM - dhd_if_t\n", __FUNCTION__));
-               return -ENOMEM;
-       }
-
-       memset(ifp, 0, sizeof(dhd_if_t));
-       ifp->info = dhd;
-       dhd->iflist[ifidx] = ifp;
-       strncpy(ifp->name, name, IFNAMSIZ);
-       ifp->name[IFNAMSIZ] = '\0';
-       if (mac_addr != NULL)
-               memcpy(&ifp->mac_addr, mac_addr, ETHER_ADDR_LEN);
-
-       if (handle == NULL) {
-               ifp->state = WLC_E_IF_ADD;
-               ifp->idx = ifidx;
-               ASSERT(dhd->sysioc_pid >= 0);
-               up(&dhd->sysioc_sem);
-       } else
-               ifp->net = (struct net_device *)handle;
-
-       return 0;
-}
-
-void
-dhd_del_if(dhd_info_t *dhd, int ifidx)
-{
-       dhd_if_t *ifp;
-
-       DHD_TRACE(("%s: idx %d\n", __FUNCTION__, ifidx));
-
-       ASSERT(dhd && ifidx && (ifidx < DHD_MAX_IFS));
-       ifp = dhd->iflist[ifidx];
-       if (!ifp) {
-               DHD_ERROR(("%s: Null interface\n", __FUNCTION__));
-               return;
-       }
-
-       ifp->state = WLC_E_IF_DEL;
-       ifp->idx = ifidx;
-       ASSERT(dhd->sysioc_pid >= 0);
-       up(&dhd->sysioc_sem);
-}
-
-dhd_pub_t *
-dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen)
-{
-       dhd_info_t *dhd = NULL;
-       struct net_device *net;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-       /* updates firmware nvram path if it was provided as module paramters */
-       if ((firmware_path != NULL) && (firmware_path[0] != '\0'))
-               strcpy(fw_path, firmware_path);
-       if ((nvram_path != NULL) && (nvram_path[0] != '\0'))
-               strcpy(nv_path, nvram_path);
-
-       /* Allocate etherdev, including space for private structure */
-       if (!(net = alloc_etherdev(sizeof(dhd)))) {
-               DHD_ERROR(("%s: OOM - alloc_etherdev\n", __FUNCTION__));
-               goto fail;
-       }
-
-       /* Allocate primary dhd_info */
-       if (!(dhd = MALLOC(osh, sizeof(dhd_info_t)))) {
-               DHD_ERROR(("%s: OOM - alloc dhd_info\n", __FUNCTION__));
-               goto fail;
-       }
-
-       memset(dhd, 0, sizeof(dhd_info_t));
-
-       /*
-        * Save the dhd_info into the priv
-        */
-       memcpy(netdev_priv(net), &dhd, sizeof(dhd));
-       dhd->pub.osh = osh;
-
-       /* Set network interface name if it was provided as module parameter */
-       if (iface_name[0]) {
-               int len;
-               char ch;
-               strncpy(net->name, iface_name, IFNAMSIZ);
-               net->name[IFNAMSIZ - 1] = 0;
-               len = strlen(net->name);
-               ch = net->name[len - 1];
-               if ((ch > '9' || ch < '0') && (len < IFNAMSIZ - 2))
-                       strcat(net->name, "%d");
-       }
-        
-        /* we rename the netdevice interface name wlan0 */
-        dev_alloc_name(net, "wlan%d");
-
-       if (dhd_add_if(dhd, 0, (void *)net, net->name, NULL, 0, 0) == DHD_BAD_IF)
-               goto fail;
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31))
-       net->open = NULL;
-#else
-       net->netdev_ops = NULL;
-#endif
-       init_MUTEX(&dhd->proto_sem);
-       /* Initialize other structure content */
-       init_waitqueue_head(&dhd->ioctl_resp_wait);
-       init_waitqueue_head(&dhd->ctrl_wait);
-
-       /* Initialize the spinlocks */
-       spin_lock_init(&dhd->sdlock);
-       spin_lock_init(&dhd->txqlock);
-
-       /* Link to info module */
-       dhd->pub.info = dhd;
-
-       /* Link to bus module */
-       dhd->pub.bus = bus;
-       dhd->pub.hdrlen = bus_hdrlen;
-
-       /* Attach and link in the protocol */
-       if (dhd_prot_attach(&dhd->pub) != 0) {
-               DHD_ERROR(("dhd_prot_attach failed\n"));
-               goto fail;
-       }
-#if defined(CONFIG_WIRELESS_EXT)
-       /* Attach and link in the iw */
-       if (wl_iw_attach(net, (void *)&dhd->pub) != 0) {
-               DHD_ERROR(("wl_iw_attach failed\n"));
-               goto fail;
-       }
-#endif /* defined(CONFIG_WIRELESS_EXT) */
-
-
-       /* Set up the watchdog timer */
-       init_timer(&dhd->timer);
-       dhd->timer.data = (ulong)dhd;
-       dhd->timer.function = dhd_watchdog;
-
-       /* Initialize thread based operation and lock */
-       init_MUTEX(&dhd->sdsem);
-       if ((dhd_watchdog_prio >= 0) && (dhd_dpc_prio >= 0)) {
-               dhd->threads_only = TRUE;
-       }
-       else {
-               dhd->threads_only = FALSE;
-       }
-
-       if (dhd_dpc_prio >= 0) {
-               /* Initialize watchdog thread */
-               sema_init(&dhd->watchdog_sem, 0);
-               init_completion(&dhd->watchdog_exited);
-               dhd->watchdog_pid = kernel_thread(dhd_watchdog_thread, dhd, 0);
-       } else {
-               dhd->watchdog_pid = -1;
-       }
-
-       /* Set up the bottom half handler */
-       if (dhd_dpc_prio >= 0) {
-               /* Initialize DPC thread */
-               sema_init(&dhd->dpc_sem, 0);
-               init_completion(&dhd->dpc_exited);
-               dhd->dpc_pid = kernel_thread(dhd_dpc_thread, dhd, 0);
-       } else {
-               tasklet_init(&dhd->tasklet, dhd_dpc, (ulong)dhd);
-               dhd->dpc_pid = -1;
-       }
-
-       if (dhd_sysioc) {
-               sema_init(&dhd->sysioc_sem, 0);
-               init_completion(&dhd->sysioc_exited);
-               dhd->sysioc_pid = kernel_thread(_dhd_sysioc_thread, dhd, 0);
-       } else {
-               dhd->sysioc_pid = -1;
-       }
-
-       /*
-        * Save the dhd_info into the priv
-        */
-       memcpy(netdev_priv(net), &dhd, sizeof(dhd));
-
-#if defined(CONFIG_WIFI_CONTROL_FUNC_BCM4319)
-       g_bus = bus;
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) && 1
-       register_pm_notifier(&dhd_sleep_pm_notifier);
-#endif /*  (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) */
-       /* && defined(DHD_GPL) */
-       /* Init lock suspend to prevent kernel going to suspend */
-       WAKE_LOCK_INIT(&dhd->pub, WAKE_LOCK_TMOUT, "dhd_wake_lock");
-       WAKE_LOCK_INIT(&dhd->pub, WAKE_LOCK_LINK_DOWN_TMOUT, "dhd_wake_lock_link_dw_event");
-
-#ifdef CONFIG_HAS_EARLYSUSPEND
-       dhd->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 20;
-       dhd->early_suspend.suspend = dhd_early_suspend;
-       dhd->early_suspend.resume = dhd_late_resume;
-       register_early_suspend(&dhd->early_suspend);
-#endif
-
-       return &dhd->pub;
-
-fail:
-       if (net)
-               free_netdev(net);
-       if (dhd)
-               dhd_detach(&dhd->pub);
-
-       return NULL;
-}
-
-
-int
-dhd_bus_start(dhd_pub_t *dhdp)
-{
-       int ret = -1;
-       dhd_info_t *dhd = (dhd_info_t*)dhdp->info;
-#ifdef EMBEDDED_PLATFORM
-       char iovbuf[WL_EVENTING_MASK_LEN + 12]; /*  Room for "event_msgs" + '\0' + bitvec  */
-#endif /* EMBEDDED_PLATFORM */
-
-       ASSERT(dhd);
-
-       DHD_TRACE(("%s: \n", __FUNCTION__));
-       printk ("%s: firmware downloading. firmware = %s nvram = %s\n", __FUNCTION__, fw_path, nv_path);
-
-       /* try to download image and nvram to the dongle */
-       if  (dhd->pub.busstate == DHD_BUS_DOWN) {
-               WAKE_LOCK_INIT(dhdp, WAKE_LOCK_DOWNLOAD, "dhd_bus_start");
-               WAKE_LOCK(dhdp, WAKE_LOCK_DOWNLOAD);
-               if (!(dhd_bus_download_firmware(dhd->pub.bus, dhd->pub.osh,
-                                               fw_path, nv_path))) {
-                       DHD_ERROR(("%s: dhdsdio_probe_download failed. firmware = %s nvram = %s\n",
-                                  __FUNCTION__, fw_path, nv_path));
-                       WAKE_UNLOCK(dhdp, WAKE_LOCK_DOWNLOAD);
-                       WAKE_LOCK_DESTROY(dhdp, WAKE_LOCK_DOWNLOAD);
-                       return -1;
-               }
-
-               WAKE_UNLOCK(dhdp, WAKE_LOCK_DOWNLOAD);
-               WAKE_LOCK_DESTROY(dhdp, WAKE_LOCK_DOWNLOAD);
-       }
-
-       /* Start the watchdog timer */
-       dhd->pub.tickcnt = 0;
-       dhd_os_wd_timer(&dhd->pub, dhd_watchdog_ms);
-
-       /* Bring up the bus */
-       if ((ret = dhd_bus_init(&dhd->pub, TRUE)) != 0) {
-               DHD_ERROR(("%s, dhd_bus_init failed %d\n", __FUNCTION__, ret));
-               return ret;
-       }
-#if defined(OOB_INTR_ONLY)
-       /* Host registration for OOB interrupt */
-       if (bcmsdh_register_oob_intr(dhdp)) {
-               del_timer(&dhd->timer);
-               dhd->wd_timer_valid = FALSE;
-               DHD_ERROR(("%s Host failed to resgister for OOB\n", __FUNCTION__));
-               return -ENODEV;
-       }
-
-       /* Enable oob at firmware */
-       dhd_enable_oob_intr(dhd->pub.bus, TRUE);
-#endif /* defined(OOB_INTR_ONLY) */
-
-       /* If bus is not ready, can't come up */
-       if (dhd->pub.busstate != DHD_BUS_DATA) {
-               del_timer(&dhd->timer);
-               dhd->wd_timer_valid = FALSE;
-               DHD_ERROR(("%s failed bus is not ready\n", __FUNCTION__));
-               return -ENODEV;
-       }
-
-#ifdef EMBEDDED_PLATFORM
-       bcm_mkiovar("event_msgs", dhdp->eventmask, WL_EVENTING_MASK_LEN, iovbuf, sizeof(iovbuf));
-       dhdcdc_query_ioctl(dhdp, 0, WLC_GET_VAR, iovbuf, sizeof(iovbuf));
-       bcopy(iovbuf, dhdp->eventmask, WL_EVENTING_MASK_LEN);
-
-       setbit(dhdp->eventmask, WLC_E_SET_SSID);
-       setbit(dhdp->eventmask, WLC_E_PRUNE);
-       setbit(dhdp->eventmask, WLC_E_AUTH);
-       setbit(dhdp->eventmask, WLC_E_REASSOC);
-       setbit(dhdp->eventmask, WLC_E_REASSOC_IND);
-       setbit(dhdp->eventmask, WLC_E_DEAUTH_IND);
-       setbit(dhdp->eventmask, WLC_E_DISASSOC_IND);
-       setbit(dhdp->eventmask, WLC_E_DISASSOC);
-       setbit(dhdp->eventmask, WLC_E_JOIN);
-       setbit(dhdp->eventmask, WLC_E_ASSOC_IND);
-       setbit(dhdp->eventmask, WLC_E_PSK_SUP);
-       setbit(dhdp->eventmask, WLC_E_LINK);
-       setbit(dhdp->eventmask, WLC_E_NDIS_LINK);
-       setbit(dhdp->eventmask, WLC_E_MIC_ERROR);
-       setbit(dhdp->eventmask, WLC_E_PMKID_CACHE);
-       setbit(dhdp->eventmask, WLC_E_TXFAIL);
-       setbit(dhdp->eventmask, WLC_E_JOIN_START);
-       setbit(dhdp->eventmask, WLC_E_SCAN_COMPLETE);
-
-       dhdp->pktfilter_count = 1;
-       /* Setup filter to allow only unicast */
-       dhdp->pktfilter[0] = "100 0 0 0 0x01 0x00";
-#endif /* EMBEDDED_PLATFORM */
-
-       /* Bus is ready, do any protocol initialization */
-       if ((ret = dhd_prot_init(&dhd->pub)) < 0)
-               return ret;
-
-       return 0;
-}
-
-int
-dhd_iovar(dhd_pub_t *pub, int ifidx, char *name, char *cmd_buf, uint cmd_len, int set)
-{
-       char buf[strlen(name) + 1 + cmd_len];
-       int len = sizeof(buf);
-       wl_ioctl_t ioc;
-       int ret;
-
-       len = bcm_mkiovar(name, cmd_buf, cmd_len, buf, len);
-
-       memset(&ioc, 0, sizeof(ioc));
-
-       ioc.cmd = set? WLC_SET_VAR : WLC_GET_VAR;
-       ioc.buf = buf;
-       ioc.len = len;
-       ioc.set = set;
-
-       ret = dhd_prot_ioctl(pub, ifidx, &ioc, ioc.buf, ioc.len);
-       if (!set && ret >= 0)
-               memcpy(cmd_buf, buf, cmd_len);
-
-       return ret;
-}
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31))
-static struct net_device_ops dhd_ops_pri = {
-       .ndo_open = dhd_open,
-       .ndo_stop = dhd_stop,
-       .ndo_get_stats = dhd_get_stats,
-       .ndo_do_ioctl = dhd_ioctl_entry,
-       .ndo_start_xmit = dhd_start_xmit,
-       .ndo_set_mac_address = dhd_set_mac_address,
-       .ndo_set_multicast_list = dhd_set_multicast_list
-};
-
-static struct net_device_ops dhd_ops_virt = {
-       .ndo_get_stats = dhd_get_stats,
-       .ndo_do_ioctl = dhd_ioctl_entry,
-       .ndo_start_xmit = dhd_start_xmit,
-       .ndo_set_mac_address = dhd_set_mac_address,
-       .ndo_set_multicast_list = dhd_set_multicast_list
-};
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) */
-int
-dhd_net_attach(dhd_pub_t *dhdp, int ifidx)
-{
-       dhd_info_t *dhd = (dhd_info_t *)dhdp->info;
-       struct net_device *net;
-       uint8 temp_addr[ETHER_ADDR_LEN] = { 0x00, 0x90, 0x4c, 0x11, 0x22, 0x33 };
-
-       DHD_TRACE(("%s: ifidx %d\n", __FUNCTION__, ifidx));
-
-       ASSERT(dhd && dhd->iflist[ifidx]);
-
-       net = dhd->iflist[ifidx]->net;
-       ASSERT(net);
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31))
-       ASSERT(!net->open);
-       net->get_stats = dhd_get_stats;
-       net->do_ioctl = dhd_ioctl_entry;
-       net->hard_start_xmit = dhd_start_xmit;
-       net->set_mac_address = dhd_set_mac_address;
-       net->set_multicast_list = dhd_set_multicast_list;
-       net->open = net->stop = NULL;
-#else
-       ASSERT(!net->netdev_ops);
-       net->netdev_ops = &dhd_ops_virt;
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31))
-               net->open = dhd_open;
-               net->stop = dhd_stop;
-#else
-               net->netdev_ops = &dhd_ops_pri;
-#endif
-
-       /*
-        * We have to use the primary MAC for virtual interfaces
-        */
-       if (ifidx != 0) {
-               /* for virtual interfaces use the primary MAC  */
-               memcpy(temp_addr, dhd->pub.mac.octet, ETHER_ADDR_LEN);
-
-       }
-
-       if (ifidx == 1) {
-               DHD_TRACE(("%s ACCESS POINT MAC: \n", __FUNCTION__));
-               /*  ACCESSPOINT INTERFACE CASE */
-               temp_addr[0] |= 0X02;  /* set bit 2 , - Locally Administered address  */
-
-       }
-       net->hard_header_len = ETH_HLEN + dhd->pub.hdrlen;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
-       net->ethtool_ops = &dhd_ethtool_ops;
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) */
-
-#if defined(CONFIG_WIRELESS_EXT)
-#if WIRELESS_EXT < 19
-       net->get_wireless_stats = dhd_get_wireless_stats;
-#endif /* WIRELESS_EXT < 19 */
-#if WIRELESS_EXT > 12
-       net->wireless_handlers = (struct iw_handler_def *)&wl_iw_handler_def;
-#endif /* WIRELESS_EXT > 12 */
-#endif /* defined(CONFIG_WIRELESS_EXT) */
-
-
-       dhd->pub.rxsz = net->mtu + net->hard_header_len + dhd->pub.hdrlen;
-
-       memcpy(net->dev_addr, temp_addr, ETHER_ADDR_LEN);
-
-       if (register_netdev(net) != 0) {
-               DHD_ERROR(("%s: couldn't register the net device\n", __FUNCTION__));
-               goto fail;
-       }
-
-       printf("%s: Broadcom Dongle Host Driver mac=%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", net->name,
-              dhd->pub.mac.octet[0], dhd->pub.mac.octet[1], dhd->pub.mac.octet[2],
-              dhd->pub.mac.octet[3], dhd->pub.mac.octet[4], dhd->pub.mac.octet[5]);
-
-#if defined(CONFIG_WIRELESS_EXT) && !defined(CSCAN)
-#ifdef SOFTAP
-       if (ifidx == 0)
-               /* Don't call for SOFTAP Interface in SOFTAP MODE */
-               wl_iw_iscan_set_scan_broadcast_prep(net, 1);
-#else
-               wl_iw_iscan_set_scan_broadcast_prep(net, 1);
-#endif /* SOFTAP */
-#endif /* CONFIG_WIRELESS_EXT */
-
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       up(&dhd_registration_sem);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-       return 0;
-
-fail:
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
-       net->open = NULL;
-#else
-       net->netdev_ops = NULL;
-#endif
-       return BCME_ERROR;
-}
-
-void
-dhd_bus_detach(dhd_pub_t *dhdp)
-{
-       dhd_info_t *dhd;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (dhdp) {
-               dhd = (dhd_info_t *)dhdp->info;
-               if (dhd) {
-                       /* Stop the protocol module */
-                       dhd_prot_stop(&dhd->pub);
-
-                       /* Stop the bus module */
-                       dhd_bus_stop(dhd->pub.bus, TRUE);
-#if defined(OOB_INTR_ONLY)
-                       bcmsdh_unregister_oob_intr();
-#endif /* defined(OOB_INTR_ONLY) */
-
-                       /* Clear the watchdog timer */
-                       del_timer(&dhd->timer);
-                       dhd->wd_timer_valid = FALSE;
-               }
-       }
-}
-
-void
-dhd_detach(dhd_pub_t *dhdp)
-{
-       dhd_info_t *dhd;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (dhdp) {
-               dhd = (dhd_info_t *)dhdp->info;
-               if (dhd) {
-                       dhd_if_t *ifp;
-                       int i;
-
-#if defined(CONFIG_HAS_EARLYSUSPEND)
-                       unregister_early_suspend(&dhd->early_suspend);
-#endif /* defined(CONFIG_HAS_EARLYSUSPEND) */
-
-                       for (i = 1; i < DHD_MAX_IFS; i++)
-                               if (dhd->iflist[i])
-                                       dhd_del_if(dhd, i);
-
-                       ifp = dhd->iflist[0];
-                       ASSERT(ifp);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31))
-                       if (ifp->net->open) {
-#else
-                       if (ifp->net->netdev_ops == &dhd_ops_pri) {
-#endif
-                               dhd_stop(ifp->net);
-                               unregister_netdev(ifp->net);
-                       }
-
-
-               if (dhd->watchdog_pid >= 0)
-               {
-                       KILL_PROC(dhd->watchdog_pid, SIGTERM);
-                       wait_for_completion(&dhd->watchdog_exited);
-               }
-
-               if (dhd->dpc_pid >= 0)
-               {
-                       KILL_PROC(dhd->dpc_pid, SIGTERM);
-                       wait_for_completion(&dhd->dpc_exited);
-               }
-               else
-               tasklet_kill(&dhd->tasklet);
-
-               if (dhd->sysioc_pid >= 0) {
-                       KILL_PROC(dhd->sysioc_pid, SIGTERM);
-                       wait_for_completion(&dhd->sysioc_exited);
-               }
-
-               dhd_bus_detach(dhdp);
-
-               if (dhdp->prot)
-                       dhd_prot_detach(dhdp);
-
-#if defined(CONFIG_WIRELESS_EXT)
-               /* Attach and link in the iw */
-               wl_iw_detach();
-#endif
-
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) && 1
-               unregister_pm_notifier(&dhd_sleep_pm_notifier);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) */
-       /* && defined(DHD_GPL) */
-               WAKE_LOCK_DESTROY(dhdp, WAKE_LOCK_TMOUT);
-               WAKE_LOCK_DESTROY(dhdp, WAKE_LOCK_LINK_DOWN_TMOUT);
-               free_netdev(ifp->net);
-               MFREE(dhd->pub.osh, ifp, sizeof(*ifp));
-               MFREE(dhd->pub.osh, dhd, sizeof(*dhd));
-       }
-}
-}
-static void 
-dhd_module_cleanup(void)
-{
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       printk("hojie: dhd_module_cleanup()\n");
-
-       dhd_bus_unregister();
-#if defined(CONFIG_WIFI_CONTROL_FUNC_BCM4319)
-       wifi_del_dev();
-#endif
-       /* Call customer gpio to turn off power with WL_REG_ON signal */
-       dhd_customer_gpio_wlan_ctrl(WLAN_POWER_OFF);
-}
-
-
-static int 
-dhd_module_init(void)
-{
-       int error;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       /* Sanity check on the module parameters */
-       do {
-               /* Both watchdog and DPC as tasklets are ok */
-               if ((dhd_watchdog_prio < 0) && (dhd_dpc_prio < 0))
-                       break;
-
-               /* If both watchdog and DPC are threads, TX must be deferred */
-               if ((dhd_watchdog_prio >= 0) && (dhd_dpc_prio >= 0) && dhd_deferred_tx)
-                       break;
-
-               DHD_ERROR(("Invalid module parameters.\n"));
-               return -EINVAL;
-       } while (0);
-       /* Call customer gpio to turn on power with WL_REG_ON signal */
-       dhd_customer_gpio_wlan_ctrl(WLAN_POWER_ON);
-
-#if defined(CONFIG_WIFI_CONTROL_FUNC_BCM4319)
-       sema_init(&wifi_control_sem, 0);
-
-       error = wifi_add_dev();
-       if (error) {
-               DHD_ERROR(("%s: platform_driver_register failed\n", __FUNCTION__));
-               goto faild;
-       }
-
-       /* Waiting callback after platform_driver_register is done or exit with error */
-       if (down_timeout(&wifi_control_sem,  msecs_to_jiffies(1000)) != 0) {
-               printk("%s: platform_driver_register timeout\n", __FUNCTION__);
-               /* renove device */
-               wifi_del_dev();
-               goto faild;
-       }
-#endif /* #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC_BCM4319) */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       sema_init(&dhd_registration_sem, 0);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
-
-       error = dhd_bus_register();
-
-       if (!error)
-               printf("\n%s\n", dhd_version);
-       else {
-               DHD_ERROR(("%s: sdio_register_driver failed\n", __FUNCTION__));
-               goto faild;
-       }
-
-//#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-#if 0
-       /*
-        * Wait till MMC sdio_register_driver callback called and made driver attach.
-        * It's needed to make sync up exit from dhd insmod  and
-        * Kernel MMC sdio device callback registration
-        */
-       if (down_timeout(&dhd_registration_sem,  msecs_to_jiffies(DHD_REGISTRATION_TIMEOUT)) != 0) {
-               error = -EINVAL;
-               DHD_ERROR(("%s: sdio_register_driver timeout\n", __FUNCTION__));
-               dhd_bus_unregister();
-       }
-#endif
-       return error;
-
-faild:
-       /* turn off power and exit */
-       dhd_customer_gpio_wlan_ctrl(WLAN_POWER_OFF);
-       return -EINVAL;
-}
-
-//hojie: 2010.10.11
-//for wifi power control
-
-//#if (ANDROID_POWER_SAVE == 1)
-#if 0
-//#include <linux/android_power.h>
-//#include <linux/suspend.h>
-//android_suspend_lock_t wifi_android_lock;
-
-/*
- * Suspend request from android power manager.
- */
-int wifi_suspend(suspend_state_t state)
-{
-       printk("System want WIFI to suspend.\n");
-       printk("Not yet implemented.\n");
-       return 0;
-       struct lbs_private *priv = lbs_wifi_priv;
-       
-       if (priv == NULL)
-       {
-           printk("WiFi is disabled for now.\n");
-           return 0;
-       }
-       
-       if (wifi_ps_status == WIFI_PS_DRV_SLEEP)
-       {
-               printk("WiFi is in driver sleep already.\n");
-               return 0;
-       }
-       else /* This should be never occured. */
-/*     {
-           printk("ERROR: WiFi is active for now!!!!!!!!!!\n");
-           return 1;
-       }
-*/
-}
-
-
-void wifi_resume(void)
-{
-    printk("Android want wifi to be resumed.\n");
-}
-
-#endif //(ANDROID_POWER_SAVE == 1)
-
-//#include "wifi_power.h"
-
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
-extern int rk29sdk_wifi_set_carddetect(int val);
-#endif
-
-extern struct mmc_host *wifi_mmc_host;
-extern struct sdio_func *wifi_sdio_func;
-
-extern int wifi_turn_on_card(int module);
-extern int wifi_turn_off_card(void);
-
-#include "wifi_version.h"
-
-int rockchip_wifi_init_module(void)
-{
-       int ret = 0, timeout;
-
-//     printk("Broadcom BCM4319 WiFi driver (Ver %s) init.\n", "0.99");
-//     return dhd_module_init();
-
-       wifi_sdio_func = NULL;
-    wifi_func_removed = 0;
-//     wifi_no_power_gpio = 0;
-       
-       /* Make sure we are in awake. -- Yongle Lai */
-//     wifi_ps_status = WIFI_PS_AWAKE;
-       
-       printk("Broadcom BCM4319 WiFi (Powered by Rockchip, Ver %s).\n", BCM4319_DRV_VERSION);
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
-       if (wifi_mmc_host == NULL)
-       {
-               printk("SDIO host (mmc1) for WiFi is inactive.\n");
-               return -ENODEV;
-       }
-#endif
-
-       ret = dhd_module_init();
-
-       if(ret) {
-               printk("dhd_module_init() fail, ret = %d\n", ret);
-               return ret;
-       }
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
-       if (wifi_mmc_host->bus_ops != NULL) /* mmc/card is attached already. */
-       {
-               printk("SDIO maybe be attached already.\n");
-       //      wifi_no_power_gpio = 1;
-               //return 0;
-               goto wait_wifi;
-       }
-#endif 
-       wifi_turn_on_card(2);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
-    mmc_detect_change(wifi_mmc_host, 1);
-#else
-    rk29sdk_wifi_set_carddetect(1);
-#endif
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
-wait_wifi:
-#endif
-       //printk("Waiting for SDIO card to be attached.\n");
-       for (timeout = 50; timeout >=0; timeout--)
-       {
-               if (wifi_sdio_func != NULL)
-                       break;
-               msleep(100);
-       }
-       if (timeout <= 0)
-       {
-               printk("No WiFi function card has been attached (5s).\n");
-               
-       //      sdio_unregister_driver(&if_sdio_driver);
-               dhd_module_cleanup();
-               
-               wifi_turn_off_card();
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
-        mmc_detect_change(wifi_mmc_host, 1);
-#else
-        rk29sdk_wifi_set_carddetect(0);
-#endif
-               return -ENODEV;
-       }
-       printk("%s: timeout = %d (interval = 100 ms)\n", __func__, timeout);
-
-//#endif
-
-       return 0;
-
-}
-EXPORT_SYMBOL(rockchip_wifi_init_module);
-
-void rockchip_wifi_exit_module(void)
-{
-       int timeout;
-       /*
-       
-       lbs_deb_enter(LBS_DEB_SDIO);
-
-       wifi_ps_status = WIFI_PS_AWAKE;
-       
-       sdio_unregister_driver(&if_sdio_driver);
-       
-#ifdef WIFI_GPIO_POWER_CONTROL
-
-    //if (wifi_no_power_gpio == 1)
-       //      return;
-               
-       if (wifi_mmc_host == NULL)
-       {
-               printk("No SDIO host is present.\n");
-               return;
-       }
-*/
-
-       dhd_module_cleanup();
-       
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
-       if (wifi_mmc_host == NULL)
-       {
-               printk("No SDIO host is present.\n");
-               return;
-       }
-#endif
-       wifi_turn_off_card();
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
-    mmc_detect_change(wifi_mmc_host, 2);
-#else
-    rk29sdk_wifi_set_carddetect(0);
-#endif
-
-       //printk("Waiting for sdio card to be released ... \n");
-       for (timeout = 40; timeout >= 0; timeout--)
-       {
-               msleep(100);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
-        if (wifi_mmc_host->bus_ops == NULL)
-#else
-        if (wifi_func_removed == 1)
-#endif
-                       break;
-       }
-       if (timeout < 0)
-               printk("Fail to release SDIO card.\n");
-       //else
-               //printk("Success to release SDIO card.\n");
-       printk("%s: timeout = %d (interval = 100 ms)\n", __func__, timeout);
-//#endif
-
-/*     lbs_deb_leave(LBS_DEB_SDIO);*/
-       
-}
-EXPORT_SYMBOL(rockchip_wifi_exit_module);
-
-int mv88w8686_if_sdio_init_module(void)
-{
-       return rockchip_wifi_init_module();
-}
-
-void mv88w8686_if_sdio_exit_module(void)
-{
-       rockchip_wifi_exit_module();
-}
-
-EXPORT_SYMBOL(mv88w8686_if_sdio_init_module);
-EXPORT_SYMBOL(mv88w8686_if_sdio_exit_module);
-
-#ifdef BCMSDH_MODULE
-module_init(dhd_module_init);
-module_exit(dhd_module_cleanup);
-#endif
-/* mobile version
-int if_sdio_init_module2(void)
-{
-    return dhd_module_init();
-}
-
-void if_sdio_exit_module(void)
-{
-   dhd_module_cleanup();
-}
-
-EXPORT_SYMBOL(if_sdio_init_module2);
-EXPORT_SYMBOL(if_sdio_exit_module);
-*/
-/*
- * OS specific functions required to implement DHD driver in OS independent way
- */
-int
-dhd_os_proto_block(dhd_pub_t *pub)
-{
-       dhd_info_t *dhd = (dhd_info_t *)(pub->info);
-
-       if (dhd) {
-               down(&dhd->proto_sem);
-               return 1;
-       }
-       return 0;
-}
-
-int
-dhd_os_proto_unblock(dhd_pub_t *pub)
-{
-       dhd_info_t *dhd = (dhd_info_t *)(pub->info);
-
-       if (dhd) {
-               up(&dhd->proto_sem);
-               return 1;
-       }
-
-       return 0;
-}
-
-unsigned int
-dhd_os_get_ioctl_resp_timeout(void)
-{
-       return ((unsigned int)dhd_ioctl_timeout_msec);
-}
-
-void
-dhd_os_set_ioctl_resp_timeout(unsigned int timeout_msec)
-{
-       dhd_ioctl_timeout_msec = (int)timeout_msec;
-}
-
-int
-dhd_os_ioctl_resp_wait(dhd_pub_t *pub, uint *condition, bool *pending)
-{
-       dhd_info_t *dhd = (dhd_info_t *)(pub->info);
-       DECLARE_WAITQUEUE(wait, current);
-       int timeout = dhd_ioctl_timeout_msec;
-
-       /* Convert timeout in millsecond to jiffies */
-       timeout = timeout * HZ / 1000;
-
-       /* Wait until control frame is available */
-       add_wait_queue(&dhd->ioctl_resp_wait, &wait);
-       set_current_state(TASK_INTERRUPTIBLE);
-
-       while (!(*condition) && (!signal_pending(current) && timeout))
-               timeout = schedule_timeout(timeout);
-
-       if (signal_pending(current))
-               *pending = TRUE;
-
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(&dhd->ioctl_resp_wait, &wait);
-
-       return timeout;
-}
-
-int
-dhd_os_ioctl_resp_wake(dhd_pub_t *pub)
-{
-       dhd_info_t *dhd = (dhd_info_t *)(pub->info);
-
-       if (waitqueue_active(&dhd->ioctl_resp_wait)) {
-               wake_up_interruptible(&dhd->ioctl_resp_wait);
-       }
-
-       return 0;
-}
-
-void
-dhd_os_wd_timer(void *bus, uint wdtick)
-{
-       dhd_pub_t *pub = bus;
-       static uint save_dhd_watchdog_ms = 0;
-       dhd_info_t *dhd = (dhd_info_t *)pub->info;
-
-       /* don't start the wd until fw is loaded */
-       if (pub->busstate == DHD_BUS_DOWN)
-               return;
-
-       /* Totally stop the timer */
-       if (!wdtick && dhd->wd_timer_valid == TRUE) {
-               del_timer(&dhd->timer);
-               dhd->wd_timer_valid = FALSE;
-               save_dhd_watchdog_ms = wdtick;
-               return;
-       }
-
-       if (wdtick) {
-               dhd_watchdog_ms = (uint) wdtick;
-               if (save_dhd_watchdog_ms != dhd_watchdog_ms) {
-
-                       if (dhd->wd_timer_valid == TRUE)
-                               /* Stop timer and restart at new value */
-                               del_timer(&dhd->timer);
-
-                       /* Create timer again when watchdog period is
-                          dynamically changed or in the first instance
-                       */
-                       dhd->timer.expires = jiffies + dhd_watchdog_ms * HZ / 1000;
-                       add_timer(&dhd->timer);
-               } else {
-                       /* Re arm the timer, at last watchdog period */
-                       mod_timer(&dhd->timer, jiffies + dhd_watchdog_ms * HZ / 1000);
-               }
-
-               dhd->wd_timer_valid = TRUE;
-               save_dhd_watchdog_ms = wdtick;
-       }
-}
-
-void *
-dhd_os_open_image(char *filename)
-{
-       struct file *fp;
-
-
-       fp = filp_open(filename, O_RDONLY, 0);
-       /*
-        * 2.6.11 (FC4) supports filp_open() but later revs don't?
-        * Alternative:
-        * fp = open_namei(AT_FDCWD, filename, O_RD, 0);
-        * ???
-        */
-        if (IS_ERR(fp))
-                fp = NULL;
-
-        return fp;
-}
-
-int
-dhd_os_get_image_block(char *buf, int len, void *image)
-{
-       struct file *fp = (struct file *)image;
-       int rdlen;
-
-
-       if (!image)
-               return 0;
-
-       rdlen = kernel_read(fp, fp->f_pos, buf, len);
-       if (rdlen > 0)
-               fp->f_pos += rdlen;
-
-       return rdlen;
-}
-
-void
-dhd_os_close_image(void *image)
-{
-       if (image)
-               filp_close((struct file *)image, NULL);
-}
-
-
-void
-dhd_os_sdlock(dhd_pub_t *pub)
-{
-       dhd_info_t *dhd;
-
-       dhd = (dhd_info_t *)(pub->info);
-
-       if (dhd->threads_only)
-               down(&dhd->sdsem);
-       else
-       spin_lock_bh(&dhd->sdlock);
-}
-
-void
-dhd_os_sdunlock(dhd_pub_t *pub)
-{
-       dhd_info_t *dhd;
-
-       dhd = (dhd_info_t *)(pub->info);
-
-       if (dhd->threads_only)
-               up(&dhd->sdsem);
-       else
-       spin_unlock_bh(&dhd->sdlock);
-}
-
-void
-dhd_os_sdlock_txq(dhd_pub_t *pub)
-{
-       dhd_info_t *dhd;
-
-       dhd = (dhd_info_t *)(pub->info);
-       spin_lock_bh(&dhd->txqlock);
-}
-
-void
-dhd_os_sdunlock_txq(dhd_pub_t *pub)
-{
-       dhd_info_t *dhd;
-
-       dhd = (dhd_info_t *)(pub->info);
-       spin_unlock_bh(&dhd->txqlock);
-}
-void
-dhd_os_sdlock_rxq(dhd_pub_t *pub)
-{
-}
-void
-dhd_os_sdunlock_rxq(dhd_pub_t *pub)
-{
-}
-
-void
-dhd_os_sdtxlock(dhd_pub_t *pub)
-{
-       dhd_os_sdlock(pub);
-}
-
-void
-dhd_os_sdtxunlock(dhd_pub_t *pub)
-{
-       dhd_os_sdunlock(pub);
-}
-
-#ifdef DHD_USE_STATIC_BUF
-void * dhd_os_prealloc(int section, unsigned long size)
-{
-#if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC_BCM4319)
-       void *alloc_ptr = NULL;
-       if (wifi_control_data && wifi_control_data->mem_prealloc)
-       {
-               alloc_ptr = wifi_control_data->mem_prealloc(section, size);
-               if (alloc_ptr)
-               {
-                       DHD_INFO(("success alloc section %d\n", section));
-                       bzero(alloc_ptr, size);
-                       return alloc_ptr;
-               }
-       }
-
-       DHD_ERROR(("can't alloc section %d\n", section));
-       return 0;
-#else
-return MALLOC(0, size);
-#endif /* #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC_BCM4319) */
-}
-#endif /* DHD_USE_STATIC_BUF */
-#if defined(CONFIG_WIRELESS_EXT)
-struct iw_statistics *
-dhd_get_wireless_stats(struct net_device *dev)
-{
-       int res = 0;
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
-
-       res = wl_iw_get_wireless_stats(dev, &dhd->iw.wstats);
-
-       if (res == 0)
-               return &dhd->iw.wstats;
-       else
-               return NULL;
-}
-#endif /* defined(CONFIG_WIRELESS_EXT) */
-
-static int
-dhd_wl_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata,
-       wl_event_msg_t *event, void **data)
-{
-       int bcmerror = 0;
-
-       ASSERT(dhd != NULL);
-
-       bcmerror = wl_host_event(dhd, ifidx, pktdata, event, data);
-       if (bcmerror != BCME_OK)
-               return (bcmerror);
-
-#if defined(CONFIG_WIRELESS_EXT)
-       ASSERT(dhd->iflist[*ifidx] != NULL);
-       ASSERT(dhd->iflist[*ifidx]->net != NULL);
-
-       if (dhd->iflist[*ifidx]->net)
-               wl_iw_event(dhd->iflist[*ifidx]->net, event, *data);
-#endif /* defined(CONFIG_WIRELESS_EXT)  */
-
-
-       return (bcmerror);
-}
-
-/* send up locally generated event */
-void
-dhd_sendup_event(dhd_pub_t *dhdp, wl_event_msg_t *event, void *data)
-{
-       switch (ntoh32(event->event_type)) {
-       default:
-               break;
-       }
-}
-
-void dhd_wait_for_event(dhd_pub_t *dhd, bool *lockvar)
-{
-#if 1 && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-       struct dhd_info *dhdinfo =  dhd->info;
-       dhd_os_sdunlock(dhd);
-       wait_event_interruptible_timeout(dhdinfo->ctrl_wait, (*lockvar == FALSE), HZ * 2);
-       dhd_os_sdlock(dhd);
-#endif
-       return;
-}
-
-void dhd_wait_event_wakeup(dhd_pub_t *dhd)
-{
-#if 1 && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-       struct dhd_info *dhdinfo =  dhd->info;
-       if (waitqueue_active(&dhdinfo->ctrl_wait))
-               wake_up_interruptible(&dhdinfo->ctrl_wait);
-#endif
-       return;
-}
-int
-dhd_dev_reset(struct net_device *dev, uint8 flag)
-{
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
-
-       /* Turning off watchdog */
-       if (flag)
-               dhd_os_wd_timer(&dhd->pub, 0);
-
-       dhd_bus_devreset(&dhd->pub, flag);
-
-       /* Turning on watchdog back */
-       if (!flag)
-               dhd_os_wd_timer(&dhd->pub, dhd_watchdog_ms);
-       DHD_ERROR(("%s:  WLAN OFF DONE\n", __FUNCTION__));
-
-       return 1;
-}
-
-void
-dhd_dev_init_ioctl(struct net_device *dev)
-{
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
-
-       dhd_preinit_ioctls(&dhd->pub);
-}
-
-static int
-dhd_get_pend_8021x_cnt(dhd_info_t *dhd)
-{
-       return (atomic_read(&dhd->pend_8021x_cnt));
-}
-
-#define MAX_WAIT_FOR_8021X_TX  10
-
-int
-dhd_wait_pend8021x(struct net_device *dev)
-{
-       dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
-       int timeout = 10 * HZ / 1000;
-       int ntimes = MAX_WAIT_FOR_8021X_TX;
-       int pend = dhd_get_pend_8021x_cnt(dhd);
-
-       while (ntimes && pend) {
-               if (pend) {
-                       set_current_state(TASK_INTERRUPTIBLE);
-                       schedule_timeout(timeout);
-                       set_current_state(TASK_RUNNING);
-                       ntimes--;
-               }
-               pend = dhd_get_pend_8021x_cnt(dhd);
-       }
-       return pend;
-}
-
-#ifdef DHD_DEBUG
-int
-write_to_file(dhd_pub_t *dhd, uint8 *buf, int size)
-{
-       int ret = 0;
-       struct file *fp;
-       mm_segment_t old_fs;
-       loff_t pos = 0;
-
-       /* change to KERNEL_DS address limit */
-       old_fs = get_fs();
-       set_fs(KERNEL_DS);
-
-       /* open file to write */
-       fp = filp_open("/tmp/mem_dump", O_WRONLY|O_CREAT, 0640);
-       if (!fp) {
-               printf("%s: open file error\n", __FUNCTION__);
-               ret = -1;
-               goto exit;
-       }
-
-       /* Write buf to file */
-       fp->f_op->write(fp, buf, size, &pos);
-
-exit:
-       /* free buf before return */
-       MFREE(dhd->osh, buf, size);
-       /* close file before return */
-       if (fp)
-               filp_close(fp, current->files);
-       /* restore previous address limit */
-       set_fs(old_fs);
-
-       return ret;
-}
-#endif /* DHD_DEBUG */
diff --git a/drivers/net/wireless/bcm4319/dhd_linux_sched.c b/drivers/net/wireless/bcm4319/dhd_linux_sched.c
deleted file mode 100644 (file)
index 480b416..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Expose some of the kernel scheduler routines
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhd_linux_sched.c,v 1.1.34.1.6.1 2009/01/16 01:17:40 Exp $
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linuxver.h>
-
-int setScheduler(struct task_struct *p, int policy, struct sched_param *param)
-{
-       int rc = 0;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-       rc = sched_setscheduler(p, policy, param);
-#endif /* LinuxVer */
-       return rc;
-}
diff --git a/drivers/net/wireless/bcm4319/dhd_proto.h b/drivers/net/wireless/bcm4319/dhd_proto.h
deleted file mode 100644 (file)
index 382785a..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Header file describing the internal (inter-module) DHD interfaces.
- *
- * Provides type definitions and function prototypes used to link the
- * DHD OS, bus, and protocol modules.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhd_proto.h,v 1.2.82.1.4.1.16.7 2010/05/10 12:54:59 Exp $
- */
-
-#ifndef _dhd_proto_h_
-#define _dhd_proto_h_
-
-#include <dhdioctl.h>
-#include <wlioctl.h>
-
-#ifndef IOCTL_RESP_TIMEOUT
-#define IOCTL_RESP_TIMEOUT  2000 /* In milli second */
-#endif
-
-#ifndef IOCTL_CHIP_ACTIVE_TIMEOUT
-#define IOCTL_CHIP_ACTIVE_TIMEOUT  10 /* In milli second */
-#endif
-
-/*
- * Exported from the dhd protocol module (dhd_cdc, dhd_rndis)
- */
-
-/* Linkage, sets prot link and updates hdrlen in pub */
-extern int dhd_prot_attach(dhd_pub_t *dhdp);
-
-/* Unlink, frees allocated protocol memory (including dhd_prot) */
-extern void dhd_prot_detach(dhd_pub_t *dhdp);
-
-/* Initialize protocol: sync w/dongle state.
- * Sets dongle media info (iswl, drv_version, mac address).
- */
-extern int dhd_prot_init(dhd_pub_t *dhdp);
-
-/* Stop protocol: sync w/dongle state. */
-extern void dhd_prot_stop(dhd_pub_t *dhdp);
-
-extern bool dhd_proto_fcinfo(dhd_pub_t *dhd, void *pktbuf, uint8 *fcbits);
-
-/* Add any protocol-specific data header.
- * Caller must reserve prot_hdrlen prepend space.
- */
-extern void dhd_prot_hdrpush(dhd_pub_t *, int ifidx, void *txp);
-
-/* Remove any protocol-specific data header. */
-extern int dhd_prot_hdrpull(dhd_pub_t *, int *ifidx, void *rxp);
-
-/* Use protocol to issue ioctl to dongle */
-extern int dhd_prot_ioctl(dhd_pub_t *dhd, int ifidx, wl_ioctl_t * ioc, void * buf, int len);
-
-/* Check for and handle local prot-specific iovar commands */
-extern int dhd_prot_iovar_op(dhd_pub_t *dhdp, const char *name,
-                             void *params, int plen, void *arg, int len, bool set);
-
-/* Add prot dump output to a buffer */
-extern void dhd_prot_dump(dhd_pub_t *dhdp, struct bcmstrbuf *strbuf);
-
-/* Update local copy of dongle statistics */
-extern void dhd_prot_dstats(dhd_pub_t *dhdp);
-
-extern int dhd_ioctl(dhd_pub_t * dhd_pub, dhd_ioctl_t *ioc, void * buf, uint buflen);
-
-extern int dhd_preinit_ioctls(dhd_pub_t *dhd);
-
-/********************************
- * For version-string expansion *
- */
-#if defined(BDC)
-#define DHD_PROTOCOL "bdc"
-#elif defined(CDC)
-#define DHD_PROTOCOL "cdc"
-#elif defined(RNDIS)
-#define DHD_PROTOCOL "rndis"
-#else
-#define DHD_PROTOCOL "unknown"
-#endif /* proto */
-
-#endif /* _dhd_proto_h_ */
diff --git a/drivers/net/wireless/bcm4319/dhd_sdio.c b/drivers/net/wireless/bcm4319/dhd_sdio.c
deleted file mode 100644 (file)
index cac624a..0000000
+++ /dev/null
@@ -1,5871 +0,0 @@
-/*
- * DHD Bus Module for SDIO
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhd_sdio.c,v 1.157.2.27.2.33.2.126 2010/06/15 23:38:39 Exp $
- */
-
-#include <typedefs.h>
-#include <osl.h>
-#include <bcmsdh.h>
-
-#ifdef BCMEMBEDIMAGE
-#include BCMEMBEDIMAGE
-#endif /* BCMEMBEDIMAGE */
-
-#include <bcmdefs.h>
-#include <bcmutils.h>
-#include <bcmendian.h>
-#include <bcmdevs.h>
-
-#include <siutils.h>
-#include <hndpmu.h>
-#include <hndsoc.h>
-#ifdef DHD_DEBUG
-#include <hndrte_armtrap.h>
-#include <hndrte_cons.h>
-#endif /* DHD_DEBUG */
-#include <sbchipc.h>
-#include <sbhnddma.h>
-
-#include <sdio.h>
-#include <sbsdio.h>
-#include <sbsdpcmdev.h>
-#include <bcmsdpcm.h>
-
-#include <proto/ethernet.h>
-#include <proto/802.1d.h>
-#include <proto/802.11.h>
-
-#include <dngl_stats.h>
-#include <dhd.h>
-#include <dhd_bus.h>
-#include <dhd_proto.h>
-#include <dhd_dbg.h>
-#include <dhdioctl.h>
-#include <sdiovar.h>
-
-#ifndef DHDSDIO_MEM_DUMP_FNAME
-#define DHDSDIO_MEM_DUMP_FNAME         "mem_dump"
-#endif
-
-#define QLEN           256     /* bulk rx and tx queue lengths */
-#define FCHI           (QLEN - 10)
-#define FCLOW          (FCHI / 2)
-#define PRIOMASK       7
-
-#define TXRETRIES      2       /* # of retries for tx frames */
-
-#if defined(CONFIG_MACH_SANDGATE2G)
-#define DHD_RXBOUND    250     /* Default for max rx frames in one scheduling */
-#else
-#define DHD_RXBOUND    50      /* Default for max rx frames in one scheduling */
-#endif /* defined(CONFIG_MACH_SANDGATE2G) */
-
-#define DHD_TXBOUND    20      /* Default for max tx frames in one scheduling */
-
-#define DHD_TXMINMAX   1       /* Max tx frames if rx still pending */
-
-#define MEMBLOCK       2048            /* Block size used for downloading of dongle image */
-#define MAX_DATA_BUF   (32 * 1024)     /* Must be large enough to hold biggest possible glom */
-
-/* Packet alignment for most efficient SDIO (can change based on platform) */
-#ifndef DHD_SDALIGN
-#define DHD_SDALIGN    32
-#endif
-#if !ISPOWEROF2(DHD_SDALIGN)
-#error DHD_SDALIGN is not a power of 2!
-#endif
-
-#ifndef DHD_FIRSTREAD
-#define DHD_FIRSTREAD  32
-#endif
-#if !ISPOWEROF2(DHD_FIRSTREAD)
-#error DHD_FIRSTREAD is not a power of 2!
-#endif
-
-/* Total length of frame header for dongle protocol */
-#define SDPCM_HDRLEN   (SDPCM_FRAMETAG_LEN + SDPCM_SWHEADER_LEN)
-#ifdef SDTEST
-#define SDPCM_RESERVE  (SDPCM_HDRLEN + SDPCM_TEST_HDRLEN + DHD_SDALIGN)
-#else
-#define SDPCM_RESERVE  (SDPCM_HDRLEN + DHD_SDALIGN)
-#endif
-
-/* Space for header read, limit for data packets */
-#ifndef MAX_HDR_READ
-#define MAX_HDR_READ   32
-#endif
-#if !ISPOWEROF2(MAX_HDR_READ)
-#error MAX_HDR_READ is not a power of 2!
-#endif
-
-#define MAX_RX_DATASZ  2048
-
-/* Maximum milliseconds to wait for F2 to come up */
-#define DHD_WAIT_F2RDY 3000
-
-/* Bump up limit on waiting for HT to account for first startup;
- * if the image is doing a CRC calculation before programming the PMU
- * for HT availability, it could take a couple hundred ms more, so
- * max out at a half second (500000us).
- */
-#if (PMU_MAX_TRANSITION_DLY <= 500000)
-#undef PMU_MAX_TRANSITION_DLY
-#define PMU_MAX_TRANSITION_DLY 500000
-#endif
-
-/* Value for ChipClockCSR during initial setup */
-#define DHD_INIT_CLKCTL1       (SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_ALP_AVAIL_REQ)
-#define DHD_INIT_CLKCTL2       (SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_FORCE_ALP)
-
-/* Flags for SDH calls */
-#define F2SYNC (SDIO_REQ_4BYTE | SDIO_REQ_FIXED)
-
-/* Packet free applicable unconditionally for sdio and sdspi.  Conditional if
- * bufpool was present for gspi bus.
- */
-#define PKTFREE2()             if ((bus->bus != SPI_BUS) || bus->usebufpool) \
-                                       PKTFREE(bus->dhd->osh, pkt, FALSE);
-DHD_SPINWAIT_SLEEP_INIT(sdioh_spinwait_sleep);
-extern int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len);
-
-#ifdef DHD_DEBUG
-/* Device console log buffer state */
-typedef struct dhd_console {
-       uint            count;                  /* Poll interval msec counter */
-       uint            log_addr;               /* Log struct address (fixed) */
-       hndrte_log_t    log;                    /* Log struct (host copy) */
-       uint            bufsize;                /* Size of log buffer */
-       uint8           *buf;                   /* Log buffer (host copy) */
-       uint            last;                   /* Last buffer read index */
-} dhd_console_t;
-#endif /* DHD_DEBUG */
-
-/* Private data for SDIO bus interaction */
-typedef struct dhd_bus {
-       dhd_pub_t       *dhd;
-
-       bcmsdh_info_t   *sdh;                   /* Handle for BCMSDH calls */
-       si_t            *sih;                   /* Handle for SI calls */
-       char            *vars;                  /* Variables (from CIS and/or other) */
-       uint            varsz;                  /* Size of variables buffer */
-       uint32          sbaddr;                 /* Current SB window pointer (-1, invalid) */
-
-       sdpcmd_regs_t   *regs;                  /* Registers for SDIO core */
-       uint            sdpcmrev;               /* SDIO core revision */
-       uint            armrev;                 /* CPU core revision */
-       uint            ramrev;                 /* SOCRAM core revision */
-       uint32          ramsize;                /* Size of RAM in SOCRAM (bytes) */
-       uint32          orig_ramsize;           /* Size of RAM in SOCRAM (bytes) */
-
-       uint32          bus;                    /* gSPI or SDIO bus */
-       uint32          hostintmask;            /* Copy of Host Interrupt Mask */
-       uint32          intstatus;              /* Intstatus bits (events) pending */
-       bool            dpc_sched;              /* Indicates DPC schedule (intrpt rcvd) */
-       bool            fcstate;                /* State of dongle flow-control */
-
-       uint16          cl_devid;               /* cached devid for dhdsdio_probe_attach() */
-       char            *fw_path; /* module_param: path to firmware image */
-       char            *nv_path; /* module_param: path to nvram vars file */
-       const char      *nvram_params;          /* user specified nvram params. */
-
-       uint            blocksize;              /* Block size of SDIO transfers */
-       uint            roundup;                /* Max roundup limit */
-
-       struct pktq     txq;                    /* Queue length used for flow-control */
-       uint8           flowcontrol;            /* per prio flow control bitmask */
-       uint8           tx_seq;                 /* Transmit sequence number (next) */
-       uint8           tx_max;                 /* Maximum transmit sequence allowed */
-
-       uint8           hdrbuf[MAX_HDR_READ + DHD_SDALIGN];
-       uint8           *rxhdr;                 /* Header of current rx frame (in hdrbuf) */
-       uint16          nextlen;                /* Next Read Len from last header */
-       uint8           rx_seq;                 /* Receive sequence number (expected) */
-       bool            rxskip;                 /* Skip receive (awaiting NAK ACK) */
-
-       void            *glomd;                 /* Packet containing glomming descriptor */
-       void            *glom;                  /* Packet chain for glommed superframe */
-       uint            glomerr;                /* Glom packet read errors */
-
-       uint8           *rxbuf;                 /* Buffer for receiving control packets */
-       uint            rxblen;                 /* Allocated length of rxbuf */
-       uint8           *rxctl;                 /* Aligned pointer into rxbuf */
-       uint8           *databuf;               /* Buffer for receiving big glom packet */
-       uint8           *dataptr;               /* Aligned pointer into databuf */
-       uint            rxlen;                  /* Length of valid data in buffer */
-
-       uint8           sdpcm_ver;              /* Bus protocol reported by dongle */
-
-       bool            intr;                   /* Use interrupts */
-       bool            poll;                   /* Use polling */
-       bool            ipend;                  /* Device interrupt is pending */
-       bool            intdis;                 /* Interrupts disabled by isr */
-       uint            intrcount;              /* Count of device interrupt callbacks */
-       uint            lastintrs;              /* Count as of last watchdog timer */
-       uint            spurious;               /* Count of spurious interrupts */
-       uint            pollrate;               /* Ticks between device polls */
-       uint            polltick;               /* Tick counter */
-       uint            pollcnt;                /* Count of active polls */
-
-#ifdef DHD_DEBUG
-       dhd_console_t   console;                /* Console output polling support */
-       uint            console_addr;           /* Console address from shared struct */
-#endif /* DHD_DEBUG */
-
-       uint            regfails;               /* Count of R_REG/W_REG failures */
-
-       uint            clkstate;               /* State of sd and backplane clock(s) */
-       bool            activity;               /* Activity flag for clock down */
-       int32           idletime;               /* Control for activity timeout */
-       int32           idlecount;              /* Activity timeout counter */
-       int32           idleclock;              /* How to set bus driver when idle */
-       int32           sd_divisor;             /* Speed control to bus driver */
-       int32           sd_mode;                /* Mode control to bus driver */
-       int32           sd_rxchain;             /* If bcmsdh api accepts PKT chains */
-       bool            use_rxchain;            /* If dhd should use PKT chains */
-       bool            sleeping;               /* Is SDIO bus sleeping? */
-       bool            rxflow_mode;    /* Rx flow control mode */
-       bool            rxflow;                 /* Is rx flow control on */
-       uint            prev_rxlim_hit;         /* Is prev rx limit exceeded (per dpc schedule) */
-       bool            alp_only;               /* Don't use HT clock (ALP only) */
-       /* Field to decide if rx of control frames happen in rxbuf or lb-pool */
-       bool            usebufpool;
-
-#ifdef SDTEST
-       /* external loopback */
-       bool            ext_loop;
-       uint8           loopid;
-
-       /* pktgen configuration */
-       uint            pktgen_freq;            /* Ticks between bursts */
-       uint            pktgen_count;           /* Packets to send each burst */
-       uint            pktgen_print;           /* Bursts between count displays */
-       uint            pktgen_total;           /* Stop after this many */
-       uint            pktgen_minlen;          /* Minimum packet data len */
-       uint            pktgen_maxlen;          /* Maximum packet data len */
-       uint            pktgen_mode;            /* Configured mode: tx, rx, or echo */
-       uint            pktgen_stop;            /* Number of tx failures causing stop */
-
-       /* active pktgen fields */
-       uint            pktgen_tick;            /* Tick counter for bursts */
-       uint            pktgen_ptick;           /* Burst counter for printing */
-       uint            pktgen_sent;            /* Number of test packets generated */
-       uint            pktgen_rcvd;            /* Number of test packets received */
-       uint            pktgen_fail;            /* Number of failed send attempts */
-       uint16          pktgen_len;             /* Length of next packet to send */
-#endif /* SDTEST */
-
-       /* Some additional counters */
-       uint            tx_sderrs;              /* Count of tx attempts with sd errors */
-       uint            fcqueued;               /* Tx packets that got queued */
-       uint            rxrtx;                  /* Count of rtx requests (NAK to dongle) */
-       uint            rx_toolong;             /* Receive frames too long to receive */
-       uint            rxc_errors;             /* SDIO errors when reading control frames */
-       uint            rx_hdrfail;             /* SDIO errors on header reads */
-       uint            rx_badhdr;              /* Bad received headers (roosync?) */
-       uint            rx_badseq;              /* Mismatched rx sequence number */
-       uint            fc_rcvd;                /* Number of flow-control events received */
-       uint            fc_xoff;                /* Number which turned on flow-control */
-       uint            fc_xon;                 /* Number which turned off flow-control */
-       uint            rxglomfail;             /* Failed deglom attempts */
-       uint            rxglomframes;           /* Number of glom frames (superframes) */
-       uint            rxglompkts;             /* Number of packets from glom frames */
-       uint            f2rxhdrs;               /* Number of header reads */
-       uint            f2rxdata;               /* Number of frame data reads */
-       uint            f2txdata;               /* Number of f2 frame writes */
-       uint            f1regdata;              /* Number of f1 register accesses */
-
-       uint8           *ctrl_frame_buf;
-       uint32          ctrl_frame_len;
-       bool            ctrl_frame_stat;
-} dhd_bus_t;
-
-/* clkstate */
-#define CLK_NONE       0
-#define CLK_SDONLY     1
-#define CLK_PENDING    2       /* Not used yet */
-#define CLK_AVAIL      3
-
-#define DHD_NOPMU(dhd) (FALSE)
-
-#ifdef DHD_DEBUG
-static int qcount[NUMPRIO];
-static int tx_packets[NUMPRIO];
-#endif /* DHD_DEBUG */
-
-/* Deferred transmit */
-const uint dhd_deferred_tx = 1;
-
-extern uint dhd_watchdog_ms;
-extern void dhd_os_wd_timer(void *bus, uint wdtick);
-
-/* Tx/Rx bounds */
-uint dhd_txbound;
-uint dhd_rxbound;
-uint dhd_txminmax;
-
-/* override the RAM size if possible */
-#define DONGLE_MIN_MEMSIZE (128 *1024)
-int dhd_dongle_memsize;
-
-static bool dhd_doflow;
-static bool dhd_alignctl;
-
-static bool sd1idle;
-
-static bool retrydata;
-#define RETRYCHAN(chan) (((chan) == SDPCM_EVENT_CHANNEL) || retrydata)
-
-static const uint watermark = 8;
-static const uint firstread = DHD_FIRSTREAD;
-
-#define HDATLEN (firstread - (SDPCM_HDRLEN))
-
-/* Retry count for register access failures */
-static const uint retry_limit = 2;
-
-/* Force even SD lengths (some host controllers mess up on odd bytes) */
-static bool forcealign;
-
-#define ALIGNMENT  4
-
-#if defined(OOB_INTR_ONLY) && defined(HW_OOB)
-extern void bcmsdh_enable_hw_oob_intr(void *sdh, bool enable);
-#endif
-
-#if defined(OOB_INTR_ONLY) && defined(SDIO_ISR_THREAD)
-#error OOB_INTR_ONLY is NOT working with SDIO_ISR_THREAD
-#endif /* defined(OOB_INTR_ONLY) && defined(SDIO_ISR_THREAD) */
-#define PKTALIGN(osh, p, len, align)                                   \
-       do {                                                            \
-               uint datalign;                                          \
-               datalign = (uintptr)PKTDATA((osh), (p));                \
-               datalign = ROUNDUP(datalign, (align)) - datalign;       \
-               ASSERT(datalign < (align));                             \
-               ASSERT(PKTLEN((osh), (p)) >= ((len) + datalign));       \
-               if (datalign)                                           \
-                       PKTPULL((osh), (p), datalign);                  \
-               PKTSETLEN((osh), (p), (len));                           \
-       } while (0)
-
-/* Limit on rounding up frames */
-static const uint max_roundup = 512;
-
-/* Try doing readahead */
-static bool dhd_readahead;
-
-
-/* To check if there's window offered */
-#define DATAOK(bus) \
-       (((uint8)(bus->tx_max - bus->tx_seq) != 0) && \
-       (((uint8)(bus->tx_max - bus->tx_seq) & 0x80) == 0))
-
-/* Macros to get register read/write status */
-/* NOTE: these assume a local dhdsdio_bus_t *bus! */
-#define R_SDREG(regvar, regaddr, retryvar) \
-do { \
-       retryvar = 0; \
-       do { \
-               regvar = R_REG(bus->dhd->osh, regaddr); \
-       } while (bcmsdh_regfail(bus->sdh) && (++retryvar <= retry_limit)); \
-       if (retryvar) { \
-               bus->regfails += (retryvar-1); \
-               if (retryvar > retry_limit) { \
-                       DHD_ERROR(("%s: FAILED" #regvar "READ, LINE %d\n", \
-                                  __FUNCTION__, __LINE__)); \
-                       regvar = 0; \
-               } \
-       } \
-} while (0)
-
-#define W_SDREG(regval, regaddr, retryvar) \
-do { \
-       retryvar = 0; \
-       do { \
-               W_REG(bus->dhd->osh, regaddr, regval); \
-       } while (bcmsdh_regfail(bus->sdh) && (++retryvar <= retry_limit)); \
-       if (retryvar) { \
-               bus->regfails += (retryvar-1); \
-               if (retryvar > retry_limit) \
-                       DHD_ERROR(("%s: FAILED REGISTER WRITE, LINE %d\n", \
-                                  __FUNCTION__, __LINE__)); \
-       } \
-} while (0)
-
-
-#define DHD_BUS                        SDIO_BUS
-
-#define PKT_AVAILABLE()                (intstatus & I_HMB_FRAME_IND)
-
-#define HOSTINTMASK            (I_HMB_SW_MASK | I_CHIPACTIVE)
-
-#define GSPI_PR55150_BAILOUT
-
-
-#ifdef SDTEST
-static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq);
-static void dhdsdio_sdtest_set(dhd_bus_t *bus, bool start);
-#endif
-
-#ifdef DHD_DEBUG
-static int dhdsdio_checkdied(dhd_bus_t *bus, uint8 *data, uint size);
-static int dhdsdio_mem_dump(dhd_bus_t *bus);
-#endif /* DHD_DEBUG  */
-static int dhdsdio_download_state(dhd_bus_t *bus, bool enter);
-
-static void dhdsdio_release(dhd_bus_t *bus, osl_t *osh);
-static void dhdsdio_release_malloc(dhd_bus_t *bus, osl_t *osh);
-static void dhdsdio_disconnect(void *ptr);
-static bool dhdsdio_chipmatch(uint16 chipid);
-static bool dhdsdio_probe_attach(dhd_bus_t *bus, osl_t *osh, void *sdh,
-                                 void * regsva, uint16  devid);
-static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh);
-static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh);
-static void dhdsdio_release_dongle(dhd_bus_t *bus, osl_t *osh);
-
-static uint process_nvram_vars(char *varbuf, uint len);
-
-static void dhd_dongle_setmemsize(struct dhd_bus *bus, int mem_size);
-static int dhd_bcmsdh_recv_buf(dhd_bus_t *bus, uint32 addr, uint fn, uint flags,
-       uint8 *buf, uint nbytes,
-       void *pkt, bcmsdh_cmplt_fn_t complete, void *handle);
-static int dhd_bcmsdh_send_buf(dhd_bus_t *bus, uint32 addr, uint fn, uint flags,
-       uint8 *buf, uint nbytes,
-       void *pkt, bcmsdh_cmplt_fn_t complete, void *handle);
-
-static bool dhdsdio_download_firmware(struct dhd_bus *bus, osl_t *osh, void *sdh);
-static int _dhdsdio_download_firmware(struct dhd_bus *bus);
-
-static int dhdsdio_download_code_file(struct dhd_bus *bus, char *image_path);
-static int dhdsdio_download_nvram(struct dhd_bus *bus);
-#ifdef BCMEMBEDIMAGE
-static int dhdsdio_download_code_array(struct dhd_bus *bus);
-#endif
-
-
-static void
-dhd_dongle_setmemsize(struct dhd_bus *bus, int mem_size)
-{
-       int32 min_size =  DONGLE_MIN_MEMSIZE;
-       /* Restrict the memsize to user specified limit */
-       DHD_ERROR(("user: Restrict the dongle ram size to %d, min accepted %d\n",
-               dhd_dongle_memsize, min_size));
-       if ((dhd_dongle_memsize > min_size) &&
-               (dhd_dongle_memsize < (int32)bus->orig_ramsize))
-               bus->ramsize = dhd_dongle_memsize;
-}
-
-static int
-dhdsdio_set_siaddr_window(dhd_bus_t *bus, uint32 address)
-{
-       int err = 0;
-       bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW,
-                        (address >> 8) & SBSDIO_SBADDRLOW_MASK, &err);
-       if (!err)
-               bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRMID,
-                                (address >> 16) & SBSDIO_SBADDRMID_MASK, &err);
-       if (!err)
-               bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRHIGH,
-                                (address >> 24) & SBSDIO_SBADDRHIGH_MASK, &err);
-       return err;
-}
-
-
-/* Turn backplane clock on or off */
-static int
-dhdsdio_htclk(dhd_bus_t *bus, bool on, bool pendok)
-{
-       int err;
-       uint8 clkctl, clkreq, devctl;
-       bcmsdh_info_t *sdh;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-#if defined(OOB_INTR_ONLY)
-       pendok = FALSE;
-#endif
-       clkctl = 0;
-       sdh = bus->sdh;
-
-
-       if (on) {
-               /* Request HT Avail */
-               clkreq = bus->alp_only ? SBSDIO_ALP_AVAIL_REQ : SBSDIO_HT_AVAIL_REQ;
-
-               if ((bus->sih->chip == BCM4329_CHIP_ID) && (bus->sih->chiprev == 0))
-                       clkreq |= SBSDIO_FORCE_ALP;
-
-
-
-
-               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &err);
-               if (err) {
-                       DHD_ERROR(("%s: HT Avail request error: %d\n", __FUNCTION__, err));
-                       return BCME_ERROR;
-               }
-
-               if (pendok &&
-                   ((bus->sih->buscoretype == PCMCIA_CORE_ID) && (bus->sih->buscorerev == 9))) {
-                       uint32 dummy, retries;
-                       R_SDREG(dummy, &bus->regs->clockctlstatus, retries);
-               }
-
-               /* Check current status */
-               clkctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, &err);
-               if (err) {
-                       DHD_ERROR(("%s: HT Avail read error: %d\n", __FUNCTION__, err));
-                       return BCME_ERROR;
-               }
-
-               /* Go to pending and await interrupt if appropriate */
-               if (!SBSDIO_CLKAV(clkctl, bus->alp_only) && pendok) {
-                       /* Allow only clock-available interrupt */
-                       devctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, &err);
-                       if (err) {
-                               DHD_ERROR(("%s: Devctl access error setting CA: %d\n",
-                                          __FUNCTION__, err));
-                               return BCME_ERROR;
-                       }
-
-                       devctl |= SBSDIO_DEVCTL_CA_INT_ONLY;
-                       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, devctl, &err);
-                       DHD_INFO(("CLKCTL: set PENDING\n"));
-                       bus->clkstate = CLK_PENDING;
-
-                       return BCME_OK;
-               } else if (bus->clkstate == CLK_PENDING) {
-                       /* Cancel CA-only interrupt filter */
-                       devctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, &err);
-                       devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY;
-                       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, devctl, &err);
-               }
-
-               /* Otherwise, wait here (polling) for HT Avail */
-               if (!SBSDIO_CLKAV(clkctl, bus->alp_only)) {
-                       SPINWAIT_SLEEP(sdioh_spinwait_sleep,
-                               ((clkctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1,
-                                                           SBSDIO_FUNC1_CHIPCLKCSR, &err)),
-                                 !SBSDIO_CLKAV(clkctl, bus->alp_only)), PMU_MAX_TRANSITION_DLY);
-               }
-               if (err) {
-                       DHD_ERROR(("%s: HT Avail request error: %d\n", __FUNCTION__, err));
-                       return BCME_ERROR;
-               }
-               if (!SBSDIO_CLKAV(clkctl, bus->alp_only)) {
-                       DHD_ERROR(("%s: HT Avail timeout (%d): clkctl 0x%02x\n",
-                                  __FUNCTION__, PMU_MAX_TRANSITION_DLY, clkctl));
-                       return BCME_ERROR;
-               }
-
-
-               /* Mark clock available */
-               bus->clkstate = CLK_AVAIL;
-               DHD_INFO(("CLKCTL: turned ON\n"));
-
-#if defined(DHD_DEBUG)
-               if (bus->alp_only == TRUE) {
-#if !defined(BCMLXSDMMC)
-                       if (!SBSDIO_ALPONLY(clkctl)) {
-                               DHD_ERROR(("%s: HT Clock, when ALP Only\n", __FUNCTION__));
-                       }
-#endif /* !defined(BCMLXSDMMC) */
-               } else {
-                       if (SBSDIO_ALPONLY(clkctl)) {
-                               DHD_ERROR(("%s: HT Clock should be on.\n", __FUNCTION__));
-                       }
-               }
-#endif /* defined (DHD_DEBUG) */
-
-               bus->activity = TRUE;
-       } else {
-               clkreq = 0;
-
-               if (bus->clkstate == CLK_PENDING) {
-                       /* Cancel CA-only interrupt filter */
-                       devctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, &err);
-                       devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY;
-                       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, devctl, &err);
-               }
-
-               bus->clkstate = CLK_SDONLY;
-               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &err);
-               DHD_INFO(("CLKCTL: turned OFF\n"));
-               if (err) {
-                       DHD_ERROR(("%s: Failed access turning clock off: %d\n",
-                                  __FUNCTION__, err));
-                       return BCME_ERROR;
-               }
-       }
-       return BCME_OK;
-}
-
-/* Change idle/active SD state */
-static int
-dhdsdio_sdclk(dhd_bus_t *bus, bool on)
-{
-       int err;
-       int32 iovalue;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (on) {
-               if (bus->idleclock == DHD_IDLE_STOP) {
-                       /* Turn on clock and restore mode */
-                       iovalue = 1;
-                       err = bcmsdh_iovar_op(bus->sdh, "sd_clock", NULL, 0,
-                                             &iovalue, sizeof(iovalue), TRUE);
-                       if (err) {
-                               DHD_ERROR(("%s: error enabling sd_clock: %d\n",
-                                          __FUNCTION__, err));
-                               return BCME_ERROR;
-                       }
-
-                       iovalue = bus->sd_mode;
-                       err = bcmsdh_iovar_op(bus->sdh, "sd_mode", NULL, 0,
-                                             &iovalue, sizeof(iovalue), TRUE);
-                       if (err) {
-                               DHD_ERROR(("%s: error changing sd_mode: %d\n",
-                                          __FUNCTION__, err));
-                               return BCME_ERROR;
-                       }
-               } else if (bus->idleclock != DHD_IDLE_ACTIVE) {
-                       /* Restore clock speed */
-                       iovalue = bus->sd_divisor;
-                       err = bcmsdh_iovar_op(bus->sdh, "sd_divisor", NULL, 0,
-                                             &iovalue, sizeof(iovalue), TRUE);
-                       if (err) {
-                               DHD_ERROR(("%s: error restoring sd_divisor: %d\n",
-                                          __FUNCTION__, err));
-                               return BCME_ERROR;
-                       }
-               }
-               bus->clkstate = CLK_SDONLY;
-       } else {
-               /* Stop or slow the SD clock itself */
-               if ((bus->sd_divisor == -1) || (bus->sd_mode == -1)) {
-                       DHD_TRACE(("%s: can't idle clock, divisor %d mode %d\n",
-                                  __FUNCTION__, bus->sd_divisor, bus->sd_mode));
-                       return BCME_ERROR;
-               }
-               if (bus->idleclock == DHD_IDLE_STOP) {
-                       if (sd1idle) {
-                               /* Change to SD1 mode and turn off clock */
-                               iovalue = 1;
-                               err = bcmsdh_iovar_op(bus->sdh, "sd_mode", NULL, 0,
-                                                     &iovalue, sizeof(iovalue), TRUE);
-                               if (err) {
-                                       DHD_ERROR(("%s: error changing sd_clock: %d\n",
-                                                  __FUNCTION__, err));
-                                       return BCME_ERROR;
-                               }
-                       }
-
-                       iovalue = 0;
-                       err = bcmsdh_iovar_op(bus->sdh, "sd_clock", NULL, 0,
-                                             &iovalue, sizeof(iovalue), TRUE);
-                       if (err) {
-                               DHD_ERROR(("%s: error disabling sd_clock: %d\n",
-                                          __FUNCTION__, err));
-                               return BCME_ERROR;
-                       }
-               } else if (bus->idleclock != DHD_IDLE_ACTIVE) {
-                       /* Set divisor to idle value */
-                       iovalue = bus->idleclock;
-                       err = bcmsdh_iovar_op(bus->sdh, "sd_divisor", NULL, 0,
-                                             &iovalue, sizeof(iovalue), TRUE);
-                       if (err) {
-                               DHD_ERROR(("%s: error changing sd_divisor: %d\n",
-                                          __FUNCTION__, err));
-                               return BCME_ERROR;
-                       }
-               }
-               bus->clkstate = CLK_NONE;
-       }
-
-       return BCME_OK;
-}
-
-/* Transition SD and backplane clock readiness */
-static int
-dhdsdio_clkctl(dhd_bus_t *bus, uint target, bool pendok)
-{
-       int ret = BCME_OK;
-#ifdef DHD_DEBUG
-       uint oldstate = bus->clkstate;
-#endif /* DHD_DEBUG */
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       /* Early exit if we're already there */
-       if (bus->clkstate == target) {
-               if (target == CLK_AVAIL) {
-                       dhd_os_wd_timer(bus->dhd, dhd_watchdog_ms);
-                       bus->activity = TRUE;
-               }
-               return BCME_OK;
-       }
-
-       switch (target) {
-       case CLK_AVAIL:
-               /* Make sure SD clock is available */
-               if (bus->clkstate == CLK_NONE)
-                       dhdsdio_sdclk(bus, TRUE);
-               /* Now request HT Avail on the backplane */
-               ret = dhdsdio_htclk(bus, TRUE, pendok);
-               if (ret == BCME_OK) {
-                       dhd_os_wd_timer(bus->dhd, dhd_watchdog_ms);
-                       bus->activity = TRUE;
-               }
-               break;
-
-       case CLK_SDONLY:
-               /* Remove HT request, or bring up SD clock */
-               if (bus->clkstate == CLK_NONE)
-                       ret = dhdsdio_sdclk(bus, TRUE);
-               else if (bus->clkstate == CLK_AVAIL)
-                       ret = dhdsdio_htclk(bus, FALSE, FALSE);
-               else
-                       DHD_ERROR(("dhdsdio_clkctl: request for %d -> %d\n",
-                                  bus->clkstate, target));
-               if (ret == BCME_OK) {
-                       dhd_os_wd_timer(bus->dhd, dhd_watchdog_ms);
-               }
-               break;
-
-       case CLK_NONE:
-               /* Make sure to remove HT request */
-               if (bus->clkstate == CLK_AVAIL)
-                       ret = dhdsdio_htclk(bus, FALSE, FALSE);
-               /* Now remove the SD clock */
-               ret = dhdsdio_sdclk(bus, FALSE);
-               dhd_os_wd_timer(bus->dhd, 0);
-               break;
-       }
-#ifdef DHD_DEBUG
-       DHD_INFO(("dhdsdio_clkctl: %d -> %d\n", oldstate, bus->clkstate));
-#endif /* DHD_DEBUG */
-
-       return ret;
-}
-
-int
-dhdsdio_bussleep(dhd_bus_t *bus, bool sleep)
-{
-       bcmsdh_info_t *sdh = bus->sdh;
-       sdpcmd_regs_t *regs = bus->regs;
-       uint retries = 0;
-
-       DHD_INFO(("dhdsdio_bussleep: request %s (currently %s)\n",
-                 (sleep ? "SLEEP" : "WAKE"),
-                 (bus->sleeping ? "SLEEP" : "WAKE")));
-
-       /* Done if we're already in the requested state */
-       if (sleep == bus->sleeping)
-               return BCME_OK;
-
-       /* Going to sleep: set the alarm and turn off the lights... */
-       if (sleep) {
-               /* Don't sleep if something is pending */
-               if (bus->dpc_sched || bus->rxskip || pktq_len(&bus->txq))
-                       return BCME_BUSY;
-
-
-               /* Disable SDIO interrupts (no longer interested) */
-               bcmsdh_intr_disable(bus->sdh);
-
-               /* Make sure the controller has the bus up */
-               dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-
-               /* Tell device to start using OOB wakeup */
-               W_SDREG(SMB_USE_OOB, &regs->tosbmailbox, retries);
-               if (retries > retry_limit)
-                       DHD_ERROR(("CANNOT SIGNAL CHIP, WILL NOT WAKE UP!!\n"));
-
-               /* Turn off our contribution to the HT clock request */
-               dhdsdio_clkctl(bus, CLK_SDONLY, FALSE);
-
-               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR,
-                                SBSDIO_FORCE_HW_CLKREQ_OFF, NULL);
-
-               /* Isolate the bus */
-               if (bus->sih->chip != BCM4329_CHIP_ID && bus->sih->chip != BCM4319_CHIP_ID) {
-                               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL,
-                                       SBSDIO_DEVCTL_PADS_ISO, NULL);
-               }
-
-               /* Change state */
-               bus->sleeping = TRUE;
-
-       } else {
-               /* Waking up: bus power up is ok, set local state */
-
-               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR,
-                                0, NULL);
-
-               /* Force pad isolation off if possible (in case power never toggled) */
-               if ((bus->sih->buscoretype == PCMCIA_CORE_ID) && (bus->sih->buscorerev >= 10))
-                       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, 0, NULL);
-
-
-               /* Make sure the controller has the bus up */
-               dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-
-               /* Send misc interrupt to indicate OOB not needed */
-               W_SDREG(0, &regs->tosbmailboxdata, retries);
-               if (retries <= retry_limit)
-                       W_SDREG(SMB_DEV_INT, &regs->tosbmailbox, retries);
-
-               if (retries > retry_limit)
-                       DHD_ERROR(("CANNOT SIGNAL CHIP TO CLEAR OOB!!\n"));
-
-               /* Make sure we have SD bus access */
-               dhdsdio_clkctl(bus, CLK_SDONLY, FALSE);
-
-               /* Change state */
-               bus->sleeping = FALSE;
-
-               /* Enable interrupts again */
-               if (bus->intr && (bus->dhd->busstate == DHD_BUS_DATA)) {
-                       bus->intdis = FALSE;
-                       bcmsdh_intr_enable(bus->sdh);
-               }
-       }
-
-       return BCME_OK;
-}
-#if defined(OOB_INTR_ONLY)
-void
-dhd_enable_oob_intr(struct dhd_bus *bus, bool enable)
-{
-#if defined(HW_OOB)
-       bcmsdh_enable_hw_oob_intr(bus->sdh, enable);
-#else
-       sdpcmd_regs_t *regs = bus->regs;
-       uint retries = 0;
-
-       dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-       if (enable == TRUE) {
-
-               /* Tell device to start using OOB wakeup */
-               W_SDREG(SMB_USE_OOB, &regs->tosbmailbox, retries);
-               if (retries > retry_limit)
-                       DHD_ERROR(("CANNOT SIGNAL CHIP, WILL NOT WAKE UP!!\n"));
-
-       } else {
-               /* Send misc interrupt to indicate OOB not needed */
-               W_SDREG(0, &regs->tosbmailboxdata, retries);
-               if (retries <= retry_limit)
-                       W_SDREG(SMB_DEV_INT, &regs->tosbmailbox, retries);
-       }
-
-       /* Turn off our contribution to the HT clock request */
-       dhdsdio_clkctl(bus, CLK_SDONLY, FALSE);
-#endif /* !defined(HW_OOB) */
-}
-#endif /* defined(OOB_INTR_ONLY) */
-
-#define BUS_WAKE(bus) \
-       do { \
-               if ((bus)->sleeping) \
-                       dhdsdio_bussleep((bus), FALSE); \
-       } while (0);
-
-
-/* Writes a HW/SW header into the packet and sends it. */
-/* Assumes: (a) header space already there, (b) caller holds lock */
-static int
-dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
-{
-       int ret;
-       osl_t *osh;
-       uint8 *frame;
-       uint16 len, pad = 0;
-       uint32 swheader;
-       uint retries = 0;
-       bcmsdh_info_t *sdh;
-       void *new;
-       int i;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       sdh = bus->sdh;
-       osh = bus->dhd->osh;
-
-       if (bus->dhd->dongle_reset) {
-               ret = BCME_NOTREADY;
-               goto done;
-       }
-
-       frame = (uint8*)PKTDATA(osh, pkt);
-
-       /* Add alignment padding, allocate new packet if needed */
-       if ((pad = ((uintptr)frame % DHD_SDALIGN))) {
-               if (PKTHEADROOM(osh, pkt) < pad) {
-                       DHD_INFO(("%s: insufficient headroom %d for %d pad\n",
-                                 __FUNCTION__, (int)PKTHEADROOM(osh, pkt), pad));
-                       bus->dhd->tx_realloc++;
-                       new = PKTGET(osh, (PKTLEN(osh, pkt) + DHD_SDALIGN), TRUE);
-                       if (!new) {
-                               DHD_ERROR(("%s: couldn't allocate new %d-byte packet\n",
-                                          __FUNCTION__, PKTLEN(osh, pkt) + DHD_SDALIGN));
-                               ret = BCME_NOMEM;
-                               goto done;
-                       }
-
-                       PKTALIGN(osh, new, PKTLEN(osh, pkt), DHD_SDALIGN);
-                       bcopy(PKTDATA(osh, pkt), PKTDATA(osh, new), PKTLEN(osh, pkt));
-                       if (free_pkt)
-                               PKTFREE(osh, pkt, TRUE);
-                       /* free the pkt if canned one is not used */
-                       free_pkt = TRUE;
-                       pkt = new;
-                       frame = (uint8*)PKTDATA(osh, pkt);
-                       ASSERT(((uintptr)frame % DHD_SDALIGN) == 0);
-                       pad = 0;
-               } else {
-                       PKTPUSH(osh, pkt, pad);
-                       frame = (uint8*)PKTDATA(osh, pkt);
-
-                       ASSERT((pad + SDPCM_HDRLEN) <= (int) PKTLEN(osh, pkt));
-                       bzero(frame, pad + SDPCM_HDRLEN);
-               }
-       }
-       ASSERT(pad < DHD_SDALIGN);
-
-       /* Hardware tag: 2 byte len followed by 2 byte ~len check (all LE) */
-       len = (uint16)PKTLEN(osh, pkt);
-       *(uint16*)frame = htol16(len);
-       *(((uint16*)frame) + 1) = htol16(~len);
-
-       /* Software tag: channel, sequence number, data offset */
-       swheader = ((chan << SDPCM_CHANNEL_SHIFT) & SDPCM_CHANNEL_MASK) | bus->tx_seq |
-               (((pad + SDPCM_HDRLEN) << SDPCM_DOFFSET_SHIFT) & SDPCM_DOFFSET_MASK);
-       htol32_ua_store(swheader, frame + SDPCM_FRAMETAG_LEN);
-       htol32_ua_store(0, frame + SDPCM_FRAMETAG_LEN + sizeof(swheader));
-
-#ifdef DHD_DEBUG
-       tx_packets[PKTPRIO(pkt)]++;
-       if (DHD_BYTES_ON() &&
-           (((DHD_CTL_ON() && (chan == SDPCM_CONTROL_CHANNEL)) ||
-             (DHD_DATA_ON() && (chan != SDPCM_CONTROL_CHANNEL))))) {
-               prhex("Tx Frame", frame, len);
-       } else if (DHD_HDRS_ON()) {
-               prhex("TxHdr", frame, MIN(len, 16));
-       }
-#endif
-
-       /* Raise len to next SDIO block to eliminate tail command */
-       if (bus->roundup && bus->blocksize && (len > bus->blocksize)) {
-               uint16 pad = bus->blocksize - (len % bus->blocksize);
-               if ((pad <= bus->roundup) && (pad < bus->blocksize))
-#ifdef NOTUSED
-                       if (pad <= PKTTAILROOM(osh, pkt))
-#endif /* NOTUSED */
-                               len += pad;
-       } else if (len % DHD_SDALIGN) {
-               len += DHD_SDALIGN - (len % DHD_SDALIGN);
-       }
-
-       /* Some controllers have trouble with odd bytes -- round to even */
-       if (forcealign && (len & (ALIGNMENT - 1))) {
-#ifdef NOTUSED
-               if (PKTTAILROOM(osh, pkt))
-#endif
-                       len = ROUNDUP(len, ALIGNMENT);
-#ifdef NOTUSED
-               else
-                       DHD_ERROR(("%s: sending unrounded %d-byte packet\n", __FUNCTION__, len));
-#endif
-       }
-
-       do {
-               ret = dhd_bcmsdh_send_buf(bus, bcmsdh_cur_sbwad(sdh), SDIO_FUNC_2, F2SYNC,
-                                     frame, len, pkt, NULL, NULL);
-               bus->f2txdata++;
-               ASSERT(ret != BCME_PENDING);
-
-               if (ret < 0) {
-                       /* On failure, abort the command and terminate the frame */
-                       DHD_INFO(("%s: sdio error %d, abort command and terminate frame.\n",
-                                 __FUNCTION__, ret));
-                       bus->tx_sderrs++;
-
-                       bcmsdh_abort(sdh, SDIO_FUNC_2);
-                       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_FRAMECTRL,
-                                        SFC_WF_TERM, NULL);
-                       bus->f1regdata++;
-
-                       for (i = 0; i < 3; i++) {
-                               uint8 hi, lo;
-                               hi = bcmsdh_cfg_read(sdh, SDIO_FUNC_1,
-                                                    SBSDIO_FUNC1_WFRAMEBCHI, NULL);
-                               lo = bcmsdh_cfg_read(sdh, SDIO_FUNC_1,
-                                                    SBSDIO_FUNC1_WFRAMEBCLO, NULL);
-                               bus->f1regdata += 2;
-                               if ((hi == 0) && (lo == 0))
-                                       break;
-                       }
-
-               }
-               if (ret == 0) {
-                       bus->tx_seq = (bus->tx_seq + 1) % SDPCM_SEQUENCE_WRAP;
-               }
-       } while ((ret < 0) && retrydata && retries++ < TXRETRIES);
-
-done:
-       /* restore pkt buffer pointer before calling tx complete routine */
-       PKTPULL(osh, pkt, SDPCM_HDRLEN + pad);
-       dhd_os_sdunlock(bus->dhd);
-       dhd_txcomplete(bus->dhd, pkt, ret != 0);
-       dhd_os_sdlock(bus->dhd);
-
-       if (free_pkt)
-               PKTFREE(osh, pkt, TRUE);
-
-       return ret;
-}
-
-int
-dhd_bus_txdata(struct dhd_bus *bus, void *pkt)
-{
-       int ret = BCME_ERROR;
-       osl_t *osh;
-       uint datalen, prec;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       osh = bus->dhd->osh;
-       datalen = PKTLEN(osh, pkt);
-
-#ifdef SDTEST
-       /* Push the test header if doing loopback */
-       if (bus->ext_loop) {
-               uint8* data;
-               PKTPUSH(osh, pkt, SDPCM_TEST_HDRLEN);
-               data = PKTDATA(osh, pkt);
-               *data++ = SDPCM_TEST_ECHOREQ;
-               *data++ = (uint8)bus->loopid++;
-               *data++ = (datalen >> 0);
-               *data++ = (datalen >> 8);
-               datalen += SDPCM_TEST_HDRLEN;
-       }
-#endif /* SDTEST */
-
-       /* Add space for the header */
-       PKTPUSH(osh, pkt, SDPCM_HDRLEN);
-       ASSERT(ISALIGNED((uintptr)PKTDATA(osh, pkt), 2));
-
-       prec = PRIO2PREC((PKTPRIO(pkt) & PRIOMASK));
-
-
-       /* Check for existing queue, current flow-control, pending event, or pending clock */
-       if (dhd_deferred_tx || bus->fcstate || pktq_len(&bus->txq) || bus->dpc_sched ||
-           (!DATAOK(bus)) || (bus->flowcontrol & NBITVAL(prec)) ||
-           (bus->clkstate != CLK_AVAIL)) {
-               DHD_TRACE(("%s: deferring pktq len %d\n", __FUNCTION__,
-                       pktq_len(&bus->txq)));
-               bus->fcqueued++;
-
-               /* Priority based enq */
-               dhd_os_sdlock_txq(bus->dhd);
-               if (dhd_prec_enq(bus->dhd, &bus->txq, pkt, prec) == FALSE) {
-                       PKTPULL(osh, pkt, SDPCM_HDRLEN);
-                       dhd_txcomplete(bus->dhd, pkt, FALSE);
-                       PKTFREE(osh, pkt, TRUE);
-                       DHD_ERROR(("%s: out of bus->txq !!!\n", __FUNCTION__));
-                       ret = BCME_NORESOURCE;
-               } else {
-                       ret = BCME_OK;
-               }
-               dhd_os_sdunlock_txq(bus->dhd);
-
-               if ((pktq_len(&bus->txq) >= FCHI) && dhd_doflow)
-                       dhd_txflowcontrol(bus->dhd, 0, ON);
-
-#ifdef DHD_DEBUG
-               if (pktq_plen(&bus->txq, prec) > qcount[prec])
-                       qcount[prec] = pktq_plen(&bus->txq, prec);
-#endif
-               /* Schedule DPC if needed to send queued packet(s) */
-               if (dhd_deferred_tx && !bus->dpc_sched) {
-                       bus->dpc_sched = TRUE;
-                       dhd_sched_dpc(bus->dhd);
-               }
-       } else {
-               /* Lock: we're about to use shared data/code (and SDIO) */
-               dhd_os_sdlock(bus->dhd);
-
-               /* Otherwise, send it now */
-               BUS_WAKE(bus);
-               /* Make sure back plane ht clk is on, no pending allowed */
-               dhdsdio_clkctl(bus, CLK_AVAIL, TRUE);
-
-#ifndef SDTEST
-               DHD_TRACE(("%s: calling txpkt\n", __FUNCTION__));
-               ret = dhdsdio_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, TRUE);
-#else
-               ret = dhdsdio_txpkt(bus, pkt,
-                       (bus->ext_loop ? SDPCM_TEST_CHANNEL : SDPCM_DATA_CHANNEL), TRUE);
-#endif
-               if (ret)
-                       bus->dhd->tx_errors++;
-               else
-                       bus->dhd->dstats.tx_bytes += datalen;
-
-               if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
-                       bus->activity = FALSE;
-                       dhdsdio_clkctl(bus, CLK_NONE, TRUE);
-               }
-
-               dhd_os_sdunlock(bus->dhd);
-       }
-
-
-       return ret;
-}
-
-static uint
-dhdsdio_sendfromq(dhd_bus_t *bus, uint maxframes)
-{
-       void *pkt;
-       uint32 intstatus = 0;
-       uint retries = 0;
-       int ret = 0, prec_out;
-       uint cnt = 0;
-       uint datalen;
-       uint8 tx_prec_map;
-
-       dhd_pub_t *dhd = bus->dhd;
-       sdpcmd_regs_t *regs = bus->regs;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       tx_prec_map = ~bus->flowcontrol;
-
-       /* Send frames until the limit or some other event */
-       for (cnt = 0; (cnt < maxframes) && DATAOK(bus); cnt++) {
-               dhd_os_sdlock_txq(bus->dhd);
-               if ((pkt = pktq_mdeq(&bus->txq, tx_prec_map, &prec_out)) == NULL) {
-                       dhd_os_sdunlock_txq(bus->dhd);
-                       break;
-               }
-               dhd_os_sdunlock_txq(bus->dhd);
-               datalen = PKTLEN(bus->dhd->osh, pkt) - SDPCM_HDRLEN;
-
-#ifndef SDTEST
-               ret = dhdsdio_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, TRUE);
-#else
-               ret = dhdsdio_txpkt(bus, pkt,
-                       (bus->ext_loop ? SDPCM_TEST_CHANNEL : SDPCM_DATA_CHANNEL), TRUE);
-#endif
-               if (ret)
-                       bus->dhd->tx_errors++;
-               else
-                       bus->dhd->dstats.tx_bytes += datalen;
-
-               /* In poll mode, need to check for other events */
-               if (!bus->intr && cnt)
-               {
-                       /* Check device status, signal pending interrupt */
-                       R_SDREG(intstatus, &regs->intstatus, retries);
-                       bus->f2txdata++;
-                       if (bcmsdh_regfail(bus->sdh))
-                               break;
-                       if (intstatus & bus->hostintmask)
-                               bus->ipend = TRUE;
-               }
-       }
-
-       /* Deflow-control stack if needed */
-       if (dhd_doflow && dhd->up && (dhd->busstate == DHD_BUS_DATA) &&
-           dhd->txoff && (pktq_len(&bus->txq) < FCLOW))
-               dhd_txflowcontrol(dhd, 0, OFF);
-
-       return cnt;
-}
-
-int
-dhd_bus_txctl(struct dhd_bus *bus, uchar *msg, uint msglen)
-{
-       uint8 *frame;
-       uint16 len;
-       uint32 swheader;
-       uint retries = 0;
-       bcmsdh_info_t *sdh = bus->sdh;
-       uint8 doff = 0;
-       int ret = -1;
-       int i;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (bus->dhd->dongle_reset)
-               return -EIO;
-
-       /* Back the pointer to make a room for bus header */
-       frame = msg - SDPCM_HDRLEN;
-       len = (msglen += SDPCM_HDRLEN);
-
-       /* Add alignment padding (optional for ctl frames) */
-       if (dhd_alignctl) {
-               if ((doff = ((uintptr)frame % DHD_SDALIGN))) {
-                       frame -= doff;
-                       len += doff;
-                       msglen += doff;
-                       bzero(frame, doff + SDPCM_HDRLEN);
-               }
-               ASSERT(doff < DHD_SDALIGN);
-       }
-       doff += SDPCM_HDRLEN;
-
-       /* Round send length to next SDIO block */
-       if (bus->roundup && bus->blocksize && (len > bus->blocksize)) {
-               uint16 pad = bus->blocksize - (len % bus->blocksize);
-               if ((pad <= bus->roundup) && (pad < bus->blocksize))
-                       len += pad;
-       } else if (len % DHD_SDALIGN) {
-               len += DHD_SDALIGN - (len % DHD_SDALIGN);
-       }
-
-       /* Satisfy length-alignment requirements */
-       if (forcealign && (len & (ALIGNMENT - 1)))
-               len = ROUNDUP(len, ALIGNMENT);
-
-       ASSERT(ISALIGNED((uintptr)frame, 2));
-
-
-       /* Need to lock here to protect txseq and SDIO tx calls */
-       dhd_os_sdlock(bus->dhd);
-
-       BUS_WAKE(bus);
-
-       /* Make sure backplane clock is on */
-       dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-
-       /* Hardware tag: 2 byte len followed by 2 byte ~len check (all LE) */
-       *(uint16*)frame = htol16((uint16)msglen);
-       *(((uint16*)frame) + 1) = htol16(~msglen);
-
-       /* Software tag: channel, sequence number, data offset */
-       swheader = ((SDPCM_CONTROL_CHANNEL << SDPCM_CHANNEL_SHIFT) & SDPCM_CHANNEL_MASK)
-               | bus->tx_seq | ((doff << SDPCM_DOFFSET_SHIFT) & SDPCM_DOFFSET_MASK);
-       htol32_ua_store(swheader, frame + SDPCM_FRAMETAG_LEN);
-       htol32_ua_store(0, frame + SDPCM_FRAMETAG_LEN + sizeof(swheader));
-
-       if (!DATAOK(bus)) {
-               DHD_INFO(("%s: No bus credit bus->tx_max %d, bus->tx_seq %d\n",
-                       __FUNCTION__, bus->tx_max, bus->tx_seq));
-               bus->ctrl_frame_stat = TRUE;
-               /* Send from dpc */
-               bus->ctrl_frame_buf = frame;
-               bus->ctrl_frame_len = len;
-
-               dhd_wait_for_event(bus->dhd, &bus->ctrl_frame_stat);
-
-               if (bus->ctrl_frame_stat == FALSE) {
-                       DHD_INFO(("%s: ctrl_frame_stat == FALSE\n", __FUNCTION__));
-                       ret = 0;
-               } else {
-                       DHD_INFO(("%s: ctrl_frame_stat == TRUE\n", __FUNCTION__));
-                       ret = -1;
-               }
-       }
-
-       if (ret == -1) {
-#ifdef DHD_DEBUG
-               if (DHD_BYTES_ON() && DHD_CTL_ON()) {
-                       prhex("Tx Frame", frame, len);
-               } else if (DHD_HDRS_ON()) {
-                       prhex("TxHdr", frame, MIN(len, 16));
-               }
-#endif
-
-               do {
-                       bus->ctrl_frame_stat = FALSE;
-                       ret = dhd_bcmsdh_send_buf(bus, bcmsdh_cur_sbwad(sdh), SDIO_FUNC_2, F2SYNC,
-                                                 frame, len, NULL, NULL, NULL);
-
-                       ASSERT(ret != BCME_PENDING);
-
-                       if (ret < 0) {
-                               /* On failure, abort the command and terminate the frame */
-                               DHD_INFO(("%s: sdio error %d, abort command and terminate frame.\n",
-                                         __FUNCTION__, ret));
-                               bus->tx_sderrs++;
-
-                               bcmsdh_abort(sdh, SDIO_FUNC_2);
-
-                               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_FRAMECTRL,
-                                                SFC_WF_TERM, NULL);
-                               bus->f1regdata++;
-
-                               for (i = 0; i < 3; i++) {
-                                       uint8 hi, lo;
-                                       hi = bcmsdh_cfg_read(sdh, SDIO_FUNC_1,
-                                                            SBSDIO_FUNC1_WFRAMEBCHI, NULL);
-                                       lo = bcmsdh_cfg_read(sdh, SDIO_FUNC_1,
-                                                            SBSDIO_FUNC1_WFRAMEBCLO, NULL);
-                                       bus->f1regdata += 2;
-                                       if ((hi == 0) && (lo == 0))
-                                               break;
-                               }
-
-                       }
-                       if (ret == 0) {
-                               bus->tx_seq = (bus->tx_seq + 1) % SDPCM_SEQUENCE_WRAP;
-                       }
-               } while ((ret < 0) && retries++ < TXRETRIES);
-       }
-
-       if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
-               bus->activity = FALSE;
-               dhdsdio_clkctl(bus, CLK_NONE, TRUE);
-       }
-
-       dhd_os_sdunlock(bus->dhd);
-
-       if (ret)
-               bus->dhd->tx_ctlerrs++;
-       else
-               bus->dhd->tx_ctlpkts++;
-
-       return ret ? -EIO : 0;
-}
-
-int
-dhd_bus_rxctl(struct dhd_bus *bus, uchar *msg, uint msglen)
-{
-       int timeleft;
-       uint rxlen = 0;
-       bool pending;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (bus->dhd->dongle_reset)
-               return -EIO;
-
-       /* Wait until control frame is available */
-       timeleft = dhd_os_ioctl_resp_wait(bus->dhd, &bus->rxlen, &pending);
-
-       dhd_os_sdlock(bus->dhd);
-       rxlen = bus->rxlen;
-       bcopy(bus->rxctl, msg, MIN(msglen, rxlen));
-       bus->rxlen = 0;
-       dhd_os_sdunlock(bus->dhd);
-
-       if (rxlen) {
-               DHD_CTL(("%s: resumed on rxctl frame, got %d expected %d\n",
-                        __FUNCTION__, rxlen, msglen));
-       } else if (timeleft == 0) {
-               DHD_ERROR(("%s: resumed on timeout\n", __FUNCTION__));
-#ifdef DHD_DEBUG
-               dhd_os_sdlock(bus->dhd);
-               dhdsdio_checkdied(bus, NULL, 0);
-               dhd_os_sdunlock(bus->dhd);
-#endif /* DHD_DEBUG */
-       } else if (pending == TRUE) {
-               DHD_CTL(("%s: cancelled\n", __FUNCTION__));
-               return -ERESTARTSYS;
-       } else {
-               DHD_CTL(("%s: resumed for unknown reason?\n", __FUNCTION__));
-#ifdef DHD_DEBUG
-               dhd_os_sdlock(bus->dhd);
-               dhdsdio_checkdied(bus, NULL, 0);
-               dhd_os_sdunlock(bus->dhd);
-#endif /* DHD_DEBUG */
-       }
-
-       if (rxlen)
-               bus->dhd->rx_ctlpkts++;
-       else
-               bus->dhd->rx_ctlerrs++;
-
-       return rxlen ? (int)rxlen : -ETIMEDOUT;
-}
-
-/* IOVar table */
-enum {
-       IOV_INTR = 1,
-       IOV_POLLRATE,
-       IOV_SDREG,
-       IOV_SBREG,
-       IOV_SDCIS,
-       IOV_MEMBYTES,
-       IOV_MEMSIZE,
-#ifdef DHD_DEBUG
-       IOV_CHECKDIED,
-#endif
-       IOV_DOWNLOAD,
-       IOV_FORCEEVEN,
-       IOV_SDIOD_DRIVE,
-       IOV_READAHEAD,
-       IOV_SDRXCHAIN,
-       IOV_ALIGNCTL,
-       IOV_SDALIGN,
-       IOV_DEVRESET,
-       IOV_CPU,
-#ifdef SDTEST
-       IOV_PKTGEN,
-       IOV_EXTLOOP,
-#endif /* SDTEST */
-       IOV_SPROM,
-       IOV_TXBOUND,
-       IOV_RXBOUND,
-       IOV_TXMINMAX,
-       IOV_IDLETIME,
-       IOV_IDLECLOCK,
-       IOV_SD1IDLE,
-       IOV_SLEEP,
-       IOV_VARS
-};
-
-const bcm_iovar_t dhdsdio_iovars[] = {
-       {"intr",        IOV_INTR,       0,      IOVT_BOOL,      0 },
-       {"sleep",       IOV_SLEEP,      0,      IOVT_BOOL,      0 },
-       {"pollrate",    IOV_POLLRATE,   0,      IOVT_UINT32,    0 },
-       {"idletime",    IOV_IDLETIME,   0,      IOVT_INT32,     0 },
-       {"idleclock",   IOV_IDLECLOCK,  0,      IOVT_INT32,     0 },
-       {"sd1idle",     IOV_SD1IDLE,    0,      IOVT_BOOL,      0 },
-       {"membytes",    IOV_MEMBYTES,   0,      IOVT_BUFFER,    2 * sizeof(int) },
-       {"memsize",     IOV_MEMSIZE,    0,      IOVT_UINT32,    0 },
-       {"download",    IOV_DOWNLOAD,   0,      IOVT_BOOL,      0 },
-       {"vars",        IOV_VARS,       0,      IOVT_BUFFER,    0 },
-       {"sdiod_drive", IOV_SDIOD_DRIVE, 0,     IOVT_UINT32,    0 },
-       {"readahead",   IOV_READAHEAD,  0,      IOVT_BOOL,      0 },
-       {"sdrxchain",   IOV_SDRXCHAIN,  0,      IOVT_BOOL,      0 },
-       {"alignctl",    IOV_ALIGNCTL,   0,      IOVT_BOOL,      0 },
-       {"sdalign",     IOV_SDALIGN,    0,      IOVT_BOOL,      0 },
-       {"devreset",    IOV_DEVRESET,   0,      IOVT_BOOL,      0 },
-#ifdef DHD_DEBUG
-       {"sdreg",       IOV_SDREG,      0,      IOVT_BUFFER,    sizeof(sdreg_t) },
-       {"sbreg",       IOV_SBREG,      0,      IOVT_BUFFER,    sizeof(sdreg_t) },
-       {"sd_cis",      IOV_SDCIS,      0,      IOVT_BUFFER,    DHD_IOCTL_MAXLEN },
-       {"forcealign",  IOV_FORCEEVEN,  0,      IOVT_BOOL,      0 },
-       {"txbound",     IOV_TXBOUND,    0,      IOVT_UINT32,    0 },
-       {"rxbound",     IOV_RXBOUND,    0,      IOVT_UINT32,    0 },
-       {"txminmax", IOV_TXMINMAX,      0,      IOVT_UINT32,    0 },
-       {"cpu",         IOV_CPU,        0,      IOVT_BOOL,      0 },
-#ifdef DHD_DEBUG
-       {"checkdied",   IOV_CHECKDIED,  0,      IOVT_BUFFER,    0 },
-#endif /* DHD_DEBUG  */
-#endif /* DHD_DEBUG */
-#ifdef SDTEST
-       {"extloop",     IOV_EXTLOOP,    0,      IOVT_BOOL,      0 },
-       {"pktgen",      IOV_PKTGEN,     0,      IOVT_BUFFER,    sizeof(dhd_pktgen_t) },
-#endif /* SDTEST */
-
-       {NULL, 0, 0, 0, 0 }
-};
-
-static void
-dhd_dump_pct(struct bcmstrbuf *strbuf, char *desc, uint num, uint div)
-{
-       uint q1, q2;
-
-       if (!div) {
-               bcm_bprintf(strbuf, "%s N/A", desc);
-       } else {
-               q1 = num / div;
-               q2 = (100 * (num - (q1 * div))) / div;
-               bcm_bprintf(strbuf, "%s %d.%02d", desc, q1, q2);
-       }
-}
-
-void
-dhd_bus_dump(dhd_pub_t *dhdp, struct bcmstrbuf *strbuf)
-{
-       dhd_bus_t *bus = dhdp->bus;
-
-       bcm_bprintf(strbuf, "Bus SDIO structure:\n");
-       bcm_bprintf(strbuf, "hostintmask 0x%08x intstatus 0x%08x sdpcm_ver %d\n",
-                   bus->hostintmask, bus->intstatus, bus->sdpcm_ver);
-       bcm_bprintf(strbuf, "fcstate %d qlen %d tx_seq %d, max %d, rxskip %d rxlen %d rx_seq %d\n",
-                   bus->fcstate, pktq_len(&bus->txq), bus->tx_seq, bus->tx_max, bus->rxskip,
-                   bus->rxlen, bus->rx_seq);
-       bcm_bprintf(strbuf, "intr %d intrcount %d lastintrs %d spurious %d\n",
-                   bus->intr, bus->intrcount, bus->lastintrs, bus->spurious);
-       bcm_bprintf(strbuf, "pollrate %d pollcnt %d regfails %d\n",
-                   bus->pollrate, bus->pollcnt, bus->regfails);
-
-       bcm_bprintf(strbuf, "\nAdditional counters:\n");
-       bcm_bprintf(strbuf, "tx_sderrs %d fcqueued %d rxrtx %d rx_toolong %d rxc_errors %d\n",
-                   bus->tx_sderrs, bus->fcqueued, bus->rxrtx, bus->rx_toolong,
-                   bus->rxc_errors);
-       bcm_bprintf(strbuf, "rx_hdrfail %d badhdr %d badseq %d\n",
-                   bus->rx_hdrfail, bus->rx_badhdr, bus->rx_badseq);
-       bcm_bprintf(strbuf, "fc_rcvd %d, fc_xoff %d, fc_xon %d\n",
-                   bus->fc_rcvd, bus->fc_xoff, bus->fc_xon);
-       bcm_bprintf(strbuf, "rxglomfail %d, rxglomframes %d, rxglompkts %d\n",
-                   bus->rxglomfail, bus->rxglomframes, bus->rxglompkts);
-       bcm_bprintf(strbuf, "f2rx (hdrs/data) %d (%d/%d), f2tx %d f1regs %d\n",
-                   (bus->f2rxhdrs + bus->f2rxdata), bus->f2rxhdrs, bus->f2rxdata,
-                   bus->f2txdata, bus->f1regdata);
-       {
-               dhd_dump_pct(strbuf, "\nRx: pkts/f2rd", bus->dhd->rx_packets,
-                            (bus->f2rxhdrs + bus->f2rxdata));
-               dhd_dump_pct(strbuf, ", pkts/f1sd", bus->dhd->rx_packets, bus->f1regdata);
-               dhd_dump_pct(strbuf, ", pkts/sd", bus->dhd->rx_packets,
-                            (bus->f2rxhdrs + bus->f2rxdata + bus->f1regdata));
-               dhd_dump_pct(strbuf, ", pkts/int", bus->dhd->rx_packets, bus->intrcount);
-               bcm_bprintf(strbuf, "\n");
-
-               dhd_dump_pct(strbuf, "Rx: glom pct", (100 * bus->rxglompkts),
-                            bus->dhd->rx_packets);
-               dhd_dump_pct(strbuf, ", pkts/glom", bus->rxglompkts, bus->rxglomframes);
-               bcm_bprintf(strbuf, "\n");
-
-               dhd_dump_pct(strbuf, "Tx: pkts/f2wr", bus->dhd->tx_packets, bus->f2txdata);
-               dhd_dump_pct(strbuf, ", pkts/f1sd", bus->dhd->tx_packets, bus->f1regdata);
-               dhd_dump_pct(strbuf, ", pkts/sd", bus->dhd->tx_packets,
-                            (bus->f2txdata + bus->f1regdata));
-               dhd_dump_pct(strbuf, ", pkts/int", bus->dhd->tx_packets, bus->intrcount);
-               bcm_bprintf(strbuf, "\n");
-
-               dhd_dump_pct(strbuf, "Total: pkts/f2rw",
-                            (bus->dhd->tx_packets + bus->dhd->rx_packets),
-                            (bus->f2txdata + bus->f2rxhdrs + bus->f2rxdata));
-               dhd_dump_pct(strbuf, ", pkts/f1sd",
-                            (bus->dhd->tx_packets + bus->dhd->rx_packets), bus->f1regdata);
-               dhd_dump_pct(strbuf, ", pkts/sd",
-                            (bus->dhd->tx_packets + bus->dhd->rx_packets),
-                            (bus->f2txdata + bus->f2rxhdrs + bus->f2rxdata + bus->f1regdata));
-               dhd_dump_pct(strbuf, ", pkts/int",
-                            (bus->dhd->tx_packets + bus->dhd->rx_packets), bus->intrcount);
-               bcm_bprintf(strbuf, "\n\n");
-       }
-
-#ifdef SDTEST
-       if (bus->pktgen_count) {
-               bcm_bprintf(strbuf, "pktgen config and count:\n");
-               bcm_bprintf(strbuf, "freq %d count %d print %d total %d min %d len %d\n",
-                           bus->pktgen_freq, bus->pktgen_count, bus->pktgen_print,
-                           bus->pktgen_total, bus->pktgen_minlen, bus->pktgen_maxlen);
-               bcm_bprintf(strbuf, "send attempts %d rcvd %d fail %d\n",
-                           bus->pktgen_sent, bus->pktgen_rcvd, bus->pktgen_fail);
-       }
-#endif /* SDTEST */
-#ifdef DHD_DEBUG
-       bcm_bprintf(strbuf, "dpc_sched %d host interrupt%spending\n",
-                   bus->dpc_sched, (bcmsdh_intr_pending(bus->sdh) ? " " : " not "));
-       bcm_bprintf(strbuf, "blocksize %d roundup %d\n", bus->blocksize, bus->roundup);
-#endif /* DHD_DEBUG */
-       bcm_bprintf(strbuf, "clkstate %d activity %d idletime %d idlecount %d sleeping %d\n",
-                   bus->clkstate, bus->activity, bus->idletime, bus->idlecount, bus->sleeping);
-}
-
-void
-dhd_bus_clearcounts(dhd_pub_t *dhdp)
-{
-       dhd_bus_t *bus = (dhd_bus_t *)dhdp->bus;
-
-       bus->intrcount = bus->lastintrs = bus->spurious = bus->regfails = 0;
-       bus->rxrtx = bus->rx_toolong = bus->rxc_errors = 0;
-       bus->rx_hdrfail = bus->rx_badhdr = bus->rx_badseq = 0;
-       bus->tx_sderrs = bus->fc_rcvd = bus->fc_xoff = bus->fc_xon = 0;
-       bus->rxglomfail = bus->rxglomframes = bus->rxglompkts = 0;
-       bus->f2rxhdrs = bus->f2rxdata = bus->f2txdata = bus->f1regdata = 0;
-}
-
-#ifdef SDTEST
-static int
-dhdsdio_pktgen_get(dhd_bus_t *bus, uint8 *arg)
-{
-       dhd_pktgen_t pktgen;
-
-       pktgen.version = DHD_PKTGEN_VERSION;
-       pktgen.freq = bus->pktgen_freq;
-       pktgen.count = bus->pktgen_count;
-       pktgen.print = bus->pktgen_print;
-       pktgen.total = bus->pktgen_total;
-       pktgen.minlen = bus->pktgen_minlen;
-       pktgen.maxlen = bus->pktgen_maxlen;
-       pktgen.numsent = bus->pktgen_sent;
-       pktgen.numrcvd = bus->pktgen_rcvd;
-       pktgen.numfail = bus->pktgen_fail;
-       pktgen.mode = bus->pktgen_mode;
-       pktgen.stop = bus->pktgen_stop;
-
-       bcopy(&pktgen, arg, sizeof(pktgen));
-
-       return 0;
-}
-
-static int
-dhdsdio_pktgen_set(dhd_bus_t *bus, uint8 *arg)
-{
-       dhd_pktgen_t pktgen;
-       uint oldcnt, oldmode;
-
-       bcopy(arg, &pktgen, sizeof(pktgen));
-       if (pktgen.version != DHD_PKTGEN_VERSION)
-               return BCME_BADARG;
-
-       oldcnt = bus->pktgen_count;
-       oldmode = bus->pktgen_mode;
-
-       bus->pktgen_freq = pktgen.freq;
-       bus->pktgen_count = pktgen.count;
-       bus->pktgen_print = pktgen.print;
-       bus->pktgen_total = pktgen.total;
-       bus->pktgen_minlen = pktgen.minlen;
-       bus->pktgen_maxlen = pktgen.maxlen;
-       bus->pktgen_mode = pktgen.mode;
-       bus->pktgen_stop = pktgen.stop;
-
-       bus->pktgen_tick = bus->pktgen_ptick = 0;
-       bus->pktgen_len = MAX(bus->pktgen_len, bus->pktgen_minlen);
-       bus->pktgen_len = MIN(bus->pktgen_len, bus->pktgen_maxlen);
-
-       /* Clear counts for a new pktgen (mode change, or was stopped) */
-       if (bus->pktgen_count && (!oldcnt || oldmode != bus->pktgen_mode))
-               bus->pktgen_sent = bus->pktgen_rcvd = bus->pktgen_fail = 0;
-
-       return 0;
-}
-#endif /* SDTEST */
-
-static int
-dhdsdio_membytes(dhd_bus_t *bus, bool write, uint32 address, uint8 *data, uint size)
-{
-       int bcmerror = 0;
-       uint32 sdaddr;
-       uint dsize;
-
-       /* Determine initial transfer parameters */
-       sdaddr = address & SBSDIO_SB_OFT_ADDR_MASK;
-       if ((sdaddr + size) & SBSDIO_SBWINDOW_MASK)
-               dsize = (SBSDIO_SB_OFT_ADDR_LIMIT - sdaddr);
-       else
-               dsize = size;
-
-       /* Set the backplane window to include the start address */
-       if ((bcmerror = dhdsdio_set_siaddr_window(bus, address))) {
-               DHD_ERROR(("%s: window change failed\n", __FUNCTION__));
-               goto xfer_done;
-       }
-
-       /* Do the transfer(s) */
-       while (size) {
-               DHD_INFO(("%s: %s %d bytes at offset 0x%08x in window 0x%08x\n",
-                         __FUNCTION__, (write ? "write" : "read"), dsize, sdaddr,
-                         (address & SBSDIO_SBWINDOW_MASK)));
-               if ((bcmerror = bcmsdh_rwdata(bus->sdh, write, sdaddr, data, dsize))) {
-                       DHD_ERROR(("%s: membytes transfer failed\n", __FUNCTION__));
-                       break;
-               }
-
-               /* Adjust for next transfer (if any) */
-               if ((size -= dsize)) {
-                       data += dsize;
-                       address += dsize;
-                       if ((bcmerror = dhdsdio_set_siaddr_window(bus, address))) {
-                               DHD_ERROR(("%s: window change failed\n", __FUNCTION__));
-                               break;
-                       }
-                       sdaddr = 0;
-                       dsize = MIN(SBSDIO_SB_OFT_ADDR_LIMIT, size);
-               }
-       }
-
-xfer_done:
-       /* Return the window to backplane enumeration space for core access */
-       if (dhdsdio_set_siaddr_window(bus, bcmsdh_cur_sbwad(bus->sdh))) {
-               DHD_ERROR(("%s: FAILED to set window back to 0x%x\n", __FUNCTION__,
-                       bcmsdh_cur_sbwad(bus->sdh)));
-       }
-
-       return bcmerror;
-}
-
-#ifdef DHD_DEBUG
-static int
-dhdsdio_readshared(dhd_bus_t *bus, sdpcm_shared_t *sh)
-{
-       uint32 addr;
-       int rv;
-
-       /* Read last word in memory to determine address of sdpcm_shared structure */
-       if ((rv = dhdsdio_membytes(bus, FALSE, bus->ramsize - 4, (uint8 *)&addr, 4)) < 0)
-               return rv;
-
-       addr = ltoh32(addr);
-
-       DHD_INFO(("sdpcm_shared address 0x%08X\n", addr));
-
-       /*
-        * Check if addr is valid.
-        * NVRAM length at the end of memory should have been overwritten.
-        */
-       if (addr == 0 || ((~addr >> 16) & 0xffff) == (addr & 0xffff)) {
-               DHD_ERROR(("%s: address (0x%08x) of sdpcm_shared invalid\n", __FUNCTION__, addr));
-               return BCME_ERROR;
-       }
-
-       /* Read hndrte_shared structure */
-       if ((rv = dhdsdio_membytes(bus, FALSE, addr, (uint8 *)sh, sizeof(sdpcm_shared_t))) < 0)
-               return rv;
-
-       /* Endianness */
-       sh->flags = ltoh32(sh->flags);
-       sh->trap_addr = ltoh32(sh->trap_addr);
-       sh->assert_exp_addr = ltoh32(sh->assert_exp_addr);
-       sh->assert_file_addr = ltoh32(sh->assert_file_addr);
-       sh->assert_line = ltoh32(sh->assert_line);
-       sh->console_addr = ltoh32(sh->console_addr);
-       sh->msgtrace_addr = ltoh32(sh->msgtrace_addr);
-
-       if ((sh->flags & SDPCM_SHARED_VERSION_MASK) != SDPCM_SHARED_VERSION) {
-               DHD_ERROR(("%s: sdpcm_shared version %d in dhd "
-                          "is different than sdpcm_shared version %d in dongle\n",
-                          __FUNCTION__, SDPCM_SHARED_VERSION,
-                          sh->flags & SDPCM_SHARED_VERSION_MASK));
-               return BCME_ERROR;
-       }
-
-       return BCME_OK;
-}
-
-static int
-dhdsdio_checkdied(dhd_bus_t *bus, uint8 *data, uint size)
-{
-       int bcmerror = 0;
-       uint msize = 512;
-       char *mbuffer = NULL;
-       uint maxstrlen = 256;
-       char *str = NULL;
-       trap_t tr;
-       sdpcm_shared_t sdpcm_shared;
-       struct bcmstrbuf strbuf;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (data == NULL) {
-               /*
-                * Called after a rx ctrl timeout. "data" is NULL.
-                * allocate memory to trace the trap or assert.
-                */
-               size = msize;
-               mbuffer = data = MALLOC(bus->dhd->osh, msize);
-               if (mbuffer == NULL) {
-                       DHD_ERROR(("%s: MALLOC(%d) failed \n", __FUNCTION__, msize));
-                       bcmerror = BCME_NOMEM;
-                       goto done;
-               }
-       }
-
-       if ((str = MALLOC(bus->dhd->osh, maxstrlen)) == NULL) {
-               DHD_ERROR(("%s: MALLOC(%d) failed \n", __FUNCTION__, maxstrlen));
-               bcmerror = BCME_NOMEM;
-               goto done;
-       }
-
-       if ((bcmerror = dhdsdio_readshared(bus, &sdpcm_shared)) < 0)
-               goto done;
-
-       bcm_binit(&strbuf, data, size);
-
-       bcm_bprintf(&strbuf, "msgtrace address : 0x%08X\nconsole address  : 0x%08X\n",
-                   sdpcm_shared.msgtrace_addr, sdpcm_shared.console_addr);
-
-       if ((sdpcm_shared.flags & SDPCM_SHARED_ASSERT_BUILT) == 0) {
-               /* NOTE: Misspelled assert is intentional - DO NOT FIX.
-                * (Avoids conflict with real asserts for programmatic parsing of output.)
-                */
-               bcm_bprintf(&strbuf, "Assrt not built in dongle\n");
-       }
-
-       if ((sdpcm_shared.flags & (SDPCM_SHARED_ASSERT|SDPCM_SHARED_TRAP)) == 0) {
-               /* NOTE: Misspelled assert is intentional - DO NOT FIX.
-                * (Avoids conflict with real asserts for programmatic parsing of output.)
-                */
-               bcm_bprintf(&strbuf, "No trap%s in dongle",
-                         (sdpcm_shared.flags & SDPCM_SHARED_ASSERT_BUILT)
-                         ?"/assrt" :"");
-       } else {
-               if (sdpcm_shared.flags & SDPCM_SHARED_ASSERT) {
-                       /* Download assert */
-                       bcm_bprintf(&strbuf, "Dongle assert");
-                       if (sdpcm_shared.assert_exp_addr != 0) {
-                               str[0] = '\0';
-                               if ((bcmerror = dhdsdio_membytes(bus, FALSE,
-                                                                sdpcm_shared.assert_exp_addr,
-                                                                (uint8 *)str, maxstrlen)) < 0)
-                                       goto done;
-
-                               str[maxstrlen - 1] = '\0';
-                               bcm_bprintf(&strbuf, " expr \"%s\"", str);
-                       }
-
-                       if (sdpcm_shared.assert_file_addr != 0) {
-                               str[0] = '\0';
-                               if ((bcmerror = dhdsdio_membytes(bus, FALSE,
-                                                                sdpcm_shared.assert_file_addr,
-                                                                (uint8 *)str, maxstrlen)) < 0)
-                                       goto done;
-
-                               str[maxstrlen - 1] = '\0';
-                               bcm_bprintf(&strbuf, " file \"%s\"", str);
-                       }
-
-                       bcm_bprintf(&strbuf, " line %d ", sdpcm_shared.assert_line);
-               }
-
-               if (sdpcm_shared.flags & SDPCM_SHARED_TRAP) {
-                       if ((bcmerror = dhdsdio_membytes(bus, FALSE,
-                                                        sdpcm_shared.trap_addr,
-                                                        (uint8*)&tr, sizeof(trap_t))) < 0)
-                               goto done;
-
-                       bcm_bprintf(&strbuf,
-                       "Dongle trap type 0x%x @ epc 0x%x, cpsr 0x%x, spsr 0x%x, sp 0x%x,"
-                       "lp 0x%x, rpc 0x%x Trap offset 0x%x, "
-                       "r0 0x%x, r1 0x%x, r2 0x%x, r3 0x%x, r4 0x%x, r5 0x%x, r6 0x%x, r7 0x%x\n",
-                       tr.type, tr.epc, tr.cpsr, tr.spsr, tr.r13, tr.r14, tr.pc,
-                       sdpcm_shared.trap_addr,
-                       tr.r0, tr.r1, tr.r2, tr.r3, tr.r4, tr.r5, tr.r6, tr.r7);
-               }
-       }
-
-       if (sdpcm_shared.flags & (SDPCM_SHARED_ASSERT | SDPCM_SHARED_TRAP)) {
-               DHD_ERROR(("%s: %s\n", __FUNCTION__, strbuf.origbuf));
-       }
-
-#ifdef DHD_DEBUG
-       if (sdpcm_shared.flags & SDPCM_SHARED_TRAP) {
-               /* Mem dump to a file on device */
-               dhdsdio_mem_dump(bus);
-       }
-#endif /* DHD_DEBUG */
-
-done:
-       if (mbuffer)
-               MFREE(bus->dhd->osh, mbuffer, msize);
-       if (str)
-               MFREE(bus->dhd->osh, str, maxstrlen);
-
-       return bcmerror;
-}
-
-static int
-dhdsdio_mem_dump(dhd_bus_t *bus)
-{
-       int ret = 0;
-       int size; /* Full mem size */
-       int start = 0; /* Start address */
-       int read_size = 0; /* Read size of each iteration */
-       uint8 *buf = NULL, *databuf = NULL;
-
-       /* Get full mem size */
-       size = bus->ramsize;
-       buf = MALLOC(bus->dhd->osh, size);
-       if (!buf) {
-               printf("%s: Out of memory (%d bytes)\n", __FUNCTION__, size);
-               return -1;
-       }
-
-       /* Read mem content */
-       printf("Dump dongle memory");
-       databuf = buf;
-       while (size)
-       {
-               read_size = MIN(MEMBLOCK, size);
-               if ((ret = dhdsdio_membytes(bus, FALSE, start, databuf, read_size)))
-               {
-                       printf("%s: Error membytes %d\n", __FUNCTION__, ret);
-                       if (buf) {
-                               MFREE(bus->dhd->osh, buf, size);
-                       }
-                       return -1;
-               }
-               printf(".");
-
-               /* Decrement size and increment start address */
-               size -= read_size;
-               start += read_size;
-               databuf += read_size;
-       }
-       printf("Done\n");
-
-       /* free buf before return !!! */
-       if (write_to_file(bus->dhd, buf, bus->ramsize))
-       {
-               printf("%s: Error writing to files\n", __FUNCTION__);
-               return -1;
-       }
-
-       /* buf free handled in write_to_file, not here */
-       return 0;
-}
-
-#define CONSOLE_LINE_MAX       192
-
-static int
-dhdsdio_readconsole(dhd_bus_t *bus)
-{
-       dhd_console_t *c = &bus->console;
-       uint8 line[CONSOLE_LINE_MAX], ch;
-       uint32 n, idx, addr;
-       int rv;
-
-       /* Don't do anything until FWREADY updates console address */
-       if (bus->console_addr == 0)
-               return 0;
-
-       /* Read console log struct */
-       addr = bus->console_addr + OFFSETOF(hndrte_cons_t, log);
-       if ((rv = dhdsdio_membytes(bus, FALSE, addr, (uint8 *)&c->log, sizeof(c->log))) < 0)
-               return rv;
-
-       /* Allocate console buffer (one time only) */
-       if (c->buf == NULL) {
-               c->bufsize = ltoh32(c->log.buf_size);
-               if ((c->buf = MALLOC(bus->dhd->osh, c->bufsize)) == NULL)
-                       return BCME_NOMEM;
-       }
-
-       idx = ltoh32(c->log.idx);
-
-       /* Protect against corrupt value */
-       if (idx > c->bufsize)
-               return BCME_ERROR;
-
-       /* Skip reading the console buffer if the index pointer has not moved */
-       if (idx == c->last)
-               return BCME_OK;
-
-       /* Read the console buffer */
-       addr = ltoh32(c->log.buf);
-       if ((rv = dhdsdio_membytes(bus, FALSE, addr, c->buf, c->bufsize)) < 0)
-               return rv;
-
-       while (c->last != idx) {
-               for (n = 0; n < CONSOLE_LINE_MAX - 2; n++) {
-                       if (c->last == idx) {
-                               /* This would output a partial line.  Instead, back up
-                                * the buffer pointer and output this line next time around.
-                                */
-                               if (c->last >= n)
-                                       c->last -= n;
-                               else
-                                       c->last = c->bufsize - n;
-                               goto break2;
-                       }
-                       ch = c->buf[c->last];
-                       c->last = (c->last + 1) % c->bufsize;
-                       if (ch == '\n')
-                               break;
-                       line[n] = ch;
-               }
-
-               if (n > 0) {
-                       if (line[n - 1] == '\r')
-                               n--;
-                       line[n] = 0;
-                       printf("CONSOLE: %s\n", line);
-               }
-       }
-break2:
-
-       return BCME_OK;
-}
-#endif /* DHD_DEBUG */
-
-int
-dhdsdio_downloadvars(dhd_bus_t *bus, void *arg, int len)
-{
-       int bcmerror = BCME_OK;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       /* Basic sanity checks */
-       if (bus->dhd->up) {
-               bcmerror = BCME_NOTDOWN;
-               goto err;
-       }
-       if (!len) {
-               bcmerror = BCME_BUFTOOSHORT;
-               goto err;
-       }
-
-       /* Free the old ones and replace with passed variables */
-       if (bus->vars)
-               MFREE(bus->dhd->osh, bus->vars, bus->varsz);
-
-       bus->vars = MALLOC(bus->dhd->osh, len);
-       bus->varsz = bus->vars ? len : 0;
-       if (bus->vars == NULL) {
-               bcmerror = BCME_NOMEM;
-               goto err;
-       }
-
-       /* Copy the passed variables, which should include the terminating double-null */
-       bcopy(arg, bus->vars, bus->varsz);
-err:
-       return bcmerror;
-}
-
-static int
-dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, uint32 actionid, const char *name,
-                void *params, int plen, void *arg, int len, int val_size)
-{
-       int bcmerror = 0;
-       int32 int_val = 0;
-       bool bool_val = 0;
-
-       DHD_TRACE(("%s: Enter, action %d name %s params %p plen %d arg %p len %d val_size %d\n",
-                  __FUNCTION__, actionid, name, params, plen, arg, len, val_size));
-
-       if ((bcmerror = bcm_iovar_lencheck(vi, arg, len, IOV_ISSET(actionid))) != 0)
-               goto exit;
-
-       if (plen >= (int)sizeof(int_val))
-               bcopy(params, &int_val, sizeof(int_val));
-
-       bool_val = (int_val != 0) ? TRUE : FALSE;
-
-
-       /* Some ioctls use the bus */
-       dhd_os_sdlock(bus->dhd);
-
-       /* Check if dongle is in reset. If so, only allow DEVRESET iovars */
-       if (bus->dhd->dongle_reset && !(actionid == IOV_SVAL(IOV_DEVRESET) ||
-                                       actionid == IOV_GVAL(IOV_DEVRESET))) {
-               bcmerror = BCME_NOTREADY;
-               goto exit;
-       }
-
-       /* Handle sleep stuff before any clock mucking */
-       if (vi->varid == IOV_SLEEP) {
-               if (IOV_ISSET(actionid)) {
-                       bcmerror = dhdsdio_bussleep(bus, bool_val);
-               } else {
-                       int_val = (int32)bus->sleeping;
-                       bcopy(&int_val, arg, val_size);
-               }
-               goto exit;
-       }
-
-       /* Request clock to allow SDIO accesses */
-       if (!bus->dhd->dongle_reset) {
-               BUS_WAKE(bus);
-               dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-       }
-
-       switch (actionid) {
-       case IOV_GVAL(IOV_INTR):
-               int_val = (int32)bus->intr;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_INTR):
-               bus->intr = bool_val;
-               bus->intdis = FALSE;
-               if (bus->dhd->up) {
-                       if (bus->intr) {
-                               DHD_INTR(("%s: enable SDIO device interrupts\n", __FUNCTION__));
-                               bcmsdh_intr_enable(bus->sdh);
-                       } else {
-                               DHD_INTR(("%s: disable SDIO interrupts\n", __FUNCTION__));
-                               bcmsdh_intr_disable(bus->sdh);
-                       }
-               }
-               break;
-
-       case IOV_GVAL(IOV_POLLRATE):
-               int_val = (int32)bus->pollrate;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_POLLRATE):
-               bus->pollrate = (uint)int_val;
-               bus->poll = (bus->pollrate != 0);
-               break;
-
-       case IOV_GVAL(IOV_IDLETIME):
-               int_val = bus->idletime;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_IDLETIME):
-               if ((int_val < 0) && (int_val != DHD_IDLE_IMMEDIATE)) {
-                       bcmerror = BCME_BADARG;
-               } else {
-                       bus->idletime = int_val;
-               }
-               break;
-
-       case IOV_GVAL(IOV_IDLECLOCK):
-               int_val = (int32)bus->idleclock;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_IDLECLOCK):
-               bus->idleclock = int_val;
-               break;
-
-       case IOV_GVAL(IOV_SD1IDLE):
-               int_val = (int32)sd1idle;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_SD1IDLE):
-               sd1idle = bool_val;
-               break;
-
-
-       case IOV_SVAL(IOV_MEMBYTES):
-       case IOV_GVAL(IOV_MEMBYTES):
-       {
-               uint32 address;
-               uint size, dsize;
-               uint8 *data;
-
-               bool set = (actionid == IOV_SVAL(IOV_MEMBYTES));
-
-               ASSERT(plen >= 2*sizeof(int));
-
-               address = (uint32)int_val;
-               bcopy((char *)params + sizeof(int_val), &int_val, sizeof(int_val));
-               size = (uint)int_val;
-
-               /* Do some validation */
-               dsize = set ? plen - (2 * sizeof(int)) : len;
-               if (dsize < size) {
-                       DHD_ERROR(("%s: error on %s membytes, addr 0x%08x size %d dsize %d\n",
-                                  __FUNCTION__, (set ? "set" : "get"), address, size, dsize));
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-
-               DHD_INFO(("%s: Request to %s %d bytes at address 0x%08x\n", __FUNCTION__,
-                         (set ? "write" : "read"), size, address));
-
-               /* If we know about SOCRAM, check for a fit */
-               if ((bus->orig_ramsize) &&
-                   ((address > bus->orig_ramsize) || (address + size > bus->orig_ramsize))) {
-                       DHD_ERROR(("%s: ramsize 0x%08x doesn't have %d bytes at 0x%08x\n",
-                                  __FUNCTION__, bus->orig_ramsize, size, address));
-                       bcmerror = BCME_BADARG;
-                       break;
-               }
-
-               /* Generate the actual data pointer */
-               data = set ? (uint8*)params + 2 * sizeof(int): (uint8*)arg;
-
-               /* Call to do the transfer */
-               bcmerror = dhdsdio_membytes(bus, set, address, data, size);
-
-               break;
-       }
-
-       case IOV_GVAL(IOV_MEMSIZE):
-               int_val = (int32)bus->ramsize;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_GVAL(IOV_SDIOD_DRIVE):
-               int_val = (int32)dhd_sdiod_drive_strength;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_SDIOD_DRIVE):
-               dhd_sdiod_drive_strength = int_val;
-               si_sdiod_drive_strength_init(bus->sih, bus->dhd->osh, dhd_sdiod_drive_strength);
-               break;
-
-       case IOV_SVAL(IOV_DOWNLOAD):
-               bcmerror = dhdsdio_download_state(bus, bool_val);
-               break;
-
-       case IOV_SVAL(IOV_VARS):
-               bcmerror = dhdsdio_downloadvars(bus, arg, len);
-               break;
-
-       case IOV_GVAL(IOV_READAHEAD):
-               int_val = (int32)dhd_readahead;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_READAHEAD):
-               if (bool_val && !dhd_readahead)
-                       bus->nextlen = 0;
-               dhd_readahead = bool_val;
-               break;
-
-       case IOV_GVAL(IOV_SDRXCHAIN):
-               int_val = (int32)bus->use_rxchain;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_SDRXCHAIN):
-               if (bool_val && !bus->sd_rxchain)
-                       bcmerror = BCME_UNSUPPORTED;
-               else
-                       bus->use_rxchain = bool_val;
-               break;
-       case IOV_GVAL(IOV_ALIGNCTL):
-               int_val = (int32)dhd_alignctl;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_ALIGNCTL):
-               dhd_alignctl = bool_val;
-               break;
-
-       case IOV_GVAL(IOV_SDALIGN):
-               int_val = DHD_SDALIGN;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-#ifdef DHD_DEBUG
-       case IOV_GVAL(IOV_VARS):
-               if (bus->varsz < (uint)len)
-                       bcopy(bus->vars, arg, bus->varsz);
-               else
-                       bcmerror = BCME_BUFTOOSHORT;
-               break;
-#endif /* DHD_DEBUG */
-
-#ifdef DHD_DEBUG
-       case IOV_GVAL(IOV_SDREG):
-       {
-               sdreg_t *sd_ptr;
-               uint32 addr, size;
-
-               sd_ptr = (sdreg_t *)params;
-
-               addr = (uintptr)bus->regs + sd_ptr->offset;
-               size = sd_ptr->func;
-               int_val = (int32)bcmsdh_reg_read(bus->sdh, addr, size);
-               if (bcmsdh_regfail(bus->sdh))
-                       bcmerror = BCME_SDIO_ERROR;
-               bcopy(&int_val, arg, sizeof(int32));
-               break;
-       }
-
-       case IOV_SVAL(IOV_SDREG):
-       {
-               sdreg_t *sd_ptr;
-               uint32 addr, size;
-
-               sd_ptr = (sdreg_t *)params;
-
-               addr = (uintptr)bus->regs + sd_ptr->offset;
-               size = sd_ptr->func;
-               bcmsdh_reg_write(bus->sdh, addr, size, sd_ptr->value);
-               if (bcmsdh_regfail(bus->sdh))
-                       bcmerror = BCME_SDIO_ERROR;
-               break;
-       }
-
-       /* Same as above, but offset is not backplane (not SDIO core) */
-       case IOV_GVAL(IOV_SBREG):
-       {
-               sdreg_t sdreg;
-               uint32 addr, size;
-
-               bcopy(params, &sdreg, sizeof(sdreg));
-
-               addr = SI_ENUM_BASE + sdreg.offset;
-               size = sdreg.func;
-               int_val = (int32)bcmsdh_reg_read(bus->sdh, addr, size);
-               if (bcmsdh_regfail(bus->sdh))
-                       bcmerror = BCME_SDIO_ERROR;
-               bcopy(&int_val, arg, sizeof(int32));
-               break;
-       }
-
-       case IOV_SVAL(IOV_SBREG):
-       {
-               sdreg_t sdreg;
-               uint32 addr, size;
-
-               bcopy(params, &sdreg, sizeof(sdreg));
-
-               addr = SI_ENUM_BASE + sdreg.offset;
-               size = sdreg.func;
-               bcmsdh_reg_write(bus->sdh, addr, size, sdreg.value);
-               if (bcmsdh_regfail(bus->sdh))
-                       bcmerror = BCME_SDIO_ERROR;
-               break;
-       }
-
-       case IOV_GVAL(IOV_SDCIS):
-       {
-               *(char *)arg = 0;
-
-               bcmstrcat(arg, "\nFunc 0\n");
-               bcmsdh_cis_read(bus->sdh, 0x10, (uint8 *)arg + strlen(arg), SBSDIO_CIS_SIZE_LIMIT);
-               bcmstrcat(arg, "\nFunc 1\n");
-               bcmsdh_cis_read(bus->sdh, 0x11, (uint8 *)arg + strlen(arg), SBSDIO_CIS_SIZE_LIMIT);
-               bcmstrcat(arg, "\nFunc 2\n");
-               bcmsdh_cis_read(bus->sdh, 0x12, (uint8 *)arg + strlen(arg), SBSDIO_CIS_SIZE_LIMIT);
-               break;
-       }
-
-       case IOV_GVAL(IOV_FORCEEVEN):
-               int_val = (int32)forcealign;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_FORCEEVEN):
-               forcealign = bool_val;
-               break;
-
-       case IOV_GVAL(IOV_TXBOUND):
-               int_val = (int32)dhd_txbound;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_TXBOUND):
-               dhd_txbound = (uint)int_val;
-               break;
-
-       case IOV_GVAL(IOV_RXBOUND):
-               int_val = (int32)dhd_rxbound;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_RXBOUND):
-               dhd_rxbound = (uint)int_val;
-               break;
-
-       case IOV_GVAL(IOV_TXMINMAX):
-               int_val = (int32)dhd_txminmax;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_TXMINMAX):
-               dhd_txminmax = (uint)int_val;
-               break;
-
-
-
-#endif /* DHD_DEBUG */
-
-
-#ifdef SDTEST
-       case IOV_GVAL(IOV_EXTLOOP):
-               int_val = (int32)bus->ext_loop;
-               bcopy(&int_val, arg, val_size);
-               break;
-
-       case IOV_SVAL(IOV_EXTLOOP):
-               bus->ext_loop = bool_val;
-               break;
-
-       case IOV_GVAL(IOV_PKTGEN):
-               bcmerror = dhdsdio_pktgen_get(bus, arg);
-               break;
-
-       case IOV_SVAL(IOV_PKTGEN):
-               bcmerror = dhdsdio_pktgen_set(bus, arg);
-               break;
-#endif /* SDTEST */
-
-
-       case IOV_SVAL(IOV_DEVRESET):
-               DHD_TRACE(("%s: Called set IOV_DEVRESET=%d dongle_reset=%d busstate=%d\n",
-                          __FUNCTION__, bool_val, bus->dhd->dongle_reset,
-                          bus->dhd->busstate));
-
-               ASSERT(bus->dhd->osh);
-               /* ASSERT(bus->cl_devid); */
-
-               dhd_bus_devreset(bus->dhd, (uint8)bool_val);
-
-               break;
-
-       case IOV_GVAL(IOV_DEVRESET):
-               DHD_TRACE(("%s: Called get IOV_DEVRESET\n", __FUNCTION__));
-
-               /* Get its status */
-               int_val = (bool) bus->dhd->dongle_reset;
-               bcopy(&int_val, arg, val_size);
-
-               break;
-
-       default:
-               bcmerror = BCME_UNSUPPORTED;
-               break;
-       }
-
-exit:
-       if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
-               bus->activity = FALSE;
-               dhdsdio_clkctl(bus, CLK_NONE, TRUE);
-       }
-
-       dhd_os_sdunlock(bus->dhd);
-
-       if (actionid == IOV_SVAL(IOV_DEVRESET) && bool_val == FALSE)
-               dhd_preinit_ioctls((dhd_pub_t *) bus->dhd);
-
-       return bcmerror;
-}
-
-static int
-dhdsdio_write_vars(dhd_bus_t *bus)
-{
-       int bcmerror = 0;
-       uint32 varsize;
-       uint32 varaddr;
-       uint8 *vbuffer;
-       uint32 varsizew;
-#ifdef DHD_DEBUG
-       char *nvram_ularray;
-#endif /* DHD_DEBUG */
-
-       /* Even if there are no vars are to be written, we still need to set the ramsize. */
-       varsize = bus->varsz ? ROUNDUP(bus->varsz, 4) : 0;
-       varaddr = (bus->ramsize - 4) - varsize;
-
-       if (bus->vars) {
-               vbuffer = (uint8 *)MALLOC(bus->dhd->osh, varsize);
-               if (!vbuffer)
-                       return BCME_NOMEM;
-
-               bzero(vbuffer, varsize);
-               bcopy(bus->vars, vbuffer, bus->varsz);
-
-               /* Write the vars list */
-               bcmerror = dhdsdio_membytes(bus, TRUE, varaddr, vbuffer, varsize);
-#ifdef DHD_DEBUG
-               /* Verify NVRAM bytes */
-               DHD_INFO(("Compare NVRAM dl & ul; varsize=%d\n", varsize));
-               nvram_ularray = (char*)MALLOC(bus->dhd->osh, varsize);
-               if (!nvram_ularray)
-                       return BCME_NOMEM;
-
-               /* Upload image to verify downloaded contents. */
-               memset(nvram_ularray, 0xaa, varsize);
-
-               /* Read the vars list to temp buffer for comparison */
-               bcmerror = dhdsdio_membytes(bus, FALSE, varaddr, nvram_ularray, varsize);
-               if (bcmerror) {
-                               DHD_ERROR(("%s: error %d on reading %d nvram bytes at 0x%08x\n",
-                                       __FUNCTION__, bcmerror, varsize, varaddr));
-               }
-               /* Compare the org NVRAM with the one read from RAM */
-               if (memcmp(vbuffer, nvram_ularray, varsize)) {
-                       DHD_ERROR(("%s: Downloaded NVRAM image is corrupted.\n", __FUNCTION__));
-               } else
-                       DHD_ERROR(("%s: Download, Upload and compare of NVRAM succeeded.\n",
-                       __FUNCTION__));
-
-               MFREE(bus->dhd->osh, nvram_ularray, varsize);
-#endif /* DHD_DEBUG */
-
-               MFREE(bus->dhd->osh, vbuffer, varsize);
-       }
-
-       /* adjust to the user specified RAM */
-       DHD_INFO(("Physical memory size: %d, usable memory size: %d\n",
-               bus->orig_ramsize, bus->ramsize));
-       DHD_INFO(("Vars are at %d, orig varsize is %d\n",
-               varaddr, varsize));
-       varsize = ((bus->orig_ramsize - 4) - varaddr);
-
-       /*
-        * Determine the length token:
-        * Varsize, converted to words, in lower 16-bits, checksum in upper 16-bits.
-        */
-       if (bcmerror) {
-               varsizew = 0;
-       } else {
-               varsizew = varsize / 4;
-               varsizew = (~varsizew << 16) | (varsizew & 0x0000FFFF);
-               varsizew = htol32(varsizew);
-       }
-
-       DHD_INFO(("New varsize is %d, length token=0x%08x\n", varsize, varsizew));
-
-       /* Write the length token to the last word */
-       bcmerror = dhdsdio_membytes(bus, TRUE, (bus->orig_ramsize - 4),
-               (uint8*)&varsizew, 4);
-
-       return bcmerror;
-}
-
-static int
-dhdsdio_download_state(dhd_bus_t *bus, bool enter)
-{
-       uint retries;
-       int bcmerror = 0;
-
-       /* To enter download state, disable ARM and reset SOCRAM.
-        * To exit download state, simply reset ARM (default is RAM boot).
-        */
-       if (enter) {
-
-               bus->alp_only = TRUE;
-
-               if (!(si_setcore(bus->sih, ARM7S_CORE_ID, 0)) &&
-                   !(si_setcore(bus->sih, ARMCM3_CORE_ID, 0))) {
-                       DHD_ERROR(("%s: Failed to find ARM core!\n", __FUNCTION__));
-                       bcmerror = BCME_ERROR;
-                       goto fail;
-               }
-
-               si_core_disable(bus->sih, 0);
-               if (bcmsdh_regfail(bus->sdh)) {
-                       bcmerror = BCME_SDIO_ERROR;
-                       goto fail;
-               }
-
-               if (!(si_setcore(bus->sih, SOCRAM_CORE_ID, 0))) {
-                       DHD_ERROR(("%s: Failed to find SOCRAM core!\n", __FUNCTION__));
-                       bcmerror = BCME_ERROR;
-                       goto fail;
-               }
-
-               si_core_reset(bus->sih, 0, 0);
-               if (bcmsdh_regfail(bus->sdh)) {
-                       DHD_ERROR(("%s: Failure trying reset SOCRAM core?\n", __FUNCTION__));
-                       bcmerror = BCME_SDIO_ERROR;
-                       goto fail;
-               }
-
-               /* Clear the top bit of memory */
-               if (bus->ramsize) {
-                       uint32 zeros = 0;
-                       dhdsdio_membytes(bus, TRUE, bus->ramsize - 4, (uint8*)&zeros, 4);
-               }
-       } else {
-               if (!(si_setcore(bus->sih, SOCRAM_CORE_ID, 0))) {
-                       DHD_ERROR(("%s: Failed to find SOCRAM core!\n", __FUNCTION__));
-                       bcmerror = BCME_ERROR;
-                       goto fail;
-               }
-
-               if (!si_iscoreup(bus->sih)) {
-                       DHD_ERROR(("%s: SOCRAM core is down after reset?\n", __FUNCTION__));
-                       bcmerror = BCME_ERROR;
-                       goto fail;
-               }
-
-               if ((bcmerror = dhdsdio_write_vars(bus))) {
-                       DHD_ERROR(("%s: no vars written to RAM\n", __FUNCTION__));
-                       bcmerror = 0;
-               }
-
-               if (!si_setcore(bus->sih, PCMCIA_CORE_ID, 0) &&
-                   !si_setcore(bus->sih, SDIOD_CORE_ID, 0)) {
-                       DHD_ERROR(("%s: Can't change back to SDIO core?\n", __FUNCTION__));
-                       bcmerror = BCME_ERROR;
-                       goto fail;
-               }
-               W_SDREG(0xFFFFFFFF, &bus->regs->intstatus, retries);
-
-
-               if (!(si_setcore(bus->sih, ARM7S_CORE_ID, 0)) &&
-                   !(si_setcore(bus->sih, ARMCM3_CORE_ID, 0))) {
-                       DHD_ERROR(("%s: Failed to find ARM core!\n", __FUNCTION__));
-                       bcmerror = BCME_ERROR;
-                       goto fail;
-               }
-
-               si_core_reset(bus->sih, 0, 0);
-               if (bcmsdh_regfail(bus->sdh)) {
-                       DHD_ERROR(("%s: Failure trying to reset ARM core?\n", __FUNCTION__));
-                       bcmerror = BCME_SDIO_ERROR;
-                       goto fail;
-               }
-
-               /* Allow HT Clock now that the ARM is running. */
-               bus->alp_only = FALSE;
-
-               bus->dhd->busstate = DHD_BUS_LOAD;
-       }
-
-fail:
-       /* Always return to SDIOD core */
-       if (!si_setcore(bus->sih, PCMCIA_CORE_ID, 0))
-               si_setcore(bus->sih, SDIOD_CORE_ID, 0);
-
-       return bcmerror;
-}
-
-int
-dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name,
-                 void *params, int plen, void *arg, int len, bool set)
-{
-       dhd_bus_t *bus = dhdp->bus;
-       const bcm_iovar_t *vi = NULL;
-       int bcmerror = 0;
-       int val_size;
-       uint32 actionid;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       ASSERT(name);
-       ASSERT(len >= 0);
-
-       /* Get MUST have return space */
-       ASSERT(set || (arg && len));
-
-       /* Set does NOT take qualifiers */
-       ASSERT(!set || (!params && !plen));
-
-       /* Look up var locally; if not found pass to host driver */
-       if ((vi = bcm_iovar_lookup(dhdsdio_iovars, name)) == NULL) {
-               dhd_os_sdlock(bus->dhd);
-
-               BUS_WAKE(bus);
-
-               /* Turn on clock in case SD command needs backplane */
-               dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-
-               bcmerror = bcmsdh_iovar_op(bus->sdh, name, params, plen, arg, len, set);
-
-               /* Check for bus configuration changes of interest */
-
-               /* If it was divisor change, read the new one */
-               if (set && strcmp(name, "sd_divisor") == 0) {
-                       if (bcmsdh_iovar_op(bus->sdh, "sd_divisor", NULL, 0,
-                                           &bus->sd_divisor, sizeof(int32), FALSE) != BCME_OK) {
-                               bus->sd_divisor = -1;
-                               DHD_ERROR(("%s: fail on %s get\n", __FUNCTION__, name));
-                       } else {
-                               DHD_INFO(("%s: noted %s update, value now %d\n",
-                                         __FUNCTION__, name, bus->sd_divisor));
-                       }
-               }
-               /* If it was a mode change, read the new one */
-               if (set && strcmp(name, "sd_mode") == 0) {
-                       if (bcmsdh_iovar_op(bus->sdh, "sd_mode", NULL, 0,
-                                           &bus->sd_mode, sizeof(int32), FALSE) != BCME_OK) {
-                               bus->sd_mode = -1;
-                               DHD_ERROR(("%s: fail on %s get\n", __FUNCTION__, name));
-                       } else {
-                               DHD_INFO(("%s: noted %s update, value now %d\n",
-                                         __FUNCTION__, name, bus->sd_mode));
-                       }
-               }
-               /* Similar check for blocksize change */
-               if (set && strcmp(name, "sd_blocksize") == 0) {
-                       int32 fnum = 2;
-                       if (bcmsdh_iovar_op(bus->sdh, "sd_blocksize", &fnum, sizeof(int32),
-                                           &bus->blocksize, sizeof(int32), FALSE) != BCME_OK) {
-                               bus->blocksize = 0;
-                               DHD_ERROR(("%s: fail on %s get\n", __FUNCTION__, "sd_blocksize"));
-                       } else {
-                               DHD_INFO(("%s: noted %s update, value now %d\n",
-                                         __FUNCTION__, "sd_blocksize", bus->blocksize));
-                       }
-               }
-               bus->roundup = MIN(max_roundup, bus->blocksize);
-
-               if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
-                       bus->activity = FALSE;
-                       dhdsdio_clkctl(bus, CLK_NONE, TRUE);
-               }
-
-               dhd_os_sdunlock(bus->dhd);
-               goto exit;
-       }
-
-       DHD_CTL(("%s: %s %s, len %d plen %d\n", __FUNCTION__,
-                name, (set ? "set" : "get"), len, plen));
-
-       /* set up 'params' pointer in case this is a set command so that
-        * the convenience int and bool code can be common to set and get
-        */
-       if (params == NULL) {
-               params = arg;
-               plen = len;
-       }
-
-       if (vi->type == IOVT_VOID)
-               val_size = 0;
-       else if (vi->type == IOVT_BUFFER)
-               val_size = len;
-       else
-               /* all other types are integer sized */
-               val_size = sizeof(int);
-
-       actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid);
-       bcmerror = dhdsdio_doiovar(bus, vi, actionid, name, params, plen, arg, len, val_size);
-
-exit:
-       return bcmerror;
-}
-
-void
-dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex)
-{
-       osl_t *osh = bus->dhd->osh;
-       uint32 local_hostintmask;
-       uint8 saveclk;
-       uint retries;
-       int err;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (enforce_mutex)
-               dhd_os_sdlock(bus->dhd);
-
-       BUS_WAKE(bus);
-
-       /* Enable clock for device interrupts */
-       dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-
-       /* Disable and clear interrupts at the chip level also */
-       W_SDREG(0, &bus->regs->hostintmask, retries);
-       local_hostintmask = bus->hostintmask;
-       bus->hostintmask = 0;
-
-       /* Change our idea of bus state */
-       bus->dhd->busstate = DHD_BUS_DOWN;
-
-       /* Force clocks on backplane to be sure F2 interrupt propagates */
-       saveclk = bcmsdh_cfg_read(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, &err);
-       if (!err) {
-               bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR,
-                                (saveclk | SBSDIO_FORCE_HT), &err);
-       }
-       if (err) {
-               DHD_ERROR(("%s: Failed to force clock for F2: err %d\n", __FUNCTION__, err));
-       }
-
-       /* Turn off the bus (F2), free any pending packets */
-       DHD_INTR(("%s: disable SDIO interrupts\n", __FUNCTION__));
-       bcmsdh_intr_disable(bus->sdh);
-       bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_0, SDIOD_CCCR_IOEN, SDIO_FUNC_ENABLE_1, NULL);
-
-       /* Clear any pending interrupts now that F2 is disabled */
-       W_SDREG(local_hostintmask, &bus->regs->intstatus, retries);
-
-       /* Turn off the backplane clock (only) */
-       dhdsdio_clkctl(bus, CLK_SDONLY, FALSE);
-
-       /* Clear the data packet queues */
-       pktq_flush(osh, &bus->txq, TRUE);
-
-       /* Clear any held glomming stuff */
-       if (bus->glomd)
-               PKTFREE(osh, bus->glomd, FALSE);
-
-       if (bus->glom)
-               PKTFREE(osh, bus->glom, FALSE);
-
-       bus->glom = bus->glomd = NULL;
-
-       /* Clear rx control and wake any waiters */
-       bus->rxlen = 0;
-       dhd_os_ioctl_resp_wake(bus->dhd);
-
-       /* Reset some F2 state stuff */
-       bus->rxskip = FALSE;
-       bus->tx_seq = bus->rx_seq = 0;
-
-       if (enforce_mutex)
-               dhd_os_sdunlock(bus->dhd);
-}
-
-int
-dhd_bus_init(dhd_pub_t *dhdp, bool enforce_mutex)
-{
-       dhd_bus_t *bus = dhdp->bus;
-       dhd_timeout_t tmo;
-       uint retries = 0;
-       uint8 ready, enable;
-       int err, ret = 0;
-       uint8 saveclk;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       ASSERT(bus->dhd);
-       if (!bus->dhd)
-               return 0;
-
-       if (enforce_mutex)
-               dhd_os_sdlock(bus->dhd);
-
-       /* Make sure backplane clock is on, needed to generate F2 interrupt */
-       dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-       if (bus->clkstate != CLK_AVAIL)
-               goto exit;
-
-
-       /* Force clocks on backplane to be sure F2 interrupt propagates */
-       saveclk = bcmsdh_cfg_read(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, &err);
-       if (!err) {
-               bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR,
-                                (saveclk | SBSDIO_FORCE_HT), &err);
-       }
-       if (err) {
-               DHD_ERROR(("%s: Failed to force clock for F2: err %d\n", __FUNCTION__, err));
-               goto exit;
-       }
-
-       /* Enable function 2 (frame transfers) */
-       W_SDREG((SDPCM_PROT_VERSION << SMB_DATA_VERSION_SHIFT),
-               &bus->regs->tosbmailboxdata, retries);
-       enable = (SDIO_FUNC_ENABLE_1 | SDIO_FUNC_ENABLE_2);
-
-       bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_0, SDIOD_CCCR_IOEN, enable, NULL);
-
-       /* Give the dongle some time to do its thing and set IOR2 */
-       dhd_timeout_start(&tmo, DHD_WAIT_F2RDY * 1000);
-
-       ready = 0;
-       while (ready != enable && !dhd_timeout_expired(&tmo))
-               ready = bcmsdh_cfg_read(bus->sdh, SDIO_FUNC_0, SDIOD_CCCR_IORDY, NULL);
-
-
-       DHD_INFO(("%s: enable 0x%02x, ready 0x%02x (waited %uus)\n",
-                 __FUNCTION__, enable, ready, tmo.elapsed));
-
-
-       /* If F2 successfully enabled, set core and enable interrupts */
-       if (ready == enable) {
-               /* Make sure we're talking to the core. */
-               if (!(bus->regs = si_setcore(bus->sih, PCMCIA_CORE_ID, 0)))
-                       bus->regs = si_setcore(bus->sih, SDIOD_CORE_ID, 0);
-
-               /* Set up the interrupt mask and enable interrupts */
-               bus->hostintmask = HOSTINTMASK;
-               W_SDREG(bus->hostintmask, &bus->regs->hostintmask, retries);
-
-               bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_WATERMARK, (uint8)watermark, &err);
-
-               /* Set bus state according to enable result */
-               dhdp->busstate = DHD_BUS_DATA;
-
-               /* bcmsdh_intr_unmask(bus->sdh); */
-
-               bus->intdis = FALSE;
-               if (bus->intr) {
-                       DHD_INTR(("%s: enable SDIO device interrupts\n", __FUNCTION__));
-                       bcmsdh_intr_enable(bus->sdh);
-               } else {
-                       DHD_INTR(("%s: disable SDIO interrupts\n", __FUNCTION__));
-                       bcmsdh_intr_disable(bus->sdh);
-               }
-
-       }
-
-
-       else {
-               /* Disable F2 again */
-               enable = SDIO_FUNC_ENABLE_1;
-               bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_0, SDIOD_CCCR_IOEN, enable, NULL);
-       }
-
-       /* Restore previous clock setting */
-       bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err);
-
-
-       /* If we didn't come up, turn off backplane clock */
-       if (dhdp->busstate != DHD_BUS_DATA)
-               dhdsdio_clkctl(bus, CLK_NONE, FALSE);
-
-exit:
-       if (enforce_mutex)
-               dhd_os_sdunlock(bus->dhd);
-
-       return ret;
-}
-
-static void
-dhdsdio_rxfail(dhd_bus_t *bus, bool abort, bool rtx)
-{
-       bcmsdh_info_t *sdh = bus->sdh;
-       sdpcmd_regs_t *regs = bus->regs;
-       uint retries = 0;
-       uint16 lastrbc;
-       uint8 hi, lo;
-       int err;
-
-       DHD_ERROR(("%s: %sterminate frame%s\n", __FUNCTION__,
-                  (abort ? "abort command, " : ""), (rtx ? ", send NAK" : "")));
-
-       if (abort) {
-               bcmsdh_abort(sdh, SDIO_FUNC_2);
-       }
-
-       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_FRAMECTRL, SFC_RF_TERM, &err);
-       bus->f1regdata++;
-
-       /* Wait until the packet has been flushed (device/FIFO stable) */
-       for (lastrbc = retries = 0xffff; retries > 0; retries--) {
-               hi = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_RFRAMEBCHI, NULL);
-               lo = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_RFRAMEBCLO, NULL);
-               bus->f1regdata += 2;
-
-               if ((hi == 0) && (lo == 0))
-                       break;
-
-               if ((hi > (lastrbc >> 8)) && (lo > (lastrbc & 0x00ff))) {
-                       DHD_ERROR(("%s: count growing: last 0x%04x now 0x%04x\n",
-                                  __FUNCTION__, lastrbc, ((hi << 8) + lo)));
-               }
-               lastrbc = (hi << 8) + lo;
-       }
-
-       if (!retries) {
-               DHD_ERROR(("%s: count never zeroed: last 0x%04x\n", __FUNCTION__, lastrbc));
-       } else {
-               DHD_INFO(("%s: flush took %d iterations\n", __FUNCTION__, (0xffff - retries)));
-       }
-
-       if (rtx) {
-               bus->rxrtx++;
-               W_SDREG(SMB_NAK, &regs->tosbmailbox, retries);
-               bus->f1regdata++;
-               if (retries <= retry_limit) {
-                       bus->rxskip = TRUE;
-               }
-       }
-
-       /* Clear partial in any case */
-       bus->nextlen = 0;
-
-       /* If we can't reach the device, signal failure */
-       if (err || bcmsdh_regfail(sdh))
-               bus->dhd->busstate = DHD_BUS_DOWN;
-}
-
-static void
-dhdsdio_read_control(dhd_bus_t *bus, uint8 *hdr, uint len, uint doff)
-{
-       bcmsdh_info_t *sdh = bus->sdh;
-       uint rdlen, pad;
-
-       int sdret;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       /* Control data already received in aligned rxctl */
-       if ((bus->bus == SPI_BUS) && (!bus->usebufpool))
-               goto gotpkt;
-
-       ASSERT(bus->rxbuf);
-       /* Set rxctl for frame (w/optional alignment) */
-       bus->rxctl = bus->rxbuf;
-       if (dhd_alignctl) {
-               bus->rxctl += firstread;
-               if ((pad = ((uintptr)bus->rxctl % DHD_SDALIGN)))
-                       bus->rxctl += (DHD_SDALIGN - pad);
-               bus->rxctl -= firstread;
-       }
-       ASSERT(bus->rxctl >= bus->rxbuf);
-
-       /* Copy the already-read portion over */
-       bcopy(hdr, bus->rxctl, firstread);
-       if (len <= firstread)
-               goto gotpkt;
-
-       /* Copy the full data pkt in gSPI case and process ioctl. */
-       if (bus->bus == SPI_BUS) {
-               bcopy(hdr, bus->rxctl, len);
-               goto gotpkt;
-       }
-
-       /* Raise rdlen to next SDIO block to avoid tail command */
-       rdlen = len - firstread;
-       if (bus->roundup && bus->blocksize && (rdlen > bus->blocksize)) {
-               pad = bus->blocksize - (rdlen % bus->blocksize);
-               if ((pad <= bus->roundup) && (pad < bus->blocksize) &&
-                   ((len + pad) < bus->dhd->maxctl))
-                       rdlen += pad;
-       } else if (rdlen % DHD_SDALIGN) {
-               rdlen += DHD_SDALIGN - (rdlen % DHD_SDALIGN);
-       }
-
-       /* Satisfy length-alignment requirements */
-       if (forcealign && (rdlen & (ALIGNMENT - 1)))
-               rdlen = ROUNDUP(rdlen, ALIGNMENT);
-
-       /* Drop if the read is too big or it exceeds our maximum */
-       if ((rdlen + firstread) > bus->dhd->maxctl) {
-               DHD_ERROR(("%s: %d-byte control read exceeds %d-byte buffer\n",
-                          __FUNCTION__, rdlen, bus->dhd->maxctl));
-               bus->dhd->rx_errors++;
-               dhdsdio_rxfail(bus, FALSE, FALSE);
-               goto done;
-       }
-
-       if ((len - doff) > bus->dhd->maxctl) {
-               DHD_ERROR(("%s: %d-byte ctl frame (%d-byte ctl data) exceeds %d-byte limit\n",
-                          __FUNCTION__, len, (len - doff), bus->dhd->maxctl));
-               bus->dhd->rx_errors++; bus->rx_toolong++;
-               dhdsdio_rxfail(bus, FALSE, FALSE);
-               goto done;
-       }
-
-
-       /* Read remainder of frame body into the rxctl buffer */
-       sdret = dhd_bcmsdh_recv_buf(bus, bcmsdh_cur_sbwad(sdh), SDIO_FUNC_2, F2SYNC,
-                                   (bus->rxctl + firstread), rdlen, NULL, NULL, NULL);
-       bus->f2rxdata++;
-       ASSERT(sdret != BCME_PENDING);
-
-       /* Control frame failures need retransmission */
-       if (sdret < 0) {
-               DHD_ERROR(("%s: read %d control bytes failed: %d\n", __FUNCTION__, rdlen, sdret));
-               bus->rxc_errors++; /* dhd.rx_ctlerrs is higher level */
-               dhdsdio_rxfail(bus, TRUE, TRUE);
-               goto done;
-       }
-
-gotpkt:
-
-#ifdef DHD_DEBUG
-       if (DHD_BYTES_ON() && DHD_CTL_ON()) {
-               prhex("RxCtrl", bus->rxctl, len);
-       }
-#endif
-
-       /* Point to valid data and indicate its length */
-       bus->rxctl += doff;
-       bus->rxlen = len - doff;
-
-done:
-       /* Awake any waiters */
-       dhd_os_ioctl_resp_wake(bus->dhd);
-}
-
-static uint8
-dhdsdio_rxglom(dhd_bus_t *bus, uint8 rxseq)
-{
-       uint16 dlen, totlen;
-       uint8 *dptr, num = 0;
-
-       uint16 sublen, check;
-       void *pfirst, *plast, *pnext, *save_pfirst;
-       osl_t *osh = bus->dhd->osh;
-
-       int errcode;
-       uint8 chan, seq, doff, sfdoff;
-       uint8 txmax;
-
-       int ifidx = 0;
-       bool usechain = bus->use_rxchain;
-
-       /* If packets, issue read(s) and send up packet chain */
-       /* Return sequence numbers consumed? */
-
-       DHD_TRACE(("dhdsdio_rxglom: start: glomd %p glom %p\n", bus->glomd, bus->glom));
-
-       /* If there's a descriptor, generate the packet chain */
-       if (bus->glomd) {
-               dhd_os_sdlock_rxq(bus->dhd);
-
-               pfirst = plast = pnext = NULL;
-               dlen = (uint16)PKTLEN(osh, bus->glomd);
-               dptr = PKTDATA(osh, bus->glomd);
-               if (!dlen || (dlen & 1)) {
-                       DHD_ERROR(("%s: bad glomd len (%d), ignore descriptor\n",
-                                  __FUNCTION__, dlen));
-                       dlen = 0;
-               }
-
-               for (totlen = num = 0; dlen; num++) {
-                       /* Get (and move past) next length */
-                       sublen = ltoh16_ua(dptr);
-                       dlen -= sizeof(uint16);
-                       dptr += sizeof(uint16);
-                       if ((sublen < SDPCM_HDRLEN) ||
-                           ((num == 0) && (sublen < (2 * SDPCM_HDRLEN)))) {
-                               DHD_ERROR(("%s: descriptor len %d bad: %d\n",
-                                          __FUNCTION__, num, sublen));
-                               pnext = NULL;
-                               break;
-                       }
-                       if (sublen % DHD_SDALIGN) {
-                               DHD_ERROR(("%s: sublen %d not a multiple of %d\n",
-                                          __FUNCTION__, sublen, DHD_SDALIGN));
-                               usechain = FALSE;
-                       }
-                       totlen += sublen;
-
-                       /* For last frame, adjust read len so total is a block multiple */
-                       if (!dlen) {
-                               sublen += (ROUNDUP(totlen, bus->blocksize) - totlen);
-                               totlen = ROUNDUP(totlen, bus->blocksize);
-                       }
-
-                       /* Allocate/chain packet for next subframe */
-                       if ((pnext = PKTGET(osh, sublen + DHD_SDALIGN, FALSE)) == NULL) {
-                               DHD_ERROR(("%s: PKTGET failed, num %d len %d\n",
-                                          __FUNCTION__, num, sublen));
-                               break;
-                       }
-                       ASSERT(!PKTLINK(pnext));
-                       if (!pfirst) {
-                               ASSERT(!plast);
-                               pfirst = plast = pnext;
-                       } else {
-                               ASSERT(plast);
-                               PKTSETNEXT(osh, plast, pnext);
-                               plast = pnext;
-                       }
-
-                       /* Adhere to start alignment requirements */
-                       PKTALIGN(osh, pnext, sublen, DHD_SDALIGN);
-               }
-
-               /* If all allocations succeeded, save packet chain in bus structure */
-               if (pnext) {
-                       DHD_GLOM(("%s: allocated %d-byte packet chain for %d subframes\n",
-                                 __FUNCTION__, totlen, num));
-                       if (DHD_GLOM_ON() && bus->nextlen) {
-                               if (totlen != bus->nextlen) {
-                                       DHD_GLOM(("%s: glomdesc mismatch: nextlen %d glomdesc %d "
-                                                 "rxseq %d\n", __FUNCTION__, bus->nextlen,
-                                                 totlen, rxseq));
-                               }
-                       }
-                       bus->glom = pfirst;
-                       pfirst = pnext = NULL;
-               } else {
-                       if (pfirst)
-                               PKTFREE(osh, pfirst, FALSE);
-                       bus->glom = NULL;
-                       num = 0;
-               }
-
-               /* Done with descriptor packet */
-               PKTFREE(osh, bus->glomd, FALSE);
-               bus->glomd = NULL;
-               bus->nextlen = 0;
-
-               dhd_os_sdunlock_rxq(bus->dhd);
-       }
-
-       /* Ok -- either we just generated a packet chain, or had one from before */
-       if (bus->glom) {
-               if (DHD_GLOM_ON()) {
-                       DHD_GLOM(("%s: attempt superframe read, packet chain:\n", __FUNCTION__));
-                       for (pnext = bus->glom; pnext; pnext = PKTNEXT(osh, pnext)) {
-                               DHD_GLOM(("    %p: %p len 0x%04x (%d)\n",
-                                         pnext, (uint8*)PKTDATA(osh, pnext),
-                                         PKTLEN(osh, pnext), PKTLEN(osh, pnext)));
-                       }
-               }
-
-               pfirst = bus->glom;
-               dlen = (uint16)pkttotlen(osh, pfirst);
-
-               /* Do an SDIO read for the superframe.  Configurable iovar to
-                * read directly into the chained packet, or allocate a large
-                * packet and and copy into the chain.
-                */
-               if (usechain) {
-                       errcode = dhd_bcmsdh_recv_buf(bus,
-                                                     bcmsdh_cur_sbwad(bus->sdh), SDIO_FUNC_2,
-                                                     F2SYNC, (uint8*)PKTDATA(osh, pfirst),
-                                                     dlen, pfirst, NULL, NULL);
-               } else if (bus->dataptr) {
-                       errcode = dhd_bcmsdh_recv_buf(bus,
-                                                     bcmsdh_cur_sbwad(bus->sdh), SDIO_FUNC_2,
-                                                     F2SYNC, bus->dataptr,
-                                                     dlen, NULL, NULL, NULL);
-                       sublen = (uint16)pktfrombuf(osh, pfirst, 0, dlen, bus->dataptr);
-                       if (sublen != dlen) {
-                               DHD_ERROR(("%s: FAILED TO COPY, dlen %d sublen %d\n",
-                                          __FUNCTION__, dlen, sublen));
-                               errcode = -1;
-                       }
-                       pnext = NULL;
-               } else {
-                       DHD_ERROR(("COULDN'T ALLOC %d-BYTE GLOM, FORCE FAILURE\n", dlen));
-                       errcode = -1;
-               }
-               bus->f2rxdata++;
-               ASSERT(errcode != BCME_PENDING);
-
-               /* On failure, kill the superframe, allow a couple retries */
-               if (errcode < 0) {
-                       DHD_ERROR(("%s: glom read of %d bytes failed: %d\n",
-                                  __FUNCTION__, dlen, errcode));
-                       bus->dhd->rx_errors++;
-
-                       if (bus->glomerr++ < 3) {
-                               dhdsdio_rxfail(bus, TRUE, TRUE);
-                       } else {
-                               bus->glomerr = 0;
-                               dhdsdio_rxfail(bus, TRUE, FALSE);
-                               dhd_os_sdlock_rxq(bus->dhd);
-                               PKTFREE(osh, bus->glom, FALSE);
-                               dhd_os_sdunlock_rxq(bus->dhd);
-                               bus->rxglomfail++;
-                               bus->glom = NULL;
-                       }
-                       return 0;
-               }
-
-#ifdef DHD_DEBUG
-               if (DHD_GLOM_ON()) {
-                       prhex("SUPERFRAME", PKTDATA(osh, pfirst),
-                             MIN(PKTLEN(osh, pfirst), 48));
-               }
-#endif
-
-
-               /* Validate the superframe header */
-               dptr = (uint8 *)PKTDATA(osh, pfirst);
-               sublen = ltoh16_ua(dptr);
-               check = ltoh16_ua(dptr + sizeof(uint16));
-
-               chan = SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]);
-               seq = SDPCM_PACKET_SEQUENCE(&dptr[SDPCM_FRAMETAG_LEN]);
-               bus->nextlen = dptr[SDPCM_FRAMETAG_LEN + SDPCM_NEXTLEN_OFFSET];
-               if ((bus->nextlen << 4) > MAX_RX_DATASZ) {
-                       DHD_INFO(("%s: got frame w/nextlen too large (%d) seq %d\n",
-                                 __FUNCTION__, bus->nextlen, seq));
-                       bus->nextlen = 0;
-               }
-               doff = SDPCM_DOFFSET_VALUE(&dptr[SDPCM_FRAMETAG_LEN]);
-               txmax = SDPCM_WINDOW_VALUE(&dptr[SDPCM_FRAMETAG_LEN]);
-
-               errcode = 0;
-               if ((uint16)~(sublen^check)) {
-                       DHD_ERROR(("%s (superframe): HW hdr error: len/check 0x%04x/0x%04x\n",
-                                  __FUNCTION__, sublen, check));
-                       errcode = -1;
-               } else if (ROUNDUP(sublen, bus->blocksize) != dlen) {
-                       DHD_ERROR(("%s (superframe): len 0x%04x, rounded 0x%04x, expect 0x%04x\n",
-                                  __FUNCTION__, sublen, ROUNDUP(sublen, bus->blocksize), dlen));
-                       errcode = -1;
-               } else if (SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]) != SDPCM_GLOM_CHANNEL) {
-                       DHD_ERROR(("%s (superframe): bad channel %d\n", __FUNCTION__,
-                                  SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN])));
-                       errcode = -1;
-               } else if (SDPCM_GLOMDESC(&dptr[SDPCM_FRAMETAG_LEN])) {
-                       DHD_ERROR(("%s (superframe): got second descriptor?\n", __FUNCTION__));
-                       errcode = -1;
-               } else if ((doff < SDPCM_HDRLEN) ||
-                          (doff > (PKTLEN(osh, pfirst) - SDPCM_HDRLEN))) {
-                       DHD_ERROR(("%s (superframe): Bad data offset %d: HW %d pkt %d min %d\n",
-                                  __FUNCTION__, doff, sublen, PKTLEN(osh, pfirst), SDPCM_HDRLEN));
-                       errcode = -1;
-               }
-
-               /* Check sequence number of superframe SW header */
-               if (rxseq != seq) {
-                       DHD_INFO(("%s: (superframe) rx_seq %d, expected %d\n",
-                                 __FUNCTION__, seq, rxseq));
-                       bus->rx_badseq++;
-                       rxseq = seq;
-               }
-
-               /* Check window for sanity */
-               if ((uint8)(txmax - bus->tx_seq) > 0x40) {
-                       DHD_ERROR(("%s: got unlikely tx max %d with tx_seq %d\n",
-                                  __FUNCTION__, txmax, bus->tx_seq));
-                       txmax = bus->tx_seq + 2;
-               }
-               bus->tx_max = txmax;
-
-               /* Remove superframe header, remember offset */
-               PKTPULL(osh, pfirst, doff);
-               sfdoff = doff;
-
-               /* Validate all the subframe headers */
-               for (num = 0, pnext = pfirst; pnext && !errcode;
-                    num++, pnext = PKTNEXT(osh, pnext)) {
-                       dptr = (uint8 *)PKTDATA(osh, pnext);
-                       dlen = (uint16)PKTLEN(osh, pnext);
-                       sublen = ltoh16_ua(dptr);
-                       check = ltoh16_ua(dptr + sizeof(uint16));
-                       chan = SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]);
-                       doff = SDPCM_DOFFSET_VALUE(&dptr[SDPCM_FRAMETAG_LEN]);
-#ifdef DHD_DEBUG
-                       if (DHD_GLOM_ON()) {
-                               prhex("subframe", dptr, 32);
-                       }
-#endif
-
-                       if ((uint16)~(sublen^check)) {
-                               DHD_ERROR(("%s (subframe %d): HW hdr error: "
-                                          "len/check 0x%04x/0x%04x\n",
-                                          __FUNCTION__, num, sublen, check));
-                               errcode = -1;
-                       } else if ((sublen > dlen) || (sublen < SDPCM_HDRLEN)) {
-                               DHD_ERROR(("%s (subframe %d): length mismatch: "
-                                          "len 0x%04x, expect 0x%04x\n",
-                                          __FUNCTION__, num, sublen, dlen));
-                               errcode = -1;
-                       } else if ((chan != SDPCM_DATA_CHANNEL) &&
-                                  (chan != SDPCM_EVENT_CHANNEL)) {
-                               DHD_ERROR(("%s (subframe %d): bad channel %d\n",
-                                          __FUNCTION__, num, chan));
-                               errcode = -1;
-                       } else if ((doff < SDPCM_HDRLEN) || (doff > sublen)) {
-                               DHD_ERROR(("%s (subframe %d): Bad data offset %d: HW %d min %d\n",
-                                          __FUNCTION__, num, doff, sublen, SDPCM_HDRLEN));
-                               errcode = -1;
-                       }
-               }
-
-               if (errcode) {
-                       /* Terminate frame on error, request a couple retries */
-                       if (bus->glomerr++ < 3) {
-                               /* Restore superframe header space */
-                               PKTPUSH(osh, pfirst, sfdoff);
-                               dhdsdio_rxfail(bus, TRUE, TRUE);
-                       } else {
-                               bus->glomerr = 0;
-                               dhdsdio_rxfail(bus, TRUE, FALSE);
-                               dhd_os_sdlock_rxq(bus->dhd);
-                               PKTFREE(osh, bus->glom, FALSE);
-                               dhd_os_sdunlock_rxq(bus->dhd);
-                               bus->rxglomfail++;
-                               bus->glom = NULL;
-                       }
-                       bus->nextlen = 0;
-                       return 0;
-               }
-
-               /* Basic SD framing looks ok - process each packet (header) */
-               save_pfirst = pfirst;
-               bus->glom = NULL;
-               plast = NULL;
-
-               dhd_os_sdlock_rxq(bus->dhd);
-               for (num = 0; pfirst; rxseq++, pfirst = pnext) {
-                       pnext = PKTNEXT(osh, pfirst);
-                       PKTSETNEXT(osh, pfirst, NULL);
-
-                       dptr = (uint8 *)PKTDATA(osh, pfirst);
-                       sublen = ltoh16_ua(dptr);
-                       chan = SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]);
-                       seq = SDPCM_PACKET_SEQUENCE(&dptr[SDPCM_FRAMETAG_LEN]);
-                       doff = SDPCM_DOFFSET_VALUE(&dptr[SDPCM_FRAMETAG_LEN]);
-
-                       DHD_GLOM(("%s: Get subframe %d, %p(%p/%d), sublen %d chan %d seq %d\n",
-                                 __FUNCTION__, num, pfirst, PKTDATA(osh, pfirst),
-                                 PKTLEN(osh, pfirst), sublen, chan, seq));
-
-                       ASSERT((chan == SDPCM_DATA_CHANNEL) || (chan == SDPCM_EVENT_CHANNEL));
-
-                       if (rxseq != seq) {
-                               DHD_GLOM(("%s: rx_seq %d, expected %d\n",
-                                         __FUNCTION__, seq, rxseq));
-                               bus->rx_badseq++;
-                               rxseq = seq;
-                       }
-
-#ifdef DHD_DEBUG
-                       if (DHD_BYTES_ON() && DHD_DATA_ON()) {
-                               prhex("Rx Subframe Data", dptr, dlen);
-                       }
-#endif
-
-                       PKTSETLEN(osh, pfirst, sublen);
-                       PKTPULL(osh, pfirst, doff);
-
-                       if (PKTLEN(osh, pfirst) == 0) {
-                               PKTFREE(bus->dhd->osh, pfirst, FALSE);
-                               if (plast) {
-                                       PKTSETNEXT(osh, plast, pnext);
-                               } else {
-                                       ASSERT(save_pfirst == pfirst);
-                                       save_pfirst = pnext;
-                               }
-                               continue;
-                       } else if (dhd_prot_hdrpull(bus->dhd, &ifidx, pfirst) != 0) {
-                               DHD_ERROR(("%s: rx protocol error\n", __FUNCTION__));
-                               bus->dhd->rx_errors++;
-                               PKTFREE(osh, pfirst, FALSE);
-                               if (plast) {
-                                       PKTSETNEXT(osh, plast, pnext);
-                               } else {
-                                       ASSERT(save_pfirst == pfirst);
-                                       save_pfirst = pnext;
-                               }
-                               continue;
-                       }
-
-                       /* this packet will go up, link back into chain and count it */
-                       PKTSETNEXT(osh, pfirst, pnext);
-                       plast = pfirst;
-                       num++;
-
-#ifdef DHD_DEBUG
-                       if (DHD_GLOM_ON()) {
-                               DHD_GLOM(("%s subframe %d to stack, %p(%p/%d) nxt/lnk %p/%p\n",
-                                         __FUNCTION__, num, pfirst,
-                                         PKTDATA(osh, pfirst), PKTLEN(osh, pfirst),
-                                         PKTNEXT(osh, pfirst), PKTLINK(pfirst)));
-                               prhex("", (uint8 *)PKTDATA(osh, pfirst),
-                                     MIN(PKTLEN(osh, pfirst), 32));
-                       }
-#endif /* DHD_DEBUG */
-               }
-               dhd_os_sdunlock_rxq(bus->dhd);
-               if (num) {
-                       dhd_os_sdunlock(bus->dhd);
-                       dhd_rx_frame(bus->dhd, ifidx, save_pfirst, num);
-                       dhd_os_sdlock(bus->dhd);
-               }
-
-               bus->rxglomframes++;
-               bus->rxglompkts += num;
-       }
-       return num;
-}
-
-/* Return TRUE if there may be more frames to read */
-static uint
-dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
-{
-       osl_t *osh = bus->dhd->osh;
-       bcmsdh_info_t *sdh = bus->sdh;
-
-       uint16 len, check;      /* Extracted hardware header fields */
-       uint8 chan, seq, doff;  /* Extracted software header fields */
-       uint8 fcbits;           /* Extracted fcbits from software header */
-       uint8 delta;
-
-       void *pkt;      /* Packet for event or data frames */
-       uint16 pad;     /* Number of pad bytes to read */
-       uint16 rdlen;   /* Total number of bytes to read */
-       uint8 rxseq;    /* Next sequence number to expect */
-       uint rxleft = 0;        /* Remaining number of frames allowed */
-       int sdret;      /* Return code from bcmsdh calls */
-       uint8 txmax;    /* Maximum tx sequence offered */
-       bool len_consistent; /* Result of comparing readahead len and len from hw-hdr */
-       uint8 *rxbuf;
-       int ifidx = 0;
-       uint rxcount = 0; /* Total frames read */
-
-#if defined(DHD_DEBUG) || defined(SDTEST)
-       bool sdtest = FALSE;    /* To limit message spew from test mode */
-#endif
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       ASSERT(maxframes);
-
-#ifdef SDTEST
-       /* Allow pktgen to override maxframes */
-       if (bus->pktgen_count && (bus->pktgen_mode == DHD_PKTGEN_RECV)) {
-               maxframes = bus->pktgen_count;
-               sdtest = TRUE;
-       }
-#endif
-
-       /* Not finished unless we encounter no more frames indication */
-       *finished = FALSE;
-
-
-       for (rxseq = bus->rx_seq, rxleft = maxframes;
-            !bus->rxskip && rxleft && bus->dhd->busstate != DHD_BUS_DOWN;
-            rxseq++, rxleft--) {
-
-               /* Handle glomming separately */
-               if (bus->glom || bus->glomd) {
-                       uint8 cnt;
-                       DHD_GLOM(("%s: calling rxglom: glomd %p, glom %p\n",
-                                 __FUNCTION__, bus->glomd, bus->glom));
-                       cnt = dhdsdio_rxglom(bus, rxseq);
-                       DHD_GLOM(("%s: rxglom returned %d\n", __FUNCTION__, cnt));
-                       rxseq += cnt - 1;
-                       rxleft = (rxleft > cnt) ? (rxleft - cnt) : 1;
-                       continue;
-               }
-
-               /* Try doing single read if we can */
-               if (dhd_readahead && bus->nextlen) {
-                       uint16 nextlen = bus->nextlen;
-                       bus->nextlen = 0;
-
-                       if (bus->bus == SPI_BUS) {
-                               rdlen = len = nextlen;
-                       }
-                       else {
-                               rdlen = len = nextlen << 4;
-
-                               /* Pad read to blocksize for efficiency */
-                               if (bus->roundup && bus->blocksize && (rdlen > bus->blocksize)) {
-                                       pad = bus->blocksize - (rdlen % bus->blocksize);
-                                       if ((pad <= bus->roundup) && (pad < bus->blocksize) &&
-                                               ((rdlen + pad + firstread) < MAX_RX_DATASZ))
-                                               rdlen += pad;
-                               } else if (rdlen % DHD_SDALIGN) {
-                                       rdlen += DHD_SDALIGN - (rdlen % DHD_SDALIGN);
-                               }
-                       }
-
-                       /* We use bus->rxctl buffer in WinXP for initial control pkt receives.
-                        * Later we use buffer-poll for data as well as control packets.
-                        * This is required becuase dhd receives full frame in gSPI unlike SDIO.
-                        * After the frame is received we have to distinguish whether it is data
-                        * or non-data frame.
-                        */
-                       /* Allocate a packet buffer */
-                       dhd_os_sdlock_rxq(bus->dhd);
-                       if (!(pkt = PKTGET(osh, rdlen + DHD_SDALIGN, FALSE))) {
-                               if (bus->bus == SPI_BUS) {
-                                       bus->usebufpool = FALSE;
-                                       bus->rxctl = bus->rxbuf;
-                                       if (dhd_alignctl) {
-                                               bus->rxctl += firstread;
-                                               if ((pad = ((uintptr)bus->rxctl % DHD_SDALIGN)))
-                                                       bus->rxctl += (DHD_SDALIGN - pad);
-                                               bus->rxctl -= firstread;
-                                       }
-                                       ASSERT(bus->rxctl >= bus->rxbuf);
-                                       rxbuf = bus->rxctl;
-                                       /* Read the entire frame */
-                                       sdret = dhd_bcmsdh_recv_buf(bus,
-                                                                   bcmsdh_cur_sbwad(sdh),
-                                                                   SDIO_FUNC_2,
-                                                                   F2SYNC, rxbuf, rdlen,
-                                                                   NULL, NULL, NULL);
-                                       bus->f2rxdata++;
-                                       ASSERT(sdret != BCME_PENDING);
-
-
-                                       /* Control frame failures need retransmission */
-                                       if (sdret < 0) {
-                                               DHD_ERROR(("%s: read %d control bytes failed: %d\n",
-                                                  __FUNCTION__, rdlen, sdret));
-                                               /* dhd.rx_ctlerrs is higher level */
-                                               bus->rxc_errors++;
-                                               dhd_os_sdunlock_rxq(bus->dhd);
-                                               dhdsdio_rxfail(bus, TRUE,
-                                                   (bus->bus == SPI_BUS) ? FALSE : TRUE);
-                                               continue;
-                                       }
-                               } else {
-                                       /* Give up on data, request rtx of events */
-                                       DHD_ERROR(("%s (nextlen): PKTGET failed: len %d rdlen %d "
-                                                  "expected rxseq %d\n",
-                                                  __FUNCTION__, len, rdlen, rxseq));
-                                       /* Just go try again w/normal header read */
-                                       dhd_os_sdunlock_rxq(bus->dhd);
-                                       continue;
-                               }
-                       } else {
-                               if (bus->bus == SPI_BUS)
-                                       bus->usebufpool = TRUE;
-
-                               ASSERT(!PKTLINK(pkt));
-                               PKTALIGN(osh, pkt, rdlen, DHD_SDALIGN);
-                               rxbuf = (uint8 *)PKTDATA(osh, pkt);
-                               /* Read the entire frame */
-                               sdret = dhd_bcmsdh_recv_buf(bus, bcmsdh_cur_sbwad(sdh),
-                                                           SDIO_FUNC_2,
-                                                           F2SYNC, rxbuf, rdlen,
-                                                           pkt, NULL, NULL);
-                               bus->f2rxdata++;
-                               ASSERT(sdret != BCME_PENDING);
-
-                               if (sdret < 0) {
-                                       DHD_ERROR(("%s (nextlen): read %d bytes failed: %d\n",
-                                          __FUNCTION__, rdlen, sdret));
-                                       PKTFREE(bus->dhd->osh, pkt, FALSE);
-                                       bus->dhd->rx_errors++;
-                                       dhd_os_sdunlock_rxq(bus->dhd);
-                                       /* Force retry w/normal header read.  Don't attemp NAK for
-                                        * gSPI
-                                        */
-                                       dhdsdio_rxfail(bus, TRUE,
-                                             (bus->bus == SPI_BUS) ? FALSE : TRUE);
-                                       continue;
-                               }
-                       }
-                       dhd_os_sdunlock_rxq(bus->dhd);
-
-                       /* Now check the header */
-                       bcopy(rxbuf, bus->rxhdr, SDPCM_HDRLEN);
-
-                       /* Extract hardware header fields */
-                       len = ltoh16_ua(bus->rxhdr);
-                       check = ltoh16_ua(bus->rxhdr + sizeof(uint16));
-
-                       /* All zeros means readahead info was bad */
-                       if (!(len|check)) {
-                               DHD_INFO(("%s (nextlen): read zeros in HW header???\n",
-                                          __FUNCTION__));
-                               dhd_os_sdlock_rxq(bus->dhd);
-                               PKTFREE2();
-                               dhd_os_sdunlock_rxq(bus->dhd);
-                               GSPI_PR55150_BAILOUT;
-                               continue;
-                       }
-
-                       /* Validate check bytes */
-                       if ((uint16)~(len^check)) {
-                               DHD_ERROR(("%s (nextlen): HW hdr error: nextlen/len/check"
-                                          " 0x%04x/0x%04x/0x%04x\n", __FUNCTION__, nextlen,
-                                          len, check));
-                               dhd_os_sdlock_rxq(bus->dhd);
-                               PKTFREE2();
-                               dhd_os_sdunlock_rxq(bus->dhd);
-                               bus->rx_badhdr++;
-                               dhdsdio_rxfail(bus, FALSE, FALSE);
-                               GSPI_PR55150_BAILOUT;
-                               continue;
-                       }
-
-                       /* Validate frame length */
-                       if (len < SDPCM_HDRLEN) {
-                               DHD_ERROR(("%s (nextlen): HW hdr length invalid: %d\n",
-                                          __FUNCTION__, len));
-                               dhd_os_sdlock_rxq(bus->dhd);
-                               PKTFREE2();
-                               dhd_os_sdunlock_rxq(bus->dhd);
-                               GSPI_PR55150_BAILOUT;
-                               continue;
-                       }
-
-                       /* Check for consistency with readahead info */
-                               len_consistent = (nextlen != (ROUNDUP(len, 16) >> 4));
-                       if (len_consistent) {
-                               /* Mismatch, force retry w/normal header (may be >4K) */
-                               DHD_ERROR(("%s (nextlen): mismatch, nextlen %d len %d rnd %d; "
-                                          "expected rxseq %d\n",
-                                          __FUNCTION__, nextlen, len, ROUNDUP(len, 16), rxseq));
-                               dhd_os_sdlock_rxq(bus->dhd);
-                               PKTFREE2();
-                               dhd_os_sdunlock_rxq(bus->dhd);
-                               dhdsdio_rxfail(bus, TRUE, (bus->bus == SPI_BUS) ? FALSE : TRUE);
-                               GSPI_PR55150_BAILOUT;
-                               continue;
-                       }
-
-
-                       /* Extract software header fields */
-                       chan = SDPCM_PACKET_CHANNEL(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-                       seq = SDPCM_PACKET_SEQUENCE(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-                       doff = SDPCM_DOFFSET_VALUE(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-                       txmax = SDPCM_WINDOW_VALUE(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-
-                               bus->nextlen =
-                                        bus->rxhdr[SDPCM_FRAMETAG_LEN + SDPCM_NEXTLEN_OFFSET];
-                               if ((bus->nextlen << 4) > MAX_RX_DATASZ) {
-                                       DHD_INFO(("%s (nextlen): got frame w/nextlen too large"
-                                                 " (%d), seq %d\n", __FUNCTION__, bus->nextlen,
-                                                 seq));
-                                       bus->nextlen = 0;
-                               }
-
-                               bus->dhd->rx_readahead_cnt ++;
-                       /* Handle Flow Control */
-                       fcbits = SDPCM_FCMASK_VALUE(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-
-                       delta = 0;
-                       if (~bus->flowcontrol & fcbits) {
-                               bus->fc_xoff++;
-                               delta = 1;
-                       }
-                       if (bus->flowcontrol & ~fcbits) {
-                               bus->fc_xon++;
-                               delta = 1;
-                       }
-
-                       if (delta) {
-                               bus->fc_rcvd++;
-                               bus->flowcontrol = fcbits;
-                       }
-
-                       /* Check and update sequence number */
-                       if (rxseq != seq) {
-                               DHD_INFO(("%s (nextlen): rx_seq %d, expected %d\n",
-                                         __FUNCTION__, seq, rxseq));
-                               bus->rx_badseq++;
-                               rxseq = seq;
-                       }
-
-                       /* Check window for sanity */
-                       if ((uint8)(txmax - bus->tx_seq) > 0x40) {
-                                       DHD_ERROR(("%s: got unlikely tx max %d with tx_seq %d\n",
-                                               __FUNCTION__, txmax, bus->tx_seq));
-                                       txmax = bus->tx_seq + 2;
-                       }
-                       bus->tx_max = txmax;
-
-#ifdef DHD_DEBUG
-                       if (DHD_BYTES_ON() && DHD_DATA_ON()) {
-                               prhex("Rx Data", rxbuf, len);
-                       } else if (DHD_HDRS_ON()) {
-                               prhex("RxHdr", bus->rxhdr, SDPCM_HDRLEN);
-                       }
-#endif
-
-                       if (chan == SDPCM_CONTROL_CHANNEL) {
-                               if (bus->bus == SPI_BUS) {
-                                       dhdsdio_read_control(bus, rxbuf, len, doff);
-                                       if (bus->usebufpool) {
-                                               dhd_os_sdlock_rxq(bus->dhd);
-                                               PKTFREE(bus->dhd->osh, pkt, FALSE);
-                                               dhd_os_sdunlock_rxq(bus->dhd);
-                                       }
-                                       continue;
-                               } else {
-                                       DHD_ERROR(("%s (nextlen): readahead on control"
-                                                  " packet %d?\n", __FUNCTION__, seq));
-                                       /* Force retry w/normal header read */
-                                       bus->nextlen = 0;
-                                       dhdsdio_rxfail(bus, FALSE, TRUE);
-                                       dhd_os_sdlock_rxq(bus->dhd);
-                                       PKTFREE2();
-                                       dhd_os_sdunlock_rxq(bus->dhd);
-                                       continue;
-                               }
-                       }
-
-                       if ((bus->bus == SPI_BUS) && !bus->usebufpool) {
-                               DHD_ERROR(("Received %d bytes on %d channel. Running out of "
-                                          "rx pktbuf's or not yet malloced.\n", len, chan));
-                               continue;
-                       }
-
-                       /* Validate data offset */
-                       if ((doff < SDPCM_HDRLEN) || (doff > len)) {
-                               DHD_ERROR(("%s (nextlen): bad data offset %d: HW len %d min %d\n",
-                                          __FUNCTION__, doff, len, SDPCM_HDRLEN));
-                               dhd_os_sdlock_rxq(bus->dhd);
-                               PKTFREE2();
-                               dhd_os_sdunlock_rxq(bus->dhd);
-                               ASSERT(0);
-                               dhdsdio_rxfail(bus, FALSE, FALSE);
-                               continue;
-                       }
-
-                       /* All done with this one -- now deliver the packet */
-                       goto deliver;
-               }
-               /* gSPI frames should not be handled in fractions */
-               if (bus->bus == SPI_BUS) {
-                       break;
-               }
-
-               /* Read frame header (hardware and software) */
-               sdret = dhd_bcmsdh_recv_buf(bus, bcmsdh_cur_sbwad(sdh), SDIO_FUNC_2, F2SYNC,
-                                           bus->rxhdr, firstread, NULL, NULL, NULL);
-               bus->f2rxhdrs++;
-               ASSERT(sdret != BCME_PENDING);
-
-               if (sdret < 0) {
-                       DHD_ERROR(("%s: RXHEADER FAILED: %d\n", __FUNCTION__, sdret));
-                       bus->rx_hdrfail++;
-                       dhdsdio_rxfail(bus, TRUE, TRUE);
-                       continue;
-               }
-
-#ifdef DHD_DEBUG
-               if (DHD_BYTES_ON() || DHD_HDRS_ON()) {
-                       prhex("RxHdr", bus->rxhdr, SDPCM_HDRLEN);
-               }
-#endif
-
-               /* Extract hardware header fields */
-               len = ltoh16_ua(bus->rxhdr);
-               check = ltoh16_ua(bus->rxhdr + sizeof(uint16));
-
-               /* All zeros means no more frames */
-               if (!(len|check)) {
-                       *finished = TRUE;
-                       break;
-               }
-
-               /* Validate check bytes */
-               if ((uint16)~(len^check)) {
-                       DHD_ERROR(("%s: HW hdr error: len/check 0x%04x/0x%04x\n",
-                                  __FUNCTION__, len, check));
-                       bus->rx_badhdr++;
-                       dhdsdio_rxfail(bus, FALSE, FALSE);
-                       continue;
-               }
-
-               /* Validate frame length */
-               if (len < SDPCM_HDRLEN) {
-                       DHD_ERROR(("%s: HW hdr length invalid: %d\n", __FUNCTION__, len));
-                       continue;
-               }
-
-               /* Extract software header fields */
-               chan = SDPCM_PACKET_CHANNEL(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-               seq = SDPCM_PACKET_SEQUENCE(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-               doff = SDPCM_DOFFSET_VALUE(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-               txmax = SDPCM_WINDOW_VALUE(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-
-               /* Validate data offset */
-               if ((doff < SDPCM_HDRLEN) || (doff > len)) {
-                       DHD_ERROR(("%s: Bad data offset %d: HW len %d, min %d seq %d\n",
-                                  __FUNCTION__, doff, len, SDPCM_HDRLEN, seq));
-                       bus->rx_badhdr++;
-                       ASSERT(0);
-                       dhdsdio_rxfail(bus, FALSE, FALSE);
-                       continue;
-               }
-
-               /* Save the readahead length if there is one */
-               bus->nextlen = bus->rxhdr[SDPCM_FRAMETAG_LEN + SDPCM_NEXTLEN_OFFSET];
-               if ((bus->nextlen << 4) > MAX_RX_DATASZ) {
-                       DHD_INFO(("%s (nextlen): got frame w/nextlen too large (%d), seq %d\n",
-                                 __FUNCTION__, bus->nextlen, seq));
-                       bus->nextlen = 0;
-               }
-
-               /* Handle Flow Control */
-               fcbits = SDPCM_FCMASK_VALUE(&bus->rxhdr[SDPCM_FRAMETAG_LEN]);
-
-               delta = 0;
-               if (~bus->flowcontrol & fcbits) {
-                       bus->fc_xoff++;
-                       delta = 1;
-               }
-               if (bus->flowcontrol & ~fcbits) {
-                       bus->fc_xon++;
-                       delta = 1;
-               }
-
-               if (delta) {
-                       bus->fc_rcvd++;
-                       bus->flowcontrol = fcbits;
-               }
-
-               /* Check and update sequence number */
-               if (rxseq != seq) {
-                       DHD_INFO(("%s: rx_seq %d, expected %d\n", __FUNCTION__, seq, rxseq));
-                       bus->rx_badseq++;
-                       rxseq = seq;
-               }
-
-               /* Check window for sanity */
-               if ((uint8)(txmax - bus->tx_seq) > 0x40) {
-                       DHD_ERROR(("%s: got unlikely tx max %d with tx_seq %d\n",
-                                  __FUNCTION__, txmax, bus->tx_seq));
-                       txmax = bus->tx_seq + 2;
-               }
-               bus->tx_max = txmax;
-
-               /* Call a separate function for control frames */
-               if (chan == SDPCM_CONTROL_CHANNEL) {
-                       dhdsdio_read_control(bus, bus->rxhdr, len, doff);
-                       continue;
-               }
-
-               ASSERT((chan == SDPCM_DATA_CHANNEL) || (chan == SDPCM_EVENT_CHANNEL) ||
-                      (chan == SDPCM_TEST_CHANNEL) || (chan == SDPCM_GLOM_CHANNEL));
-
-               /* Length to read */
-               rdlen = (len > firstread) ? (len - firstread) : 0;
-
-               /* May pad read to blocksize for efficiency */
-               if (bus->roundup && bus->blocksize && (rdlen > bus->blocksize)) {
-                       pad = bus->blocksize - (rdlen % bus->blocksize);
-                       if ((pad <= bus->roundup) && (pad < bus->blocksize) &&
-                           ((rdlen + pad + firstread) < MAX_RX_DATASZ))
-                               rdlen += pad;
-               } else if (rdlen % DHD_SDALIGN) {
-                       rdlen += DHD_SDALIGN - (rdlen % DHD_SDALIGN);
-               }
-
-               /* Satisfy length-alignment requirements */
-               if (forcealign && (rdlen & (ALIGNMENT - 1)))
-                       rdlen = ROUNDUP(rdlen, ALIGNMENT);
-
-               if ((rdlen + firstread) > MAX_RX_DATASZ) {
-                       /* Too long -- skip this frame */
-                       DHD_ERROR(("%s: too long: len %d rdlen %d\n", __FUNCTION__, len, rdlen));
-                       bus->dhd->rx_errors++; bus->rx_toolong++;
-                       dhdsdio_rxfail(bus, FALSE, FALSE);
-                       continue;
-               }
-
-               dhd_os_sdlock_rxq(bus->dhd);
-               if (!(pkt = PKTGET(osh, (rdlen + firstread + DHD_SDALIGN), FALSE))) {
-                       /* Give up on data, request rtx of events */
-                       DHD_ERROR(("%s: PKTGET failed: rdlen %d chan %d\n",
-                                  __FUNCTION__, rdlen, chan));
-                       bus->dhd->rx_dropped++;
-                       dhd_os_sdunlock_rxq(bus->dhd);
-                       dhdsdio_rxfail(bus, FALSE, RETRYCHAN(chan));
-                       continue;
-               }
-               dhd_os_sdunlock_rxq(bus->dhd);
-
-               ASSERT(!PKTLINK(pkt));
-
-               /* Leave room for what we already read, and align remainder */
-               ASSERT(firstread < (PKTLEN(osh, pkt)));
-               PKTPULL(osh, pkt, firstread);
-               PKTALIGN(osh, pkt, rdlen, DHD_SDALIGN);
-
-               /* Read the remaining frame data */
-               sdret = dhd_bcmsdh_recv_buf(bus, bcmsdh_cur_sbwad(sdh), SDIO_FUNC_2, F2SYNC,
-                                           ((uint8 *)PKTDATA(osh, pkt)), rdlen, pkt, NULL, NULL);
-               bus->f2rxdata++;
-               ASSERT(sdret != BCME_PENDING);
-
-               if (sdret < 0) {
-                       DHD_ERROR(("%s: read %d %s bytes failed: %d\n", __FUNCTION__, rdlen,
-                                  ((chan == SDPCM_EVENT_CHANNEL) ? "event" :
-                                   ((chan == SDPCM_DATA_CHANNEL) ? "data" : "test")), sdret));
-                       dhd_os_sdlock_rxq(bus->dhd);
-                       PKTFREE(bus->dhd->osh, pkt, FALSE);
-                       dhd_os_sdunlock_rxq(bus->dhd);
-                       bus->dhd->rx_errors++;
-                       dhdsdio_rxfail(bus, TRUE, RETRYCHAN(chan));
-                       continue;
-               }
-
-               /* Copy the already-read portion */
-               PKTPUSH(osh, pkt, firstread);
-               bcopy(bus->rxhdr, PKTDATA(osh, pkt), firstread);
-
-#ifdef DHD_DEBUG
-               if (DHD_BYTES_ON() && DHD_DATA_ON()) {
-                       prhex("Rx Data", PKTDATA(osh, pkt), len);
-               }
-#endif
-
-deliver:
-               /* Save superframe descriptor and allocate packet frame */
-               if (chan == SDPCM_GLOM_CHANNEL) {
-                       if (SDPCM_GLOMDESC(&bus->rxhdr[SDPCM_FRAMETAG_LEN])) {
-                               DHD_GLOM(("%s: got glom descriptor, %d bytes:\n",
-                                         __FUNCTION__, len));
-#ifdef DHD_DEBUG
-                               if (DHD_GLOM_ON()) {
-                                       prhex("Glom Data", PKTDATA(osh, pkt), len);
-                               }
-#endif
-                               PKTSETLEN(osh, pkt, len);
-                               ASSERT(doff == SDPCM_HDRLEN);
-                               PKTPULL(osh, pkt, SDPCM_HDRLEN);
-                               bus->glomd = pkt;
-                       } else {
-                               DHD_ERROR(("%s: glom superframe w/o descriptor!\n", __FUNCTION__));
-                               dhdsdio_rxfail(bus, FALSE, FALSE);
-                       }
-                       continue;
-               }
-
-               /* Fill in packet len and prio, deliver upward */
-               PKTSETLEN(osh, pkt, len);
-               PKTPULL(osh, pkt, doff);
-
-#ifdef SDTEST
-               /* Test channel packets are processed separately */
-               if (chan == SDPCM_TEST_CHANNEL) {
-                       dhdsdio_testrcv(bus, pkt, seq);
-                       continue;
-               }
-#endif /* SDTEST */
-
-               if (PKTLEN(osh, pkt) == 0) {
-                       dhd_os_sdlock_rxq(bus->dhd);
-                       PKTFREE(bus->dhd->osh, pkt, FALSE);
-                       dhd_os_sdunlock_rxq(bus->dhd);
-                       continue;
-               } else if (dhd_prot_hdrpull(bus->dhd, &ifidx, pkt) != 0) {
-                       DHD_ERROR(("%s: rx protocol error\n", __FUNCTION__));
-                       dhd_os_sdlock_rxq(bus->dhd);
-                       PKTFREE(bus->dhd->osh, pkt, FALSE);
-                       dhd_os_sdunlock_rxq(bus->dhd);
-                       bus->dhd->rx_errors++;
-                       continue;
-               }
-
-
-               /* Unlock during rx call */
-               dhd_os_sdunlock(bus->dhd);
-               dhd_rx_frame(bus->dhd, ifidx, pkt, 1);
-               dhd_os_sdlock(bus->dhd);
-       }
-       rxcount = maxframes - rxleft;
-#ifdef DHD_DEBUG
-       /* Message if we hit the limit */
-       if (!rxleft && !sdtest)
-               DHD_DATA(("%s: hit rx limit of %d frames\n", __FUNCTION__, maxframes));
-       else
-#endif /* DHD_DEBUG */
-       DHD_DATA(("%s: processed %d frames\n", __FUNCTION__, rxcount));
-       /* Back off rxseq if awaiting rtx, update rx_seq */
-       if (bus->rxskip)
-               rxseq--;
-       bus->rx_seq = rxseq;
-
-       return rxcount;
-}
-
-static uint32
-dhdsdio_hostmail(dhd_bus_t *bus)
-{
-       sdpcmd_regs_t *regs = bus->regs;
-       uint32 intstatus = 0;
-       uint32 hmb_data;
-       uint8 fcbits;
-       uint retries = 0;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       /* Read mailbox data and ack that we did so */
-       R_SDREG(hmb_data, &regs->tohostmailboxdata, retries);
-       if (retries <= retry_limit)
-               W_SDREG(SMB_INT_ACK, &regs->tosbmailbox, retries);
-       bus->f1regdata += 2;
-
-       /* Dongle recomposed rx frames, accept them again */
-       if (hmb_data & HMB_DATA_NAKHANDLED) {
-               DHD_INFO(("Dongle reports NAK handled, expect rtx of %d\n", bus->rx_seq));
-               if (!bus->rxskip) {
-                       DHD_ERROR(("%s: unexpected NAKHANDLED!\n", __FUNCTION__));
-               }
-               bus->rxskip = FALSE;
-               intstatus |= I_HMB_FRAME_IND;
-       }
-
-       /*
-        * DEVREADY does not occur with gSPI.
-        */
-       if (hmb_data & (HMB_DATA_DEVREADY | HMB_DATA_FWREADY)) {
-               bus->sdpcm_ver = (hmb_data & HMB_DATA_VERSION_MASK) >> HMB_DATA_VERSION_SHIFT;
-               if (bus->sdpcm_ver != SDPCM_PROT_VERSION)
-                       DHD_ERROR(("Version mismatch, dongle reports %d, expecting %d\n",
-                                  bus->sdpcm_ver, SDPCM_PROT_VERSION));
-               else
-                       DHD_INFO(("Dongle ready, protocol version %d\n", bus->sdpcm_ver));
-       }
-
-       /*
-        * Flow Control has been moved into the RX headers and this out of band
-        * method isn't used any more.  Leae this here for possibly remaining backward
-        * compatible with older dongles
-        */
-       if (hmb_data & HMB_DATA_FC) {
-               fcbits = (hmb_data & HMB_DATA_FCDATA_MASK) >> HMB_DATA_FCDATA_SHIFT;
-
-               if (fcbits & ~bus->flowcontrol)
-                       bus->fc_xoff++;
-               if (bus->flowcontrol & ~fcbits)
-                       bus->fc_xon++;
-
-               bus->fc_rcvd++;
-               bus->flowcontrol = fcbits;
-       }
-
-       /* Shouldn't be any others */
-       if (hmb_data & ~(HMB_DATA_DEVREADY |
-                        HMB_DATA_NAKHANDLED |
-                        HMB_DATA_FC |
-                        HMB_DATA_FWREADY |
-                        HMB_DATA_FCDATA_MASK |
-                        HMB_DATA_VERSION_MASK)) {
-               DHD_ERROR(("Unknown mailbox data content: 0x%02x\n", hmb_data));
-       }
-
-       return intstatus;
-}
-
-bool
-dhdsdio_dpc(dhd_bus_t *bus)
-{
-       bcmsdh_info_t *sdh = bus->sdh;
-       sdpcmd_regs_t *regs = bus->regs;
-       uint32 intstatus, newstatus = 0;
-       uint retries = 0;
-       uint rxlimit = dhd_rxbound; /* Rx frames to read before resched */
-       uint txlimit = dhd_txbound; /* Tx frames to send before resched */
-       uint framecnt = 0;                /* Temporary counter of tx/rx frames */
-       bool rxdone = TRUE;               /* Flag for no more read data */
-       bool resched = FALSE;     /* Flag indicating resched wanted */
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       /* Start with leftover status bits */
-       intstatus = bus->intstatus;
-
-       dhd_os_sdlock(bus->dhd);
-
-       /* If waiting for HTAVAIL, check status */
-       if (bus->clkstate == CLK_PENDING) {
-               int err;
-               uint8 clkctl, devctl = 0;
-
-#ifdef DHD_DEBUG
-               /* Check for inconsistent device control */
-               devctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, &err);
-               if (err) {
-                       DHD_ERROR(("%s: error reading DEVCTL: %d\n", __FUNCTION__, err));
-                       bus->dhd->busstate = DHD_BUS_DOWN;
-               } else {
-                       ASSERT(devctl & SBSDIO_DEVCTL_CA_INT_ONLY);
-               }
-#endif /* DHD_DEBUG */
-
-               /* Read CSR, if clock on switch to AVAIL, else ignore */
-               clkctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, &err);
-               if (err) {
-                       DHD_ERROR(("%s: error reading CSR: %d\n", __FUNCTION__, err));
-                       bus->dhd->busstate = DHD_BUS_DOWN;
-               }
-
-               DHD_INFO(("DPC: PENDING, devctl 0x%02x clkctl 0x%02x\n", devctl, clkctl));
-
-               if (SBSDIO_HTAV(clkctl)) {
-                       devctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, &err);
-                       if (err) {
-                               DHD_ERROR(("%s: error reading DEVCTL: %d\n",
-                                          __FUNCTION__, err));
-                               bus->dhd->busstate = DHD_BUS_DOWN;
-                       }
-                       devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY;
-                       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL, devctl, &err);
-                       if (err) {
-                               DHD_ERROR(("%s: error writing DEVCTL: %d\n",
-                                          __FUNCTION__, err));
-                               bus->dhd->busstate = DHD_BUS_DOWN;
-                       }
-                       bus->clkstate = CLK_AVAIL;
-               } else {
-                       goto clkwait;
-               }
-       }
-
-       BUS_WAKE(bus);
-
-       /* Make sure backplane clock is on */
-       dhdsdio_clkctl(bus, CLK_AVAIL, TRUE);
-       if (bus->clkstate == CLK_PENDING)
-               goto clkwait;
-
-       /* Pending interrupt indicates new device status */
-       if (bus->ipend) {
-               bus->ipend = FALSE;
-               R_SDREG(newstatus, &regs->intstatus, retries);
-               bus->f1regdata++;
-               if (bcmsdh_regfail(bus->sdh))
-                       newstatus = 0;
-               newstatus &= bus->hostintmask;
-               bus->fcstate = !!(newstatus & I_HMB_FC_STATE);
-               if (newstatus) {
-                       W_SDREG(newstatus, &regs->intstatus, retries);
-                       bus->f1regdata++;
-               }
-       }
-
-       /* Merge new bits with previous */
-       intstatus |= newstatus;
-       bus->intstatus = 0;
-
-       /* Handle flow-control change: read new state in case our ack
-        * crossed another change interrupt.  If change still set, assume
-        * FC ON for safety, let next loop through do the debounce.
-        */
-       if (intstatus & I_HMB_FC_CHANGE) {
-               intstatus &= ~I_HMB_FC_CHANGE;
-               W_SDREG(I_HMB_FC_CHANGE, &regs->intstatus, retries);
-               R_SDREG(newstatus, &regs->intstatus, retries);
-               bus->f1regdata += 2;
-               bus->fcstate = !!(newstatus & (I_HMB_FC_STATE | I_HMB_FC_CHANGE));
-               intstatus |= (newstatus & bus->hostintmask);
-       }
-
-       /* Handle host mailbox indication */
-       if (intstatus & I_HMB_HOST_INT) {
-               intstatus &= ~I_HMB_HOST_INT;
-               intstatus |= dhdsdio_hostmail(bus);
-       }
-
-       /* Generally don't ask for these, can get CRC errors... */
-       if (intstatus & I_WR_OOSYNC) {
-               DHD_ERROR(("Dongle reports WR_OOSYNC\n"));
-               intstatus &= ~I_WR_OOSYNC;
-       }
-
-       if (intstatus & I_RD_OOSYNC) {
-               DHD_ERROR(("Dongle reports RD_OOSYNC\n"));
-               intstatus &= ~I_RD_OOSYNC;
-       }
-
-       if (intstatus & I_SBINT) {
-               DHD_ERROR(("Dongle reports SBINT\n"));
-               intstatus &= ~I_SBINT;
-       }
-
-       /* Would be active due to wake-wlan in gSPI */
-       if (intstatus & I_CHIPACTIVE) {
-               DHD_INFO(("Dongle reports CHIPACTIVE\n"));
-               intstatus &= ~I_CHIPACTIVE;
-       }
-
-       /* Ignore frame indications if rxskip is set */
-       if (bus->rxskip)
-               intstatus &= ~I_HMB_FRAME_IND;
-
-       /* On frame indication, read available frames */
-       if (PKT_AVAILABLE()) {
-               framecnt = dhdsdio_readframes(bus, rxlimit, &rxdone);
-               if (rxdone || bus->rxskip)
-                       intstatus &= ~I_HMB_FRAME_IND;
-               rxlimit -= MIN(framecnt, rxlimit);
-       }
-
-       /* Keep still-pending events for next scheduling */
-       bus->intstatus = intstatus;
-
-clkwait:
-       /* Re-enable interrupts to detect new device events (mailbox, rx frame)
-        * or clock availability.  (Allows tx loop to check ipend if desired.)
-        * (Unless register access seems hosed, as we may not be able to ACK...)
-        */
-       if (bus->intr && bus->intdis && !bcmsdh_regfail(sdh)) {
-               DHD_INTR(("%s: enable SDIO interrupts, rxdone %d framecnt %d\n",
-                         __FUNCTION__, rxdone, framecnt));
-               bus->intdis = FALSE;
-               bcmsdh_intr_enable(sdh);
-       }
-
-       if (DATAOK(bus) && bus->ctrl_frame_stat && (bus->clkstate == CLK_AVAIL)) {
-               int ret, i;
-
-               ret = dhd_bcmsdh_send_buf(bus, bcmsdh_cur_sbwad(sdh), SDIO_FUNC_2, F2SYNC,
-                                     (uint8 *)bus->ctrl_frame_buf, (uint32)bus->ctrl_frame_len,
-                       NULL, NULL, NULL);
-               ASSERT(ret != BCME_PENDING);
-
-               if (ret < 0) {
-                       /* On failure, abort the command and terminate the frame */
-                       DHD_INFO(("%s: sdio error %d, abort command and terminate frame.\n",
-                                 __FUNCTION__, ret));
-                       bus->tx_sderrs++;
-
-                       bcmsdh_abort(sdh, SDIO_FUNC_2);
-
-                       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_FRAMECTRL,
-                                        SFC_WF_TERM, NULL);
-                       bus->f1regdata++;
-
-                       for (i = 0; i < 3; i++) {
-                               uint8 hi, lo;
-                               hi = bcmsdh_cfg_read(sdh, SDIO_FUNC_1,
-                                                    SBSDIO_FUNC1_WFRAMEBCHI, NULL);
-                               lo = bcmsdh_cfg_read(sdh, SDIO_FUNC_1,
-                                                    SBSDIO_FUNC1_WFRAMEBCLO, NULL);
-                               bus->f1regdata += 2;
-                               if ((hi == 0) && (lo == 0))
-                                       break;
-                       }
-
-               }
-               if (ret == 0) {
-                               bus->tx_seq = (bus->tx_seq + 1) % SDPCM_SEQUENCE_WRAP;
-               }
-
-               printf("Return_dpc value is : %d\n", ret);
-               bus->ctrl_frame_stat = FALSE;
-               dhd_wait_event_wakeup(bus->dhd);
-       }
-       /* Send queued frames (limit 1 if rx may still be pending) */
-       else if ((bus->clkstate == CLK_AVAIL) && !bus->fcstate &&
-           pktq_mlen(&bus->txq, ~bus->flowcontrol) && txlimit && DATAOK(bus)) {
-               framecnt = rxdone ? txlimit : MIN(txlimit, dhd_txminmax);
-               framecnt = dhdsdio_sendfromq(bus, framecnt);
-               txlimit -= framecnt;
-       }
-
-       /* Resched if events or tx frames are pending, else await next interrupt */
-       /* On failed register access, all bets are off: no resched or interrupts */
-       if ((bus->dhd->busstate == DHD_BUS_DOWN) || bcmsdh_regfail(sdh)) {
-               DHD_ERROR(("%s: failed backplane access over SDIO, halting operation %d \n",
-                          __FUNCTION__, bcmsdh_regfail(sdh)));
-               bus->dhd->busstate = DHD_BUS_DOWN;
-               bus->intstatus = 0;
-       } else if (bus->clkstate == CLK_PENDING) {
-               DHD_INFO(("%s: rescheduled due to CLK_PENDING awaiting \
-                       I_CHIPACTIVE interrupt", __FUNCTION__));
-                       resched = TRUE;
-       } else if (bus->intstatus || bus->ipend ||
-                  (!bus->fcstate && pktq_mlen(&bus->txq, ~bus->flowcontrol) && DATAOK(bus)) ||
-                       PKT_AVAILABLE()) {  /* Read multiple frames */
-               resched = TRUE;
-       }
-
-
-       bus->dpc_sched = resched;
-
-       /* If we're done for now, turn off clock request. */
-       if ((bus->clkstate != CLK_PENDING) && bus->idletime == DHD_IDLE_IMMEDIATE) {
-               bus->activity = FALSE;
-               dhdsdio_clkctl(bus, CLK_NONE, FALSE);
-       }
-
-       dhd_os_sdunlock(bus->dhd);
-
-       return resched;
-}
-
-bool
-dhd_bus_dpc(struct dhd_bus *bus)
-{
-       bool resched;
-
-       /* Call the DPC directly. */
-       DHD_TRACE(("Calling dhdsdio_dpc() from %s\n", __FUNCTION__));
-       resched = dhdsdio_dpc(bus);
-
-       return resched;
-}
-
-void
-dhdsdio_isr(void *arg)
-{
-       dhd_bus_t *bus = (dhd_bus_t*)arg;
-       bcmsdh_info_t *sdh;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (!bus) {
-               DHD_ERROR(("%s : bus is null pointer , exit \n", __FUNCTION__));
-               return;
-       }
-       sdh = bus->sdh;
-
-       if (bus->dhd->busstate == DHD_BUS_DOWN) {
-               DHD_ERROR(("%s : bus is down. we have nothing to do\n", __FUNCTION__));
-               return;
-       }
-       /* Count the interrupt call */
-       bus->intrcount++;
-       bus->ipend = TRUE;
-
-       /* Shouldn't get this interrupt if we're sleeping? */
-       if (bus->sleeping) {
-               DHD_ERROR(("INTERRUPT WHILE SLEEPING??\n"));
-               return;
-       }
-
-       /* Disable additional interrupts (is this needed now)? */
-       if (bus->intr) {
-               DHD_INTR(("%s: disable SDIO interrupts\n", __FUNCTION__));
-       } else {
-               DHD_ERROR(("dhdsdio_isr() w/o interrupt configured!\n"));
-       }
-
-       bcmsdh_intr_disable(sdh);
-       bus->intdis = TRUE;
-
-#if defined(SDIO_ISR_THREAD)
-       DHD_TRACE(("Calling dhdsdio_dpc() from %s\n", __FUNCTION__));
-       while (dhdsdio_dpc(bus));
-#else
-       bus->dpc_sched = TRUE;
-       dhd_sched_dpc(bus->dhd);
-#endif 
-
-
-}
-
-#ifdef SDTEST
-static void
-dhdsdio_pktgen_init(dhd_bus_t *bus)
-{
-       /* Default to specified length, or full range */
-       if (dhd_pktgen_len) {
-               bus->pktgen_maxlen = MIN(dhd_pktgen_len, MAX_PKTGEN_LEN);
-               bus->pktgen_minlen = bus->pktgen_maxlen;
-       } else {
-               bus->pktgen_maxlen = MAX_PKTGEN_LEN;
-               bus->pktgen_minlen = 0;
-       }
-       bus->pktgen_len = (uint16)bus->pktgen_minlen;
-
-       /* Default to per-watchdog burst with 10s print time */
-       bus->pktgen_freq = 1;
-       bus->pktgen_print = 10000 / dhd_watchdog_ms;
-       bus->pktgen_count = (dhd_pktgen * dhd_watchdog_ms + 999) / 1000;
-
-       /* Default to echo mode */
-       bus->pktgen_mode = DHD_PKTGEN_ECHO;
-       bus->pktgen_stop = 1;
-}
-
-static void
-dhdsdio_pktgen(dhd_bus_t *bus)
-{
-       void *pkt;
-       uint8 *data;
-       uint pktcount;
-       uint fillbyte;
-       osl_t *osh = bus->dhd->osh;
-       uint16 len;
-
-       /* Display current count if appropriate */
-       if (bus->pktgen_print && (++bus->pktgen_ptick >= bus->pktgen_print)) {
-               bus->pktgen_ptick = 0;
-               printf("%s: send attempts %d rcvd %d\n",
-                      __FUNCTION__, bus->pktgen_sent, bus->pktgen_rcvd);
-       }
-
-       /* For recv mode, just make sure dongle has started sending */
-       if (bus->pktgen_mode == DHD_PKTGEN_RECV) {
-               if (!bus->pktgen_rcvd)
-                       dhdsdio_sdtest_set(bus, TRUE);
-               return;
-       }
-
-       /* Otherwise, generate or request the specified number of packets */
-       for (pktcount = 0; pktcount < bus->pktgen_count; pktcount++) {
-               /* Stop if total has been reached */
-               if (bus->pktgen_total && (bus->pktgen_sent >= bus->pktgen_total)) {
-                       bus->pktgen_count = 0;
-                       break;
-               }
-
-               /* Allocate an appropriate-sized packet */
-               len = bus->pktgen_len;
-               if (!(pkt = PKTGET(osh, (len + SDPCM_HDRLEN + SDPCM_TEST_HDRLEN + DHD_SDALIGN),
-                                  TRUE))) {;
-                       DHD_ERROR(("%s: PKTGET failed!\n", __FUNCTION__));
-                       break;
-               }
-               PKTALIGN(osh, pkt, (len + SDPCM_HDRLEN + SDPCM_TEST_HDRLEN), DHD_SDALIGN);
-               data = (uint8*)PKTDATA(osh, pkt) + SDPCM_HDRLEN;
-
-               /* Write test header cmd and extra based on mode */
-               switch (bus->pktgen_mode) {
-               case DHD_PKTGEN_ECHO:
-                       *data++ = SDPCM_TEST_ECHOREQ;
-                       *data++ = (uint8)bus->pktgen_sent;
-                       break;
-
-               case DHD_PKTGEN_SEND:
-                       *data++ = SDPCM_TEST_DISCARD;
-                       *data++ = (uint8)bus->pktgen_sent;
-                       break;
-
-               case DHD_PKTGEN_RXBURST:
-                       *data++ = SDPCM_TEST_BURST;
-                       *data++ = (uint8)bus->pktgen_count;
-                       break;
-
-               default:
-                       DHD_ERROR(("Unrecognized pktgen mode %d\n", bus->pktgen_mode));
-                       PKTFREE(osh, pkt, TRUE);
-                       bus->pktgen_count = 0;
-                       return;
-               }
-
-               /* Write test header length field */
-               *data++ = (len >> 0);
-               *data++ = (len >> 8);
-
-               /* Then fill in the remainder -- N/A for burst, but who cares... */
-               for (fillbyte = 0; fillbyte < len; fillbyte++)
-                       *data++ = SDPCM_TEST_FILL(fillbyte, (uint8)bus->pktgen_sent);
-
-#ifdef DHD_DEBUG
-               if (DHD_BYTES_ON() && DHD_DATA_ON()) {
-                       data = (uint8*)PKTDATA(osh, pkt) + SDPCM_HDRLEN;
-                       prhex("dhdsdio_pktgen: Tx Data", data, PKTLEN(osh, pkt) - SDPCM_HDRLEN);
-               }
-#endif
-
-               /* Send it */
-               if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, TRUE)) {
-                       bus->pktgen_fail++;
-                       if (bus->pktgen_stop && bus->pktgen_stop == bus->pktgen_fail)
-                               bus->pktgen_count = 0;
-               }
-               bus->pktgen_sent++;
-
-               /* Bump length if not fixed, wrap at max */
-               if (++bus->pktgen_len > bus->pktgen_maxlen)
-                       bus->pktgen_len = (uint16)bus->pktgen_minlen;
-
-               /* Special case for burst mode: just send one request! */
-               if (bus->pktgen_mode == DHD_PKTGEN_RXBURST)
-                       break;
-       }
-}
-
-static void
-dhdsdio_sdtest_set(dhd_bus_t *bus, bool start)
-{
-       void *pkt;
-       uint8 *data;
-       osl_t *osh = bus->dhd->osh;
-
-       /* Allocate the packet */
-       if (!(pkt = PKTGET(osh, SDPCM_HDRLEN + SDPCM_TEST_HDRLEN + DHD_SDALIGN, TRUE))) {
-               DHD_ERROR(("%s: PKTGET failed!\n", __FUNCTION__));
-               return;
-       }
-       PKTALIGN(osh, pkt, (SDPCM_HDRLEN + SDPCM_TEST_HDRLEN), DHD_SDALIGN);
-       data = (uint8*)PKTDATA(osh, pkt) + SDPCM_HDRLEN;
-
-       /* Fill in the test header */
-       *data++ = SDPCM_TEST_SEND;
-       *data++ = start;
-       *data++ = (bus->pktgen_maxlen >> 0);
-       *data++ = (bus->pktgen_maxlen >> 8);
-
-       /* Send it */
-       if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, TRUE))
-               bus->pktgen_fail++;
-}
-
-
-static void
-dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq)
-{
-       osl_t *osh = bus->dhd->osh;
-       uint8 *data;
-       uint pktlen;
-
-       uint8 cmd;
-       uint8 extra;
-       uint16 len;
-       uint16 offset;
-
-       /* Check for min length */
-       if ((pktlen = PKTLEN(osh, pkt)) < SDPCM_TEST_HDRLEN) {
-               DHD_ERROR(("dhdsdio_restrcv: toss runt frame, pktlen %d\n", pktlen));
-               PKTFREE(osh, pkt, FALSE);
-               return;
-       }
-
-       /* Extract header fields */
-       data = PKTDATA(osh, pkt);
-       cmd = *data++;
-       extra = *data++;
-       len = *data++; len += *data++ << 8;
-
-       /* Check length for relevant commands */
-       if (cmd == SDPCM_TEST_DISCARD || cmd == SDPCM_TEST_ECHOREQ || cmd == SDPCM_TEST_ECHORSP) {
-               if (pktlen != len + SDPCM_TEST_HDRLEN) {
-                       DHD_ERROR(("dhdsdio_testrcv: frame length mismatch, pktlen %d seq %d"
-                                  " cmd %d extra %d len %d\n", pktlen, seq, cmd, extra, len));
-                       PKTFREE(osh, pkt, FALSE);
-                       return;
-               }
-       }
-
-       /* Process as per command */
-       switch (cmd) {
-       case SDPCM_TEST_ECHOREQ:
-               /* Rx->Tx turnaround ok (even on NDIS w/current implementation) */
-               *(uint8 *)(PKTDATA(osh, pkt)) = SDPCM_TEST_ECHORSP;
-               if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, TRUE) == 0) {
-                       bus->pktgen_sent++;
-               } else {
-                       bus->pktgen_fail++;
-                       PKTFREE(osh, pkt, FALSE);
-               }
-               bus->pktgen_rcvd++;
-               break;
-
-       case SDPCM_TEST_ECHORSP:
-               if (bus->ext_loop) {
-                       PKTFREE(osh, pkt, FALSE);
-                       bus->pktgen_rcvd++;
-                       break;
-               }
-
-               for (offset = 0; offset < len; offset++, data++) {
-                       if (*data != SDPCM_TEST_FILL(offset, extra)) {
-                               DHD_ERROR(("dhdsdio_testrcv: echo data mismatch: "
-                                          "offset %d (len %d) expect 0x%02x rcvd 0x%02x\n",
-                                          offset, len, SDPCM_TEST_FILL(offset, extra), *data));
-                               break;
-                       }
-               }
-               PKTFREE(osh, pkt, FALSE);
-               bus->pktgen_rcvd++;
-               break;
-
-       case SDPCM_TEST_DISCARD:
-               PKTFREE(osh, pkt, FALSE);
-               bus->pktgen_rcvd++;
-               break;
-
-       case SDPCM_TEST_BURST:
-       case SDPCM_TEST_SEND:
-       default:
-               DHD_INFO(("dhdsdio_testrcv: unsupported or unknown command, pktlen %d seq %d"
-                         " cmd %d extra %d len %d\n", pktlen, seq, cmd, extra, len));
-               PKTFREE(osh, pkt, FALSE);
-               break;
-       }
-
-       /* For recv mode, stop at limie (and tell dongle to stop sending) */
-       if (bus->pktgen_mode == DHD_PKTGEN_RECV) {
-               if (bus->pktgen_total && (bus->pktgen_rcvd >= bus->pktgen_total)) {
-                       bus->pktgen_count = 0;
-                       dhdsdio_sdtest_set(bus, FALSE);
-               }
-       }
-}
-#endif /* SDTEST */
-
-extern bool
-dhd_bus_watchdog(dhd_pub_t *dhdp)
-{
-       dhd_bus_t *bus;
-
-       DHD_TIMER(("%s: Enter\n", __FUNCTION__));
-
-       bus = dhdp->bus;
-
-       if (bus->dhd->dongle_reset)
-               return FALSE;
-
-       /* Ignore the timer if simulating bus down */
-       if (bus->sleeping)
-               return FALSE;
-
-       dhd_os_sdlock(bus->dhd);
-
-       /* Poll period: check device if appropriate. */
-       if (bus->poll && (++bus->polltick >= bus->pollrate)) {
-               uint32 intstatus = 0;
-
-               /* Reset poll tick */
-               bus->polltick = 0;
-
-               /* Check device if no interrupts */
-               if (!bus->intr || (bus->intrcount == bus->lastintrs)) {
-
-                       if (!bus->dpc_sched) {
-                               uint8 devpend;
-                               devpend = bcmsdh_cfg_read(bus->sdh, SDIO_FUNC_0,
-                                                         SDIOD_CCCR_INTPEND, NULL);
-                               intstatus = devpend & (INTR_STATUS_FUNC1 | INTR_STATUS_FUNC2);
-                       }
-
-                       /* If there is something, make like the ISR and schedule the DPC */
-                       if (intstatus) {
-                               bus->pollcnt++;
-                               bus->ipend = TRUE;
-                               if (bus->intr) {
-                                       bcmsdh_intr_disable(bus->sdh);
-                               }
-                               bus->dpc_sched = TRUE;
-                               dhd_sched_dpc(bus->dhd);
-
-                       }
-               }
-
-               /* Update interrupt tracking */
-               bus->lastintrs = bus->intrcount;
-       }
-
-#ifdef DHD_DEBUG
-       /* Poll for console output periodically */
-       if (dhdp->busstate == DHD_BUS_DATA && dhd_console_ms != 0) {
-               bus->console.count += dhd_watchdog_ms;
-               if (bus->console.count >= dhd_console_ms) {
-                       bus->console.count -= dhd_console_ms;
-                       /* Make sure backplane clock is on */
-                       dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-                       if (dhdsdio_readconsole(bus) < 0)
-                               dhd_console_ms = 0;     /* On error, stop trying */
-               }
-       }
-#endif /* DHD_DEBUG */
-
-#ifdef SDTEST
-       /* Generate packets if configured */
-       if (bus->pktgen_count && (++bus->pktgen_tick >= bus->pktgen_freq)) {
-               /* Make sure backplane clock is on */
-               dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-               bus->pktgen_tick = 0;
-               dhdsdio_pktgen(bus);
-       }
-#endif
-
-       /* On idle timeout clear activity flag and/or turn off clock */
-       if ((bus->idletime > 0) && (bus->clkstate == CLK_AVAIL)) {
-               if (++bus->idlecount >= bus->idletime) {
-                       bus->idlecount = 0;
-                       if (bus->activity) {
-                               bus->activity = FALSE;
-                               dhd_os_wd_timer(bus->dhd,dhd_watchdog_ms);
-                       } else {
-                               dhdsdio_clkctl(bus, CLK_NONE, FALSE);
-                       }
-               }
-       }
-
-       dhd_os_sdunlock(bus->dhd);
-
-       return bus->ipend;
-}
-
-#ifdef DHD_DEBUG
-extern int
-dhd_bus_console_in(dhd_pub_t *dhdp, uchar *msg, uint msglen)
-{
-       dhd_bus_t *bus = dhdp->bus;
-       uint32 addr, val;
-       int rv;
-       void *pkt;
-
-       /* Address could be zero if CONSOLE := 0 in dongle Makefile */
-       if (bus->console_addr == 0)
-               return BCME_UNSUPPORTED;
-
-       /* Exclusive bus access */
-       dhd_os_sdlock(bus->dhd);
-
-       /* Don't allow input if dongle is in reset */
-       if (bus->dhd->dongle_reset) {
-               dhd_os_sdunlock(bus->dhd);
-               return BCME_NOTREADY;
-       }
-
-       /* Request clock to allow SDIO accesses */
-       BUS_WAKE(bus);
-       /* No pend allowed since txpkt is called later, ht clk has to be on */
-       dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-
-       /* Zero cbuf_index */
-       addr = bus->console_addr + OFFSETOF(hndrte_cons_t, cbuf_idx);
-       val = htol32(0);
-       if ((rv = dhdsdio_membytes(bus, TRUE, addr, (uint8 *)&val, sizeof(val))) < 0)
-               goto done;
-
-       /* Write message into cbuf */
-       addr = bus->console_addr + OFFSETOF(hndrte_cons_t, cbuf);
-       if ((rv = dhdsdio_membytes(bus, TRUE, addr, (uint8 *)msg, msglen)) < 0)
-               goto done;
-
-       /* Write length into vcons_in */
-       addr = bus->console_addr + OFFSETOF(hndrte_cons_t, vcons_in);
-       val = htol32(msglen);
-       if ((rv = dhdsdio_membytes(bus, TRUE, addr, (uint8 *)&val, sizeof(val))) < 0)
-               goto done;
-
-       /* Bump dongle by sending an empty event pkt.
-        * sdpcm_sendup (RX) checks for virtual console input.
-        */
-       if (((pkt = PKTGET(bus->dhd->osh, 4 + SDPCM_RESERVE, TRUE)) != NULL) &&
-               bus->clkstate == CLK_AVAIL)
-               dhdsdio_txpkt(bus, pkt, SDPCM_EVENT_CHANNEL, TRUE);
-
-done:
-       if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
-               bus->activity = FALSE;
-               dhdsdio_clkctl(bus, CLK_NONE, TRUE);
-       }
-
-       dhd_os_sdunlock(bus->dhd);
-
-       return rv;
-}
-#endif /* DHD_DEBUG */
-
-#ifdef DHD_DEBUG
-static void
-dhd_dump_cis(uint fn, uint8 *cis)
-{
-       uint byte, tag, tdata;
-       DHD_INFO(("Function %d CIS:\n", fn));
-
-       for (tdata = byte = 0; byte < SBSDIO_CIS_SIZE_LIMIT; byte++) {
-               if ((byte % 16) == 0)
-                       DHD_INFO(("    "));
-               DHD_INFO(("%02x ", cis[byte]));
-               if ((byte % 16) == 15)
-                       DHD_INFO(("\n"));
-               if (!tdata--) {
-                       tag = cis[byte];
-                       if (tag == 0xff)
-                               break;
-                       else if (!tag)
-                               tdata = 0;
-                       else if ((byte + 1) < SBSDIO_CIS_SIZE_LIMIT)
-                               tdata = cis[byte + 1] + 1;
-                       else
-                               DHD_INFO(("]"));
-               }
-       }
-       if ((byte % 16) != 15)
-               DHD_INFO(("\n"));
-}
-#endif /* DHD_DEBUG */
-
-static bool
-dhdsdio_chipmatch(uint16 chipid)
-{
-       if (chipid == BCM4325_CHIP_ID)
-               return TRUE;
-       if (chipid == BCM4329_CHIP_ID)
-               return TRUE;
-       if (chipid == BCM4315_CHIP_ID)
-               return TRUE;
-       if (chipid == BCM4319_CHIP_ID)
-               return TRUE;
-       return FALSE;
-}
-
-static void *
-dhdsdio_probe(uint16 venid, uint16 devid, uint16 bus_no, uint16 slot,
-       uint16 func, uint bustype, void *regsva, osl_t * osh, void *sdh)
-{
-       int ret;
-       dhd_bus_t *bus;
-
-       /* Init global variables at run-time, not as part of the declaration.
-        * This is required to support init/de-init of the driver. Initialization
-        * of globals as part of the declaration results in non-deterministic
-        * behavior since the value of the globals may be different on the
-        * first time that the driver is initialized vs subsequent initializations.
-        */
-       dhd_txbound = DHD_TXBOUND;
-       dhd_rxbound = DHD_RXBOUND;
-       dhd_alignctl = TRUE;
-       sd1idle = TRUE;
-       dhd_readahead = TRUE;
-       retrydata = FALSE;
-       dhd_doflow = FALSE;
-       dhd_dongle_memsize = 0;
-       dhd_txminmax = DHD_TXMINMAX;
-
-       forcealign = TRUE;
-
-
-       dhd_common_init();
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-       DHD_INFO(("%s: venid 0x%04x devid 0x%04x\n", __FUNCTION__, venid, devid));
-
-       /* We make assumptions about address window mappings */
-       ASSERT((uintptr)regsva == SI_ENUM_BASE);
-
-       /* BCMSDH passes venid and devid based on CIS parsing -- but low-power start
-        * means early parse could fail, so here we should get either an ID
-        * we recognize OR (-1) indicating we must request power first.
-        */
-       /* Check the Vendor ID */
-       switch (venid) {
-               case 0x0000:
-               case VENDOR_BROADCOM:
-                       break;
-               default:
-                       DHD_ERROR(("%s: unknown vendor: 0x%04x\n",
-                                  __FUNCTION__, venid));
-                       return NULL;
-       }
-
-       /* Check the Device ID and make sure it's one that we support */
-       switch (devid) {
-               case BCM4325_D11DUAL_ID:                /* 4325 802.11a/g id */
-               case BCM4325_D11G_ID:                   /* 4325 802.11g 2.4Ghz band id */
-               case BCM4325_D11A_ID:                   /* 4325 802.11a 5Ghz band id */
-                       DHD_INFO(("%s: found 4325 Dongle\n", __FUNCTION__));
-                       break;
-               case BCM4329_D11NDUAL_ID:               /* 4329 802.11n dualband device */
-               case BCM4329_D11N2G_ID:         /* 4329 802.11n 2.4G device */
-               case BCM4329_D11N5G_ID:         /* 4329 802.11n 5G device */
-               case 0x4329:
-                       DHD_INFO(("%s: found 4329 Dongle\n", __FUNCTION__));
-                       break;
-               case BCM4315_D11DUAL_ID:                /* 4315 802.11a/g id */
-               case BCM4315_D11G_ID:                   /* 4315 802.11g id */
-               case BCM4315_D11A_ID:                   /* 4315 802.11a id */
-                       DHD_INFO(("%s: found 4315 Dongle\n", __FUNCTION__));
-                       break;
-               case BCM4319_D11N_ID:                   /* 4319 802.11n id */
-               case BCM4319_D11N2G_ID:                 /* 4319 802.11n2g id */
-               case BCM4319_D11N5G_ID:                 /* 4319 802.11n5g id */
-                       DHD_INFO(("%s: found 4319 Dongle\n", __FUNCTION__));
-                       break;
-               case 0:
-                       DHD_INFO(("%s: allow device id 0, will check chip internals\n",
-                                 __FUNCTION__));
-                       break;
-
-               default:
-                       DHD_ERROR(("%s: skipping 0x%04x/0x%04x, not a dongle\n",
-                                  __FUNCTION__, venid, devid));
-                       return NULL;
-       }
-
-       if (osh == NULL) {
-               /* Ask the OS interface part for an OSL handle */
-               if (!(osh = dhd_osl_attach(sdh, DHD_BUS))) {
-                       DHD_ERROR(("%s: osl_attach failed!\n", __FUNCTION__));
-                       return NULL;
-               }
-       }
-
-       /* Allocate private bus interface state */
-       if (!(bus = MALLOC(osh, sizeof(dhd_bus_t)))) {
-               DHD_ERROR(("%s: MALLOC of dhd_bus_t failed\n", __FUNCTION__));
-               goto fail;
-       }
-       bzero(bus, sizeof(dhd_bus_t));
-       bus->sdh = sdh;
-       bus->cl_devid = (uint16)devid;
-       bus->bus = DHD_BUS;
-       bus->tx_seq = SDPCM_SEQUENCE_WRAP - 1;
-       bus->usebufpool = FALSE; /* Use bufpool if allocated, else use locally malloced rxbuf */
-
-       /* attempt to attach to the dongle */
-       if (!(dhdsdio_probe_attach(bus, osh, sdh, regsva, devid))) {
-               DHD_ERROR(("%s: dhdsdio_probe_attach failed\n", __FUNCTION__));
-               goto fail;
-       }
-
-       /* Attach to the dhd/OS/network interface */
-       if (!(bus->dhd = dhd_attach(osh, bus, SDPCM_RESERVE))) {
-               DHD_ERROR(("%s: dhd_attach failed\n", __FUNCTION__));
-               goto fail;
-       }
-
-       /* Allocate buffers */
-       if (!(dhdsdio_probe_malloc(bus, osh, sdh))) {
-               DHD_ERROR(("%s: dhdsdio_probe_malloc failed\n", __FUNCTION__));
-               goto fail;
-       }
-
-       if (!(dhdsdio_probe_init(bus, osh, sdh))) {
-               DHD_ERROR(("%s: dhdsdio_probe_init failed\n", __FUNCTION__));
-               goto fail;
-       }
-
-       /* Register interrupt callback, but mask it (not operational yet). */
-       DHD_INTR(("%s: disable SDIO interrupts (not interested yet)\n", __FUNCTION__));
-       bcmsdh_intr_disable(sdh);
-       if ((ret = bcmsdh_intr_reg(sdh, dhdsdio_isr, bus)) != 0) {
-               DHD_ERROR(("%s: FAILED: bcmsdh_intr_reg returned %d\n",
-                          __FUNCTION__, ret));
-               goto fail;
-       }
-       DHD_INTR(("%s: registered SDIO interrupt function ok\n", __FUNCTION__));
-
-       DHD_INFO(("%s: completed!!\n", __FUNCTION__));
-
-
-       /* if firmware path present try to download and bring up bus */
-       if ((ret = dhd_bus_start(bus->dhd)) != 0) {
-               DHD_ERROR(("%s: failed\n", __FUNCTION__));
-               goto fail;
-               if (ret == BCME_NOTUP)  {
-                       DHD_ERROR(("%s: dongle is not responding\n", __FUNCTION__));
-                       goto fail;
-               }
-       }
-       /* Ok, have the per-port tell the stack we're open for business */
-       if (dhd_net_attach(bus->dhd, 0) != 0) {
-               DHD_ERROR(("%s: Net attach failed!!\n", __FUNCTION__));
-               goto fail;
-       }
-
-       return bus;
-
-fail:
-       dhdsdio_release(bus, osh);
-       return NULL;
-}
-
-
-static bool
-dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva,
-                    uint16 devid)
-{
-       uint8 clkctl = 0;
-       int err = 0;
-
-       bus->alp_only = TRUE;
-
-       /* Return the window to backplane enumeration space for core access */
-       if (dhdsdio_set_siaddr_window(bus, SI_ENUM_BASE)) {
-               DHD_ERROR(("%s: FAILED to return to SI_ENUM_BASE\n", __FUNCTION__));
-       }
-
-#ifdef DHD_DEBUG
-       printf("F1 signature read @0x18000000=0x%4x\n",
-              bcmsdh_reg_read(bus->sdh, SI_ENUM_BASE, 4));
-
-
-#endif /* DHD_DEBUG */
-
-
-       /* Force PLL off until si_attach() programs PLL control regs */
-
-
-
-       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, DHD_INIT_CLKCTL1, &err);
-       if (!err)
-               clkctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, &err);
-
-       if (err || ((clkctl & ~SBSDIO_AVBITS) != DHD_INIT_CLKCTL1)) {
-               DHD_ERROR(("dhdsdio_probe: ChipClkCSR access: err %d wrote 0x%02x read 0x%02x\n",
-                          err, DHD_INIT_CLKCTL1, clkctl));
-               goto fail;
-       }
-
-
-#ifdef DHD_DEBUG
-       if (DHD_INFO_ON()) {
-               uint fn, numfn;
-               uint8 *cis[SDIOD_MAX_IOFUNCS];
-               int err = 0;
-
-               numfn = bcmsdh_query_iofnum(sdh);
-               ASSERT(numfn <= SDIOD_MAX_IOFUNCS);
-
-               /* Make sure ALP is available before trying to read CIS */
-               SPINWAIT(((clkctl = bcmsdh_cfg_read(sdh, SDIO_FUNC_1,
-                                                   SBSDIO_FUNC1_CHIPCLKCSR, NULL)),
-                         !SBSDIO_ALPAV(clkctl)), PMU_MAX_TRANSITION_DLY);
-
-               /* Now request ALP be put on the bus */
-               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR,
-                                DHD_INIT_CLKCTL2, &err);
-               OSL_DELAY(65);
-
-               for (fn = 0; fn <= numfn; fn++) {
-                       if (!(cis[fn] = MALLOC(osh, SBSDIO_CIS_SIZE_LIMIT))) {
-                               DHD_INFO(("dhdsdio_probe: fn %d cis malloc failed\n", fn));
-                               break;
-                       }
-                       bzero(cis[fn], SBSDIO_CIS_SIZE_LIMIT);
-
-                       if ((err = bcmsdh_cis_read(sdh, fn, cis[fn], SBSDIO_CIS_SIZE_LIMIT))) {
-                               DHD_INFO(("dhdsdio_probe: fn %d cis read err %d\n", fn, err));
-                               MFREE(osh, cis[fn], SBSDIO_CIS_SIZE_LIMIT);
-                               break;
-                       }
-                       dhd_dump_cis(fn, cis[fn]);
-               }
-
-               while (fn-- > 0) {
-                       ASSERT(cis[fn]);
-                       MFREE(osh, cis[fn], SBSDIO_CIS_SIZE_LIMIT);
-               }
-
-               if (err) {
-                       DHD_ERROR(("dhdsdio_probe: failure reading or parsing CIS\n"));
-                       goto fail;
-               }
-       }
-#endif /* DHD_DEBUG */
-
-       /* si_attach() will provide an SI handle and scan the backplane */
-       if (!(bus->sih = si_attach((uint)devid, osh, regsva, DHD_BUS, sdh,
-                                  &bus->vars, &bus->varsz))) {
-               DHD_ERROR(("%s: si_attach failed!\n", __FUNCTION__));
-               goto fail;
-       }
-
-       bcmsdh_chipinfo(sdh, bus->sih->chip, bus->sih->chiprev);
-
-       if (!dhdsdio_chipmatch((uint16)bus->sih->chip)) {
-               DHD_ERROR(("%s: unsupported chip: 0x%04x\n",
-                          __FUNCTION__, bus->sih->chip));
-               goto fail;
-       }
-
-       si_sdiod_drive_strength_init(bus->sih, osh, dhd_sdiod_drive_strength);
-
-
-       /* Get info on the ARM and SOCRAM cores... */
-       if (!DHD_NOPMU(bus)) {
-               if ((si_setcore(bus->sih, ARM7S_CORE_ID, 0)) ||
-                   (si_setcore(bus->sih, ARMCM3_CORE_ID, 0))) {
-                       bus->armrev = si_corerev(bus->sih);
-               } else {
-                       DHD_ERROR(("%s: failed to find ARM core!\n", __FUNCTION__));
-                       goto fail;
-               }
-               if (!(bus->orig_ramsize = si_socram_size(bus->sih))) {
-                       DHD_ERROR(("%s: failed to find SOCRAM memory!\n", __FUNCTION__));
-                       goto fail;
-               }
-               bus->ramsize = bus->orig_ramsize;
-               if (dhd_dongle_memsize)
-                       dhd_dongle_setmemsize(bus, dhd_dongle_memsize);
-
-               DHD_ERROR(("DHD: dongle ram size is set to %d(orig %d)\n",
-                       bus->ramsize, bus->orig_ramsize));
-       }
-
-       /* ...but normally deal with the SDPCMDEV core */
-       if (!(bus->regs = si_setcore(bus->sih, PCMCIA_CORE_ID, 0)) &&
-           !(bus->regs = si_setcore(bus->sih, SDIOD_CORE_ID, 0))) {
-               DHD_ERROR(("%s: failed to find SDIODEV core!\n", __FUNCTION__));
-               goto fail;
-       }
-       bus->sdpcmrev = si_corerev(bus->sih);
-
-       /* Set core control so an SDIO reset does a backplane reset */
-       OR_REG(osh, &bus->regs->corecontrol, CC_BPRESEN);
-
-       pktq_init(&bus->txq, (PRIOMASK + 1), QLEN);
-
-       /* Locate an appropriately-aligned portion of hdrbuf */
-       bus->rxhdr = (uint8 *)ROUNDUP((uintptr)&bus->hdrbuf[0], DHD_SDALIGN);
-
-       /* Set the poll and/or interrupt flags */
-       bus->intr = (bool)dhd_intr;
-       if ((bus->poll = (bool)dhd_poll))
-               bus->pollrate = 1;
-
-       return TRUE;
-
-fail:
-       return FALSE;
-}
-
-static bool
-dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh)
-{
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-#ifndef DHD_USE_STATIC_BUF
-       if (bus->dhd->maxctl) {
-               bus->rxblen = ROUNDUP((bus->dhd->maxctl + SDPCM_HDRLEN), ALIGNMENT) + DHD_SDALIGN;
-               if (!(bus->rxbuf = MALLOC(osh, bus->rxblen))) {
-                       DHD_ERROR(("%s: MALLOC of %d-byte rxbuf failed\n",
-                                  __FUNCTION__, bus->rxblen));
-                       goto fail;
-               }
-       }
-
-       /* Allocate buffer to receive glomed packet */
-       if (!(bus->databuf = MALLOC(osh, MAX_DATA_BUF))) {
-               DHD_ERROR(("%s: MALLOC of %d-byte databuf failed\n",
-                       __FUNCTION__, MAX_DATA_BUF));
-               /* release rxbuf which was already located as above */
-               if (!bus->rxblen) MFREE(osh, bus->rxbuf, bus->rxblen);
-               goto fail;
-       }
-#else
-       if (bus->dhd->maxctl) {
-               bus->rxblen = ROUNDUP((bus->dhd->maxctl + SDPCM_HDRLEN), ALIGNMENT) + DHD_SDALIGN;
-               if (!(bus->rxbuf = dhd_os_prealloc(DHD_PREALLOC_RXBUF, bus->rxblen))) {
-                       DHD_ERROR(("%s: MALLOC of %d-byte rxbuf failed\n",
-                                  __FUNCTION__, bus->rxblen));
-                       goto fail;
-               }
-       }
-       /* Allocate buffer to receive glomed packet */
-       if (!(bus->databuf = dhd_os_prealloc(DHD_PREALLOC_DATABUF, MAX_DATA_BUF))) {
-               DHD_ERROR(("%s: MALLOC of %d-byte databuf failed\n",
-                       __FUNCTION__, MAX_DATA_BUF));
-               goto fail;
-       }
-#endif /* DHD_USE_STATIC_BUF */
-
-       /* Align the buffer */
-       if ((uintptr)bus->databuf % DHD_SDALIGN)
-               bus->dataptr = bus->databuf + (DHD_SDALIGN - ((uintptr)bus->databuf % DHD_SDALIGN));
-       else
-               bus->dataptr = bus->databuf;
-
-       return TRUE;
-
-fail:
-       return FALSE;
-}
-
-
-static bool
-dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh)
-{
-       int32 fnum;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-#ifdef SDTEST
-       dhdsdio_pktgen_init(bus);
-#endif /* SDTEST */
-
-       /* Disable F2 to clear any intermediate frame state on the dongle */
-       bcmsdh_cfg_write(sdh, SDIO_FUNC_0, SDIOD_CCCR_IOEN, SDIO_FUNC_ENABLE_1, NULL);
-
-       bus->dhd->busstate = DHD_BUS_DOWN;
-       bus->sleeping = FALSE;
-       bus->rxflow = FALSE;
-       bus->prev_rxlim_hit = 0;
-
-
-       /* Done with backplane-dependent accesses, can drop clock... */
-       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);
-
-       /* ...and initialize clock/power states */
-       bus->clkstate = CLK_SDONLY;
-       bus->idletime = (int32)dhd_idletime;
-       bus->idleclock = DHD_IDLE_ACTIVE;
-
-       /* Query the SD clock speed */
-       if (bcmsdh_iovar_op(sdh, "sd_divisor", NULL, 0,
-                           &bus->sd_divisor, sizeof(int32), FALSE) != BCME_OK) {
-               DHD_ERROR(("%s: fail on %s get\n", __FUNCTION__, "sd_divisor"));
-               bus->sd_divisor = -1;
-       } else {
-               DHD_INFO(("%s: Initial value for %s is %d\n",
-                         __FUNCTION__, "sd_divisor", bus->sd_divisor));
-       }
-
-       /* Query the SD bus mode */
-       if (bcmsdh_iovar_op(sdh, "sd_mode", NULL, 0,
-                           &bus->sd_mode, sizeof(int32), FALSE) != BCME_OK) {
-               DHD_ERROR(("%s: fail on %s get\n", __FUNCTION__, "sd_mode"));
-               bus->sd_mode = -1;
-       } else {
-               DHD_INFO(("%s: Initial value for %s is %d\n",
-                         __FUNCTION__, "sd_mode", bus->sd_mode));
-       }
-
-       /* Query the F2 block size, set roundup accordingly */
-       fnum = 2;
-       if (bcmsdh_iovar_op(sdh, "sd_blocksize", &fnum, sizeof(int32),
-                           &bus->blocksize, sizeof(int32), FALSE) != BCME_OK) {
-               bus->blocksize = 0;
-               DHD_ERROR(("%s: fail on %s get\n", __FUNCTION__, "sd_blocksize"));
-       } else {
-               DHD_INFO(("%s: Initial value for %s is %d\n",
-                         __FUNCTION__, "sd_blocksize", bus->blocksize));
-       }
-       bus->roundup = MIN(max_roundup, bus->blocksize);
-
-       /* Query if bus module supports packet chaining, default to use if supported */
-       if (bcmsdh_iovar_op(sdh, "sd_rxchain", NULL, 0,
-                           &bus->sd_rxchain, sizeof(int32), FALSE) != BCME_OK) {
-               bus->sd_rxchain = FALSE;
-       } else {
-               DHD_INFO(("%s: bus module (through bcmsdh API) %s chaining\n",
-                         __FUNCTION__, (bus->sd_rxchain ? "supports" : "does not support")));
-       }
-       bus->use_rxchain = (bool)bus->sd_rxchain;
-
-       return TRUE;
-}
-
-bool
-dhd_bus_download_firmware(struct dhd_bus *bus, osl_t *osh,
-                          char *fw_path, char *nv_path)
-{
-       bool ret;
-       bus->fw_path = fw_path;
-       bus->nv_path = nv_path;
-
-       ret = dhdsdio_download_firmware(bus, osh, bus->sdh);
-
-
-       return ret;
-}
-
-static bool
-dhdsdio_download_firmware(struct dhd_bus *bus, osl_t *osh, void *sdh)
-{
-       bool ret;
-
-       /* Download the firmware */
-       dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-
-       ret = _dhdsdio_download_firmware(bus) == 0;
-
-       dhdsdio_clkctl(bus, CLK_SDONLY, FALSE);
-
-       return ret;
-}
-
-/* Detach and free everything */
-static void
-dhdsdio_release(dhd_bus_t *bus, osl_t *osh)
-{
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (bus) {
-               ASSERT(osh);
-
-
-               /* De-register interrupt handler */
-               bcmsdh_intr_disable(bus->sdh);
-               bcmsdh_intr_dereg(bus->sdh);
-
-               if (bus->dhd) {
-
-                       dhdsdio_release_dongle(bus, osh);
-
-                       dhd_detach(bus->dhd);
-                       bus->dhd = NULL;
-               }
-
-               dhdsdio_release_malloc(bus, osh);
-
-
-               MFREE(osh, bus, sizeof(dhd_bus_t));
-       }
-
-       if (osh)
-               dhd_osl_detach(osh);
-
-       DHD_TRACE(("%s: Disconnected\n", __FUNCTION__));
-}
-
-static void
-dhdsdio_release_malloc(dhd_bus_t *bus, osl_t *osh)
-{
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (bus->dhd && bus->dhd->dongle_reset)
-               return;
-
-       if (bus->rxbuf) {
-#ifndef DHD_USE_STATIC_BUF
-               MFREE(osh, bus->rxbuf, bus->rxblen);
-#endif
-               bus->rxctl = bus->rxbuf = NULL;
-               bus->rxlen = 0;
-       }
-
-       if (bus->databuf) {
-#ifndef DHD_USE_STATIC_BUF
-               MFREE(osh, bus->databuf, MAX_DATA_BUF);
-#endif
-               bus->databuf = NULL;
-       }
-}
-
-
-static void
-dhdsdio_release_dongle(dhd_bus_t *bus, osl_t *osh)
-{
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (bus->dhd && bus->dhd->dongle_reset)
-               return;
-
-       if (bus->sih) {
-               dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-#if !defined(BCMLXSDMMC)
-               si_watchdog(bus->sih, 4);
-#endif /* !defined(BCMLXSDMMC) */
-               dhdsdio_clkctl(bus, CLK_NONE, FALSE);
-               si_detach(bus->sih);
-               if (bus->vars && bus->varsz)
-                       MFREE(osh, bus->vars, bus->varsz);
-               bus->vars = NULL;
-       }
-
-       DHD_TRACE(("%s: Disconnected\n", __FUNCTION__));
-}
-
-static void
-dhdsdio_disconnect(void *ptr)
-{
-       dhd_bus_t *bus = (dhd_bus_t *)ptr;
-
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       if (bus) {
-               ASSERT(bus->dhd);
-               dhdsdio_release(bus, bus->dhd->osh);
-       }
-
-       DHD_TRACE(("%s: Disconnected\n", __FUNCTION__));
-}
-
-
-/* Register/Unregister functions are called by the main DHD entry
- * point (e.g. module insertion) to link with the bus driver, in
- * order to look for or await the device.
- */
-
-static bcmsdh_driver_t dhd_sdio = {
-       dhdsdio_probe,
-       dhdsdio_disconnect
-};
-
-int
-dhd_bus_register(void)
-{
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       return bcmsdh_register(&dhd_sdio);
-}
-
-void
-dhd_bus_unregister(void)
-{
-       DHD_TRACE(("%s: Enter\n", __FUNCTION__));
-
-       bcmsdh_unregister();
-}
-
-#ifdef BCMEMBEDIMAGE
-static int
-dhdsdio_download_code_array(struct dhd_bus *bus)
-{
-       int bcmerror = -1;
-       int offset = 0;
-
-       DHD_INFO(("%s: download embedded firmware...\n", __FUNCTION__));
-
-       /* Download image */
-       while ((offset + MEMBLOCK) < sizeof(dlarray)) {
-               bcmerror = dhdsdio_membytes(bus, TRUE, offset, dlarray + offset, MEMBLOCK);
-               if (bcmerror) {
-                       DHD_ERROR(("%s: error %d on writing %d membytes at 0x%08x\n",
-                               __FUNCTION__, bcmerror, MEMBLOCK, offset));
-                       goto err;
-               }
-
-               offset += MEMBLOCK;
-       }
-
-       if (offset < sizeof(dlarray)) {
-               bcmerror = dhdsdio_membytes(bus, TRUE, offset,
-                       dlarray + offset, sizeof(dlarray) - offset);
-               if (bcmerror) {
-                       DHD_ERROR(("%s: error %d on writing %d membytes at 0x%08x\n",
-                               __FUNCTION__, bcmerror, sizeof(dlarray) - offset, offset));
-                       goto err;
-               }
-       }
-
-#ifdef DHD_DEBUG
-       /* Upload and compare the downloaded code */
-       {
-               unsigned char *ularray;
-
-               ularray = MALLOC(bus->dhd->osh, bus->ramsize);
-               /* Upload image to verify downloaded contents. */
-               offset = 0;
-               memset(ularray, 0xaa, bus->ramsize);
-               while ((offset + MEMBLOCK) < sizeof(dlarray)) {
-                       bcmerror = dhdsdio_membytes(bus, FALSE, offset, ularray + offset, MEMBLOCK);
-                       if (bcmerror) {
-                               DHD_ERROR(("%s: error %d on reading %d membytes at 0x%08x\n",
-                                       __FUNCTION__, bcmerror, MEMBLOCK, offset));
-                               goto err;
-                       }
-
-                       offset += MEMBLOCK;
-               }
-
-               if (offset < sizeof(dlarray)) {
-                       bcmerror = dhdsdio_membytes(bus, FALSE, offset,
-                               ularray + offset, sizeof(dlarray) - offset);
-                       if (bcmerror) {
-                               DHD_ERROR(("%s: error %d on reading %d membytes at 0x%08x\n",
-                                       __FUNCTION__, bcmerror, sizeof(dlarray) - offset, offset));
-                               goto err;
-                       }
-               }
-
-               if (memcmp(dlarray, ularray, sizeof(dlarray))) {
-                       DHD_ERROR(("%s: Downloaded image is corrupted.\n", __FUNCTION__));
-                       ASSERT(0);
-                       goto err;
-               } else
-                       DHD_ERROR(("%s: Download, Upload and compare succeeded.\n", __FUNCTION__));
-
-               MFREE(bus->dhd->osh, ularray, bus->ramsize);
-       }
-#endif /* DHD_DEBUG */
-
-err:
-       return bcmerror;
-}
-#endif /* BCMEMBEDIMAGE */
-
-static int
-dhdsdio_download_code_file(struct dhd_bus *bus, char *fw_path)
-{
-       int bcmerror = -1;
-       int offset = 0;
-       uint len;
-       void *image = NULL;
-       uint8 *memblock = NULL, *memptr;
-
-       DHD_INFO(("%s: download firmware %s\n", __FUNCTION__, fw_path));
-
-       image = dhd_os_open_image(fw_path);
-       if (image == NULL)
-               goto err;
-
-       memptr = memblock = MALLOC(bus->dhd->osh, MEMBLOCK + DHD_SDALIGN);
-       if (memblock == NULL) {
-               DHD_ERROR(("%s: Failed to allocate memory %d bytes\n", __FUNCTION__, MEMBLOCK));
-               goto err;
-       }
-       if ((uint32)(uintptr)memblock % DHD_SDALIGN)
-               memptr += (DHD_SDALIGN - ((uint32)(uintptr)memblock % DHD_SDALIGN));
-
-       /* Download image */
-       while ((len = dhd_os_get_image_block((char*)memptr, MEMBLOCK, image))) {
-               bcmerror = dhdsdio_membytes(bus, TRUE, offset, memptr, len);
-               if (bcmerror) {
-                       DHD_ERROR(("%s: error %d on writing %d membytes at 0x%08x\n",
-                               __FUNCTION__, bcmerror, MEMBLOCK, offset));
-                       goto err;
-               }
-
-               offset += MEMBLOCK;
-       }
-
-err:
-       if (memblock)
-               MFREE(bus->dhd->osh, memblock, MEMBLOCK + DHD_SDALIGN);
-
-       if (image)
-               dhd_os_close_image(image);
-
-       return bcmerror;
-}
-
-/*
- * ProcessVars:Takes a buffer of "<var>=<value>\n" lines read from a file and ending in a NUL.
- * Removes carriage returns, empty lines, comment lines, and converts newlines to NULs.
- * Shortens buffer as needed and pads with NULs.  End of buffer is marked by two NULs.
-*/
-
-static uint
-process_nvram_vars(char *varbuf, uint len)
-{
-       char *dp;
-       bool findNewline;
-       int column;
-       uint buf_len, n;
-
-       dp = varbuf;
-
-       findNewline = FALSE;
-       column = 0;
-
-       for (n = 0; n < len; n++) {
-               if (varbuf[n] == 0)
-                       break;
-               if (varbuf[n] == '\r')
-                       continue;
-               if (findNewline && varbuf[n] != '\n')
-                       continue;
-               findNewline = FALSE;
-               if (varbuf[n] == '#') {
-                       findNewline = TRUE;
-                       continue;
-               }
-               if (varbuf[n] == '\n') {
-                       if (column == 0)
-                               continue;
-                       *dp++ = 0;
-                       column = 0;
-                       continue;
-               }
-               *dp++ = varbuf[n];
-               column++;
-       }
-       buf_len = dp - varbuf;
-
-       while (dp < varbuf + n)
-               *dp++ = 0;
-
-       return buf_len;
-}
-
-/*
-       EXAMPLE: nvram_array
-       nvram_arry format:
-       name=value
-       Use carriage return at the end of each assignment, and an empty string with
-       carriage return at the end of array.
-
-       For example:
-       unsigned char  nvram_array[] = {"name1=value1\n", "name2=value2\n", "\n"};
-       Hex values start with 0x, and mac addr format: xx:xx:xx:xx:xx:xx.
-
-       Search "EXAMPLE: nvram_array" to see how the array is activated.
-*/
-
-void
-dhd_bus_set_nvram_params(struct dhd_bus * bus, const char *nvram_params)
-{
-       bus->nvram_params = nvram_params;
-}
-
-static int
-dhdsdio_download_nvram(struct dhd_bus *bus)
-{
-       int bcmerror = -1;
-       uint len;
-       void * image = NULL;
-       char * memblock = NULL;
-       char *bufp;
-       char *nv_path;
-       bool nvram_file_exists;
-
-       nv_path = bus->nv_path;
-
-       nvram_file_exists = ((nv_path != NULL) && (nv_path[0] != '\0'));
-       if (!nvram_file_exists && (bus->nvram_params == NULL))
-               return (0);
-
-       if (nvram_file_exists) {
-               image = dhd_os_open_image(nv_path);
-               if (image == NULL)
-                       goto err;
-       }
-
-       memblock = MALLOC(bus->dhd->osh, MEMBLOCK);
-       if (memblock == NULL) {
-               DHD_ERROR(("%s: Failed to allocate memory %d bytes\n",
-                          __FUNCTION__, MEMBLOCK));
-               goto err;
-       }
-
-       /* Download variables */
-       if (nvram_file_exists) {
-               len = dhd_os_get_image_block(memblock, MEMBLOCK, image);
-       }
-       else {
-               len = strlen(bus->nvram_params);
-               ASSERT(len <= MEMBLOCK);
-               if (len > MEMBLOCK)
-                       len = MEMBLOCK;
-               memcpy(memblock, bus->nvram_params, len);
-       }
-
-       if (len > 0 && len < MEMBLOCK) {
-               bufp = (char *)memblock;
-               bufp[len] = 0;
-               len = process_nvram_vars(bufp, len);
-               bufp += len;
-               *bufp++ = 0;
-               if (len)
-                       bcmerror = dhdsdio_downloadvars(bus, memblock, len + 1);
-               if (bcmerror) {
-                       DHD_ERROR(("%s: error downloading vars: %d\n",
-                                  __FUNCTION__, bcmerror));
-               }
-       }
-       else {
-               DHD_ERROR(("%s: error reading nvram file: %d\n",
-                          __FUNCTION__, len));
-               bcmerror = BCME_SDIO_ERROR;
-       }
-
-err:
-       if (memblock)
-               MFREE(bus->dhd->osh, memblock, MEMBLOCK);
-
-       if (image)
-               dhd_os_close_image(image);
-
-       return bcmerror;
-}
-
-static int
-_dhdsdio_download_firmware(struct dhd_bus *bus)
-{
-       int bcmerror = -1;
-
-       bool embed = FALSE;     /* download embedded firmware */
-       bool dlok = FALSE;      /* download firmware succeeded */
-
-       /* Out immediately if no image to download */
-       if ((bus->fw_path == NULL) || (bus->fw_path[0] == '\0')) {
-#ifdef BCMEMBEDIMAGE
-               embed = TRUE;
-#else
-               return bcmerror;
-#endif
-       }
-
-       /* Keep arm in reset */
-       if (dhdsdio_download_state(bus, TRUE)) {
-               DHD_ERROR(("%s: error placing ARM core in reset\n", __FUNCTION__));
-               goto err;
-       }
-
-       /* External image takes precedence if specified */
-       if ((bus->fw_path != NULL) && (bus->fw_path[0] != '\0')) {
-               if (dhdsdio_download_code_file(bus, bus->fw_path)) {
-                       DHD_ERROR(("%s: dongle image file download failed\n", __FUNCTION__));
-#ifdef BCMEMBEDIMAGE
-                       embed = TRUE;
-#else
-                       goto err;
-#endif
-               }
-               else {
-                       embed = FALSE;
-                       dlok = TRUE;
-               }
-       }
-#ifdef BCMEMBEDIMAGE
-       if (embed) {
-               if (dhdsdio_download_code_array(bus)) {
-                       DHD_ERROR(("%s: dongle image array download failed\n", __FUNCTION__));
-                       goto err;
-               }
-               else {
-                       dlok = TRUE;
-               }
-       }
-#endif
-       if (!dlok) {
-               DHD_ERROR(("%s: dongle image download failed\n", __FUNCTION__));
-               goto err;
-       }
-
-       /* EXAMPLE: nvram_array */
-       /* If a valid nvram_arry is specified as above, it can be passed down to dongle */
-       /* dhd_bus_set_nvram_params(bus, (char *)&nvram_array); */
-
-       /* External nvram takes precedence if specified */
-       if (dhdsdio_download_nvram(bus)) {
-               DHD_ERROR(("%s: dongle nvram file download failed\n", __FUNCTION__));
-       }
-
-       /* Take arm out of reset */
-       if (dhdsdio_download_state(bus, FALSE)) {
-               DHD_ERROR(("%s: error getting out of ARM core reset\n", __FUNCTION__));
-               goto err;
-       }
-
-       bcmerror = 0;
-
-err:
-       return bcmerror;
-}
-
-static int
-dhd_bcmsdh_recv_buf(dhd_bus_t *bus, uint32 addr, uint fn, uint flags, uint8 *buf, uint nbytes,
-       void *pkt, bcmsdh_cmplt_fn_t complete, void *handle)
-{
-       int status;
-
-       /* 4329: GSPI check */
-       status = bcmsdh_recv_buf(bus->sdh, addr, fn, flags, buf, nbytes, pkt, complete, handle);
-       return status;
-}
-
-static int
-dhd_bcmsdh_send_buf(dhd_bus_t *bus, uint32 addr, uint fn, uint flags, uint8 *buf, uint nbytes,
-       void *pkt, bcmsdh_cmplt_fn_t complete, void *handle)
-{
-       return (bcmsdh_send_buf(bus->sdh, addr, fn, flags, buf, nbytes, pkt, complete, handle));
-}
-
-uint
-dhd_bus_chip(struct dhd_bus *bus)
-{
-       ASSERT(bus->sih != NULL);
-       return bus->sih->chip;
-}
-
-void *
-dhd_bus_pub(struct dhd_bus *bus)
-{
-       return bus->dhd;
-}
-
-void *
-dhd_bus_txq(struct dhd_bus *bus)
-{
-       return &bus->txq;
-}
-
-uint
-dhd_bus_hdrlen(struct dhd_bus *bus)
-{
-       return SDPCM_HDRLEN;
-}
-
-int
-dhd_bus_devreset(dhd_pub_t *dhdp, uint8 flag)
-{
-       int bcmerror = 0;
-       dhd_bus_t *bus;
-
-       bus = dhdp->bus;
-
-       if (flag == TRUE) {
-               if (!bus->dhd->dongle_reset) {
-#if !defined(IGNORE_ETH0_DOWN)
-                       /* Force flow control as protection when stop come before ifconfig_down */
-                       dhd_txflowcontrol(bus->dhd, 0, ON);
-#endif /* !defined(IGNORE_ETH0_DOWN) */
-                       /* save country settinng if was pre-setup with priv ioctl */
-                       dhd_os_proto_block(dhdp);
-                       dhdcdc_query_ioctl(bus->dhd, 0, WLC_GET_COUNTRY,
-                               bus->dhd->country_code, sizeof(bus->dhd->country_code));
-                       dhd_os_proto_unblock(dhdp);
-                       /* Expect app to have torn down any connection before calling */
-                       /* Stop the bus, disable F2 */
-                       dhd_bus_stop(bus, FALSE);
-
-                       /* Clean tx/rx buffer pointers, detach from the dongle */
-                       dhdsdio_release_dongle(bus, bus->dhd->osh);
-
-                       bus->dhd->dongle_reset = TRUE;
-                       bus->dhd->up = FALSE;
-
-                       DHD_TRACE(("%s:  WLAN OFF DONE\n", __FUNCTION__));
-                       /* App can now remove power from device */
-               } else
-                       bcmerror = BCME_SDIO_ERROR;
-       } else {
-               /* App must have restored power to device before calling */
-
-               DHD_TRACE(("\n\n%s: == WLAN ON ==\n", __FUNCTION__));
-
-               if (bus->dhd->dongle_reset) {
-                       /* Turn on WLAN */
-                       /* Reset SD client */
-                       bcmsdh_reset(bus->sdh);
-
-                       /* Attempt to re-attach & download */
-                       if (dhdsdio_probe_attach(bus, bus->dhd->osh, bus->sdh,
-                                               (uint32 *)SI_ENUM_BASE,
-                                               bus->cl_devid)) {
-                               /* Attempt to download binary to the dongle */
-                               if (dhdsdio_probe_init(bus, bus->dhd->osh, bus->sdh) &&
-                                       dhdsdio_download_firmware(bus, bus->dhd->osh, bus->sdh)) {
-
-                                       /* Re-init bus, enable F2 transfer */
-                                       dhd_bus_init((dhd_pub_t *) bus->dhd, FALSE);
-
-#if defined(OOB_INTR_ONLY)
-                                       dhd_enable_oob_intr(bus, TRUE);
-#endif /* defined(OOB_INTR_ONLY) */
-
-                                       bus->dhd->dongle_reset = FALSE;
-                                       bus->dhd->up = TRUE;
-
-#if !defined(IGNORE_ETH0_DOWN)
-                                       /* Restore flow control  */
-                                       dhd_txflowcontrol(bus->dhd, 0, OFF);
-#endif 
-
-                                       DHD_TRACE(("%s: WLAN ON DONE\n", __FUNCTION__));
-                               } else
-                                       bcmerror = BCME_SDIO_ERROR;
-                       } else
-                               bcmerror = BCME_SDIO_ERROR;
-               } else {
-                       bcmerror = BCME_NOTDOWN;
-                       DHD_ERROR(("%s: Set DEVRESET=FALSE invoked when device is on\n",
-                               __FUNCTION__));
-                       bcmerror = BCME_SDIO_ERROR;
-               }
-       }
-       return bcmerror;
-}
diff --git a/drivers/net/wireless/bcm4319/dngl_stats.h b/drivers/net/wireless/bcm4319/dngl_stats.h
deleted file mode 100644 (file)
index e5db54e..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Common stats definitions for clients of dongle
- * ports
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dngl_stats.h,v 1.2.140.3 2008/05/26 16:52:08 Exp $
- */
-
-#ifndef _dngl_stats_h_
-#define _dngl_stats_h_
-
-typedef struct {
-       unsigned long   rx_packets;             /* total packets received */
-       unsigned long   tx_packets;             /* total packets transmitted */
-       unsigned long   rx_bytes;               /* total bytes received */
-       unsigned long   tx_bytes;               /* total bytes transmitted */
-       unsigned long   rx_errors;              /* bad packets received */
-       unsigned long   tx_errors;              /* packet transmit problems */
-       unsigned long   rx_dropped;             /* packets dropped by dongle */
-       unsigned long   tx_dropped;             /* packets dropped by dongle */
-       unsigned long   multicast;      /* multicast packets received */
-} dngl_stats_t;
-
-#endif /* _dngl_stats_h_ */
diff --git a/drivers/net/wireless/bcm4319/firmware/nvram_4319_201008.txt b/drivers/net/wireless/bcm4319/firmware/nvram_4319_201008.txt
deleted file mode 100644 (file)
index 452ea8f..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# bcm94319wlusbn4l board\r
-# $Copyright (C) 2008 Broadcom Corporation$\r
-# $Id: bcm94319lcsdn4l.txt,v 1.18 2009/11/11 17:44:06 jayaramn Exp $\r
-\r
-sromrev=3\r
-vendid=0x14e4\r
-devid=0x4338\r
-\r
-boardtype=0x507\r
-boardrev=0x1402\r
-boardflags=0x02000200\r
-\r
-# On board crystal frequency in KHz\r
-xtalfreq=30000\r
-\r
-aa2g=1\r
-aa5g=0\r
-ag0=3\r
-\r
-ccode=ww\r
-regrev=5\r
-opo=0\r
-pa0b0=0x15E0\r
-pa0b1=0xFAC6\r
-pa0b2=0xFEC3\r
-pa0itssit=62\r
-pa0maxpwr=74\r
-\r
-rssismf2g=0xa \r
-rssismc2g=0xb \r
-rssisav2g=0x3 \r
-bxa2g=0\r
-tri2g=0x6B\r
-cckdigfilttype=3\r
-rxpo2g=2\r
-\r
-cckpo=0\r
-ofdmpo=0x44444444\r
-mcs2gpo0=0x6666\r
-mcs2gpo1=0x6666\r
-mcs2gpo2=0x0000\r
-mcs2gpo3=0x0000\r
-mcs2gpo4=0x6666\r
-mcs2gpo5=0x6666\r
-boardnum=1\r
-macaddr=00:90:4c:14:43:19\r
-\r
-#for mfgc\r
-otpimagesize=182\r
diff --git a/drivers/net/wireless/bcm4319/hndpmu.c b/drivers/net/wireless/bcm4319/hndpmu.c
deleted file mode 100644 (file)
index 307347a..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Misc utility routines for accessing PMU corerev specific features
- * of the SiliconBackplane-based Broadcom chips.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: hndpmu.c,v 1.95.2.17.4.11.2.63 2010/07/21 13:55:09 Exp $
- */
-
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
-#include <bcmutils.h>
-#include <siutils.h>
-#include <bcmdevs.h>
-#include <hndsoc.h>
-#include <sbchipc.h>
-#include <hndpmu.h>
-
-/* debug/trace */
-#define        PMU_ERROR(args)
-
-#define        PMU_MSG(args)
-
-
-/* SDIO Pad drive strength to select value mappings */
-typedef struct {
-       uint8 strength;                 /* Pad Drive Strength in mA */
-       uint8 sel;                      /* Chip-specific select value */
-} sdiod_drive_str_t;
-
-/* SDIO Drive Strength to sel value table for PMU Rev 1 */
-static const sdiod_drive_str_t sdiod_drive_strength_tab1[] = {
-       {4, 0x2},
-       {2, 0x3},
-       {1, 0x0},
-       {0, 0x0} };
-
-/* SDIO Drive Strength to sel value table for PMU Rev 2, 3 */
-static const sdiod_drive_str_t sdiod_drive_strength_tab2[] = {
-       {12, 0x7},
-       {10, 0x6},
-       {8, 0x5},
-       {6, 0x4},
-       {4, 0x2},
-       {2, 0x1},
-       {0, 0x0} };
-
-#define SDIOD_DRVSTR_KEY(chip, pmu)    (((chip) << 16) | (pmu))
-
-void
-si_sdiod_drive_strength_init(si_t *sih, osl_t *osh, uint32 drivestrength)
-{
-       chipcregs_t *cc;
-       uint origidx, intr_val = 0;
-       sdiod_drive_str_t *str_tab = NULL;
-       uint32 str_mask = 0;
-       uint32 str_shift = 0;
-
-       if (!(sih->cccaps & CC_CAP_PMU)) {
-               return;
-       }
-
-       /* Remember original core before switch to chipc */
-       cc = (chipcregs_t *) si_switch_core(sih, CC_CORE_ID, &origidx, &intr_val);
-
-       switch (SDIOD_DRVSTR_KEY(sih->chip, sih->pmurev)) {
-       case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 1):
-               str_tab = (sdiod_drive_str_t *)&sdiod_drive_strength_tab1;
-               str_mask = 0x30000000;
-               str_shift = 28;
-               break;
-       case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 2):
-       case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 3):
-       case SDIOD_DRVSTR_KEY(BCM4315_CHIP_ID, 4):
-               str_tab = (sdiod_drive_str_t *)&sdiod_drive_strength_tab2;
-               str_mask = 0x00003800;
-               str_shift = 11;
-               break;
-
-       default:
-               PMU_MSG(("No SDIO Drive strength init done for chip %x rev %d pmurev %d\n",
-                        sih->chip, sih->chiprev, sih->pmurev));
-
-               break;
-       }
-
-       if (str_tab != NULL) {
-               uint32 drivestrength_sel = 0;
-               uint32 cc_data_temp;
-               int i;
-
-               for (i = 0; str_tab[i].strength != 0; i ++) {
-                       if (drivestrength >= str_tab[i].strength) {
-                               drivestrength_sel = str_tab[i].sel;
-                               break;
-                       }
-               }
-
-               W_REG(osh, &cc->chipcontrol_addr, 1);
-               cc_data_temp = R_REG(osh, &cc->chipcontrol_data);
-               cc_data_temp &= ~str_mask;
-               drivestrength_sel <<= str_shift;
-               cc_data_temp |= drivestrength_sel;
-               W_REG(osh, &cc->chipcontrol_data, cc_data_temp);
-
-               PMU_MSG(("SDIO: %dmA drive strength selected, set to 0x%08x\n",
-                        drivestrength, cc_data_temp));
-       }
-
-       /* Return to original core */
-       si_restore_core(sih, origidx, intr_val);
-}
diff --git a/drivers/net/wireless/bcm4319/include/Makefile b/drivers/net/wireless/bcm4319/include/Makefile
deleted file mode 100644 (file)
index 439ead1..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# include/Makefile
-#
-# Copyright 2005, Broadcom, Inc.
-#
-# $Id: Makefile,v 13.5 2005/02/17 19:11:31 Exp $
-#
-
-SRCBASE        = ..
-
-TARGETS        = epivers.h
-
-
-all release:
-       bash epivers.sh
-
-clean:
-       rm -rf ${TARGETS} *.prev
-
-
-.PHONY: all release clean
diff --git a/drivers/net/wireless/bcm4319/include/aidmp.h b/drivers/net/wireless/bcm4319/include/aidmp.h
deleted file mode 100644 (file)
index a927e5d..0000000
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Broadcom AMBA Interconnect definitions.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: aidmp.h,v 13.2.10.1 2008/05/07 20:32:12 Exp $
- */
-
-
-#ifndef        _AIDMP_H
-#define        _AIDMP_H
-
-
-#define        MFGID_ARM               0x43b
-#define        MFGID_BRCM              0x4bf
-#define        MFGID_MIPS              0x4a7
-
-
-#define        CC_SIM                  0
-#define        CC_EROM                 1
-#define        CC_CORESIGHT            9
-#define        CC_VERIF                0xb
-#define        CC_OPTIMO               0xd
-#define        CC_GEN                  0xe
-#define        CC_PRIMECELL            0xf
-
-
-#define        ER_EROMENTRY            0x000
-#define        ER_REMAPCONTROL         0xe00
-#define        ER_REMAPSELECT          0xe04
-#define        ER_MASTERSELECT         0xe10
-#define        ER_ITCR                 0xf00
-#define        ER_ITIP                 0xf04
-
-
-#define        ER_TAG                  0xe
-#define        ER_TAG1                 0x6
-#define        ER_VALID                1
-#define        ER_CI                   0
-#define        ER_MP                   2
-#define        ER_ADD                  4
-#define        ER_END                  0xe
-#define        ER_BAD                  0xffffffff
-
-
-#define        CIA_MFG_MASK            0xfff00000
-#define        CIA_MFG_SHIFT           20
-#define        CIA_CID_MASK            0x000fff00
-#define        CIA_CID_SHIFT           8
-#define        CIA_CCL_MASK            0x000000f0
-#define        CIA_CCL_SHIFT           4
-
-
-#define        CIB_REV_MASK            0xff000000
-#define        CIB_REV_SHIFT           24
-#define        CIB_NSW_MASK            0x00f80000
-#define        CIB_NSW_SHIFT           19
-#define        CIB_NMW_MASK            0x0007c000
-#define        CIB_NMW_SHIFT           14
-#define        CIB_NSP_MASK            0x00003e00
-#define        CIB_NSP_SHIFT           9
-#define        CIB_NMP_MASK            0x000001f0
-#define        CIB_NMP_SHIFT           4
-
-
-#define        MPD_MUI_MASK            0x0000ff00
-#define        MPD_MUI_SHIFT           8
-#define        MPD_MP_MASK             0x000000f0
-#define        MPD_MP_SHIFT            4
-
-
-#define        AD_ADDR_MASK            0xfffff000
-#define        AD_SP_MASK              0x00000f00
-#define        AD_SP_SHIFT             8
-#define        AD_ST_MASK              0x000000c0
-#define        AD_ST_SHIFT             6
-#define        AD_ST_SLAVE             0x00000000
-#define        AD_ST_BRIDGE            0x00000040
-#define        AD_ST_SWRAP             0x00000080
-#define        AD_ST_MWRAP             0x000000c0
-#define        AD_SZ_MASK              0x00000030
-#define        AD_SZ_SHIFT             4
-#define        AD_SZ_4K                0x00000000
-#define        AD_SZ_8K                0x00000010
-#define        AD_SZ_16K               0x00000020
-#define        AD_SZ_SZD               0x00000030
-#define        AD_AG32                 0x00000008
-#define        AD_ADDR_ALIGN           0x00000fff
-#define        AD_SZ_BASE              0x00001000      
-
-
-#define        SD_SZ_MASK              0xfffff000
-#define        SD_SG32                 0x00000008
-#define        SD_SZ_ALIGN             0x00000fff
-
-
-#ifndef _LANGUAGE_ASSEMBLY
-
-typedef volatile struct _aidmp {
-       uint32  oobselina30;    
-       uint32  oobselina74;    
-       uint32  PAD[6];
-       uint32  oobselinb30;    
-       uint32  oobselinb74;    
-       uint32  PAD[6];
-       uint32  oobselinc30;    
-       uint32  oobselinc74;    
-       uint32  PAD[6];
-       uint32  oobselind30;    
-       uint32  oobselind74;    
-       uint32  PAD[38];
-       uint32  oobselouta30;   
-       uint32  oobselouta74;   
-       uint32  PAD[6];
-       uint32  oobseloutb30;   
-       uint32  oobseloutb74;   
-       uint32  PAD[6];
-       uint32  oobseloutc30;   
-       uint32  oobseloutc74;   
-       uint32  PAD[6];
-       uint32  oobseloutd30;   
-       uint32  oobseloutd74;   
-       uint32  PAD[38];
-       uint32  oobsynca;       
-       uint32  oobseloutaen;   
-       uint32  PAD[6];
-       uint32  oobsyncb;       
-       uint32  oobseloutben;   
-       uint32  PAD[6];
-       uint32  oobsyncc;       
-       uint32  oobseloutcen;   
-       uint32  PAD[6];
-       uint32  oobsyncd;       
-       uint32  oobseloutden;   
-       uint32  PAD[38];
-       uint32  oobaextwidth;   
-       uint32  oobainwidth;    
-       uint32  oobaoutwidth;   
-       uint32  PAD[5];
-       uint32  oobbextwidth;   
-       uint32  oobbinwidth;    
-       uint32  oobboutwidth;   
-       uint32  PAD[5];
-       uint32  oobcextwidth;   
-       uint32  oobcinwidth;    
-       uint32  oobcoutwidth;   
-       uint32  PAD[5];
-       uint32  oobdextwidth;   
-       uint32  oobdinwidth;    
-       uint32  oobdoutwidth;   
-       uint32  PAD[37];
-       uint32  ioctrlset;      
-       uint32  ioctrlclear;    
-       uint32  ioctrl;         
-       uint32  PAD[61];
-       uint32  iostatus;       
-       uint32  PAD[127];
-       uint32  ioctrlwidth;    
-       uint32  iostatuswidth;  
-       uint32  PAD[62];
-       uint32  resetctrl;      
-       uint32  resetstatus;    
-       uint32  resetreadid;    
-       uint32  resetwriteid;   
-       uint32  PAD[60];
-       uint32  errlogctrl;     
-       uint32  errlogdone;     
-       uint32  errlogstatus;   
-       uint32  errlogaddrlo;   
-       uint32  errlogaddrhi;   
-       uint32  errlogid;       
-       uint32  errloguser;     
-       uint32  errlogflags;    
-       uint32  PAD[56];
-       uint32  intstatus;      
-       uint32  PAD[127];
-       uint32  config;         
-       uint32  PAD[63];
-       uint32  itcr;           
-       uint32  PAD[3];
-       uint32  itipooba;       
-       uint32  itipoobb;       
-       uint32  itipoobc;       
-       uint32  itipoobd;       
-       uint32  PAD[4];
-       uint32  itipoobaout;    
-       uint32  itipoobbout;    
-       uint32  itipoobcout;    
-       uint32  itipoobdout;    
-       uint32  PAD[4];
-       uint32  itopooba;       
-       uint32  itopoobb;       
-       uint32  itopoobc;       
-       uint32  itopoobd;       
-       uint32  PAD[4];
-       uint32  itopoobain;     
-       uint32  itopoobbin;     
-       uint32  itopoobcin;     
-       uint32  itopoobdin;     
-       uint32  PAD[4];
-       uint32  itopreset;      
-       uint32  PAD[15];
-       uint32  peripherialid4; 
-       uint32  peripherialid5; 
-       uint32  peripherialid6; 
-       uint32  peripherialid7; 
-       uint32  peripherialid0; 
-       uint32  peripherialid1; 
-       uint32  peripherialid2; 
-       uint32  peripherialid3; 
-       uint32  componentid0;   
-       uint32  componentid1;   
-       uint32  componentid2;   
-       uint32  componentid3;   
-} aidmp_t;
-
-#endif 
-
-
-#define        OOB_BUSCONFIG           0x020
-#define        OOB_STATUSA             0x100
-#define        OOB_STATUSB             0x104
-#define        OOB_STATUSC             0x108
-#define        OOB_STATUSD             0x10c
-#define        OOB_ENABLEA0            0x200
-#define        OOB_ENABLEA1            0x204
-#define        OOB_ENABLEA2            0x208
-#define        OOB_ENABLEA3            0x20c
-#define        OOB_ENABLEB0            0x280
-#define        OOB_ENABLEB1            0x284
-#define        OOB_ENABLEB2            0x288
-#define        OOB_ENABLEB3            0x28c
-#define        OOB_ENABLEC0            0x300
-#define        OOB_ENABLEC1            0x304
-#define        OOB_ENABLEC2            0x308
-#define        OOB_ENABLEC3            0x30c
-#define        OOB_ENABLED0            0x380
-#define        OOB_ENABLED1            0x384
-#define        OOB_ENABLED2            0x388
-#define        OOB_ENABLED3            0x38c
-#define        OOB_ITCR                0xf00
-#define        OOB_ITIPOOBA            0xf10
-#define        OOB_ITIPOOBB            0xf14
-#define        OOB_ITIPOOBC            0xf18
-#define        OOB_ITIPOOBD            0xf1c
-#define        OOB_ITOPOOBA            0xf30
-#define        OOB_ITOPOOBB            0xf34
-#define        OOB_ITOPOOBC            0xf38
-#define        OOB_ITOPOOBD            0xf3c
-
-
-#define        AI_OOBSELINA30          0x000
-#define        AI_OOBSELINA74          0x004
-#define        AI_OOBSELINB30          0x020
-#define        AI_OOBSELINB74          0x024
-#define        AI_OOBSELINC30          0x040
-#define        AI_OOBSELINC74          0x044
-#define        AI_OOBSELIND30          0x060
-#define        AI_OOBSELIND74          0x064
-#define        AI_OOBSELOUTA30         0x100
-#define        AI_OOBSELOUTA74         0x104
-#define        AI_OOBSELOUTB30         0x120
-#define        AI_OOBSELOUTB74         0x124
-#define        AI_OOBSELOUTC30         0x140
-#define        AI_OOBSELOUTC74         0x144
-#define        AI_OOBSELOUTD30         0x160
-#define        AI_OOBSELOUTD74         0x164
-#define        AI_OOBSYNCA             0x200
-#define        AI_OOBSELOUTAEN         0x204
-#define        AI_OOBSYNCB             0x220
-#define        AI_OOBSELOUTBEN         0x224
-#define        AI_OOBSYNCC             0x240
-#define        AI_OOBSELOUTCEN         0x244
-#define        AI_OOBSYNCD             0x260
-#define        AI_OOBSELOUTDEN         0x264
-#define        AI_OOBAEXTWIDTH         0x300
-#define        AI_OOBAINWIDTH          0x304
-#define        AI_OOBAOUTWIDTH         0x308
-#define        AI_OOBBEXTWIDTH         0x320
-#define        AI_OOBBINWIDTH          0x324
-#define        AI_OOBBOUTWIDTH         0x328
-#define        AI_OOBCEXTWIDTH         0x340
-#define        AI_OOBCINWIDTH          0x344
-#define        AI_OOBCOUTWIDTH         0x348
-#define        AI_OOBDEXTWIDTH         0x360
-#define        AI_OOBDINWIDTH          0x364
-#define        AI_OOBDOUTWIDTH         0x368
-#define        AI_IOCTRLSET            0x400
-#define        AI_IOCTRLCLEAR          0x404
-#define        AI_IOCTRL               0x408
-#define        AI_IOSTATUS             0x500
-#define        AI_IOCTRLWIDTH          0x700
-#define        AI_IOSTATUSWIDTH        0x704
-#define        AI_RESETCTRL            0x800
-#define        AI_RESETSTATUS          0x804
-#define        AI_RESETREADID          0x808
-#define        AI_RESETWRITEID         0x80c
-#define        AI_ERRLOGCTRL           0xa00
-#define        AI_ERRLOGDONE           0xa04
-#define        AI_ERRLOGSTATUS         0xa08
-#define        AI_ERRLOGADDRLO         0xa0c
-#define        AI_ERRLOGADDRHI         0xa10
-#define        AI_ERRLOGID             0xa14
-#define        AI_ERRLOGUSER           0xa18
-#define        AI_ERRLOGFLAGS          0xa1c
-#define        AI_INTSTATUS            0xa00
-#define        AI_CONFIG               0xe00
-#define        AI_ITCR                 0xf00
-#define        AI_ITIPOOBA             0xf10
-#define        AI_ITIPOOBB             0xf14
-#define        AI_ITIPOOBC             0xf18
-#define        AI_ITIPOOBD             0xf1c
-#define        AI_ITIPOOBAOUT          0xf30
-#define        AI_ITIPOOBBOUT          0xf34
-#define        AI_ITIPOOBCOUT          0xf38
-#define        AI_ITIPOOBDOUT          0xf3c
-#define        AI_ITOPOOBA             0xf50
-#define        AI_ITOPOOBB             0xf54
-#define        AI_ITOPOOBC             0xf58
-#define        AI_ITOPOOBD             0xf5c
-#define        AI_ITOPOOBAIN           0xf70
-#define        AI_ITOPOOBBIN           0xf74
-#define        AI_ITOPOOBCIN           0xf78
-#define        AI_ITOPOOBDIN           0xf7c
-#define        AI_ITOPRESET            0xf90
-#define        AI_PERIPHERIALID4       0xfd0
-#define        AI_PERIPHERIALID5       0xfd4
-#define        AI_PERIPHERIALID6       0xfd8
-#define        AI_PERIPHERIALID7       0xfdc
-#define        AI_PERIPHERIALID0       0xfe0
-#define        AI_PERIPHERIALID1       0xfe4
-#define        AI_PERIPHERIALID2       0xfe8
-#define        AI_PERIPHERIALID3       0xfec
-#define        AI_COMPONENTID0         0xff0
-#define        AI_COMPONENTID1         0xff4
-#define        AI_COMPONENTID2         0xff8
-#define        AI_COMPONENTID3         0xffc
-
-
-#define        AIRC_RESET              1
-
-
-#define        AICFG_OOB               0x00000020
-#define        AICFG_IOS               0x00000010
-#define        AICFG_IOC               0x00000008
-#define        AICFG_TO                0x00000004
-#define        AICFG_ERRL              0x00000002
-#define        AICFG_RST               0x00000001
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/bcmcdc.h b/drivers/net/wireless/bcm4319/include/bcmcdc.h
deleted file mode 100644 (file)
index c2a860b..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * CDC network driver ioctl/indication encoding
- * Broadcom 802.11abg Networking Device Driver
- *
- * Definitions subject to change without notice.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmcdc.h,v 13.14.16.3.16.4 2009/04/12 16:58:45 Exp $
- */
-#include <proto/ethernet.h>
-
-typedef struct cdc_ioctl {
-       uint32 cmd;      /* ioctl command value */
-       uint32 len;      /* lower 16: output buflen; upper 16: input buflen (excludes header) */
-       uint32 flags;    /* flag defns given below */
-       uint32 status;   /* status code returned from the device */
-} cdc_ioctl_t;
-
-/* Max valid buffer size that can be sent to the dongle */
-#define CDC_MAX_MSG_SIZE   ETHER_MAX_LEN
-
-/* len field is divided into input and output buffer lengths */
-#define CDCL_IOC_OUTLEN_MASK   0x0000FFFF  /* maximum or expected response length, */
-                                          /* excluding IOCTL header */
-#define CDCL_IOC_OUTLEN_SHIFT  0
-#define CDCL_IOC_INLEN_MASK    0xFFFF0000   /* input buffer length, excluding IOCTL header */
-#define CDCL_IOC_INLEN_SHIFT   16
-
-/* CDC flag definitions */
-#define CDCF_IOC_ERROR         0x01    /* 0=success, 1=ioctl cmd failed */
-#define CDCF_IOC_SET           0x02    /* 0=get, 1=set cmd */
-#define CDCF_IOC_IF_MASK       0xF000  /* I/F index */
-#define CDCF_IOC_IF_SHIFT      12
-#define CDCF_IOC_ID_MASK       0xFFFF0000      /* used to uniquely id an ioctl req/resp pairing */
-#define CDCF_IOC_ID_SHIFT      16              /* # of bits of shift for ID Mask */
-
-#define CDC_IOC_IF_IDX(flags)  (((flags) & CDCF_IOC_IF_MASK) >> CDCF_IOC_IF_SHIFT)
-#define CDC_IOC_ID(flags)      (((flags) & CDCF_IOC_ID_MASK) >> CDCF_IOC_ID_SHIFT)
-
-#define CDC_GET_IF_IDX(hdr) \
-       ((int)((((hdr)->flags) & CDCF_IOC_IF_MASK) >> CDCF_IOC_IF_SHIFT))
-#define CDC_SET_IF_IDX(hdr, idx) \
-       ((hdr)->flags = (((hdr)->flags & ~CDCF_IOC_IF_MASK) | ((idx) << CDCF_IOC_IF_SHIFT)))
-
-/*
- * BDC header
- *
- *   The BDC header is used on data packets to convey priority across USB.
- */
-
-#define        BDC_HEADER_LEN          4
-
-#define BDC_PROTO_VER          1       /* Protocol version */
-
-#define BDC_FLAG_VER_MASK      0xf0    /* Protocol version mask */
-#define BDC_FLAG_VER_SHIFT     4       /* Protocol version shift */
-
-#define BDC_FLAG__UNUSED       0x03    /* Unassigned */
-#define BDC_FLAG_SUM_GOOD      0x04    /* Dongle has verified good RX checksums */
-#define BDC_FLAG_SUM_NEEDED    0x08    /* Dongle needs to do TX checksums */
-
-#define BDC_PRIORITY_MASK      0x7
-
-#define BDC_FLAG2_FC_FLAG      0x10    /* flag to indicate if pkt contains */
-                                                                       /* FLOW CONTROL info only */
-#define BDC_PRIORITY_FC_SHIFT  4               /* flow control info shift */
-
-#define BDC_FLAG2_IF_MASK      0x0f    /* APSTA: interface on which the packet was received */
-#define BDC_FLAG2_IF_SHIFT     0
-
-#define BDC_GET_IF_IDX(hdr) \
-       ((int)((((hdr)->flags2) & BDC_FLAG2_IF_MASK) >> BDC_FLAG2_IF_SHIFT))
-#define BDC_SET_IF_IDX(hdr, idx) \
-       ((hdr)->flags2 = (((hdr)->flags2 & ~BDC_FLAG2_IF_MASK) | ((idx) << BDC_FLAG2_IF_SHIFT)))
-
-struct bdc_header {
-       uint8   flags;                  /* Flags */
-       uint8   priority;       /* 802.1d Priority 0:2 bits, 4:7 flow control info for usb */
-       uint8   flags2;
-       uint8   rssi;
-};
diff --git a/drivers/net/wireless/bcm4319/include/bcmdefs.h b/drivers/net/wireless/bcm4319/include/bcmdefs.h
deleted file mode 100644 (file)
index e3c6876..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Misc system wide definitions
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: bcmdefs.h,v 13.38.4.10.2.7.6.11 2010/02/01 05:51:55 Exp $
- */
-
-
-#ifndef        _bcmdefs_h_
-#define        _bcmdefs_h_
-
-#define STATIC static
-
-
-#define        SI_BUS                  0       
-#define        PCI_BUS                 1       
-#define        PCMCIA_BUS              2       
-#define SDIO_BUS               3       
-#define JTAG_BUS               4       
-#define USB_BUS                        5       
-#define SPI_BUS                        6       
-
-
-#ifdef BCMBUSTYPE
-#define BUSTYPE(bus)   (BCMBUSTYPE)
-#else
-#define BUSTYPE(bus)   (bus)
-#endif
-
-
-#ifdef BCMCHIPTYPE
-#define CHIPTYPE(bus)  (BCMCHIPTYPE)
-#else
-#define CHIPTYPE(bus)  (bus)
-#endif
-
-
-
-#if defined(BCMSPROMBUS)
-#define SPROMBUS       (BCMSPROMBUS)
-#elif defined(SI_PCMCIA_SROM)
-#define SPROMBUS       (PCMCIA_BUS)
-#else
-#define SPROMBUS       (PCI_BUS)
-#endif
-
-
-#ifdef BCMCHIPID
-#define CHIPID(chip)   (BCMCHIPID)
-#else
-#define CHIPID(chip)   (chip)
-#endif
-
-
-#define DMADDR_MASK_32 0x0             
-#define DMADDR_MASK_30 0xc0000000      
-#define DMADDR_MASK_0  0xffffffff      
-
-#define        DMADDRWIDTH_30  30 
-#define        DMADDRWIDTH_32  32 
-#define        DMADDRWIDTH_63  63 
-#define        DMADDRWIDTH_64  64 
-
-
-#define BCMEXTRAHDROOM 164
-
-
-#define BCMDONGLEHDRSZ 12
-#define BCMDONGLEPADSZ 16
-
-#define BCMDONGLEOVERHEAD      (BCMDONGLEHDRSZ + BCMDONGLEPADSZ)
-
-
-
-#define BITFIELD_MASK(width) \
-               (((unsigned)1 << (width)) - 1)
-#define GFIELD(val, field) \
-               (((val) >> field ## _S) & field ## _M)
-#define SFIELD(val, field, bits) \
-               (((val) & (~(field ## _M << field ## _S))) | \
-                ((unsigned)(bits) << field ## _S))
-
-
-#ifdef BCMSMALL
-#undef BCMSPACE
-#define bcmspace       FALSE   
-#else
-#define        BCMSPACE
-#define bcmspace       TRUE    
-#endif
-
-
-#define        MAXSZ_NVRAM_VARS        4096
-
-#define LOCATOR_EXTERN static
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/bcmdevs.h b/drivers/net/wireless/bcm4319/include/bcmdevs.h
deleted file mode 100644 (file)
index 14853f1..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Broadcom device-specific manifest constants.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmdevs.h,v 13.172.4.5.4.10.2.36 2010/05/25 08:33:44 Exp $
- */
-
-
-#ifndef        _BCMDEVS_H
-#define        _BCMDEVS_H
-
-
-#define        VENDOR_EPIGRAM          0xfeda
-#define        VENDOR_BROADCOM         0x14e4
-#define VENDOR_SI_IMAGE                0x1095          
-#define VENDOR_TI              0x104c          
-#define VENDOR_RICOH           0x1180          
-#define VENDOR_JMICRON         0x197b
-
-
-#define        VENDOR_BROADCOM_PCMCIA  0x02d0
-
-
-#define        VENDOR_BROADCOM_SDIO    0x00BF
-
-
-#define BCM_DNGL_VID            0xa5c
-#define BCM_DNGL_BL_PID_4320    0xbd11
-#define BCM_DNGL_BL_PID_4328    0xbd12
-#define BCM_DNGL_BL_PID_4322    0xbd13
-#define BCM_DNGL_BL_PID_4325    0xbd14
-#define BCM_DNGL_BL_PID_4315    0xbd15
-#define BCM_DNGL_BL_PID_4319    0xbd16
-#define BCM_DNGL_BDC_PID        0xbdc
-
-#define        BCM4325_D11DUAL_ID      0x431b          
-#define        BCM4325_D11G_ID         0x431c          
-#define        BCM4325_D11A_ID         0x431d          
-#define BCM4329_D11NDUAL_ID    0x432e          
-#define BCM4329_D11N2G_ID      0x432f          
-#define BCM4329_D11N5G_ID      0x4330          
-#define BCM4336_D11N_ID                0x4343          
-#define        BCM4315_D11DUAL_ID      0x4334          
-#define        BCM4315_D11G_ID         0x4335          
-#define        BCM4315_D11A_ID         0x4336          
-#define BCM4319_D11N_ID                0x4337          
-#define BCM4319_D11N2G_ID      0x4338          
-#define BCM4319_D11N5G_ID      0x4339          
-
-
-#define SDIOH_FPGA_ID          0x43f2          
-#define SPIH_FPGA_ID           0x43f5          
-#define        BCM4710_DEVICE_ID       0x4710          
-#define BCM27XX_SDIOH_ID       0x2702          
-#define PCIXX21_FLASHMEDIA0_ID 0x8033          
-#define PCIXX21_SDIOH0_ID      0x8034          
-#define PCIXX21_FLASHMEDIA_ID  0x803b          
-#define PCIXX21_SDIOH_ID       0x803c          
-#define R5C822_SDIOH_ID                0x0822          
-#define JMICRON_SDIOH_ID       0x2381          
-
-
-#define        BCM4306_CHIP_ID         0x4306          
-#define        BCM4311_CHIP_ID         0x4311          
-#define        BCM4312_CHIP_ID         0x4312          
-#define        BCM4315_CHIP_ID         0x4315          
-#define        BCM4318_CHIP_ID         0x4318          
-#define        BCM4319_CHIP_ID         0x4319          
-#define        BCM4320_CHIP_ID         0x4320          
-#define        BCM4321_CHIP_ID         0x4321          
-#define        BCM4322_CHIP_ID         0x4322          
-#define        BCM4325_CHIP_ID         0x4325          
-#define        BCM4328_CHIP_ID         0x4328          
-#define        BCM4329_CHIP_ID         0x4329          
-#define BCM4336_CHIP_ID                0x4336          
-#define        BCM4402_CHIP_ID         0x4402          
-#define        BCM4704_CHIP_ID         0x4704          
-#define        BCM4710_CHIP_ID         0x4710          
-#define        BCM4712_CHIP_ID         0x4712          
-#define BCM4785_CHIP_ID                0x4785          
-#define        BCM5350_CHIP_ID         0x5350          
-#define        BCM5352_CHIP_ID         0x5352          
-#define        BCM5354_CHIP_ID         0x5354          
-#define BCM5365_CHIP_ID                0x5365          
-
-
-
-#define        BCM4303_PKG_ID          2               
-#define        BCM4309_PKG_ID          1               
-#define        BCM4712LARGE_PKG_ID     0               
-#define        BCM4712SMALL_PKG_ID     1               
-#define        BCM4712MID_PKG_ID       2               
-#define BCM4328USBD11G_PKG_ID  2               
-#define BCM4328USBDUAL_PKG_ID  3               
-#define BCM4328SDIOD11G_PKG_ID 4               
-#define BCM4328SDIODUAL_PKG_ID 5               
-#define BCM4329_289PIN_PKG_ID  0               
-#define BCM4329_182PIN_PKG_ID  1               
-#define BCM5354E_PKG_ID                1               
-#define HDLSIM5350_PKG_ID      1               
-#define HDLSIM_PKG_ID          14              
-#define HWSIM_PKG_ID           15              
-
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/bcmendian.h b/drivers/net/wireless/bcm4319/include/bcmendian.h
deleted file mode 100644 (file)
index ae46838..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Byte order utilities
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- *  $Id: bcmendian.h,v 1.31.302.1.16.1 2009/02/03 18:34:31 Exp $
- *
- * This file by default provides proper behavior on little-endian architectures.
- * On big-endian architectures, IL_BIGENDIAN should be defined.
- */
-
-
-#ifndef _BCMENDIAN_H_
-#define _BCMENDIAN_H_
-
-#include <typedefs.h>
-
-
-#define BCMSWAP16(val) \
-       ((uint16)((((uint16)(val) & (uint16)0x00ffU) << 8) | \
-                 (((uint16)(val) & (uint16)0xff00U) >> 8)))
-
-
-#define BCMSWAP32(val) \
-       ((uint32)((((uint32)(val) & (uint32)0x000000ffU) << 24) | \
-                 (((uint32)(val) & (uint32)0x0000ff00U) <<  8) | \
-                 (((uint32)(val) & (uint32)0x00ff0000U) >>  8) | \
-                 (((uint32)(val) & (uint32)0xff000000U) >> 24)))
-
-
-#define BCMSWAP32BY16(val) \
-       ((uint32)((((uint32)(val) & (uint32)0x0000ffffU) << 16) | \
-                 (((uint32)(val) & (uint32)0xffff0000U) >> 16)))
-
-
-static INLINE uint16
-bcmswap16(uint16 val)
-{
-       return BCMSWAP16(val);
-}
-
-static INLINE uint32
-bcmswap32(uint32 val)
-{
-       return BCMSWAP32(val);
-}
-
-static INLINE uint32
-bcmswap32by16(uint32 val)
-{
-       return BCMSWAP32BY16(val);
-}
-
-
-
-
-static INLINE void
-bcmswap16_buf(uint16 *buf, uint len)
-{
-       len = len / 2;
-
-       while (len--) {
-               *buf = bcmswap16(*buf);
-               buf++;
-       }
-}
-
-#ifndef hton16
-#ifndef IL_BIGENDIAN
-#define HTON16(i) BCMSWAP16(i)
-#define HTON32(i) BCMSWAP32(i)
-#define        hton16(i) bcmswap16(i)
-#define        hton32(i) bcmswap32(i)
-#define        ntoh16(i) bcmswap16(i)
-#define        ntoh32(i) bcmswap32(i)
-#define HTOL16(i) (i)
-#define HTOL32(i) (i)
-#define ltoh16(i) (i)
-#define ltoh32(i) (i)
-#define htol16(i) (i)
-#define htol32(i) (i)
-#else
-#define HTON16(i) (i)
-#define HTON32(i) (i)
-#define        hton16(i) (i)
-#define        hton32(i) (i)
-#define        ntoh16(i) (i)
-#define        ntoh32(i) (i)
-#define HTOL16(i) BCMSWAP16(i)
-#define HTOL32(i) BCMSWAP32(i)
-#define        ltoh16(i) bcmswap16(i)
-#define        ltoh32(i) bcmswap32(i)
-#define htol16(i) bcmswap16(i)
-#define htol32(i) bcmswap32(i)
-#endif 
-#endif 
-
-#ifndef IL_BIGENDIAN
-#define ltoh16_buf(buf, i)
-#define htol16_buf(buf, i)
-#else
-#define ltoh16_buf(buf, i) bcmswap16_buf((uint16 *)buf, i)
-#define htol16_buf(buf, i) bcmswap16_buf((uint16 *)buf, i)
-#endif 
-
-
-static INLINE void
-htol16_ua_store(uint16 val, uint8 *bytes)
-{
-       bytes[0] = val & 0xff;
-       bytes[1] = val >> 8;
-}
-
-
-static INLINE void
-htol32_ua_store(uint32 val, uint8 *bytes)
-{
-       bytes[0] = val & 0xff;
-       bytes[1] = (val >> 8) & 0xff;
-       bytes[2] = (val >> 16) & 0xff;
-       bytes[3] = val >> 24;
-}
-
-
-static INLINE void
-hton16_ua_store(uint16 val, uint8 *bytes)
-{
-       bytes[0] = val >> 8;
-       bytes[1] = val & 0xff;
-}
-
-
-static INLINE void
-hton32_ua_store(uint32 val, uint8 *bytes)
-{
-       bytes[0] = val >> 24;
-       bytes[1] = (val >> 16) & 0xff;
-       bytes[2] = (val >> 8) & 0xff;
-       bytes[3] = val & 0xff;
-}
-
-#define _LTOH16_UA(cp) ((cp)[0] | ((cp)[1] << 8))
-#define _LTOH32_UA(cp) ((cp)[0] | ((cp)[1] << 8) | ((cp)[2] << 16) | ((cp)[3] << 24))
-#define _NTOH16_UA(cp) (((cp)[0] << 8) | (cp)[1])
-#define _NTOH32_UA(cp) (((cp)[0] << 24) | ((cp)[1] << 16) | ((cp)[2] << 8) | (cp)[3])
-
-
-static INLINE uint16
-ltoh16_ua(const void *bytes)
-{
-       return _LTOH16_UA((const uint8 *)bytes);
-}
-
-
-static INLINE uint32
-ltoh32_ua(const void *bytes)
-{
-       return _LTOH32_UA((const uint8 *)bytes);
-}
-
-
-static INLINE uint16
-ntoh16_ua(const void *bytes)
-{
-       return _NTOH16_UA((const uint8 *)bytes);
-}
-
-
-static INLINE uint32
-ntoh32_ua(const void *bytes)
-{
-       return _NTOH32_UA((const uint8 *)bytes);
-}
-
-#define ltoh_ua(ptr) \
-       (sizeof(*(ptr)) == sizeof(uint8) ? *(const uint8 *)ptr : \
-        sizeof(*(ptr)) == sizeof(uint16) ? _LTOH16_UA((const uint8 *)ptr) : \
-        sizeof(*(ptr)) == sizeof(uint32) ? _LTOH32_UA((const uint8 *)ptr) : \
-        0xfeedf00d)
-
-#define ntoh_ua(ptr) \
-       (sizeof(*(ptr)) == sizeof(uint8) ? *(const uint8 *)ptr : \
-        sizeof(*(ptr)) == sizeof(uint16) ? _NTOH16_UA((const uint8 *)ptr) : \
-        sizeof(*(ptr)) == sizeof(uint32) ? _NTOH32_UA((const uint8 *)ptr) : \
-        0xfeedf00d)
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/bcmpcispi.h b/drivers/net/wireless/bcm4319/include/bcmpcispi.h
deleted file mode 100644 (file)
index 7d98fb7..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Broadcom PCI-SPI Host Controller Register Definitions
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmpcispi.h,v 13.11.8.3 2008/07/09 21:23:29 Exp $
- */
-
-/* cpp contortions to concatenate w/arg prescan */
-#ifndef PAD
-#define        _PADLINE(line)  pad ## line
-#define        _XSTR(line)     _PADLINE(line)
-#define        PAD             _XSTR(__LINE__)
-#endif /* PAD */
-
-/*
-+---------------------------------------------------------------------------+
-|                                                                           |
-|                     7     6     5     4     3     2     1       0         |
-| 0x0000  SPI_CTRL    SPIE  SPE   0     MSTR  CPOL  CPHA  SPR1    SPR0      |
-| 0x0004  SPI_STAT    SPIF  WCOL  ST1   ST0   WFFUL WFEMP RFFUL   RFEMP     |
-| 0x0008  SPI_DATA    Bits 31:0, data to send out on MOSI                   |
-| 0x000C  SPI_EXT     ICNT1 ICNT0 BSWAP *HSMODE           ESPR1   ESPR0     |
-| 0x0020  GPIO_OE     0=input, 1=output                   PWR_OE  CS_OE     |
-| 0x0024  GPIO_DATA   CARD:1=missing, 0=present     CARD  PWR_DAT CS_DAT    |
-| 0x0040  INT_EDGE    0=level, 1=edge                     DEV_E   SPI_E     |
-| 0x0044  INT_POL     1=active high, 0=active low         DEV_P   SPI_P     |
-| 0x0048  INTMASK                                         DEV     SPI       |
-| 0x004C  INTSTATUS                                       DEV     SPI       |
-| 0x0060  HEXDISP     Reset value: 0x14e443f5.  In hexdisp mode, value      |
-|                     shows on the Raggedstone1 4-digit 7-segment display.  |
-| 0x0064  CURRENT_MA  Low 16 bits indicate card current consumption in mA   |
-| 0x006C  DISP_SEL    Display mode (0=hexdisp, 1=current)         DSP       |
-| 0x00C0  PLL_CTL  bit31=ext_clk, remainder unused.                         |
-| 0x00C4  PLL_STAT                            LOCK                          |
-| 0x00C8  CLK_FREQ                                                          |
-| 0x00CC  CLK_CNT                                                           |
-|                                                                           |
-| *Notes: HSMODE is not implemented, never set this bit!                    |
-| BSWAP is available in rev >= 8                                            |
-|                                                                           |
-+---------------------------------------------------------------------------+
-*/
-
-typedef volatile struct {
-       uint32 spih_ctrl;               /* 0x00 SPI Control Register */
-       uint32 spih_stat;               /* 0x04 SPI Status Register */
-       uint32 spih_data;               /* 0x08 SPI Data Register, 32-bits wide */
-       uint32 spih_ext;                /* 0x0C SPI Extension Register */
-       uint32 PAD[4];                  /* 0x10-0x1F PADDING */
-
-       uint32 spih_gpio_ctrl;          /* 0x20 SPI GPIO Control Register */
-       uint32 spih_gpio_data;          /* 0x24 SPI GPIO Data Register */
-       uint32 PAD[6];                  /* 0x28-0x3F PADDING */
-
-       uint32 spih_int_edge;           /* 0x40 SPI Interrupt Edge Register (0=Level, 1=Edge) */
-       uint32 spih_int_pol;            /* 0x44 SPI Interrupt Polarity Register (0=Active Low, */
-                                                       /* 1=Active High) */
-       uint32 spih_int_mask;           /* 0x48 SPI Interrupt Mask */
-       uint32 spih_int_status;         /* 0x4C SPI Interrupt Status */
-       uint32 PAD[4];                  /* 0x50-0x5F PADDING */
-
-       uint32 spih_hex_disp;           /* 0x60 SPI 4-digit hex display value */
-       uint32 spih_current_ma;         /* 0x64 SPI SD card current consumption in mA */
-       uint32 PAD[1];                  /* 0x68 PADDING */
-       uint32 spih_disp_sel;           /* 0x6c SPI 4-digit hex display mode select (1=current) */
-       uint32 PAD[4];                  /* 0x70-0x7F PADDING */
-       uint32 PAD[8];                  /* 0x80-0x9F PADDING */
-       uint32 PAD[8];                  /* 0xA0-0xBF PADDING */
-       uint32 spih_pll_ctrl;   /* 0xC0 PLL Control Register */
-       uint32 spih_pll_status; /* 0xC4 PLL Status Register */
-       uint32 spih_xtal_freq;  /* 0xC8 External Clock Frequency in units of 10000Hz */
-       uint32 spih_clk_count;  /* 0xCC External Clock Count Register */
-
-} spih_regs_t;
-
-typedef volatile struct {
-       uint32 cfg_space[0x40];         /* 0x000-0x0FF PCI Configuration Space (Read Only) */
-       uint32 P_IMG_CTRL0;             /* 0x100 PCI Image0 Control Register */
-
-       uint32 P_BA0;                   /* 0x104 32 R/W PCI Image0 Base Address register */
-       uint32 P_AM0;                   /* 0x108 32 R/W PCI Image0 Address Mask register */
-       uint32 P_TA0;                   /* 0x10C 32 R/W PCI Image0 Translation Address register */
-       uint32 P_IMG_CTRL1;             /* 0x110 32 R/W PCI Image1 Control register */
-       uint32 P_BA1;                   /* 0x114 32 R/W PCI Image1 Base Address register */
-       uint32 P_AM1;                   /* 0x118 32 R/W PCI Image1 Address Mask register */
-       uint32 P_TA1;                   /* 0x11C 32 R/W PCI Image1 Translation Address register */
-       uint32 P_IMG_CTRL2;             /* 0x120 32 R/W PCI Image2 Control register */
-       uint32 P_BA2;                   /* 0x124 32 R/W PCI Image2 Base Address register */
-       uint32 P_AM2;                   /* 0x128 32 R/W PCI Image2 Address Mask register */
-       uint32 P_TA2;                   /* 0x12C 32 R/W PCI Image2 Translation Address register */
-       uint32 P_IMG_CTRL3;             /* 0x130 32 R/W PCI Image3 Control register */
-       uint32 P_BA3;                   /* 0x134 32 R/W PCI Image3 Base Address register */
-       uint32 P_AM3;                   /* 0x138 32 R/W PCI Image3 Address Mask register */
-       uint32 P_TA3;                   /* 0x13C 32 R/W PCI Image3 Translation Address register */
-       uint32 P_IMG_CTRL4;             /* 0x140 32 R/W PCI Image4 Control register */
-       uint32 P_BA4;                   /* 0x144 32 R/W PCI Image4 Base Address register */
-       uint32 P_AM4;                   /* 0x148 32 R/W PCI Image4 Address Mask register */
-       uint32 P_TA4;                   /* 0x14C 32 R/W PCI Image4 Translation Address register */
-       uint32 P_IMG_CTRL5;             /* 0x150 32 R/W PCI Image5 Control register */
-       uint32 P_BA5;                   /* 0x154 32 R/W PCI Image5 Base Address register */
-       uint32 P_AM5;                   /* 0x158 32 R/W PCI Image5 Address Mask register */
-       uint32 P_TA5;                   /* 0x15C 32 R/W PCI Image5 Translation Address register */
-       uint32 P_ERR_CS;                /* 0x160 32 R/W PCI Error Control and Status register */
-       uint32 P_ERR_ADDR;              /* 0x164 32 R PCI Erroneous Address register */
-       uint32 P_ERR_DATA;              /* 0x168 32 R PCI Erroneous Data register */
-
-       uint32 PAD[5];                  /* 0x16C-0x17F PADDING */
-
-       uint32 WB_CONF_SPC_BAR;         /* 0x180 32 R WISHBONE Configuration Space Base Address */
-       uint32 W_IMG_CTRL1;             /* 0x184 32 R/W WISHBONE Image1 Control register */
-       uint32 W_BA1;                   /* 0x188 32 R/W WISHBONE Image1 Base Address register */
-       uint32 W_AM1;                   /* 0x18C 32 R/W WISHBONE Image1 Address Mask register */
-       uint32 W_TA1;                   /* 0x190 32 R/W WISHBONE Image1 Translation Address reg */
-       uint32 W_IMG_CTRL2;             /* 0x194 32 R/W WISHBONE Image2 Control register */
-       uint32 W_BA2;                   /* 0x198 32 R/W WISHBONE Image2 Base Address register */
-       uint32 W_AM2;                   /* 0x19C 32 R/W WISHBONE Image2 Address Mask register */
-       uint32 W_TA2;                   /* 0x1A0 32 R/W WISHBONE Image2 Translation Address reg */
-       uint32 W_IMG_CTRL3;             /* 0x1A4 32 R/W WISHBONE Image3 Control register */
-       uint32 W_BA3;                   /* 0x1A8 32 R/W WISHBONE Image3 Base Address register */
-       uint32 W_AM3;                   /* 0x1AC 32 R/W WISHBONE Image3 Address Mask register */
-       uint32 W_TA3;                   /* 0x1B0 32 R/W WISHBONE Image3 Translation Address reg */
-       uint32 W_IMG_CTRL4;             /* 0x1B4 32 R/W WISHBONE Image4 Control register */
-       uint32 W_BA4;                   /* 0x1B8 32 R/W WISHBONE Image4 Base Address register */
-       uint32 W_AM4;                   /* 0x1BC 32 R/W WISHBONE Image4 Address Mask register */
-       uint32 W_TA4;                   /* 0x1C0 32 R/W WISHBONE Image4 Translation Address reg */
-       uint32 W_IMG_CTRL5;             /* 0x1C4 32 R/W WISHBONE Image5 Control register */
-       uint32 W_BA5;                   /* 0x1C8 32 R/W WISHBONE Image5 Base Address register */
-       uint32 W_AM5;                   /* 0x1CC 32 R/W WISHBONE Image5 Address Mask register */
-       uint32 W_TA5;                   /* 0x1D0 32 R/W WISHBONE Image5 Translation Address reg */
-       uint32 W_ERR_CS;                /* 0x1D4 32 R/W WISHBONE Error Control and Status reg */
-       uint32 W_ERR_ADDR;              /* 0x1D8 32 R WISHBONE Erroneous Address register */
-       uint32 W_ERR_DATA;              /* 0x1DC 32 R WISHBONE Erroneous Data register */
-       uint32 CNF_ADDR;                /* 0x1E0 32 R/W Configuration Cycle register */
-       uint32 CNF_DATA;                /* 0x1E4 32 R/W Configuration Cycle Generation Data reg */
-
-       uint32 INT_ACK;                 /* 0x1E8 32 R Interrupt Acknowledge register */
-       uint32 ICR;                     /* 0x1EC 32 R/W Interrupt Control register */
-       uint32 ISR;                     /* 0x1F0 32 R/W Interrupt Status register */
-} spih_pciregs_t;
-
-/*
- * PCI Core interrupt enable and status bit definitions.
- */
-
-/* PCI Core ICR Register bit definitions */
-#define PCI_INT_PROP_EN                (1 << 0)        /* Interrupt Propagation Enable */
-#define PCI_WB_ERR_INT_EN      (1 << 1)        /* Wishbone Error Interrupt Enable */
-#define PCI_PCI_ERR_INT_EN     (1 << 2)        /* PCI Error Interrupt Enable */
-#define PCI_PAR_ERR_INT_EN     (1 << 3)        /* Parity Error Interrupt Enable */
-#define PCI_SYS_ERR_INT_EN     (1 << 4)        /* System Error Interrupt Enable */
-#define PCI_SOFTWARE_RESET     (1U << 31)      /* Software reset of the PCI Core. */
-
-
-/* PCI Core ISR Register bit definitions */
-#define PCI_INT_PROP_ST                (1 << 0)        /* Interrupt Propagation Status */
-#define PCI_WB_ERR_INT_ST      (1 << 1)        /* Wishbone Error Interrupt Status */
-#define PCI_PCI_ERR_INT_ST     (1 << 2)        /* PCI Error Interrupt Status */
-#define PCI_PAR_ERR_INT_ST     (1 << 3)        /* Parity Error Interrupt Status */
-#define PCI_SYS_ERR_INT_ST     (1 << 4)        /* System Error Interrupt Status */
-
-
-/* Registers on the Wishbone bus */
-#define SPIH_CTLR_INTR         (1 << 0)        /* SPI Host Controller Core Interrupt */
-#define SPIH_DEV_INTR          (1 << 1)        /* SPI Device Interrupt */
-#define SPIH_WFIFO_INTR                (1 << 2)        /* SPI Tx FIFO Empty Intr (FPGA Rev >= 8) */
-
-/* GPIO Bit definitions */
-#define SPIH_CS                                (1 << 0)        /* SPI Chip Select (active low) */
-#define SPIH_SLOT_POWER                (1 << 1)        /* SD Card Slot Power Enable */
-#define SPIH_CARD_DETECT       (1 << 2)        /* SD Card Detect */
-
-/* SPI Status Register Bit definitions */
-#define SPIH_STATE_MASK                0x30            /* SPI Transfer State Machine state mask */
-#define SPIH_STATE_SHIFT       4               /* SPI Transfer State Machine state shift */
-#define SPIH_WFFULL                    (1 << 3)        /* SPI Write FIFO Full */
-#define SPIH_WFEMPTY           (1 << 2)        /* SPI Write FIFO Empty */
-#define SPIH_RFFULL                    (1 << 1)        /* SPI Read FIFO Full */
-#define SPIH_RFEMPTY           (1 << 0)        /* SPI Read FIFO Empty */
-
-#define SPIH_EXT_CLK           (1U << 31)      /* Use External Clock as PLL Clock source. */
-
-#define SPIH_PLL_NO_CLK                (1 << 1)        /* Set to 1 if the PLL's input clock is lost. */
-#define SPIH_PLL_LOCKED                (1 << 3)        /* Set to 1 when the PLL is locked. */
-
-/* Spin bit loop bound check */
-#define SPI_SPIN_BOUND         0xf4240         /* 1 million */
diff --git a/drivers/net/wireless/bcm4319/include/bcmperf.h b/drivers/net/wireless/bcm4319/include/bcmperf.h
deleted file mode 100644 (file)
index 2a78784..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Performance counters software interface.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmperf.h,v 13.5 2007/09/14 22:00:59 Exp $
- */
-/* essai */
-#ifndef _BCMPERF_H_
-#define _BCMPERF_H_
-/* get cache hits and misses */
-#define BCMPERF_ENABLE_INSTRCOUNT()
-#define BCMPERF_ENABLE_ICACHE_MISS()
-#define BCMPERF_ENABLE_ICACHE_HIT()
-#define        BCMPERF_GETICACHE_MISS(x)       ((x) = 0)
-#define        BCMPERF_GETICACHE_HIT(x)        ((x) = 0)
-#define        BCMPERF_GETINSTRCOUNT(x)        ((x) = 0)
-#endif /* _BCMPERF_H_ */
diff --git a/drivers/net/wireless/bcm4319/include/bcmsdbus.h b/drivers/net/wireless/bcm4319/include/bcmsdbus.h
deleted file mode 100644 (file)
index b7b67bc..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Definitions for API from sdio common code (bcmsdh) to individual
- * host controller drivers.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdbus.h,v 13.11.14.2.6.6 2009/10/27 17:20:28 Exp $
- */
-
-#ifndef        _sdio_api_h_
-#define        _sdio_api_h_
-
-
-#define SDIOH_API_RC_SUCCESS                          (0x00)
-#define SDIOH_API_RC_FAIL                            (0x01)
-#define SDIOH_API_SUCCESS(status) (status == 0)
-
-#define SDIOH_READ              0      /* Read request */
-#define SDIOH_WRITE             1      /* Write request */
-
-#define SDIOH_DATA_FIX          0      /* Fixed addressing */
-#define SDIOH_DATA_INC          1      /* Incremental addressing */
-
-#define SDIOH_CMD_TYPE_NORMAL   0       /* Normal command */
-#define SDIOH_CMD_TYPE_APPEND   1       /* Append command */
-#define SDIOH_CMD_TYPE_CUTTHRU  2       /* Cut-through command */
-
-#define SDIOH_DATA_PIO          0       /* PIO mode */
-#define SDIOH_DATA_DMA          1       /* DMA mode */
-
-
-typedef int SDIOH_API_RC;
-
-/* SDio Host structure */
-typedef struct sdioh_info sdioh_info_t;
-
-/* callback function, taking one arg */
-typedef void (*sdioh_cb_fn_t)(void *);
-
-/* attach, return handler on success, NULL if failed.
- *  The handler shall be provided by all subsequent calls. No local cache
- *  cfghdl points to the starting address of pci device mapped memory
- */
-extern sdioh_info_t * sdioh_attach(osl_t *osh, void *cfghdl, uint irq);
-extern SDIOH_API_RC sdioh_detach(osl_t *osh, sdioh_info_t *si);
-extern SDIOH_API_RC sdioh_interrupt_register(sdioh_info_t *si, sdioh_cb_fn_t fn, void *argh);
-extern SDIOH_API_RC sdioh_interrupt_deregister(sdioh_info_t *si);
-
-/* query whether SD interrupt is enabled or not */
-extern SDIOH_API_RC sdioh_interrupt_query(sdioh_info_t *si, bool *onoff);
-
-/* enable or disable SD interrupt */
-extern SDIOH_API_RC sdioh_interrupt_set(sdioh_info_t *si, bool enable_disable);
-
-#if defined(DHD_DEBUG)
-extern bool sdioh_interrupt_pending(sdioh_info_t *si);
-#endif
-
-/* read or write one byte using cmd52 */
-extern SDIOH_API_RC sdioh_request_byte(sdioh_info_t *si, uint rw, uint fnc, uint addr, uint8 *byte);
-
-/* read or write 2/4 bytes using cmd53 */
-extern SDIOH_API_RC sdioh_request_word(sdioh_info_t *si, uint cmd_type, uint rw, uint fnc,
-       uint addr, uint32 *word, uint nbyte);
-
-/* read or write any buffer using cmd53 */
-extern SDIOH_API_RC sdioh_request_buffer(sdioh_info_t *si, uint pio_dma, uint fix_inc,
-       uint rw, uint fnc_num, uint32 addr, uint regwidth, uint32 buflen, uint8 *buffer,
-       void *pkt);
-
-/* get cis data */
-extern SDIOH_API_RC sdioh_cis_read(sdioh_info_t *si, uint fuc, uint8 *cis, uint32 length);
-
-extern SDIOH_API_RC sdioh_cfg_read(sdioh_info_t *si, uint fuc, uint32 addr, uint8 *data);
-extern SDIOH_API_RC sdioh_cfg_write(sdioh_info_t *si, uint fuc, uint32 addr, uint8 *data);
-
-/* query number of io functions */
-extern uint sdioh_query_iofnum(sdioh_info_t *si);
-
-/* handle iovars */
-extern int sdioh_iovar_op(sdioh_info_t *si, const char *name,
-                          void *params, int plen, void *arg, int len, bool set);
-
-/* Issue abort to the specified function and clear controller as needed */
-extern int sdioh_abort(sdioh_info_t *si, uint fnc);
-
-/* Start and Stop SDIO without re-enumerating the SD card. */
-extern int sdioh_start(sdioh_info_t *si, int stage);
-extern int sdioh_stop(sdioh_info_t *si);
-
-/* Reset and re-initialize the device */
-extern int sdioh_sdio_reset(sdioh_info_t *si);
-
-/* Helper function */
-void *bcmsdh_get_sdioh(bcmsdh_info_t *sdh);
-
-
-
-#endif /* _sdio_api_h_ */
diff --git a/drivers/net/wireless/bcm4319/include/bcmsdh.h b/drivers/net/wireless/bcm4319/include/bcmsdh.h
deleted file mode 100644 (file)
index f5dee5c..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * SDIO host client driver interface of Broadcom HNBU
- *     export functions to client drivers
- *     abstract OS and BUS specific details of SDIO
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdh.h,v 13.35.14.7.6.8 2009/10/14 04:22:25 Exp $
- */
-
-#ifndef        _bcmsdh_h_
-#define        _bcmsdh_h_
-
-#define BCMSDH_ERROR_VAL       0x0001 /* Error */
-#define BCMSDH_INFO_VAL                0x0002 /* Info */
-extern const uint bcmsdh_msglevel;
-
-#define BCMSDH_ERROR(x)
-#define BCMSDH_INFO(x)
-
-/* forward declarations */
-typedef struct bcmsdh_info bcmsdh_info_t;
-typedef void (*bcmsdh_cb_fn_t)(void *);
-
-/* Attach and build an interface to the underlying SD host driver.
- *  - Allocates resources (structs, arrays, mem, OS handles, etc) needed by bcmsdh.
- *  - Returns the bcmsdh handle and virtual address base for register access.
- *    The returned handle should be used in all subsequent calls, but the bcmsh
- *    implementation may maintain a single "default" handle (e.g. the first or
- *    most recent one) to enable single-instance implementations to pass NULL.
- */
-extern bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq);
-
-/* Detach - freeup resources allocated in attach */
-extern int bcmsdh_detach(osl_t *osh, void *sdh);
-
-/* Query if SD device interrupts are enabled */
-extern bool bcmsdh_intr_query(void *sdh);
-
-/* Enable/disable SD interrupt */
-extern int bcmsdh_intr_enable(void *sdh);
-extern int bcmsdh_intr_disable(void *sdh);
-
-/* Register/deregister device interrupt handler. */
-extern int bcmsdh_intr_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh);
-extern int bcmsdh_intr_dereg(void *sdh);
-
-#if defined(DHD_DEBUG)
-/* Query pending interrupt status from the host controller */
-extern bool bcmsdh_intr_pending(void *sdh);
-#endif
-
-#ifdef BCMLXSDMMC
-extern int bcmsdh_claim_host_and_lock(void *sdh);
-extern int bcmsdh_release_host_and_unlock(void *sdh);
-#endif /* BCMLXSDMMC */
-
-/* Register a callback to be called if and when bcmsdh detects
- * device removal. No-op in the case of non-removable/hardwired devices.
- */
-extern int bcmsdh_devremove_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh);
-
-/* Access SDIO address space (e.g. CCCR) using CMD52 (single-byte interface).
- *   fn:   function number
- *   addr: unmodified SDIO-space address
- *   data: data byte to write
- *   err:  pointer to error code (or NULL)
- */
-extern uint8 bcmsdh_cfg_read(void *sdh, uint func, uint32 addr, int *err);
-extern void bcmsdh_cfg_write(void *sdh, uint func, uint32 addr, uint8 data, int *err);
-
-/* Read/Write 4bytes from/to cfg space */
-extern uint32 bcmsdh_cfg_read_word(void *sdh, uint fnc_num, uint32 addr, int *err);
-extern void bcmsdh_cfg_write_word(void *sdh, uint fnc_num, uint32 addr, uint32 data, int *err);
-
-/* Read CIS content for specified function.
- *   fn:     function whose CIS is being requested (0 is common CIS)
- *   cis:    pointer to memory location to place results
- *   length: number of bytes to read
- * Internally, this routine uses the values from the cis base regs (0x9-0xB)
- * to form an SDIO-space address to read the data from.
- */
-extern int bcmsdh_cis_read(void *sdh, uint func, uint8 *cis, uint length);
-
-/* Synchronous access to device (client) core registers via CMD53 to F1.
- *   addr: backplane address (i.e. >= regsva from attach)
- *   size: register width in bytes (2 or 4)
- *   data: data for register write
- */
-extern uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size);
-extern uint32 bcmsdh_reg_write(void *sdh, uint32 addr, uint size, uint32 data);
-
-/* Indicate if last reg read/write failed */
-extern bool bcmsdh_regfail(void *sdh);
-
-/* Buffer transfer to/from device (client) core via cmd53.
- *   fn:       function number
- *   addr:     backplane address (i.e. >= regsva from attach)
- *   flags:    backplane width, address increment, sync/async
- *   buf:      pointer to memory data buffer
- *   nbytes:   number of bytes to transfer to/from buf
- *   pkt:      pointer to packet associated with buf (if any)
- *   complete: callback function for command completion (async only)
- *   handle:   handle for completion callback (first arg in callback)
- * Returns 0 or error code.
- * NOTE: Async operation is not currently supported.
- */
-typedef void (*bcmsdh_cmplt_fn_t)(void *handle, int status, bool sync_waiting);
-extern int bcmsdh_send_buf(void *sdh, uint32 addr, uint fn, uint flags,
-                           uint8 *buf, uint nbytes, void *pkt,
-                           bcmsdh_cmplt_fn_t complete, void *handle);
-extern int bcmsdh_recv_buf(void *sdh, uint32 addr, uint fn, uint flags,
-                           uint8 *buf, uint nbytes, void *pkt,
-                           bcmsdh_cmplt_fn_t complete, void *handle);
-
-/* Flags bits */
-#define SDIO_REQ_4BYTE 0x1     /* Four-byte target (backplane) width (vs. two-byte) */
-#define SDIO_REQ_FIXED 0x2     /* Fixed address (FIFO) (vs. incrementing address) */
-#define SDIO_REQ_ASYNC 0x4     /* Async request (vs. sync request) */
-
-/* Pending (non-error) return code */
-#define BCME_PENDING   1
-
-/* Read/write to memory block (F1, no FIFO) via CMD53 (sync only).
- *   rw:       read or write (0/1)
- *   addr:     direct SDIO address
- *   buf:      pointer to memory data buffer
- *   nbytes:   number of bytes to transfer to/from buf
- * Returns 0 or error code.
- */
-extern int bcmsdh_rwdata(void *sdh, uint rw, uint32 addr, uint8 *buf, uint nbytes);
-
-/* Issue an abort to the specified function */
-extern int bcmsdh_abort(void *sdh, uint fn);
-
-/* Start SDIO Host Controller communication */
-extern int bcmsdh_start(void *sdh, int stage);
-
-/* Stop SDIO Host Controller communication */
-extern int bcmsdh_stop(void *sdh);
-
-/* Returns the "Device ID" of target device on the SDIO bus. */
-extern int bcmsdh_query_device(void *sdh);
-
-/* Returns the number of IO functions reported by the device */
-extern uint bcmsdh_query_iofnum(void *sdh);
-
-/* Miscellaneous knob tweaker. */
-extern int bcmsdh_iovar_op(void *sdh, const char *name,
-                           void *params, int plen, void *arg, int len, bool set);
-
-/* Reset and reinitialize the device */
-extern int bcmsdh_reset(bcmsdh_info_t *sdh);
-
-/* helper functions */
-
-extern void *bcmsdh_get_sdioh(bcmsdh_info_t *sdh);
-
-/* callback functions */
-typedef struct {
-       /* attach to device */
-       void *(*attach)(uint16 vend_id, uint16 dev_id, uint16 bus, uint16 slot,
-                       uint16 func, uint bustype, void * regsva, osl_t * osh,
-                       void * param);
-       /* detach from device */
-       void (*detach)(void *ch);
-} bcmsdh_driver_t;
-
-/* platform specific/high level functions */
-extern int bcmsdh_register(bcmsdh_driver_t *driver);
-extern void bcmsdh_unregister(void);
-extern bool bcmsdh_chipmatch(uint16 vendor, uint16 device);
-extern void bcmsdh_device_remove(void * sdh);
-
-#if defined(OOB_INTR_ONLY)
-extern int bcmsdh_register_oob_intr(void * dhdp);
-extern void bcmsdh_unregister_oob_intr(void);
-extern void bcmsdh_oob_intr_set(bool enable);
-#endif /* defined(OOB_INTR_ONLY) */
-/* Function to pass device-status bits to DHD. */
-extern uint32 bcmsdh_get_dstatus(void *sdh);
-
-/* Function to return current window addr */
-extern uint32 bcmsdh_cur_sbwad(void *sdh);
-
-/* Function to pass chipid and rev to lower layers for controlling pr's */
-extern void bcmsdh_chipinfo(void *sdh, uint32 chip, uint32 chiprev);
-
-
-#endif /* _bcmsdh_h_ */
diff --git a/drivers/net/wireless/bcm4319/include/bcmsdh_sdmmc.h b/drivers/net/wireless/bcm4319/include/bcmsdh_sdmmc.h
deleted file mode 100644 (file)
index 6ec5874..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * BCMSDH Function Driver for the native SDIO/MMC driver in the Linux Kernel
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdh_sdmmc.h,v 13.1.2.1.8.7 2009/10/27 18:22:52 Exp $
- */
-
-#ifndef __BCMSDH_SDMMC_H__
-#define __BCMSDH_SDMMC_H__
-
-#define sd_err(x)
-#define sd_trace(x) 
-#define sd_info(x)
-#define sd_debug(x)
-#define sd_data(x)
-#define sd_ctrl(x)
-
-#define sd_sync_dma(sd, read, nbytes)
-#define sd_init_dma(sd)
-#define sd_ack_intr(sd)
-#define sd_wakeup(sd);
-
-/* Allocate/init/free per-OS private data */
-extern int sdioh_sdmmc_osinit(sdioh_info_t *sd);
-extern void sdioh_sdmmc_osfree(sdioh_info_t *sd);
-
-#define sd_log(x)
-
-#define SDIOH_ASSERT(exp) \
-       do { if (!(exp)) \
-               printf("!!!ASSERT fail: file %s lines %d", __FILE__, __LINE__); \
-       } while (0)
-
-#define BLOCK_SIZE_4318 64
-#define BLOCK_SIZE_4328 512
-
-/* internal return code */
-#define SUCCESS        0
-#define ERROR  1
-
-/* private bus modes */
-#define SDIOH_MODE_SD4         2
-#define CLIENT_INTR            0x100   /* Get rid of this! */
-
-struct sdioh_info {
-       osl_t           *osh;                   /* osh handler */
-       bool            client_intr_enabled;    /* interrupt connnected flag */
-       bool            intr_handler_valid;     /* client driver interrupt handler valid */
-       sdioh_cb_fn_t   intr_handler;           /* registered interrupt handler */
-       void            *intr_handler_arg;      /* argument to call interrupt handler */
-       uint16          intmask;                /* Current active interrupts */
-       void            *sdos_info;             /* Pointer to per-OS private data */
-
-       uint            irq;                    /* Client irq */
-       int             intrcount;              /* Client interrupts */
-
-       bool            sd_use_dma;             /* DMA on CMD53 */
-       bool            sd_blockmode;           /* sd_blockmode == FALSE => 64 Byte Cmd 53s. */
-                                               /*  Must be on for sd_multiblock to be effective */
-       bool            use_client_ints;        /* If this is false, make sure to restore */
-       int             sd_mode;                /* SD1/SD4/SPI */
-       int             client_block_size[SDIOD_MAX_IOFUNCS];           /* Blocksize */
-       uint8           num_funcs;              /* Supported funcs on client */
-       uint32          com_cis_ptr;
-       uint32          func_cis_ptr[SDIOD_MAX_IOFUNCS];
-       uint            max_dma_len;
-       uint            max_dma_descriptors;    /* DMA Descriptors supported by this controller. */
-//     SDDMA_DESCRIPTOR        SGList[32];     /* Scatter/Gather DMA List */
-};
-
-/************************************************************
- * Internal interfaces: per-port references into bcmsdh_sdmmc.c
- */
-
-/* Global message bits */
-extern uint sd_msglevel;
-
-/* OS-independent interrupt handler */
-extern bool check_client_intr(sdioh_info_t *sd);
-
-/* Core interrupt enable/disable of device interrupts */
-extern void sdioh_sdmmc_devintr_on(sdioh_info_t *sd);
-extern void sdioh_sdmmc_devintr_off(sdioh_info_t *sd);
-
-
-/**************************************************************
- * Internal interfaces: bcmsdh_sdmmc.c references to per-port code
- */
-
-/* Register mapping routines */
-extern uint32 *sdioh_sdmmc_reg_map(osl_t *osh, int32 addr, int size);
-extern void sdioh_sdmmc_reg_unmap(osl_t *osh, int32 addr, int size);
-
-/* Interrupt (de)registration routines */
-extern int sdioh_sdmmc_register_irq(sdioh_info_t *sd, uint irq);
-extern void sdioh_sdmmc_free_irq(uint irq, sdioh_info_t *sd);
-
-typedef struct _BCMSDH_SDMMC_INSTANCE {
-       sdioh_info_t    *sd;
-       struct sdio_func *func[SDIOD_MAX_IOFUNCS];
-} BCMSDH_SDMMC_INSTANCE, *PBCMSDH_SDMMC_INSTANCE;
-
-#endif /* __BCMSDH_SDMMC_H__ */
diff --git a/drivers/net/wireless/bcm4319/include/bcmsdpcm.h b/drivers/net/wireless/bcm4319/include/bcmsdpcm.h
deleted file mode 100644 (file)
index 77aca45..0000000
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Broadcom SDIO/PCMCIA
- * Software-specific definitions shared between device and host side
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdpcm.h,v 1.1.2.4 2010/07/02 01:15:46 Exp $
- */
-
-#ifndef        _bcmsdpcm_h_
-#define        _bcmsdpcm_h_
-
-/*
- * Software allocation of To SB Mailbox resources
- */
-
-/* intstatus bits */
-#define I_SMB_NAK      I_SMB_SW0       /* To SB Mailbox Frame NAK */
-#define I_SMB_INT_ACK  I_SMB_SW1       /* To SB Mailbox Host Interrupt ACK */
-#define I_SMB_USE_OOB  I_SMB_SW2       /* To SB Mailbox Use OOB Wakeup */
-#define I_SMB_DEV_INT  I_SMB_SW3       /* To SB Mailbox Miscellaneous Interrupt */
-
-/* tosbmailbox bits corresponding to intstatus bits */
-#define SMB_NAK                (1 << 0)        /* To SB Mailbox Frame NAK */
-#define SMB_INT_ACK    (1 << 1)        /* To SB Mailbox Host Interrupt ACK */
-#define SMB_USE_OOB    (1 << 2)        /* To SB Mailbox Use OOB Wakeup */
-#define SMB_DEV_INT    (1 << 3)        /* To SB Mailbox Miscellaneous Interrupt */
-#define SMB_MASK       0x0000000f      /* To SB Mailbox Mask */
-
-/* tosbmailboxdata */
-#define SMB_DATA_VERSION_MASK  0x00ff0000      /* host protocol version (sent with F2 enable) */
-#define SMB_DATA_VERSION_SHIFT 16              /* host protocol version (sent with F2 enable) */
-
-/*
- * Software allocation of To Host Mailbox resources
- */
-
-/* intstatus bits */
-#define I_HMB_FC_STATE I_HMB_SW0       /* To Host Mailbox Flow Control State */
-#define I_HMB_FC_CHANGE        I_HMB_SW1       /* To Host Mailbox Flow Control State Changed */
-#define I_HMB_FRAME_IND        I_HMB_SW2       /* To Host Mailbox Frame Indication */
-#define I_HMB_HOST_INT I_HMB_SW3       /* To Host Mailbox Miscellaneous Interrupt */
-
-/* tohostmailbox bits corresponding to intstatus bits */
-#define HMB_FC_ON      (1 << 0)        /* To Host Mailbox Flow Control State */
-#define HMB_FC_CHANGE  (1 << 1)        /* To Host Mailbox Flow Control State Changed */
-#define HMB_FRAME_IND  (1 << 2)        /* To Host Mailbox Frame Indication */
-#define HMB_HOST_INT   (1 << 3)        /* To Host Mailbox Miscellaneous Interrupt */
-#define HMB_MASK       0x0000000f      /* To Host Mailbox Mask */
-
-/* tohostmailboxdata */
-#define HMB_DATA_NAKHANDLED    1       /* we're ready to retransmit NAK'd frame to host */
-#define HMB_DATA_DEVREADY      2       /* we're ready to to talk to host after enable */
-#define HMB_DATA_FC            4       /* per prio flowcontrol update flag to host */
-#define HMB_DATA_FWREADY       8       /* firmware is ready for protocol activity */
-
-#define HMB_DATA_FCDATA_MASK   0xff000000      /* per prio flowcontrol data */
-#define HMB_DATA_FCDATA_SHIFT  24              /* per prio flowcontrol data */
-
-#define HMB_DATA_VERSION_MASK  0x00ff0000      /* device protocol version (with devready) */
-#define HMB_DATA_VERSION_SHIFT 16              /* device protocol version (with devready) */
-
-/*
- * Software-defined protocol header
- */
-
-/* Current protocol version */
-#define SDPCM_PROT_VERSION     4
-
-/* SW frame header */
-#define SDPCM_SEQUENCE_MASK            0x000000ff      /* Sequence Number Mask */
-#define SDPCM_PACKET_SEQUENCE(p) (((uint8 *)p)[0] & 0xff) /* p starts w/SW Header */
-
-#define SDPCM_CHANNEL_MASK             0x00000f00      /* Channel Number Mask */
-#define SDPCM_CHANNEL_SHIFT            8               /* Channel Number Shift */
-#define SDPCM_PACKET_CHANNEL(p) (((uint8 *)p)[1] & 0x0f) /* p starts w/SW Header */
-
-#define SDPCM_FLAGS_MASK               0x0000f000      /* Mask of flag bits */
-#define SDPCM_FLAGS_SHIFT              12              /* Flag bits shift */
-#define SDPCM_PACKET_FLAGS(p) ((((uint8 *)p)[1] & 0xf0) >> 4) /* p starts w/SW Header */
-
-/* Next Read Len: lookahead length of next frame, in 16-byte units (rounded up) */
-#define SDPCM_NEXTLEN_MASK             0x00ff0000      /* Next Read Len Mask */
-#define SDPCM_NEXTLEN_SHIFT            16              /* Next Read Len Shift */
-#define SDPCM_NEXTLEN_VALUE(p) ((((uint8 *)p)[2] & 0xff) << 4) /* p starts w/SW Header */
-#define SDPCM_NEXTLEN_OFFSET           2
-
-/* Data Offset from SOF (HW Tag, SW Tag, Pad) */
-#define SDPCM_DOFFSET_OFFSET           3               /* Data Offset */
-#define SDPCM_DOFFSET_VALUE(p)                 (((uint8 *)p)[SDPCM_DOFFSET_OFFSET] & 0xff)
-#define SDPCM_DOFFSET_MASK             0xff000000
-#define SDPCM_DOFFSET_SHIFT            24
-
-#define SDPCM_FCMASK_OFFSET            4               /* Flow control */
-#define SDPCM_FCMASK_VALUE(p)          (((uint8 *)p)[SDPCM_FCMASK_OFFSET ] & 0xff)
-#define SDPCM_WINDOW_OFFSET            5               /* Credit based fc */
-#define SDPCM_WINDOW_VALUE(p)          (((uint8 *)p)[SDPCM_WINDOW_OFFSET] & 0xff)
-#define SDPCM_VERSION_OFFSET           6               /* Version # */
-#define SDPCM_VERSION_VALUE(p)         (((uint8 *)p)[SDPCM_VERSION_OFFSET] & 0xff)
-#define SDPCM_UNUSED_OFFSET            7               /* Spare */
-#define SDPCM_UNUSED_VALUE(p)          (((uint8 *)p)[SDPCM_UNUSED_OFFSET] & 0xff)
-
-#define SDPCM_SWHEADER_LEN     8       /* SW header is 64 bits */
-
-/* logical channel numbers */
-#define SDPCM_CONTROL_CHANNEL  0       /* Control Request/Response Channel Id */
-#define SDPCM_EVENT_CHANNEL    1       /* Asyc Event Indication Channel Id */
-#define SDPCM_DATA_CHANNEL     2       /* Data Xmit/Recv Channel Id */
-#define SDPCM_GLOM_CHANNEL     3       /* For coalesced packets (superframes) */
-#define SDPCM_TEST_CHANNEL     15      /* Reserved for test/debug packets */
-#define SDPCM_MAX_CHANNEL      15
-
-#define SDPCM_SEQUENCE_WRAP    256     /* wrap-around val for eight-bit frame seq number */
-
-#define SDPCM_FLAG_RESVD0      0x01
-#define SDPCM_FLAG_RESVD1      0x02
-#define SDPCM_FLAG_GSPI_TXENAB 0x04
-#define SDPCM_FLAG_GLOMDESC    0x08    /* Superframe descriptor mask */
-
-/* For GLOM_CHANNEL frames, use a flag to indicate descriptor frame */
-#define SDPCM_GLOMDESC_FLAG    (SDPCM_FLAG_GLOMDESC << SDPCM_FLAGS_SHIFT)
-
-#define SDPCM_GLOMDESC(p)      (((uint8 *)p)[1] & 0x80)
-
-/* For TEST_CHANNEL packets, define another 4-byte header */
-#define SDPCM_TEST_HDRLEN      4       /* Generally: Cmd(1), Ext(1), Len(2);
-                                        * Semantics of Ext byte depend on command.
-                                        * Len is current or requested frame length, not
-                                        * including test header; sent little-endian.
-                                        */
-#define SDPCM_TEST_DISCARD     0x01    /* Receiver discards. Ext is a pattern id. */
-#define SDPCM_TEST_ECHOREQ     0x02    /* Echo request. Ext is a pattern id. */
-#define SDPCM_TEST_ECHORSP     0x03    /* Echo response. Ext is a pattern id. */
-#define SDPCM_TEST_BURST       0x04    /* Receiver to send a burst. Ext is a frame count */
-#define SDPCM_TEST_SEND                0x05    /* Receiver sets send mode. Ext is boolean on/off */
-
-/* Handy macro for filling in datagen packets with a pattern */
-#define SDPCM_TEST_FILL(byteno, id)    ((uint8)(id + byteno))
-
-/*
- * Software counters (first part matches hardware counters)
- */
-
-typedef volatile struct {
-       uint32 cmd52rd;         /* Cmd52RdCount, SDIO: cmd52 reads */
-       uint32 cmd52wr;         /* Cmd52WrCount, SDIO: cmd52 writes */
-       uint32 cmd53rd;         /* Cmd53RdCount, SDIO: cmd53 reads */
-       uint32 cmd53wr;         /* Cmd53WrCount, SDIO: cmd53 writes */
-       uint32 abort;           /* AbortCount, SDIO: aborts */
-       uint32 datacrcerror;    /* DataCrcErrorCount, SDIO: frames w/CRC error */
-       uint32 rdoutofsync;     /* RdOutOfSyncCount, SDIO/PCMCIA: Rd Frm out of sync */
-       uint32 wroutofsync;     /* RdOutOfSyncCount, SDIO/PCMCIA: Wr Frm out of sync */
-       uint32 writebusy;       /* WriteBusyCount, SDIO: device asserted "busy" */
-       uint32 readwait;        /* ReadWaitCount, SDIO: no data ready for a read cmd */
-       uint32 readterm;        /* ReadTermCount, SDIO: read frame termination cmds */
-       uint32 writeterm;       /* WriteTermCount, SDIO: write frames termination cmds */
-       uint32 rxdescuflo;      /* receive descriptor underflows */
-       uint32 rxfifooflo;      /* receive fifo overflows */
-       uint32 txfifouflo;      /* transmit fifo underflows */
-       uint32 runt;            /* runt (too short) frames recv'd from bus */
-       uint32 badlen;          /* frame's rxh len does not match its hw tag len */
-       uint32 badcksum;        /* frame's hw tag chksum doesn't agree with len value */
-       uint32 seqbreak;        /* break in sequence # space from one rx frame to the next */
-       uint32 rxfcrc;          /* frame rx header indicates crc error */
-       uint32 rxfwoos;         /* frame rx header indicates write out of sync */
-       uint32 rxfwft;          /* frame rx header indicates write frame termination */
-       uint32 rxfabort;        /* frame rx header indicates frame aborted */
-       uint32 woosint;         /* write out of sync interrupt */
-       uint32 roosint;         /* read out of sync interrupt */
-       uint32 rftermint;       /* read frame terminate interrupt */
-       uint32 wftermint;       /* write frame terminate interrupt */
-} sdpcmd_cnt_t;
-
-/*
- * Register Access Macros
- */
-
-#define SDIODREV_IS(var, val)  ((var) == (val))
-#define SDIODREV_GE(var, val)  ((var) >= (val))
-#define SDIODREV_GT(var, val)  ((var) > (val))
-#define SDIODREV_LT(var, val)  ((var) < (val))
-#define SDIODREV_LE(var, val)  ((var) <= (val))
-
-#define SDIODDMAREG32(h, dir, chnl) \
-       ((dir) == DMA_TX ? \
-        (void *)(uintptr)&((h)->regs->dma.sdiod32.dma32regs[chnl].xmt) : \
-        (void *)(uintptr)&((h)->regs->dma.sdiod32.dma32regs[chnl].rcv))
-
-#define SDIODDMAREG64(h, dir, chnl) \
-       ((dir) == DMA_TX ? \
-        (void *)(uintptr)&((h)->regs->dma.sdiod64.dma64regs[chnl].xmt) : \
-        (void *)(uintptr)&((h)->regs->dma.sdiod64.dma64regs[chnl].rcv))
-
-#define SDIODDMAREG(h, dir, chnl) \
-       (SDIODREV_LT((h)->corerev, 1) ? \
-        SDIODDMAREG32((h), (dir), (chnl)) : \
-        SDIODDMAREG64((h), (dir), (chnl)))
-
-#define PCMDDMAREG(h, dir, chnl) \
-       ((dir) == DMA_TX ? \
-        (void *)(uintptr)&((h)->regs->dma.pcm32.dmaregs.xmt) : \
-        (void *)(uintptr)&((h)->regs->dma.pcm32.dmaregs.rcv))
-
-#define SDPCMDMAREG(h, dir, chnl, coreid) \
-       ((coreid) == SDIOD_CORE_ID ? \
-        SDIODDMAREG(h, dir, chnl) : \
-        PCMDDMAREG(h, dir, chnl))
-
-#define SDIODFIFOREG(h, corerev) \
-       (SDIODREV_LT((corerev), 1) ? \
-        ((dma32diag_t *)(uintptr)&((h)->regs->dma.sdiod32.dmafifo)) : \
-        ((dma32diag_t *)(uintptr)&((h)->regs->dma.sdiod64.dmafifo)))
-
-#define PCMDFIFOREG(h) \
-       ((dma32diag_t *)(uintptr)&((h)->regs->dma.pcm32.dmafifo))
-
-#define SDPCMFIFOREG(h, coreid, corerev) \
-       ((coreid) == SDIOD_CORE_ID ? \
-        SDIODFIFOREG(h, corerev) : \
-        PCMDFIFOREG(h))
-
-/*
- * Shared structure between dongle and the host
- * The structure contains pointers to trap or assert information shared with the host
- */
-#define SDPCM_SHARED_VERSION       0x0002
-#define SDPCM_SHARED_VERSION_MASK  0x00FF
-#define SDPCM_SHARED_ASSERT_BUILT  0x0100
-#define SDPCM_SHARED_ASSERT        0x0200
-#define SDPCM_SHARED_TRAP          0x0400
-
-typedef struct {
-       uint32  flags;
-       uint32  trap_addr;
-       uint32  assert_exp_addr;
-       uint32  assert_file_addr;
-       uint32  assert_line;
-       uint32  console_addr;           /* Address of hndrte_cons_t */
-       uint32  msgtrace_addr;
-       uint8   tag[32];
-} sdpcm_shared_t;
-
-extern sdpcm_shared_t sdpcm_shared;
-
-#endif /* _bcmsdpcm_h_ */
diff --git a/drivers/net/wireless/bcm4319/include/bcmsdspi.h b/drivers/net/wireless/bcm4319/include/bcmsdspi.h
deleted file mode 100644 (file)
index eaae10d..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * SD-SPI Protocol Conversion - BCMSDH->SPI Translation Layer
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdspi.h,v 13.8.10.2 2008/06/30 21:09:40 Exp $
- */
-
-/* global msglevel for debug messages - bitvals come from sdiovar.h */
-
-#define sd_err(x)
-#define sd_trace(x)
-#define sd_info(x)
-#define sd_debug(x)
-#define sd_data(x)
-#define sd_ctrl(x)
-
-#define sd_log(x)
-
-#define SDIOH_ASSERT(exp) \
-       do { if (!(exp)) \
-               printf("!!!ASSERT fail: file %s lines %d", __FILE__, __LINE__); \
-       } while (0)
-
-#define BLOCK_SIZE_4318 64
-#define BLOCK_SIZE_4328 512
-
-/* internal return code */
-#define SUCCESS        0
-#undef ERROR
-#define ERROR  1
-
-/* private bus modes */
-#define SDIOH_MODE_SPI         0
-
-#define USE_BLOCKMODE          0x2     /* Block mode can be single block or multi */
-#define USE_MULTIBLOCK         0x4
-
-struct sdioh_info {
-       uint cfg_bar;                           /* pci cfg address for bar */
-       uint32 caps;                            /* cached value of capabilities reg */
-       uint            bar0;                   /* BAR0 for PCI Device */
-       osl_t           *osh;                   /* osh handler */
-       void            *controller;    /* Pointer to SPI Controller's private data struct */
-
-       uint            lockcount;              /* nest count of sdspi_lock() calls */
-       bool            client_intr_enabled;    /* interrupt connnected flag */
-       bool            intr_handler_valid;     /* client driver interrupt handler valid */
-       sdioh_cb_fn_t   intr_handler;           /* registered interrupt handler */
-       void            *intr_handler_arg;      /* argument to call interrupt handler */
-       bool            initialized;            /* card initialized */
-       uint32          target_dev;             /* Target device ID */
-       uint32          intmask;                /* Current active interrupts */
-       void            *sdos_info;             /* Pointer to per-OS private data */
-
-       uint32          controller_type;        /* Host controller type */
-       uint8           version;                /* Host Controller Spec Compliance Version */
-       uint            irq;                    /* Client irq */
-       uint32          intrcount;              /* Client interrupts */
-       uint32          local_intrcount;        /* Controller interrupts */
-       bool            host_init_done;         /* Controller initted */
-       bool            card_init_done;         /* Client SDIO interface initted */
-       bool            polled_mode;            /* polling for command completion */
-
-       bool            sd_use_dma;             /* DMA on CMD53 */
-       bool            sd_blockmode;           /* sd_blockmode == FALSE => 64 Byte Cmd 53s. */
-                                               /*  Must be on for sd_multiblock to be effective */
-       bool            use_client_ints;        /* If this is false, make sure to restore */
-       bool            got_hcint;              /* Host Controller interrupt. */
-                                               /*  polling hack in wl_linux.c:wl_timer() */
-       int             adapter_slot;           /* Maybe dealing with multiple slots/controllers */
-       int             sd_mode;                /* SD1/SD4/SPI */
-       int             client_block_size[SDIOD_MAX_IOFUNCS];           /* Blocksize */
-       uint32          data_xfer_count;        /* Current register transfer size */
-       uint32          cmd53_wr_data;          /* Used to pass CMD53 write data */
-       uint32          card_response;          /* Used to pass back response status byte */
-       uint32          card_rsp_data;          /* Used to pass back response data word */
-       uint16          card_rca;               /* Current Address */
-       uint8           num_funcs;              /* Supported funcs on client */
-       uint32          com_cis_ptr;
-       uint32          func_cis_ptr[SDIOD_MAX_IOFUNCS];
-       void            *dma_buf;
-       ulong           dma_phys;
-       int             r_cnt;                  /* rx count */
-       int             t_cnt;                  /* tx_count */
-};
-
-/************************************************************
- * Internal interfaces: per-port references into bcmsdspi.c
- */
-
-/* Global message bits */
-extern uint sd_msglevel;
-
-/**************************************************************
- * Internal interfaces: bcmsdspi.c references to per-port code
- */
-
-/* Register mapping routines */
-extern uint32 *spi_reg_map(osl_t *osh, uintptr addr, int size);
-extern void spi_reg_unmap(osl_t *osh, uintptr addr, int size);
-
-/* Interrupt (de)registration routines */
-extern int spi_register_irq(sdioh_info_t *sd, uint irq);
-extern void spi_free_irq(uint irq, sdioh_info_t *sd);
-
-/* OS-specific interrupt wrappers (atomic interrupt enable/disable) */
-extern void spi_lock(sdioh_info_t *sd);
-extern void spi_unlock(sdioh_info_t *sd);
-
-/* Allocate/init/free per-OS private data */
-extern int spi_osinit(sdioh_info_t *sd);
-extern void spi_osfree(sdioh_info_t *sd);
diff --git a/drivers/net/wireless/bcm4319/include/bcmsdstd.h b/drivers/net/wireless/bcm4319/include/bcmsdstd.h
deleted file mode 100644 (file)
index 974b3d4..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- *  'Standard' SDIO HOST CONTROLLER driver
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmsdstd.h,v 13.16.18.1.16.3 2009/12/10 01:09:23 Exp $
- */
-
-/* global msglevel for debug messages - bitvals come from sdiovar.h */
-
-#define sd_err(x)      do { if (sd_msglevel & SDH_ERROR_VAL) printf x; } while (0)
-#define sd_trace(x)
-#define sd_info(x)
-#define sd_debug(x)
-#define sd_data(x)
-#define sd_ctrl(x)
-#define sd_dma(x)
-
-#define sd_sync_dma(sd, read, nbytes)
-#define sd_init_dma(sd)
-#define sd_ack_intr(sd)
-#define sd_wakeup(sd);
-/* Allocate/init/free per-OS private data */
-extern int sdstd_osinit(sdioh_info_t *sd);
-extern void sdstd_osfree(sdioh_info_t *sd);
-
-#define sd_log(x)
-
-#define SDIOH_ASSERT(exp) \
-       do { if (!(exp)) \
-               printf("!!!ASSERT fail: file %s lines %d", __FILE__, __LINE__); \
-       } while (0)
-
-#define BLOCK_SIZE_4318 64
-#define BLOCK_SIZE_4328 512
-
-/* internal return code */
-#define SUCCESS        0
-#define ERROR  1
-
-/* private bus modes */
-#define SDIOH_MODE_SPI         0
-#define SDIOH_MODE_SD1         1
-#define SDIOH_MODE_SD4         2
-
-#define MAX_SLOTS 6    /* For PCI: Only 6 BAR entries => 6 slots */
-#define SDIOH_REG_WINSZ        0x100 /* Number of registers in Standard Host Controller */
-
-#define SDIOH_TYPE_ARASAN_HDK  1
-#define SDIOH_TYPE_BCM27XX     2
-#define SDIOH_TYPE_TI_PCIXX21  4       /* TI PCIxx21 Standard Host Controller */
-#define SDIOH_TYPE_RICOH_R5C822        5       /* Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter */
-#define SDIOH_TYPE_JMICRON     6       /* JMicron Standard SDIO Host Controller */
-
-/* For linux, allow yielding for dongle */
-#define BCMSDYIELD
-
-/* Expected card status value for CMD7 */
-#define SDIOH_CMD7_EXP_STATUS   0x00001E00
-
-#define RETRIES_LARGE 100000
-#define RETRIES_SMALL 100
-
-
-#define USE_BLOCKMODE          0x2     /* Block mode can be single block or multi */
-#define USE_MULTIBLOCK         0x4
-
-#define USE_FIFO               0x8     /* Fifo vs non-fifo */
-
-#define CLIENT_INTR            0x100   /* Get rid of this! */
-
-
-struct sdioh_info {
-       uint cfg_bar;                           /* pci cfg address for bar */
-       uint32 caps;                            /* cached value of capabilities reg */
-       uint32 curr_caps;                       /* max current capabilities reg */
-
-       osl_t           *osh;                   /* osh handler */
-       volatile char   *mem_space;             /* pci device memory va */
-       uint            lockcount;              /* nest count of sdstd_lock() calls */
-       bool            client_intr_enabled;    /* interrupt connnected flag */
-       bool            intr_handler_valid;     /* client driver interrupt handler valid */
-       sdioh_cb_fn_t   intr_handler;           /* registered interrupt handler */
-       void            *intr_handler_arg;      /* argument to call interrupt handler */
-       bool            initialized;            /* card initialized */
-       uint            target_dev;             /* Target device ID */
-       uint16          intmask;                /* Current active interrupts */
-       void            *sdos_info;             /* Pointer to per-OS private data */
-
-       uint32          controller_type;        /* Host controller type */
-       uint8           version;                /* Host Controller Spec Compliance Version */
-       uint            irq;                    /* Client irq */
-       int             intrcount;              /* Client interrupts */
-       int             local_intrcount;        /* Controller interrupts */
-       bool            host_init_done;         /* Controller initted */
-       bool            card_init_done;         /* Client SDIO interface initted */
-       bool            polled_mode;            /* polling for command completion */
-
-       bool            sd_blockmode;           /* sd_blockmode == FALSE => 64 Byte Cmd 53s. */
-                                               /*  Must be on for sd_multiblock to be effective */
-       bool            use_client_ints;        /* If this is false, make sure to restore */
-                                               /*  polling hack in wl_linux.c:wl_timer() */
-       int             adapter_slot;           /* Maybe dealing with multiple slots/controllers */
-       int             sd_mode;                /* SD1/SD4/SPI */
-       int             client_block_size[SDIOD_MAX_IOFUNCS];           /* Blocksize */
-       uint32          data_xfer_count;        /* Current transfer */
-       uint16          card_rca;               /* Current Address */
-       int8            sd_dma_mode;            /* DMA Mode (PIO, SDMA, ... ADMA2) on CMD53 */
-       uint8           num_funcs;              /* Supported funcs on client */
-       uint32          com_cis_ptr;
-       uint32          func_cis_ptr[SDIOD_MAX_IOFUNCS];
-       void            *dma_buf;               /* DMA Buffer virtual address */
-       ulong           dma_phys;               /* DMA Buffer physical address */
-       void            *adma2_dscr_buf;        /* ADMA2 Descriptor Buffer virtual address */
-       ulong           adma2_dscr_phys;        /* ADMA2 Descriptor Buffer physical address */
-
-       /* adjustments needed to make the dma align properly */
-       void            *dma_start_buf;
-       ulong           dma_start_phys;
-       uint            alloced_dma_size;
-       void            *adma2_dscr_start_buf;
-       ulong           adma2_dscr_start_phys;
-       uint            alloced_adma2_dscr_size;
-
-       int             r_cnt;                  /* rx count */
-       int             t_cnt;                  /* tx_count */
-       bool            got_hcint;              /* local interrupt flag */
-       uint16          last_intrstatus;        /* to cache intrstatus */
-};
-
-#define DMA_MODE_NONE  0
-#define DMA_MODE_SDMA  1
-#define DMA_MODE_ADMA1 2
-#define DMA_MODE_ADMA2 3
-#define DMA_MODE_ADMA2_64 4
-#define DMA_MODE_AUTO  -1
-
-#define USE_DMA(sd)            ((bool)((sd->sd_dma_mode > 0) ? TRUE : FALSE))
-
-/* SDIO Host Control Register DMA Mode Definitions */
-#define SDIOH_SDMA_MODE                        0
-#define SDIOH_ADMA1_MODE               1
-#define SDIOH_ADMA2_MODE               2
-#define SDIOH_ADMA2_64_MODE            3
-
-#define ADMA2_ATTRIBUTE_VALID          (1 << 0)        /* ADMA Descriptor line valid */
-#define ADMA2_ATTRIBUTE_END                    (1 << 1)        /* End of Descriptor */
-#define ADMA2_ATTRIBUTE_INT                    (1 << 2)        /* Interrupt when line is done */
-#define ADMA2_ATTRIBUTE_ACT_NOP                (0 << 4)        /* Skip current line, go to next. */
-#define ADMA2_ATTRIBUTE_ACT_RSV                (1 << 4)        /* Same as NOP */
-#define ADMA1_ATTRIBUTE_ACT_SET                (1 << 4)        /* ADMA1 Only - set transfer length */
-#define ADMA2_ATTRIBUTE_ACT_TRAN       (2 << 4)        /* Transfer Data of one descriptor line. */
-#define ADMA2_ATTRIBUTE_ACT_LINK       (3 << 4)        /* Link Descriptor */
-
-/* ADMA2 Descriptor Table Entry for 32-bit Address */
-typedef struct adma2_dscr_32b {
-       uint32 len_attr;
-       uint32 phys_addr;
-} adma2_dscr_32b_t;
-
-/* ADMA1 Descriptor Table Entry */
-typedef struct adma1_dscr {
-       uint32 phys_addr_attr;
-} adma1_dscr_t;
-
-/************************************************************
- * Internal interfaces: per-port references into bcmsdstd.c
- */
-
-/* Global message bits */
-extern uint sd_msglevel;
-
-/* OS-independent interrupt handler */
-extern bool check_client_intr(sdioh_info_t *sd);
-
-/* Core interrupt enable/disable of device interrupts */
-extern void sdstd_devintr_on(sdioh_info_t *sd);
-extern void sdstd_devintr_off(sdioh_info_t *sd);
-
-/* Enable/disable interrupts for local controller events */
-extern void sdstd_intrs_on(sdioh_info_t *sd, uint16 norm, uint16 err);
-extern void sdstd_intrs_off(sdioh_info_t *sd, uint16 norm, uint16 err);
-
-/* Wait for specified interrupt and error bits to be set */
-extern void sdstd_spinbits(sdioh_info_t *sd, uint16 norm, uint16 err);
-
-
-/**************************************************************
- * Internal interfaces: bcmsdstd.c references to per-port code
- */
-
-/* Register mapping routines */
-extern uint32 *sdstd_reg_map(osl_t *osh, int32 addr, int size);
-extern void sdstd_reg_unmap(osl_t *osh, int32 addr, int size);
-
-/* Interrupt (de)registration routines */
-extern int sdstd_register_irq(sdioh_info_t *sd, uint irq);
-extern void sdstd_free_irq(uint irq, sdioh_info_t *sd);
-
-/* OS-specific interrupt wrappers (atomic interrupt enable/disable) */
-extern void sdstd_lock(sdioh_info_t *sd);
-extern void sdstd_unlock(sdioh_info_t *sd);
-
-/* OS-specific wait-for-interrupt-or-status */
-extern uint16 sdstd_waitbits(sdioh_info_t *sd, uint16 norm, uint16 err, bool yield);
diff --git a/drivers/net/wireless/bcm4319/include/bcmspi.h b/drivers/net/wireless/bcm4319/include/bcmspi.h
deleted file mode 100644 (file)
index 2e2bc93..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Broadcom SPI Low-Level Hardware Driver API
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmspi.h,v 13.3.10.2 2008/06/30 21:09:40 Exp $
- */
-
-extern void spi_devintr_off(sdioh_info_t *sd);
-extern void spi_devintr_on(sdioh_info_t *sd);
-extern bool spi_start_clock(sdioh_info_t *sd, uint16 new_sd_divisor);
-extern bool spi_controller_highspeed_mode(sdioh_info_t *sd, bool hsmode);
-extern bool spi_check_client_intr(sdioh_info_t *sd, int *is_dev_intr);
-extern bool spi_hw_attach(sdioh_info_t *sd);
-extern bool spi_hw_detach(sdioh_info_t *sd);
-extern void spi_sendrecv(sdioh_info_t *sd, uint8 *msg_out, uint8 *msg_in, int msglen);
-extern void spi_spinbits(sdioh_info_t *sd);
-extern void spi_waitbits(sdioh_info_t *sd, bool yield);
diff --git a/drivers/net/wireless/bcm4319/include/bcmutils.h b/drivers/net/wireless/bcm4319/include/bcmutils.h
deleted file mode 100644 (file)
index f85ed35..0000000
+++ /dev/null
@@ -1,637 +0,0 @@
-/*
- * Misc useful os-independent macros and functions.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: bcmutils.h,v 13.184.4.6.2.1.18.25 2010/04/26 06:05:24 Exp $
- */
-
-
-#ifndef        _bcmutils_h_
-#define        _bcmutils_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define _BCM_U 0x01    
-#define _BCM_L 0x02    
-#define _BCM_D 0x04    
-#define _BCM_C 0x08    
-#define _BCM_P 0x10    
-#define _BCM_S 0x20    
-#define _BCM_X 0x40    
-#define _BCM_SP        0x80    
-
-extern const unsigned char bcm_ctype[];
-#define bcm_ismask(x)  (bcm_ctype[(int)(unsigned char)(x)])
-
-#define bcm_isalnum(c) ((bcm_ismask(c)&(_BCM_U|_BCM_L|_BCM_D)) != 0)
-#define bcm_isalpha(c) ((bcm_ismask(c)&(_BCM_U|_BCM_L)) != 0)
-#define bcm_iscntrl(c) ((bcm_ismask(c)&(_BCM_C)) != 0)
-#define bcm_isdigit(c) ((bcm_ismask(c)&(_BCM_D)) != 0)
-#define bcm_isgraph(c) ((bcm_ismask(c)&(_BCM_P|_BCM_U|_BCM_L|_BCM_D)) != 0)
-#define bcm_islower(c) ((bcm_ismask(c)&(_BCM_L)) != 0)
-#define bcm_isprint(c) ((bcm_ismask(c)&(_BCM_P|_BCM_U|_BCM_L|_BCM_D|_BCM_SP)) != 0)
-#define bcm_ispunct(c) ((bcm_ismask(c)&(_BCM_P)) != 0)
-#define bcm_isspace(c) ((bcm_ismask(c)&(_BCM_S)) != 0)
-#define bcm_isupper(c) ((bcm_ismask(c)&(_BCM_U)) != 0)
-#define bcm_isxdigit(c)        ((bcm_ismask(c)&(_BCM_D|_BCM_X)) != 0)
-#define bcm_tolower(c) (bcm_isupper((c)) ? ((c) + 'a' - 'A') : (c))
-#define bcm_toupper(c) (bcm_islower((c)) ? ((c) + 'A' - 'a') : (c))
-
-
-
-struct bcmstrbuf {
-       char *buf;      
-       unsigned int size;      
-       char *origbuf;  
-       unsigned int origsize;  
-};
-
-
-#ifdef BCMDRIVER
-#include <osl.h>
-
-#define GPIO_PIN_NOTDEFINED    0x20    
-
-
-#define SPINWAIT(exp, us) { \
-       uint countdown = (us) + 9; \
-       while ((exp) && (countdown >= 10)) {\
-               OSL_DELAY(10); \
-               countdown -= 10; \
-       } \
-}
-
-
-
-#ifndef PKTQ_LEN_DEFAULT
-#define PKTQ_LEN_DEFAULT        128    
-#endif
-#ifndef PKTQ_MAX_PREC
-#define PKTQ_MAX_PREC           16     
-#endif
-
-typedef struct pktq_prec {
-       void *head;     
-       void *tail;     
-       uint16 len;     
-       uint16 max;     
-} pktq_prec_t;
-
-
-
-struct pktq {
-       uint16 num_prec;        
-       uint16 hi_prec;         
-       uint16 max;             
-       uint16 len;             
-       
-       struct pktq_prec q[PKTQ_MAX_PREC];
-};
-
-
-struct spktq {
-       uint16 num_prec;        
-       uint16 hi_prec;         
-       uint16 max;             
-       uint16 len;             
-       
-       struct pktq_prec q[1];
-};
-
-#define PKTQ_PREC_ITER(pq, prec)        for (prec = (pq)->num_prec - 1; prec >= 0; prec--)
-
-
-
-
-struct ether_addr;
-
-extern int ether_isbcast(const void *ea);
-extern int ether_isnulladdr(const void *ea);
-
-
-
-#define pktq_psetmax(pq, prec, _max)    ((pq)->q[prec].max = (_max))
-#define pktq_plen(pq, prec)             ((pq)->q[prec].len)
-#define pktq_pavail(pq, prec)           ((pq)->q[prec].max - (pq)->q[prec].len)
-#define pktq_pfull(pq, prec)            ((pq)->q[prec].len >= (pq)->q[prec].max)
-#define pktq_pempty(pq, prec)           ((pq)->q[prec].len == 0)
-
-#define pktq_ppeek(pq, prec)            ((pq)->q[prec].head)
-#define pktq_ppeek_tail(pq, prec)       ((pq)->q[prec].tail)
-
-extern void *pktq_penq(struct pktq *pq, int prec, void *p);
-extern void *pktq_penq_head(struct pktq *pq, int prec, void *p);
-extern void *pktq_pdeq(struct pktq *pq, int prec);
-extern void *pktq_pdeq_tail(struct pktq *pq, int prec);
-
-extern bool pktq_pdel(struct pktq *pq, void *p, int prec);
-
-
-extern void pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir);
-
-extern void pktq_flush(osl_t *osh, struct pktq *pq, bool dir);
-
-
-
-extern int pktq_mlen(struct pktq *pq, uint prec_bmp);
-extern void *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out);
-
-
-
-#define pktq_len(pq)                    ((int)(pq)->len)
-#define pktq_max(pq)                    ((int)(pq)->max)
-#define pktq_avail(pq)                  ((int)((pq)->max - (pq)->len))
-#define pktq_full(pq)                   ((pq)->len >= (pq)->max)
-#define pktq_empty(pq)                  ((pq)->len == 0)
-
-
-#define pktenq(pq, p)          pktq_penq(((struct pktq *)pq), 0, (p))
-#define pktenq_head(pq, p)     pktq_penq_head(((struct pktq *)pq), 0, (p))
-#define pktdeq(pq)             pktq_pdeq(((struct pktq *)pq), 0)
-#define pktdeq_tail(pq)                pktq_pdeq_tail(((struct pktq *)pq), 0)
-#define pktqinit(pq, len) pktq_init(((struct pktq *)pq), 1, len)
-
-extern void pktq_init(struct pktq *pq, int num_prec, int max_len);
-
-extern void *pktq_deq(struct pktq *pq, int *prec_out);
-extern void *pktq_deq_tail(struct pktq *pq, int *prec_out);
-extern void *pktq_peek(struct pktq *pq, int *prec_out);
-extern void *pktq_peek_tail(struct pktq *pq, int *prec_out);
-
-
-
-extern uint pktcopy(osl_t *osh, void *p, uint offset, int len, uchar *buf);
-extern uint pktfrombuf(osl_t *osh, void *p, uint offset, int len, uchar *buf);
-extern uint pkttotlen(osl_t *osh, void *p);
-extern void *pktlast(osl_t *osh, void *p);
-extern uint pktsegcnt(osl_t *osh, void *p);
-
-
-extern uint pktsetprio(void *pkt, bool update_vtag);
-#define        PKTPRIO_VDSCP   0x100           
-#define        PKTPRIO_VLAN    0x200           
-#define        PKTPRIO_UPD     0x400           
-#define        PKTPRIO_DSCP    0x800           
-
-
-extern int bcm_atoi(char *s);
-extern ulong bcm_strtoul(char *cp, char **endp, uint base);
-extern char *bcmstrstr(char *haystack, char *needle);
-extern char *bcmstrcat(char *dest, const char *src);
-extern char *bcmstrncat(char *dest, const char *src, uint size);
-extern ulong wchar2ascii(char *abuf, ushort *wbuf, ushort wbuflen, ulong abuflen);
-char* bcmstrtok(char **string, const char *delimiters, char *tokdelim);
-int bcmstricmp(const char *s1, const char *s2);
-int bcmstrnicmp(const char* s1, const char* s2, int cnt);
-
-
-
-extern char *bcm_ether_ntoa(const struct ether_addr *ea, char *buf);
-extern int bcm_ether_atoe(char *p, struct ether_addr *ea);
-
-
-struct ipv4_addr;
-extern char *bcm_ip_ntoa(struct ipv4_addr *ia, char *buf);
-
-
-extern void bcm_mdelay(uint ms);
-
-extern char *getvar(char *vars, const char *name);
-extern int getintvar(char *vars, const char *name);
-extern uint getgpiopin(char *vars, char *pin_name, uint def_pin);
-#define bcm_perf_enable()
-#define bcmstats(fmt)
-#define        bcmlog(fmt, a1, a2)
-#define        bcmdumplog(buf, size)   *buf = '\0'
-#define        bcmdumplogent(buf, idx) -1
-
-#define bcmtslog(tstamp, fmt, a1, a2)
-#define bcmprinttslogs()
-#define bcmprinttstamp(us)
-
-
-
-
-typedef struct bcm_iovar {
-       const char *name;       
-       uint16 varid;           
-       uint16 flags;           
-       uint16 type;            
-       uint16 minlen;          
-} bcm_iovar_t;
-
-
-
-
-#define IOV_GET 0 
-#define IOV_SET 1 
-
-
-#define IOV_GVAL(id)           ((id)*2)
-#define IOV_SVAL(id)           (((id)*2)+IOV_SET)
-#define IOV_ISSET(actionid)    ((actionid & IOV_SET) == IOV_SET)
-
-
-
-extern const bcm_iovar_t *bcm_iovar_lookup(const bcm_iovar_t *table, const char *name);
-extern int bcm_iovar_lencheck(const bcm_iovar_t *table, void *arg, int len, bool set);
-
-#endif 
-
-
-#define IOVT_VOID      0       
-#define IOVT_BOOL      1       
-#define IOVT_INT8      2       
-#define IOVT_UINT8     3       
-#define IOVT_INT16     4       
-#define IOVT_UINT16    5       
-#define IOVT_INT32     6       
-#define IOVT_UINT32    7       
-#define IOVT_BUFFER    8       
-#define BCM_IOVT_VALID(type) (((unsigned int)(type)) <= IOVT_BUFFER)
-
-
-#define BCM_IOV_TYPE_INIT { \
-       "void", \
-       "bool", \
-       "int8", \
-       "uint8", \
-       "int16", \
-       "uint16", \
-       "int32", \
-       "uint32", \
-       "buffer", \
-       "" }
-
-#define BCM_IOVT_IS_INT(type) (\
-       (type == IOVT_BOOL) || \
-       (type == IOVT_INT8) || \
-       (type == IOVT_UINT8) || \
-       (type == IOVT_INT16) || \
-       (type == IOVT_UINT16) || \
-       (type == IOVT_INT32) || \
-       (type == IOVT_UINT32))
-
-
-
-#define BCME_STRLEN            64      
-#define VALID_BCMERROR(e)  ((e <= 0) && (e >= BCME_LAST))
-
-
-
-
-#define BCME_OK                                0       
-#define BCME_ERROR                     -1      
-#define BCME_BADARG                    -2      
-#define BCME_BADOPTION                 -3      
-#define BCME_NOTUP                     -4      
-#define BCME_NOTDOWN                   -5      
-#define BCME_NOTAP                     -6      
-#define BCME_NOTSTA                    -7      
-#define BCME_BADKEYIDX                 -8      
-#define BCME_RADIOOFF                  -9      
-#define BCME_NOTBANDLOCKED             -10     
-#define BCME_NOCLK                     -11     
-#define BCME_BADRATESET                        -12     
-#define BCME_BADBAND                   -13     
-#define BCME_BUFTOOSHORT               -14     
-#define BCME_BUFTOOLONG                        -15     
-#define BCME_BUSY                      -16     
-#define BCME_NOTASSOCIATED             -17     
-#define BCME_BADSSIDLEN                        -18     
-#define BCME_OUTOFRANGECHAN            -19     
-#define BCME_BADCHAN                   -20     
-#define BCME_BADADDR                   -21     
-#define BCME_NORESOURCE                        -22     
-#define BCME_UNSUPPORTED               -23     
-#define BCME_BADLEN                    -24     
-#define BCME_NOTREADY                  -25     
-#define BCME_EPERM                     -26     
-#define BCME_NOMEM                     -27     
-#define BCME_ASSOCIATED                        -28     
-#define BCME_RANGE                     -29     
-#define BCME_NOTFOUND                  -30     
-#define BCME_WME_NOT_ENABLED           -31     
-#define BCME_TSPEC_NOTFOUND            -32     
-#define BCME_ACM_NOTSUPPORTED          -33     
-#define BCME_NOT_WME_ASSOCIATION       -34     
-#define BCME_SDIO_ERROR                        -35     
-#define BCME_DONGLE_DOWN               -36     
-#define BCME_VERSION                   -37     
-#define BCME_TXFAIL                    -38     
-#define BCME_RXFAIL                    -39     
-#define BCME_NODEVICE                  -40     
-#define BCME_UNFINISHED                        -41     
-#define BCME_LAST                      BCME_UNFINISHED
-
-
-#define BCMERRSTRINGTABLE {            \
-       "OK",                           \
-       "Undefined error",              \
-       "Bad Argument",                 \
-       "Bad Option",                   \
-       "Not up",                       \
-       "Not down",                     \
-       "Not AP",                       \
-       "Not STA",                      \
-       "Bad Key Index",                \
-       "Radio Off",                    \
-       "Not band locked",              \
-       "No clock",                     \
-       "Bad Rate valueset",            \
-       "Bad Band",                     \
-       "Buffer too short",             \
-       "Buffer too long",              \
-       "Busy",                         \
-       "Not Associated",               \
-       "Bad SSID len",                 \
-       "Out of Range Channel",         \
-       "Bad Channel",                  \
-       "Bad Address",                  \
-       "Not Enough Resources",         \
-       "Unsupported",                  \
-       "Bad length",                   \
-       "Not Ready",                    \
-       "Not Permitted",                \
-       "No Memory",                    \
-       "Associated",                   \
-       "Not In Range",                 \
-       "Not Found",                    \
-       "WME Not Enabled",              \
-       "TSPEC Not Found",              \
-       "ACM Not Supported",            \
-       "Not WME Association",          \
-       "SDIO Bus Error",               \
-       "Dongle Not Accessible",        \
-       "Incorrect version",            \
-       "TX Failure",                   \
-       "RX Failure",                   \
-       "Device Not Present",           \
-       "Command not finished",         \
-}
-
-#ifndef ABS
-#define        ABS(a)                  (((a) < 0)?-(a):(a))
-#endif 
-
-#ifndef MIN
-#define        MIN(a, b)               (((a) < (b))?(a):(b))
-#endif 
-
-#ifndef MAX
-#define        MAX(a, b)               (((a) > (b))?(a):(b))
-#endif 
-
-#define CEIL(x, y)             (((x) + ((y)-1)) / (y))
-#define        ROUNDUP(x, y)           ((((x)+((y)-1))/(y))*(y))
-#define        ISALIGNED(a, x)         (((a) & ((x)-1)) == 0)
-#define ALIGN_ADDR(addr, boundary) (void *)(((uintptr)(addr) + (boundary) - 1) \
-                                                & ~((boundary) - 1))
-#define        ISPOWEROF2(x)           ((((x)-1)&(x)) == 0)
-#define VALID_MASK(mask)       !((mask) & ((mask) + 1))
-#ifndef OFFSETOF
-#define        OFFSETOF(type, member)  ((uint)(uintptr)&((type *)0)->member)
-#endif 
-#ifndef ARRAYSIZE
-#define ARRAYSIZE(a)           (sizeof(a)/sizeof(a[0]))
-#endif
-
-
-#ifndef setbit
-#ifndef NBBY                 
-#define        NBBY    8       
-#endif 
-#define        setbit(a, i)    (((uint8 *)a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define        clrbit(a, i)    (((uint8 *)a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define        isset(a, i)     (((const uint8 *)a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define        isclr(a, i)     ((((const uint8 *)a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-#endif 
-
-#define        NBITS(type)     (sizeof(type) * 8)
-#define NBITVAL(nbits) (1 << (nbits))
-#define MAXBITVAL(nbits)       ((1 << (nbits)) - 1)
-#define        NBITMASK(nbits) MAXBITVAL(nbits)
-#define MAXNBVAL(nbyte)        MAXBITVAL((nbyte) * 8)
-
-
-#define MUX(pred, true, false) ((pred) ? (true) : (false))
-
-
-#define MODDEC(x, bound) MUX((x) == 0, (bound) - 1, (x) - 1)
-#define MODINC(x, bound) MUX((x) == (bound) - 1, 0, (x) + 1)
-
-
-#define MODDEC_POW2(x, bound) (((x) - 1) & ((bound) - 1))
-#define MODINC_POW2(x, bound) (((x) + 1) & ((bound) - 1))
-
-
-#define MODADD(x, y, bound) \
-    MUX((x) + (y) >= (bound), (x) + (y) - (bound), (x) + (y))
-#define MODSUB(x, y, bound) \
-    MUX(((int)(x)) - ((int)(y)) < 0, (x) - (y) + (bound), (x) - (y))
-
-
-#define MODADD_POW2(x, y, bound) (((x) + (y)) & ((bound) - 1))
-#define MODSUB_POW2(x, y, bound) (((x) - (y)) & ((bound) - 1))
-
-
-#define CRC8_INIT_VALUE  0xff          
-#define CRC8_GOOD_VALUE  0x9f          
-#define CRC16_INIT_VALUE 0xffff                
-#define CRC16_GOOD_VALUE 0xf0b8                
-#define CRC32_INIT_VALUE 0xffffffff    
-#define CRC32_GOOD_VALUE 0xdebb20e3    
-
-
-typedef struct bcm_bit_desc {
-       uint32  bit;
-       const char* name;
-} bcm_bit_desc_t;
-
-
-typedef struct bcm_tlv {
-       uint8   id;
-       uint8   len;
-       uint8   data[1];
-} bcm_tlv_t;
-
-
-#define bcm_valid_tlv(elt, buflen) ((buflen) >= 2 && (int)(buflen) >= (int)(2 + (elt)->len))
-
-
-#define ETHER_ADDR_STR_LEN     18      
-
-
-#ifdef IL_BIGENDIAN
-static INLINE uint32
-load32_ua(uint8 *a)
-{
-       return ((a[0] << 24) | (a[1] << 16) | (a[2] << 8) | a[3]);
-}
-
-static INLINE void
-store32_ua(uint8 *a, uint32 v)
-{
-       a[0] = (v >> 24) & 0xff;
-       a[1] = (v >> 16) & 0xff;
-       a[2] = (v >> 8) & 0xff;
-       a[3] = v & 0xff;
-}
-
-static INLINE uint16
-load16_ua(uint8 *a)
-{
-       return ((a[0] << 8) | a[1]);
-}
-
-static INLINE void
-store16_ua(uint8 *a, uint16 v)
-{
-       a[0] = (v >> 8) & 0xff;
-       a[1] = v & 0xff;
-}
-
-#else 
-
-static INLINE uint32
-load32_ua(uint8 *a)
-{
-       return ((a[3] << 24) | (a[2] << 16) | (a[1] << 8) | a[0]);
-}
-
-static INLINE void
-store32_ua(uint8 *a, uint32 v)
-{
-       a[3] = (v >> 24) & 0xff;
-       a[2] = (v >> 16) & 0xff;
-       a[1] = (v >> 8) & 0xff;
-       a[0] = v & 0xff;
-}
-
-static INLINE uint16
-load16_ua(uint8 *a)
-{
-       return ((a[1] << 8) | a[0]);
-}
-
-static INLINE void
-store16_ua(uint8 *a, uint16 v)
-{
-       a[1] = (v >> 8) & 0xff;
-       a[0] = v & 0xff;
-}
-
-#endif 
-
-
-
-static INLINE void
-xor_128bit_block(const uint8 *src1, const uint8 *src2, uint8 *dst)
-{
-       if (
-#ifdef __i386__
-           1 ||
-#endif
-           (((uintptr)src1 | (uintptr)src2 | (uintptr)dst) & 3) == 0) {
-               
-               
-               ((uint32 *)dst)[0] = ((uint32 *)src1)[0] ^ ((uint32 *)src2)[0];
-               ((uint32 *)dst)[1] = ((uint32 *)src1)[1] ^ ((uint32 *)src2)[1];
-               ((uint32 *)dst)[2] = ((uint32 *)src1)[2] ^ ((uint32 *)src2)[2];
-               ((uint32 *)dst)[3] = ((uint32 *)src1)[3] ^ ((uint32 *)src2)[3];
-       } else {
-               
-               int k;
-               for (k = 0; k < 16; k++)
-                       dst[k] = src1[k] ^ src2[k];
-       }
-}
-
-
-
-extern uint8 hndcrc8(uint8 *p, uint nbytes, uint8 crc);
-extern uint16 hndcrc16(uint8 *p, uint nbytes, uint16 crc);
-extern uint32 hndcrc32(uint8 *p, uint nbytes, uint32 crc);
-
-#if defined(DHD_DEBUG) || defined(WLMSG_PRHDRS) || defined(WLMSG_PRPKT) || \
-       defined(WLMSG_ASSOC)
-extern int bcm_format_flags(const bcm_bit_desc_t *bd, uint32 flags, char* buf, int len);
-extern int bcm_format_hex(char *str, const void *bytes, int len);
-extern void prhex(const char *msg, uchar *buf, uint len);
-#endif 
-extern char *bcm_brev_str(uint32 brev, char *buf);
-extern void printbig(char *buf);
-
-
-extern bcm_tlv_t *bcm_next_tlv(bcm_tlv_t *elt, int *buflen);
-extern bcm_tlv_t *bcm_parse_tlvs(void *buf, int buflen, uint key);
-extern bcm_tlv_t *bcm_parse_ordered_tlvs(void *buf, int buflen, uint key);
-
-
-extern const char *bcmerrorstr(int bcmerror);
-
-
-typedef uint32 mbool;
-#define mboolset(mb, bit)              ((mb) |= (bit))         
-#define mboolclr(mb, bit)              ((mb) &= ~(bit))        
-#define mboolisset(mb, bit)            (((mb) & (bit)) != 0)   
-#define        mboolmaskset(mb, mask, val)     ((mb) = (((mb) & ~(mask)) | (val)))
-
-
-extern uint16 bcm_qdbm_to_mw(uint8 qdbm);
-extern uint8 bcm_mw_to_qdbm(uint16 mw);
-
-
-struct fielddesc {
-       const char *nameandfmt;
-       uint32  offset;
-       uint32  len;
-};
-
-extern void bcm_binit(struct bcmstrbuf *b, char *buf, uint size);
-extern int bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...);
-extern void bcm_inc_bytes(uchar *num, int num_bytes, uint8 amount);
-extern int bcm_cmp_bytes(uchar *arg1, uchar *arg2, uint8 nbytes);
-extern void bcm_print_bytes(char *name, const uchar *cdata, int len);
-
-typedef  uint32 (*bcmutl_rdreg_rtn)(void *arg0, uint arg1, uint32 offset);
-extern uint bcmdumpfields(bcmutl_rdreg_rtn func_ptr, void *arg0, uint arg1, struct fielddesc *str,
-                          char *buf, uint32 bufsize);
-
-extern uint bcm_mkiovar(char *name, char *data, uint datalen, char *buf, uint len);
-extern uint bcm_bitcount(uint8 *bitmap, uint bytelength);
-
-#if defined(WLTINYDUMP) || defined(WLMSG_INFORM) || defined(WLMSG_ASSOC) || \
-       defined(WLMSG_PRPKT) || defined(WLMSG_WSEC)
-extern int bcm_format_ssid(char* buf, const uchar ssid[], uint ssid_len);
-#endif 
-
-
-#define SSID_FMT_BUF_LEN       ((4 * DOT11_MAX_SSID_LEN) + 1)
-
-#ifdef __cplusplus
-       }
-#endif
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/bcmwifi.h b/drivers/net/wireless/bcm4319/include/bcmwifi.h
deleted file mode 100644 (file)
index 038aedc..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Misc utility routines for WL and Apps
- * This header file housing the define and function prototype use by
- * both the wl driver, tools & Apps.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: bcmwifi.h,v 1.15.30.4 2010/03/10 20:10:52 Exp $
- */
-
-
-#ifndef        _bcmwifi_h_
-#define        _bcmwifi_h_
-
-
-
-typedef uint16 chanspec_t;
-
-
-#define CH_UPPER_SB                    0x01
-#define CH_LOWER_SB                    0x02
-#define CH_EWA_VALID                   0x04
-#define CH_20MHZ_APART                 4
-#define CH_10MHZ_APART                 2
-#define CH_5MHZ_APART                  1
-#define CH_MAX_2G_CHANNEL              14      
-#define WLC_MAX_2G_CHANNEL             CH_MAX_2G_CHANNEL 
-#define        MAXCHANNEL              224     
-
-#define WL_CHANSPEC_CHAN_MASK          0x00ff
-#define WL_CHANSPEC_CHAN_SHIFT         0
-
-#define WL_CHANSPEC_CTL_SB_MASK                0x0300
-#define WL_CHANSPEC_CTL_SB_SHIFT            8
-#define WL_CHANSPEC_CTL_SB_LOWER       0x0100
-#define WL_CHANSPEC_CTL_SB_UPPER       0x0200
-#define WL_CHANSPEC_CTL_SB_NONE                0x0300
-
-#define WL_CHANSPEC_BW_MASK            0x0C00
-#define WL_CHANSPEC_BW_SHIFT               10
-#define WL_CHANSPEC_BW_10              0x0400
-#define WL_CHANSPEC_BW_20              0x0800
-#define WL_CHANSPEC_BW_40              0x0C00
-
-#define WL_CHANSPEC_BAND_MASK          0xf000
-#define WL_CHANSPEC_BAND_SHIFT         12
-#define WL_CHANSPEC_BAND_5G            0x1000
-#define WL_CHANSPEC_BAND_2G            0x2000
-#define INVCHANSPEC                    255
-
-
-#define WF_CHAN_FACTOR_2_4_G           4814    
-#define WF_CHAN_FACTOR_5_G             10000   
-#define WF_CHAN_FACTOR_4_G             8000    
-
-
-#define LOWER_20_SB(channel)   ((channel > CH_10MHZ_APART) ? (channel - CH_10MHZ_APART) : 0)
-#define UPPER_20_SB(channel)   ((channel < (MAXCHANNEL - CH_10MHZ_APART)) ? \
-                               (channel + CH_10MHZ_APART) : 0)
-#define CHSPEC_WLCBANDUNIT(chspec)     (CHSPEC_IS5G(chspec) ? BAND_5G_INDEX : BAND_2G_INDEX)
-#define CH20MHZ_CHSPEC(channel)        (chanspec_t)((chanspec_t)(channel) | WL_CHANSPEC_BW_20 | \
-                               WL_CHANSPEC_CTL_SB_NONE | (((channel) <= CH_MAX_2G_CHANNEL) ? \
-                               WL_CHANSPEC_BAND_2G : WL_CHANSPEC_BAND_5G))
-#define NEXT_20MHZ_CHAN(channel)       ((channel < (MAXCHANNEL - CH_20MHZ_APART)) ? \
-                                       (channel + CH_20MHZ_APART) : 0)
-#define CH40MHZ_CHSPEC(channel, ctlsb) (chanspec_t) \
-                                       ((channel) | (ctlsb) | WL_CHANSPEC_BW_40 | \
-                                       ((channel) <= CH_MAX_2G_CHANNEL ? WL_CHANSPEC_BAND_2G : \
-                                       WL_CHANSPEC_BAND_5G))
-#define CHSPEC_CHANNEL(chspec) ((uint8)(chspec & WL_CHANSPEC_CHAN_MASK))
-#define CHSPEC_BAND(chspec)    (chspec & WL_CHANSPEC_BAND_MASK)
-
-#ifdef WL20MHZ_ONLY
-
-#define CHSPEC_CTL_SB(chspec)  WL_CHANSPEC_CTL_SB_NONE
-#define CHSPEC_BW(chspec)      WL_CHANSPEC_BW_20
-#define CHSPEC_IS10(chspec)    0
-#define CHSPEC_IS20(chspec)    1
-#ifndef CHSPEC_IS40
-#define CHSPEC_IS40(chspec)    0
-#endif
-
-#else 
-
-#define CHSPEC_CTL_SB(chspec)  (chspec & WL_CHANSPEC_CTL_SB_MASK)
-#define CHSPEC_BW(chspec)      (chspec & WL_CHANSPEC_BW_MASK)
-#define CHSPEC_IS10(chspec)    ((chspec & WL_CHANSPEC_BW_MASK) == WL_CHANSPEC_BW_10)
-#define CHSPEC_IS20(chspec)    ((chspec & WL_CHANSPEC_BW_MASK) == WL_CHANSPEC_BW_20)
-#ifndef CHSPEC_IS40
-#define CHSPEC_IS40(chspec)    (((chspec) & WL_CHANSPEC_BW_MASK) == WL_CHANSPEC_BW_40)
-#endif
-
-#endif 
-
-#define CHSPEC_IS5G(chspec)    ((chspec & WL_CHANSPEC_BAND_MASK) == WL_CHANSPEC_BAND_5G)
-#define CHSPEC_IS2G(chspec)    ((chspec & WL_CHANSPEC_BAND_MASK) == WL_CHANSPEC_BAND_2G)
-#define CHSPEC_SB_NONE(chspec) ((chspec & WL_CHANSPEC_CTL_SB_MASK) == WL_CHANSPEC_CTL_SB_NONE)
-#define CHSPEC_SB_UPPER(chspec)        ((chspec & WL_CHANSPEC_CTL_SB_MASK) == WL_CHANSPEC_CTL_SB_UPPER)
-#define CHSPEC_SB_LOWER(chspec)        ((chspec & WL_CHANSPEC_CTL_SB_MASK) == WL_CHANSPEC_CTL_SB_LOWER)
-#define CHSPEC_CTL_CHAN(chspec)  ((CHSPEC_SB_LOWER(chspec)) ? \
-                                 (LOWER_20_SB(((chspec) & WL_CHANSPEC_CHAN_MASK))) : \
-                                 (UPPER_20_SB(((chspec) & WL_CHANSPEC_CHAN_MASK))))
-
-#define CHSPEC2WLC_BAND(chspec) (CHSPEC_IS5G((chspec))? WLC_BAND_5G: WLC_BAND_2G)
-
-#define CHANSPEC_STR_LEN    8
-
-
-#define WLC_MAXRATE    108     
-#define WLC_RATE_1M    2       
-#define WLC_RATE_2M    4       
-#define WLC_RATE_5M5   11      
-#define WLC_RATE_11M   22      
-#define WLC_RATE_6M    12      
-#define WLC_RATE_9M    18      
-#define WLC_RATE_12M   24      
-#define WLC_RATE_18M   36      
-#define WLC_RATE_24M   48      
-#define WLC_RATE_36M   72      
-#define WLC_RATE_48M   96      
-#define WLC_RATE_54M   108     
-
-#define WLC_2G_25MHZ_OFFSET            5       
-
-
-extern char * wf_chspec_ntoa(chanspec_t chspec, char *buf);
-
-
-extern chanspec_t wf_chspec_aton(char *a);
-
-
-extern int wf_mhz2channel(uint freq, uint start_factor);
-
-
-extern int wf_channel2mhz(uint channel, uint start_factor);
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/dhdioctl.h b/drivers/net/wireless/bcm4319/include/dhdioctl.h
deleted file mode 100644 (file)
index 980a143..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Definitions for ioctls to access DHD iovars.
- * Based on wlioctl.h (for Broadcom 802.11abg driver).
- * (Moves towards generic ioctls for BCM drivers/iovars.)
- *
- * Definitions subject to change without notice.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: dhdioctl.h,v 13.7.8.1.4.1.16.5 2010/05/21 21:49:38 Exp $
- */
-
-#ifndef _dhdioctl_h_
-#define        _dhdioctl_h_
-
-#include <typedefs.h>
-
-
-/* require default structure packing */
-#define BWL_DEFAULT_PACKING
-#include <packed_section_start.h>
-
-
-/* Linux network driver ioctl encoding */
-typedef struct dhd_ioctl {
-       uint cmd;       /* common ioctl definition */
-       void *buf;      /* pointer to user buffer */
-       uint len;       /* length of user buffer */
-       bool set;       /* get or set request (optional) */
-       uint used;      /* bytes read or written (optional) */
-       uint needed;    /* bytes needed (optional) */
-       uint driver;    /* to identify target driver */
-} dhd_ioctl_t;
-
-/* per-driver magic numbers */
-#define DHD_IOCTL_MAGIC                0x00444944
-
-/* bump this number if you change the ioctl interface */
-#define DHD_IOCTL_VERSION      1
-
-#define        DHD_IOCTL_MAXLEN        8192            /* max length ioctl buffer required */
-#define        DHD_IOCTL_SMLEN         256             /* "small" length ioctl buffer required */
-
-/* common ioctl definitions */
-#define DHD_GET_MAGIC                          0
-#define DHD_GET_VERSION                                1
-#define DHD_GET_VAR                            2
-#define DHD_SET_VAR                            3
-
-/* message levels */
-#define DHD_ERROR_VAL  0x0001
-#define DHD_TRACE_VAL  0x0002
-#define DHD_INFO_VAL   0x0004
-#define DHD_DATA_VAL   0x0008
-#define DHD_CTL_VAL    0x0010
-#define DHD_TIMER_VAL  0x0020
-#define DHD_HDRS_VAL   0x0040
-#define DHD_BYTES_VAL  0x0080
-#define DHD_INTR_VAL   0x0100
-#define DHD_LOG_VAL    0x0200
-#define DHD_GLOM_VAL   0x0400
-#define DHD_EVENT_VAL  0x0800
-#define DHD_BTA_VAL    0x1000
-#define DHD_ISCAN_VAL 0x2000
-
-#ifdef SDTEST
-/* For pktgen iovar */
-typedef struct dhd_pktgen {
-       uint version;           /* To allow structure change tracking */
-       uint freq;              /* Max ticks between tx/rx attempts */
-       uint count;             /* Test packets to send/rcv each attempt */
-       uint print;             /* Print counts every <print> attempts */
-       uint total;             /* Total packets (or bursts) */
-       uint minlen;            /* Minimum length of packets to send */
-       uint maxlen;            /* Maximum length of packets to send */
-       uint numsent;           /* Count of test packets sent */
-       uint numrcvd;           /* Count of test packets received */
-       uint numfail;           /* Count of test send failures */
-       uint mode;              /* Test mode (type of test packets) */
-       uint stop;              /* Stop after this many tx failures */
-} dhd_pktgen_t;
-
-/* Version in case structure changes */
-#define DHD_PKTGEN_VERSION 2
-
-/* Type of test packets to use */
-#define DHD_PKTGEN_ECHO                1 /* Send echo requests */
-#define DHD_PKTGEN_SEND        2 /* Send discard packets */
-#define DHD_PKTGEN_RXBURST     3 /* Request dongle send N packets */
-#define DHD_PKTGEN_RECV                4 /* Continuous rx from continuous tx dongle */
-#endif /* SDTEST */
-
-/* Enter idle immediately (no timeout) */
-#define DHD_IDLE_IMMEDIATE     (-1)
-
-/* Values for idleclock iovar: other values are the sd_divisor to use when idle */
-#define DHD_IDLE_ACTIVE        0       /* Do not request any SD clock change when idle */
-#define DHD_IDLE_STOP   (-1)   /* Request SD clock be stopped (and use SD1 mode) */
-
-
-/* require default structure packing */
-#include <packed_section_end.h>
-
-
-#endif /* _dhdioctl_h_ */
diff --git a/drivers/net/wireless/bcm4319/include/epivers.h b/drivers/net/wireless/bcm4319/include/epivers.h
deleted file mode 100644 (file)
index 114c735..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: epivers.h.in,v 13.25 2005/10/28 18:35:33 Exp $
- *
-*/
-
-
-#ifndef _epivers_h_
-#define _epivers_h_
-
-#define        EPI_MAJOR_VERSION       4
-
-#define        EPI_MINOR_VERSION       218
-
-#define        EPI_RC_NUMBER           245
-
-#define        EPI_INCREMENTAL_NUMBER  0
-
-#define        EPI_BUILD_NUMBER        0
-
-#define        EPI_VERSION             4, 218, 245, 0
-
-#define        EPI_VERSION_NUM         0x04daf500
-
-
-#define        EPI_VERSION_STR         "4.218.245.0"
-#define        EPI_ROUTER_VERSION_STR  "4.219.245.0"
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/hndpmu.h b/drivers/net/wireless/bcm4319/include/hndpmu.h
deleted file mode 100644 (file)
index e829b3d..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * HND SiliconBackplane PMU support.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: hndpmu.h,v 13.14.4.3.4.3.8.7 2010/04/09 13:20:51 Exp $
- */
-
-#ifndef _hndpmu_h_
-#define _hndpmu_h_
-
-
-extern void si_pmu_otp_power(si_t *sih, osl_t *osh, bool on);
-extern void si_sdiod_drive_strength_init(si_t *sih, osl_t *osh, uint32 drivestrength);
-
-#endif /* _hndpmu_h_ */
diff --git a/drivers/net/wireless/bcm4319/include/hndrte_armtrap.h b/drivers/net/wireless/bcm4319/include/hndrte_armtrap.h
deleted file mode 100644 (file)
index ca3281b..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * HNDRTE arm trap handling.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: hndrte_armtrap.h,v 13.3.196.2 2010/07/15 19:06:11 Exp $
- */
-
-#ifndef        _hndrte_armtrap_h
-#define        _hndrte_armtrap_h
-
-
-/* ARM trap handling */
-
-/* Trap types defined by ARM (see arminc.h) */
-
-/* Trap locations in lo memory */
-#define        TRAP_STRIDE     4
-#define FIRST_TRAP     TR_RST
-#define LAST_TRAP      (TR_FIQ * TRAP_STRIDE)
-
-#if defined(__ARM_ARCH_4T__)
-#define        MAX_TRAP_TYPE   (TR_FIQ + 1)
-#elif defined(__ARM_ARCH_7M__)
-#define        MAX_TRAP_TYPE   (TR_ISR + ARMCM3_NUMINTS)
-#endif /* __ARM_ARCH_7M__ */
-
-/* The trap structure is defined here as offsets for assembly */
-#define        TR_TYPE         0x00
-#define        TR_EPC          0x04
-#define        TR_CPSR         0x08
-#define        TR_SPSR         0x0c
-#define        TR_REGS         0x10
-#define        TR_REG(n)       (TR_REGS + (n) * 4)
-#define        TR_SP           TR_REG(13)
-#define        TR_LR           TR_REG(14)
-#define        TR_PC           TR_REG(15)
-
-#define        TRAP_T_SIZE     80
-
-#ifndef        _LANGUAGE_ASSEMBLY
-
-#include <typedefs.h>
-
-typedef struct _trap_struct {
-       uint32          type;
-       uint32          epc;
-       uint32          cpsr;
-       uint32          spsr;
-       uint32          r0;
-       uint32          r1;
-       uint32          r2;
-       uint32          r3;
-       uint32          r4;
-       uint32          r5;
-       uint32          r6;
-       uint32          r7;
-       uint32          r8;
-       uint32          r9;
-       uint32          r10;
-       uint32          r11;
-       uint32          r12;
-       uint32          r13;
-       uint32          r14;
-       uint32          pc;
-} trap_t;
-
-#endif /* !_LANGUAGE_ASSEMBLY */
-
-#endif /* _hndrte_armtrap_h */
diff --git a/drivers/net/wireless/bcm4319/include/hndrte_cons.h b/drivers/net/wireless/bcm4319/include/hndrte_cons.h
deleted file mode 100644 (file)
index a424174..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Console support for hndrte.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: hndrte_cons.h,v 13.1.2.4 2010/07/15 19:06:11 Exp $
- */
-
-#include <typedefs.h>
-
-#define CBUF_LEN       (128)
-
-#define LOG_BUF_LEN    1024
-
-typedef struct {
-       uint32          buf;            /* Can't be pointer on (64-bit) hosts */
-       uint            buf_size;
-       uint            idx;
-       char            *_buf_compat;   /* Redundant pointer for backward compat. */
-} hndrte_log_t;
-
-typedef struct {
-       /* Virtual UART
-        *   When there is no UART (e.g. Quickturn), the host should write a complete
-        *   input line directly into cbuf and then write the length into vcons_in.
-        *   This may also be used when there is a real UART (at risk of conflicting with
-        *   the real UART).  vcons_out is currently unused.
-        */
-       volatile uint   vcons_in;
-       volatile uint   vcons_out;
-
-       /* Output (logging) buffer
-        *   Console output is written to a ring buffer log_buf at index log_idx.
-        *   The host may read the output when it sees log_idx advance.
-        *   Output will be lost if the output wraps around faster than the host polls.
-        */
-       hndrte_log_t    log;
-
-       /* Console input line buffer
-        *   Characters are read one at a time into cbuf until <CR> is received, then
-        *   the buffer is processed as a command line.  Also used for virtual UART.
-        */
-       uint            cbuf_idx;
-       char            cbuf[CBUF_LEN];
-} hndrte_cons_t;
diff --git a/drivers/net/wireless/bcm4319/include/hndsoc.h b/drivers/net/wireless/bcm4319/include/hndsoc.h
deleted file mode 100644 (file)
index 3542417..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Broadcom HND chip & on-chip-interconnect-related definitions.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: hndsoc.h,v 13.3.10.3 2008/08/06 03:43:25 Exp $
- */
-
-#ifndef        _HNDSOC_H
-#define        _HNDSOC_H
-
-/* Include the soci specific files */
-#include <sbconfig.h>
-#include <aidmp.h>
-
-/*
- * SOC Interconnect Address Map.
- * All regions may not exist on all chips.
- */
-#define SI_SDRAM_BASE          0x00000000      /* Physical SDRAM */
-#define SI_PCI_MEM             0x08000000      /* Host Mode sb2pcitranslation0 (64 MB) */
-#define SI_PCI_MEM_SZ          (64 * 1024 * 1024)
-#define SI_PCI_CFG             0x0c000000      /* Host Mode sb2pcitranslation1 (64 MB) */
-#define        SI_SDRAM_SWAPPED        0x10000000      /* Byteswapped Physical SDRAM */
-
-#define SI_ENUM_BASE           0x18000000      /* Enumeration space base */
-#define SI_CORE_SIZE           0x1000          /* each core gets 4Kbytes for registers */
-#ifndef SI_MAXCORES
-#define        SI_MAXCORES             16              /* Max cores (this is arbitrary, for software
-                                                * convenience and could be changed if we
-                                                * make any larger chips
-                                                */
-#endif
-
-#define        SI_FASTRAM              0x19000000      /* On-chip RAM on chips that also have DDR */
-
-#define        SI_FLASH2               0x1c000000      /* Flash Region 2 (region 1 shadowed here) */
-#define        SI_FLASH2_SZ            0x02000000      /* Size of Flash Region 2 */
-#define        SI_ARMCM3_ROM           0x1e000000      /* ARM Cortex-M3 ROM */
-#define        SI_FLASH1               0x1fc00000      /* MIPS Flash Region 1 */
-#define        SI_FLASH1_SZ            0x00400000      /* MIPS Size of Flash Region 1 */
-#define        SI_ARM7S_ROM            0x20000000      /* ARM7TDMI-S ROM */
-#define        SI_ARMCM3_SRAM2         0x60000000      /* ARM Cortex-M3 SRAM Region 2 */
-#define        SI_ARM7S_SRAM2          0x80000000      /* ARM7TDMI-S SRAM Region 2 */
-#define        SI_ARM_FLASH1           0xffff0000      /* ARM Flash Region 1 */
-#define        SI_ARM_FLASH1_SZ        0x00010000      /* ARM Size of Flash Region 1 */
-
-#define SI_PCI_DMA             0x40000000      /* Client Mode sb2pcitranslation2 (1 GB) */
-#define SI_PCI_DMA2            0x80000000      /* Client Mode sb2pcitranslation2 (1 GB) */
-#define SI_PCI_DMA_SZ          0x40000000      /* Client Mode sb2pcitranslation2 size in bytes */
-#define SI_PCIE_DMA_L32                0x00000000      /* PCIE Client Mode sb2pcitranslation2
-                                                * (2 ZettaBytes), low 32 bits
-                                                */
-#define SI_PCIE_DMA_H32                0x80000000      /* PCIE Client Mode sb2pcitranslation2
-                                                * (2 ZettaBytes), high 32 bits
-                                                */
-
-/* core codes */
-#define        NODEV_CORE_ID           0x700           /* Invalid coreid */
-#define        CC_CORE_ID              0x800           /* chipcommon core */
-#define        ILINE20_CORE_ID         0x801           /* iline20 core */
-#define        SRAM_CORE_ID            0x802           /* sram core */
-#define        SDRAM_CORE_ID           0x803           /* sdram core */
-#define        PCI_CORE_ID             0x804           /* pci core */
-#define        MIPS_CORE_ID            0x805           /* mips core */
-#define        ENET_CORE_ID            0x806           /* enet mac core */
-#define        CODEC_CORE_ID           0x807           /* v90 codec core */
-#define        USB_CORE_ID             0x808           /* usb 1.1 host/device core */
-#define        ADSL_CORE_ID            0x809           /* ADSL core */
-#define        ILINE100_CORE_ID        0x80a           /* iline100 core */
-#define        IPSEC_CORE_ID           0x80b           /* ipsec core */
-#define        UTOPIA_CORE_ID          0x80c           /* utopia core */
-#define        PCMCIA_CORE_ID          0x80d           /* pcmcia core */
-#define        SOCRAM_CORE_ID          0x80e           /* internal memory core */
-#define        MEMC_CORE_ID            0x80f           /* memc sdram core */
-#define        OFDM_CORE_ID            0x810           /* OFDM phy core */
-#define        EXTIF_CORE_ID           0x811           /* external interface core */
-#define        D11_CORE_ID             0x812           /* 802.11 MAC core */
-#define        APHY_CORE_ID            0x813           /* 802.11a phy core */
-#define        BPHY_CORE_ID            0x814           /* 802.11b phy core */
-#define        GPHY_CORE_ID            0x815           /* 802.11g phy core */
-#define        MIPS33_CORE_ID          0x816           /* mips3302 core */
-#define        USB11H_CORE_ID          0x817           /* usb 1.1 host core */
-#define        USB11D_CORE_ID          0x818           /* usb 1.1 device core */
-#define        USB20H_CORE_ID          0x819           /* usb 2.0 host core */
-#define        USB20D_CORE_ID          0x81a           /* usb 2.0 device core */
-#define        SDIOH_CORE_ID           0x81b           /* sdio host core */
-#define        ROBO_CORE_ID            0x81c           /* roboswitch core */
-#define        ATA100_CORE_ID          0x81d           /* parallel ATA core */
-#define        SATAXOR_CORE_ID         0x81e           /* serial ATA & XOR DMA core */
-#define        GIGETH_CORE_ID          0x81f           /* gigabit ethernet core */
-#define        PCIE_CORE_ID            0x820           /* pci express core */
-#define        NPHY_CORE_ID            0x821           /* 802.11n 2x2 phy core */
-#define        SRAMC_CORE_ID           0x822           /* SRAM controller core */
-#define        MINIMAC_CORE_ID         0x823           /* MINI MAC/phy core */
-#define        ARM11_CORE_ID           0x824           /* ARM 1176 core */
-#define        ARM7S_CORE_ID           0x825           /* ARM7tdmi-s core */
-#define        LPPHY_CORE_ID           0x826           /* 802.11a/b/g phy core */
-#define        PMU_CORE_ID             0x827           /* PMU core */
-#define        SSNPHY_CORE_ID          0x828           /* 802.11n single-stream phy core */
-#define        SDIOD_CORE_ID           0x829           /* SDIO device core */
-#define        ARMCM3_CORE_ID          0x82a           /* ARM Cortex M3 core */
-#define        QNPHY_CORE_ID           0x82b           /* 802.11n 4x4 phy core */
-#define        MIPS74K_CORE_ID         0x82c           /* mips 74k core */
-#define        GMAC_CORE_ID            0x82d           /* Gigabit MAC core */
-#define        DMEMC_CORE_ID           0x82e           /* DDR1/2 memory controller core */
-#define        PCIERC_CORE_ID          0x82f           /* PCIE Root Complex core */
-#define        OCP_CORE_ID             0x830           /* OCP2OCP bridge core */
-#define        SC_CORE_ID              0x831           /* shared common core */
-#define        AHB_CORE_ID             0x832           /* OCP2AHB bridge core */
-#define        SPIH_CORE_ID            0x833           /* SPI host core */
-#define        I2S_CORE_ID             0x834           /* I2S core */
-#define OOB_ROUTER_CORE_ID     0x367           /* OOB router core ID */
-#define        DEF_AI_COMP             0xfff           /* Default component, in ai chips it maps all
-                                                * unused address ranges
-                                                */
-
-/* There are TWO constants on all HND chips: SI_ENUM_BASE above,
- * and chipcommon being the first core:
- */
-#define        SI_CC_IDX               0
-
-/* SOC Interconnect types (aka chip types) */
-#define        SOCI_SB                 0
-#define        SOCI_AI                 1
-
-/* Common core control flags */
-#define        SICF_BIST_EN            0x8000
-#define        SICF_PME_EN             0x4000
-#define        SICF_CORE_BITS          0x3ffc
-#define        SICF_FGC                0x0002
-#define        SICF_CLOCK_EN           0x0001
-
-/* Common core status flags */
-#define        SISF_BIST_DONE          0x8000
-#define        SISF_BIST_ERROR         0x4000
-#define        SISF_GATED_CLK          0x2000
-#define        SISF_DMA64              0x1000
-#define        SISF_CORE_BITS          0x0fff
-
-/* A register that is common to all cores to
- * communicate w/PMU regarding clock control.
- */
-#define SI_CLK_CTL_ST          0x1e0           /* clock control and status */
-
-/* clk_ctl_st register */
-#define        CCS_FORCEALP            0x00000001      /* force ALP request */
-#define        CCS_FORCEHT             0x00000002      /* force HT request */
-#define        CCS_FORCEILP            0x00000004      /* force ILP request */
-#define        CCS_ALPAREQ             0x00000008      /* ALP Avail Request */
-#define        CCS_HTAREQ              0x00000010      /* HT Avail Request */
-#define        CCS_FORCEHWREQOFF       0x00000020      /* Force HW Clock Request Off */
-#define        CCS_ALPAVAIL            0x00010000      /* ALP is available */
-#define        CCS_HTAVAIL             0x00020000      /* HT is available */
-#define        CCS0_HTAVAIL            0x00010000      /* HT avail in chipc and pcmcia on 4328a0 */
-#define        CCS0_ALPAVAIL           0x00020000      /* ALP avail in chipc and pcmcia on 4328a0 */
-
-/* Not really related to SOC Interconnect, but a couple of software
- * conventions for the use the flash space:
- */
-
-/* Minumum amount of flash we support */
-#define FLASH_MIN              0x00020000      /* Minimum flash size */
-
-/* A boot/binary may have an embedded block that describes its size  */
-#define        BISZ_OFFSET             0x3e0           /* At this offset into the binary */
-#define        BISZ_MAGIC              0x4249535a      /* Marked with this value: 'BISZ' */
-#define        BISZ_MAGIC_IDX          0               /* Word 0: magic */
-#define        BISZ_TXTST_IDX          1               /*      1: text start */
-#define        BISZ_TXTEND_IDX         2               /*      2: text end */
-#define        BISZ_DATAST_IDX         3               /*      3: data start */
-#define        BISZ_DATAEND_IDX        4               /*      4: data end */
-#define        BISZ_BSSST_IDX          5               /*      5: bss start */
-#define        BISZ_BSSEND_IDX         6               /*      6: bss end */
-#define BISZ_SIZE              7               /* descriptor size in 32-bit intergers */
-
-#endif /* _HNDSOC_H */
diff --git a/drivers/net/wireless/bcm4319/include/linux_osl.h b/drivers/net/wireless/bcm4319/include/linux_osl.h
deleted file mode 100644 (file)
index b059c2a..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Linux OS Independent Layer
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: linux_osl.h,v 13.131.30.8 2010/04/26 05:42:18 Exp $
- */
-
-
-#ifndef _linux_osl_h_
-#define _linux_osl_h_
-
-#include <typedefs.h>
-
-
-#include <linuxver.h>
-
-
-#ifdef __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION > 30100
-#define        ASSERT(exp)             do {} while (0)
-#else
-
-#define        ASSERT(exp)
-#endif 
-#endif 
-
-
-#define        OSL_DELAY(usec)         osl_delay(usec)
-extern void osl_delay(uint usec);
-
-
-
-#define        OSL_PCMCIA_READ_ATTR(osh, offset, buf, size) \
-       osl_pcmcia_read_attr((osh), (offset), (buf), (size))
-#define        OSL_PCMCIA_WRITE_ATTR(osh, offset, buf, size) \
-       osl_pcmcia_write_attr((osh), (offset), (buf), (size))
-extern void osl_pcmcia_read_attr(osl_t *osh, uint offset, void *buf, int size);
-extern void osl_pcmcia_write_attr(osl_t *osh, uint offset, void *buf, int size);
-
-
-#define        OSL_PCI_READ_CONFIG(osh, offset, size) \
-       osl_pci_read_config((osh), (offset), (size))
-#define        OSL_PCI_WRITE_CONFIG(osh, offset, size, val) \
-       osl_pci_write_config((osh), (offset), (size), (val))
-extern uint32 osl_pci_read_config(osl_t *osh, uint offset, uint size);
-extern void osl_pci_write_config(osl_t *osh, uint offset, uint size, uint val);
-
-
-#define OSL_PCI_BUS(osh)       osl_pci_bus(osh)
-#define OSL_PCI_SLOT(osh)      osl_pci_slot(osh)
-extern uint osl_pci_bus(osl_t *osh);
-extern uint osl_pci_slot(osl_t *osh);
-
-
-typedef struct {
-       bool pkttag;
-       uint pktalloced;        
-       bool mmbus;             
-       pktfree_cb_fn_t tx_fn;  
-       void *tx_ctx;           
-} osl_pubinfo_t;
-
-
-extern osl_t *osl_attach(void *pdev, uint bustype, bool pkttag);
-extern void osl_detach(osl_t *osh);
-
-#define PKTFREESETCB(osh, _tx_fn, _tx_ctx) \
-       do { \
-          ((osl_pubinfo_t*)osh)->tx_fn = _tx_fn; \
-          ((osl_pubinfo_t*)osh)->tx_ctx = _tx_ctx; \
-       } while (0)
-
-
-#define BUS_SWAP32(v)          (v)
-
-
-#define        MALLOC(osh, size)       osl_malloc((osh), (size))
-#define        MFREE(osh, addr, size)  osl_mfree((osh), (addr), (size))
-#define MALLOCED(osh)          osl_malloced((osh))
-
-
-#define        MALLOC_FAILED(osh)      osl_malloc_failed((osh))
-
-extern void *osl_malloc(osl_t *osh, uint size);
-extern void osl_mfree(osl_t *osh, void *addr, uint size);
-extern uint osl_malloced(osl_t *osh);
-extern uint osl_malloc_failed(osl_t *osh);
-
-
-#define        DMA_CONSISTENT_ALIGN    PAGE_SIZE
-#define        DMA_ALLOC_CONSISTENT(osh, size, pap, dmah, alignbits) \
-       osl_dma_alloc_consistent((osh), (size), (pap))
-#define        DMA_FREE_CONSISTENT(osh, va, size, pa, dmah) \
-       osl_dma_free_consistent((osh), (void*)(va), (size), (pa))
-extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, ulong *pap);
-extern void osl_dma_free_consistent(osl_t *osh, void *va, uint size, ulong pa);
-
-
-#define        DMA_TX  1       
-#define        DMA_RX  2       
-
-
-#define        DMA_MAP(osh, va, size, direction, p, dmah) \
-       osl_dma_map((osh), (va), (size), (direction))
-#define        DMA_UNMAP(osh, pa, size, direction, p, dmah) \
-       osl_dma_unmap((osh), (pa), (size), (direction))
-extern uint osl_dma_map(osl_t *osh, void *va, uint size, int direction);
-extern void osl_dma_unmap(osl_t *osh, uint pa, uint size, int direction);
-
-
-#define OSL_DMADDRWIDTH(osh, addrwidth) do {} while (0)
-
-
-#include <bcmsdh.h>
-#define OSL_WRITE_REG(osh, r, v) (bcmsdh_reg_write(NULL, (uintptr)(r), sizeof(*(r)), (v)))
-#define OSL_READ_REG(osh, r) (bcmsdh_reg_read(NULL, (uintptr)(r), sizeof(*(r))))
-
-#define SELECT_BUS_WRITE(osh, mmap_op, bus_op) if (((osl_pubinfo_t*)(osh))->mmbus) \
-       mmap_op else bus_op
-#define SELECT_BUS_READ(osh, mmap_op, bus_op) (((osl_pubinfo_t*)(osh))->mmbus) ? \
-       mmap_op : bus_op
-
-
-
-
-#ifndef printf
-#define        printf(fmt, args...)    printk(fmt, ## args)
-#endif 
-#include <linux/kernel.h>
-#include <linux/string.h>
-
-
-#ifndef IL_BIGENDIAN
-#define R_REG(osh, r) (\
-       SELECT_BUS_READ(osh, sizeof(*(r)) == sizeof(uint8) ? readb((volatile uint8*)(r)) : \
-       sizeof(*(r)) == sizeof(uint16) ? readw((volatile uint16*)(r)) : \
-       readl((volatile uint32*)(r)), OSL_READ_REG(osh, r)) \
-)
-#define W_REG(osh, r, v) do { \
-       SELECT_BUS_WRITE(osh,  \
-               switch (sizeof(*(r))) { \
-                       case sizeof(uint8):     writeb((uint8)(v), (volatile uint8*)(r)); break; \
-                       case sizeof(uint16):    writew((uint16)(v), (volatile uint16*)(r)); break; \
-                       case sizeof(uint32):    writel((uint32)(v), (volatile uint32*)(r)); break; \
-               }, \
-               (OSL_WRITE_REG(osh, r, v))); \
-       } while (0)
-#else  
-#define R_REG(osh, r) (\
-       SELECT_BUS_READ(osh, \
-               ({ \
-                       __typeof(*(r)) __osl_v; \
-                       switch (sizeof(*(r))) { \
-                               case sizeof(uint8):     __osl_v = \
-                                       readb((volatile uint8*)((uintptr)(r)^3)); break; \
-                               case sizeof(uint16):    __osl_v = \
-                                       readw((volatile uint16*)((uintptr)(r)^2)); break; \
-                               case sizeof(uint32):    __osl_v = \
-                                       readl((volatile uint32*)(r)); break; \
-                       } \
-                       __osl_v; \
-               }), \
-               OSL_READ_REG(osh, r)) \
-)
-#define W_REG(osh, r, v) do { \
-       SELECT_BUS_WRITE(osh,  \
-               switch (sizeof(*(r))) { \
-                       case sizeof(uint8):     writeb((uint8)(v), \
-                                       (volatile uint8*)((uintptr)(r)^3)); break; \
-                       case sizeof(uint16):    writew((uint16)(v), \
-                                       (volatile uint16*)((uintptr)(r)^2)); break; \
-                       case sizeof(uint32):    writel((uint32)(v), \
-                                       (volatile uint32*)(r)); break; \
-               }, \
-               (OSL_WRITE_REG(osh, r, v))); \
-       } while (0)
-#endif 
-
-#define        AND_REG(osh, r, v)              W_REG(osh, (r), R_REG(osh, r) & (v))
-#define        OR_REG(osh, r, v)               W_REG(osh, (r), R_REG(osh, r) | (v))
-
-
-#define        bcopy(src, dst, len)    memcpy((dst), (src), (len))
-#define        bcmp(b1, b2, len)       memcmp((b1), (b2), (len))
-#define        bzero(b, len)           memset((b), '\0', (len))
-
-
-#define OSL_UNCACHED(va)       ((void*)va)
-
-
-#if defined(__i386__)
-#define        OSL_GETCYCLES(x)        rdtscl((x))
-#else
-#define OSL_GETCYCLES(x)       ((x) = 0)
-#endif 
-
-
-#define        BUSPROBE(val, addr)     ({ (val) = R_REG(NULL, (addr)); 0; })
-
-
-#if !defined(CONFIG_MMC_MSM7X00A)
-#define        REG_MAP(pa, size)       ioremap_nocache((unsigned long)(pa), (unsigned long)(size))
-#else
-#define REG_MAP(pa, size)       (void *)(0)
-#endif 
-#define        REG_UNMAP(va)           iounmap((va))
-
-
-#define        R_SM(r)                 *(r)
-#define        W_SM(r, v)              (*(r) = (v))
-#define        BZERO_SM(r, len)        memset((r), '\0', (len))
-
-
-#define        PKTGET(osh, len, send)          osl_pktget((osh), (len))
-#define        PKTFREE(osh, skb, send)         osl_pktfree((osh), (skb), (send))
-#ifdef DHD_USE_STATIC_BUF
-#define        PKTGET_STATIC(osh, len, send)           osl_pktget_static((osh), (len))
-#define        PKTFREE_STATIC(osh, skb, send)          osl_pktfree_static((osh), (skb), (send))
-#endif 
-#define        PKTDATA(osh, skb)               (((struct sk_buff*)(skb))->data)
-#define        PKTLEN(osh, skb)                (((struct sk_buff*)(skb))->len)
-#define PKTHEADROOM(osh, skb)          (PKTDATA(osh, skb)-(((struct sk_buff*)(skb))->head))
-#define PKTTAILROOM(osh, skb) ((((struct sk_buff*)(skb))->end)-(((struct sk_buff*)(skb))->tail))
-#define        PKTNEXT(osh, skb)               (((struct sk_buff*)(skb))->next)
-#define        PKTSETNEXT(osh, skb, x)         (((struct sk_buff*)(skb))->next = (struct sk_buff*)(x))
-#define        PKTSETLEN(osh, skb, len)        __skb_trim((struct sk_buff*)(skb), (len))
-#define        PKTPUSH(osh, skb, bytes)        skb_push((struct sk_buff*)(skb), (bytes))
-#define        PKTPULL(osh, skb, bytes)        skb_pull((struct sk_buff*)(skb), (bytes))
-#define        PKTDUP(osh, skb)                osl_pktdup((osh), (skb))
-#define        PKTTAG(skb)                     ((void*)(((struct sk_buff*)(skb))->cb))
-#define PKTALLOCED(osh)                        ((osl_pubinfo_t *)(osh))->pktalloced
-#define PKTSETPOOL(osh, skb, x, y)     do {} while (0)
-#define PKTPOOL(osh, skb)              FALSE
-#define PKTPOOLLEN(osh, pktp)          (0)
-#define PKTPOOLAVAIL(osh, pktp)                (0)
-#define PKTPOOLADD(osh, pktp, p)       BCME_ERROR
-#define PKTPOOLGET(osh, pktp)          NULL
-#define PKTLIST_DUMP(osh, buf)
-
-extern void *osl_pktget(osl_t *osh, uint len);
-extern void osl_pktfree(osl_t *osh, void *skb, bool send);
-extern void *osl_pktget_static(osl_t *osh, uint len);
-extern void osl_pktfree_static(osl_t *osh, void *skb, bool send);
-extern void *osl_pktdup(osl_t *osh, void *skb);
-
-
-
-static INLINE void *
-osl_pkt_frmnative(osl_pubinfo_t *osh, struct sk_buff *skb)
-{
-       struct sk_buff *nskb;
-
-       if (osh->pkttag)
-               bzero((void*)skb->cb, OSL_PKTTAG_SZ);
-
-       
-       for (nskb = skb; nskb; nskb = nskb->next) {
-               osh->pktalloced++;
-       }
-
-       return (void *)skb;
-}
-#define PKTFRMNATIVE(osh, skb) osl_pkt_frmnative(((osl_pubinfo_t *)osh), (struct sk_buff*)(skb))
-
-
-static INLINE struct sk_buff *
-osl_pkt_tonative(osl_pubinfo_t *osh, void *pkt)
-{
-       struct sk_buff *nskb;
-
-       if (osh->pkttag)
-               bzero(((struct sk_buff*)pkt)->cb, OSL_PKTTAG_SZ);
-
-       
-       for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next) {
-               osh->pktalloced--;
-       }
-
-       return (struct sk_buff *)pkt;
-}
-#define PKTTONATIVE(osh, pkt)          osl_pkt_tonative((osl_pubinfo_t *)(osh), (pkt))
-
-#define        PKTLINK(skb)                    (((struct sk_buff*)(skb))->prev)
-#define        PKTSETLINK(skb, x)              (((struct sk_buff*)(skb))->prev = (struct sk_buff*)(x))
-#define        PKTPRIO(skb)                    (((struct sk_buff*)(skb))->priority)
-#define        PKTSETPRIO(skb, x)              (((struct sk_buff*)(skb))->priority = (x))
-#define PKTSUMNEEDED(skb)              (((struct sk_buff*)(skb))->ip_summed == CHECKSUM_HW)
-#define PKTSETSUMGOOD(skb, x)          (((struct sk_buff*)(skb))->ip_summed = \
-                                               ((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE))
-
-#define PKTSHARED(skb)                  (((struct sk_buff*)(skb))->cloned)
-
-
-#define OSL_ERROR(bcmerror)    osl_error(bcmerror)
-extern int osl_error(int bcmerror);
-
-
-#define        PKTBUFSZ        2048   
-
-
-#define OSL_SYSUPTIME()                ((uint32)jiffies * (1000 / HZ))
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/linuxver.h b/drivers/net/wireless/bcm4319/include/linuxver.h
deleted file mode 100644 (file)
index 6ee5c58..0000000
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * Linux-specific abstractions to gain some independence from linux kernel versions.
- * Pave over some 2.2 versus 2.4 versus 2.6 kernel differences.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: linuxver.h,v 13.38.8.1.8.6 2010/04/29 05:00:46 Exp $
- */
-
-
-#ifndef _linuxver_h_
-#define _linuxver_h_
-
-#include <linux/version.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
-#include <linux/config.h>
-#else
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33))
-#include <generated/autoconf.h>
-#else
-#include <linux/autoconf.h>
-#endif
-#endif 
-#include <linux/module.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0))
-
-#ifdef __UNDEF_NO_VERSION__
-#undef __NO_VERSION__
-#else
-#define __NO_VERSION__
-#endif
-#endif 
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
-#define module_param(_name_, _type_, _perm_)   MODULE_PARM(_name_, "i")
-#define module_param_string(_name_, _string_, _size_, _perm_) \
-               MODULE_PARM(_string_, "c" __MODULE_STRING(_size_))
-#endif
-
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 9))
-#include <linux/malloc.h>
-#else
-#include <linux/slab.h>
-#endif
-
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/netdevice.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28))
-#undef IP_TOS
-#endif 
-#include <asm/io.h>
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 41))
-#include <linux/workqueue.h>
-#else
-#include <linux/tqueue.h>
-#ifndef work_struct
-#define work_struct tq_struct
-#endif
-#ifndef INIT_WORK
-#define INIT_WORK(_work, _func, _data) INIT_TQUEUE((_work), (_func), (_data))
-#endif
-#ifndef schedule_work
-#define schedule_work(_work) schedule_task((_work))
-#endif
-#ifndef flush_scheduled_work
-#define flush_scheduled_work() flush_scheduled_tasks()
-#endif
-#endif 
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
-#define        MY_INIT_WORK(_work, _func, _data)       INIT_WORK(_work, _func)
-#else
-#define        MY_INIT_WORK(_work, _func, _data)       INIT_WORK(_work, _func, _data)
-typedef void (*work_func_t)(void *work);
-#endif 
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
-
-#ifndef IRQ_NONE
-typedef void irqreturn_t;
-#define IRQ_NONE
-#define IRQ_HANDLED
-#define IRQ_RETVAL(x)
-#endif
-#else
-typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs *ptregs);
-#endif 
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
-#define IRQF_SHARED    SA_SHIRQ
-#endif 
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 17)
-#ifdef CONFIG_NET_RADIO
-#define        CONFIG_WIRELESS_EXT
-#endif
-#endif 
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 67)
-#ifndef SANDGATE2G
-#define MOD_INC_USE_COUNT
-#endif 
-#endif 
-
-
-#ifndef __exit
-#define __exit
-#endif
-#ifndef __devexit
-#define __devexit
-#endif
-#ifndef __devinit
-#define __devinit      __init
-#endif
-#ifndef __devinitdata
-#define __devinitdata
-#endif
-#ifndef __devexit_p
-#define __devexit_p(x) x
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0))
-
-#define pci_get_drvdata(dev)           (dev)->sysdata
-#define pci_set_drvdata(dev, value)    (dev)->sysdata = (value)
-
-
-
-struct pci_device_id {
-       unsigned int vendor, device;            
-       unsigned int subvendor, subdevice;      
-       unsigned int class, class_mask;         
-       unsigned long driver_data;              
-};
-
-struct pci_driver {
-       struct list_head node;
-       char *name;
-       const struct pci_device_id *id_table;   
-       int (*probe)(struct pci_dev *dev,
-                    const struct pci_device_id *id); 
-       void (*remove)(struct pci_dev *dev);    
-       void (*suspend)(struct pci_dev *dev);   
-       void (*resume)(struct pci_dev *dev);    
-};
-
-#define MODULE_DEVICE_TABLE(type, name)
-#define PCI_ANY_ID (~0)
-
-
-#define pci_module_init pci_register_driver
-extern int pci_register_driver(struct pci_driver *drv);
-extern void pci_unregister_driver(struct pci_driver *drv);
-
-#endif 
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18))
-#define pci_module_init pci_register_driver
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 18))
-#ifdef MODULE
-#define module_init(x) int init_module(void) { return x(); }
-#define module_exit(x) void cleanup_module(void) { x(); }
-#else
-#define module_init(x) __initcall(x);
-#define module_exit(x) __exitcall(x);
-#endif
-#endif 
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 48))
-#define list_for_each(pos, head) \
-       for (pos = (head)->next; pos != (head); pos = pos->next)
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 13))
-#define pci_resource_start(dev, bar)   ((dev)->base_address[(bar)])
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 44))
-#define pci_resource_start(dev, bar)   ((dev)->resource[(bar)].start)
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 23))
-#define pci_enable_device(dev) do { } while (0)
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 14))
-#define net_device device
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 42))
-
-
-
-#ifndef PCI_DMA_TODEVICE
-#define        PCI_DMA_TODEVICE        1
-#define        PCI_DMA_FROMDEVICE      2
-#endif
-
-typedef u32 dma_addr_t;
-
-
-static inline int get_order(unsigned long size)
-{
-       int order;
-
-       size = (size-1) >> (PAGE_SHIFT-1);
-       order = -1;
-       do {
-               size >>= 1;
-               order++;
-       } while (size);
-       return order;
-}
-
-static inline void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
-                                         dma_addr_t *dma_handle)
-{
-       void *ret;
-       int gfp = GFP_ATOMIC | GFP_DMA;
-
-       ret = (void *)__get_free_pages(gfp, get_order(size));
-
-       if (ret != NULL) {
-               memset(ret, 0, size);
-               *dma_handle = virt_to_bus(ret);
-       }
-       return ret;
-}
-static inline void pci_free_consistent(struct pci_dev *hwdev, size_t size,
-                                       void *vaddr, dma_addr_t dma_handle)
-{
-       free_pages((unsigned long)vaddr, get_order(size));
-}
-#define pci_map_single(cookie, address, size, dir)     virt_to_bus(address)
-#define pci_unmap_single(cookie, address, size, dir)
-
-#endif 
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 43))
-
-#define dev_kfree_skb_any(a)           dev_kfree_skb(a)
-#define netif_down(dev)                        do { (dev)->start = 0; } while (0)
-
-
-#ifndef _COMPAT_NETDEVICE_H
-
-
-
-#define dev_kfree_skb_irq(a)   dev_kfree_skb(a)
-#define netif_wake_queue(dev) \
-               do { clear_bit(0, &(dev)->tbusy); mark_bh(NET_BH); } while (0)
-#define netif_stop_queue(dev)  set_bit(0, &(dev)->tbusy)
-
-static inline void netif_start_queue(struct net_device *dev)
-{
-       dev->tbusy = 0;
-       dev->interrupt = 0;
-       dev->start = 1;
-}
-
-#define netif_queue_stopped(dev)       (dev)->tbusy
-#define netif_running(dev)             (dev)->start
-
-#endif 
-
-#define netif_device_attach(dev)       netif_start_queue(dev)
-#define netif_device_detach(dev)       netif_stop_queue(dev)
-
-
-#define tasklet_struct                         tq_struct
-static inline void tasklet_schedule(struct tasklet_struct *tasklet)
-{
-       queue_task(tasklet, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-}
-
-static inline void tasklet_init(struct tasklet_struct *tasklet,
-                                void (*func)(unsigned long),
-                                unsigned long data)
-{
-       tasklet->next = NULL;
-       tasklet->sync = 0;
-       tasklet->routine = (void (*)(void *))func;
-       tasklet->data = (void *)data;
-}
-#define tasklet_kill(tasklet)  { do {} while (0); }
-
-
-#define del_timer_sync(timer) del_timer(timer)
-
-#else
-
-#define netif_down(dev)
-
-#endif 
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 3))
-
-
-#define PREPARE_TQUEUE(_tq, _routine, _data)                   \
-       do {                                                    \
-               (_tq)->routine = _routine;                      \
-               (_tq)->data = _data;                            \
-       } while (0)
-
-
-#define INIT_TQUEUE(_tq, _routine, _data)                      \
-       do {                                                    \
-               INIT_LIST_HEAD(&(_tq)->list);                   \
-               (_tq)->sync = 0;                                \
-               PREPARE_TQUEUE((_tq), (_routine), (_data));     \
-       } while (0)
-
-#endif 
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 6))
-
-
-
-static inline int
-pci_save_state(struct pci_dev *dev, u32 *buffer)
-{
-       int i;
-       if (buffer) {
-               for (i = 0; i < 16; i++)
-                       pci_read_config_dword(dev, i * 4, &buffer[i]);
-       }
-       return 0;
-}
-
-static inline int
-pci_restore_state(struct pci_dev *dev, u32 *buffer)
-{
-       int i;
-
-       if (buffer) {
-               for (i = 0; i < 16; i++)
-                       pci_write_config_dword(dev, i * 4, buffer[i]);
-       }
-       
-       else {
-               for (i = 0; i < 6; i ++)
-                       pci_write_config_dword(dev,
-                                              PCI_BASE_ADDRESS_0 + (i * 4),
-                                              pci_resource_start(dev, i));
-               pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-       }
-       return 0;
-}
-
-#endif 
-
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 19))
-#define read_c0_count() read_32bit_cp0_register(CP0_COUNT)
-#endif
-
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24))
-#ifndef SET_MODULE_OWNER
-#define SET_MODULE_OWNER(dev)          do {} while (0)
-#define OLD_MOD_INC_USE_COUNT          MOD_INC_USE_COUNT
-#define OLD_MOD_DEC_USE_COUNT          MOD_DEC_USE_COUNT
-#else
-#define OLD_MOD_INC_USE_COUNT          do {} while (0)
-#define OLD_MOD_DEC_USE_COUNT          do {} while (0)
-#endif
-#else 
-#ifndef SET_MODULE_OWNER
-#define SET_MODULE_OWNER(dev)          do {} while (0)
-#endif
-#ifndef MOD_INC_USE_COUNT
-#define MOD_INC_USE_COUNT                      do {} while (0)
-#endif
-#ifndef MOD_DEC_USE_COUNT
-#define MOD_DEC_USE_COUNT                      do {} while (0)
-#endif
-#define OLD_MOD_INC_USE_COUNT          MOD_INC_USE_COUNT
-#define OLD_MOD_DEC_USE_COUNT          MOD_DEC_USE_COUNT
-#endif 
-
-#ifndef SET_NETDEV_DEV
-#define SET_NETDEV_DEV(net, pdev)      do {} while (0)
-#endif
-
-#ifndef HAVE_FREE_NETDEV
-#define free_netdev(dev)               kfree(dev)
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
-
-#define af_packet_priv                 data
-#endif
-
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
-#define DRV_SUSPEND_STATE_TYPE pm_message_t
-#else
-#define DRV_SUSPEND_STATE_TYPE uint32
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
-#define CHECKSUM_HW    CHECKSUM_PARTIAL
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31))
-#define KILL_PROC(nr, sig) \
-{ \
-struct task_struct *tsk; \
-struct pid *pid;    \
-pid = find_get_pid((pid_t)nr);    \
-tsk = pid_task(pid, PIDTYPE_PID);    \
-if (tsk) send_sig(sig, tsk, 1); \
-}
-#else
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && (LINUX_VERSION_CODE <= \
-       KERNEL_VERSION(2, 6, 30))
-#define KILL_PROC(pid, sig) \
-{ \
-       struct task_struct *tsk; \
-       tsk = find_task_by_vpid(pid); \
-       if (tsk) send_sig(sig, tsk, 1); \
-}
-#else
-#define KILL_PROC(pid, sig) \
-{ \
-       kill_proc(pid, sig, 1); \
-}
-#endif 
-#endif 
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
-#define netdev_priv(dev) dev->priv
-#endif
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/miniopt.h b/drivers/net/wireless/bcm4319/include/miniopt.h
deleted file mode 100644 (file)
index 3667fb1..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Command line options parser.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: miniopt.h,v 1.1.6.2 2009/01/14 23:52:48 Exp $
- */
-
-
-#ifndef MINI_OPT_H
-#define MINI_OPT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ---- Include Files ---------------------------------------------------- */
-/* ---- Constants and Types ---------------------------------------------- */
-
-#define MINIOPT_MAXKEY 128     /* Max options */
-typedef struct miniopt {
-
-       /* These are persistent after miniopt_init() */
-       const char* name;               /* name for prompt in error strings */
-       const char* flags;              /* option chars that take no args */
-       bool longflags;         /* long options may be flags */
-       bool opt_end;           /* at end of options (passed a "--") */
-
-       /* These are per-call to miniopt() */
-
-       int consumed;           /* number of argv entries cosumed in
-                                * the most recent call to miniopt()
-                                */
-       bool positional;
-       bool good_int;          /* 'val' member is the result of a sucessful
-                                * strtol conversion of the option value
-                                */
-       char opt;
-       char key[MINIOPT_MAXKEY];
-       char* valstr;           /* positional param, or value for the option,
-                                * or null if the option had
-                                * no accompanying value
-                                */
-       uint uval;              /* strtol translation of valstr */
-       int  val;               /* strtol translation of valstr */
-} miniopt_t;
-
-void miniopt_init(miniopt_t *t, const char* name, const char* flags, bool longflags);
-int miniopt(miniopt_t *t, char **argv);
-
-
-/* ---- Variable Externs ------------------------------------------------- */
-/* ---- Function Prototypes ---------------------------------------------- */
-
-
-#ifdef __cplusplus
-       }
-#endif
-
-#endif  /* MINI_OPT_H  */
diff --git a/drivers/net/wireless/bcm4319/include/msgtrace.h b/drivers/net/wireless/bcm4319/include/msgtrace.h
deleted file mode 100644 (file)
index 1479086..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Trace messages sent over HBUS
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: msgtrace.h,v 1.1.2.4 2009/01/27 04:09:40 Exp $
- */
-
-#ifndef        _MSGTRACE_H
-#define        _MSGTRACE_H
-
-#ifndef _TYPEDEFS_H_
-#include <typedefs.h>
-#endif
-
-
-/* This marks the start of a packed structure section. */
-#include <packed_section_start.h>
-
-#define MSGTRACE_VERSION 1
-
-/* Message trace header */
-typedef BWL_PRE_PACKED_STRUCT struct msgtrace_hdr {
-       uint8   version;
-       uint8   spare;
-       uint16  len;    /* Len of the trace */
-       uint32  seqnum; /* Sequence number of message. Useful if the messsage has been lost
-                        * because of DMA error or a bus reset (ex: SDIO Func2)
-                        */
-       uint32  discarded_bytes;  /* Number of discarded bytes because of trace overflow  */
-       uint32  discarded_printf; /* Number of discarded printf because of trace overflow */
-} BWL_POST_PACKED_STRUCT msgtrace_hdr_t;
-
-#define MSGTRACE_HDRLEN        sizeof(msgtrace_hdr_t)
-
-/* The hbus driver generates traces when sending a trace message. This causes endless traces.
- * This flag must be set to TRUE in any hbus traces. The flag is reset in the function msgtrace_put.
- * This prevents endless traces but generates hasardous lost of traces only in bus device code.
- * It is recommendat to set this flag in macro SD_TRACE but not in SD_ERROR for avoiding missing
- * hbus error traces. hbus error trace should not generates endless traces.
- */
-extern bool msgtrace_hbus_trace;
-
-typedef void (*msgtrace_func_send_t)(void *hdl1, void *hdl2, uint8 *hdr,
-                                     uint16 hdrlen, uint8 *buf, uint16 buflen);
-
-extern void msgtrace_sent(void);
-extern void msgtrace_put(char *buf, int count);
-extern void msgtrace_init(void *hdl1, void *hdl2, msgtrace_func_send_t func_send);
-
-/* This marks the end of a packed structure section. */
-#include <packed_section_end.h>
-
-#endif /* _MSGTRACE_H */
diff --git a/drivers/net/wireless/bcm4319/include/osl.h b/drivers/net/wireless/bcm4319/include/osl.h
deleted file mode 100644 (file)
index 5599e53..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * OS Abstraction Layer
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: osl.h,v 13.37.32.1 2008/11/20 00:51:15 Exp $
- */
-
-
-#ifndef _osl_h_
-#define _osl_h_
-
-
-typedef struct osl_info osl_t;
-typedef struct osl_dmainfo osldma_t;
-
-#define OSL_PKTTAG_SZ  32 
-
-
-typedef void (*pktfree_cb_fn_t)(void *ctx, void *pkt, unsigned int status);
-
-#include <linux_osl.h>
-
-
-
-
-#define        SET_REG(osh, r, mask, val)      W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
-
-#ifndef AND_REG
-#define AND_REG(osh, r, v)             W_REG(osh, (r), R_REG(osh, r) & (v))
-#endif   
-
-#ifndef OR_REG
-#define OR_REG(osh, r, v)              W_REG(osh, (r), R_REG(osh, r) | (v))
-#endif   
-
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/packed_section_end.h b/drivers/net/wireless/bcm4319/include/packed_section_end.h
deleted file mode 100644 (file)
index 5b61c18..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Declare directives for structure packing. No padding will be provided
- * between the members of packed structures, and therefore, there is no
- * guarantee that structure members will be aligned.
- *
- * Declaring packed structures is compiler specific. In order to handle all
- * cases, packed structures should be delared as:
- *
- * #include <packed_section_start.h>
- *
- * typedef BWL_PRE_PACKED_STRUCT struct foobar_t {
- *    some_struct_members;
- * } BWL_POST_PACKED_STRUCT foobar_t;
- *
- * #include <packed_section_end.h>
- *
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: packed_section_end.h,v 1.1.6.3 2008/12/10 00:27:54 Exp $
- */
-
-
-
-
-#ifdef BWL_PACKED_SECTION
-       #undef BWL_PACKED_SECTION
-#else
-       #error "BWL_PACKED_SECTION is NOT defined!"
-#endif
-
-
-
-
-
-#undef BWL_PRE_PACKED_STRUCT
-#undef BWL_POST_PACKED_STRUCT
diff --git a/drivers/net/wireless/bcm4319/include/packed_section_start.h b/drivers/net/wireless/bcm4319/include/packed_section_start.h
deleted file mode 100644 (file)
index cb93aa6..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Declare directives for structure packing. No padding will be provided
- * between the members of packed structures, and therefore, there is no
- * guarantee that structure members will be aligned.
- *
- * Declaring packed structures is compiler specific. In order to handle all
- * cases, packed structures should be delared as:
- *
- * #include <packed_section_start.h>
- *
- * typedef BWL_PRE_PACKED_STRUCT struct foobar_t {
- *    some_struct_members;
- * } BWL_POST_PACKED_STRUCT foobar_t;
- *
- * #include <packed_section_end.h>
- *
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: packed_section_start.h,v 1.1.6.3 2008/12/10 00:27:54 Exp $
- */
-
-
-
-
-#ifdef BWL_PACKED_SECTION
-       #error "BWL_PACKED_SECTION is already defined!"
-#else
-       #define BWL_PACKED_SECTION
-#endif
-
-
-
-
-
-#if defined(__GNUC__)
-       #define BWL_PRE_PACKED_STRUCT
-       #define BWL_POST_PACKED_STRUCT  __attribute__((packed))
-#elif defined(__CC_ARM)
-       #define BWL_PRE_PACKED_STRUCT   __packed
-       #define BWL_POST_PACKED_STRUCT
-#else
-       #error "Unknown compiler!"
-#endif
diff --git a/drivers/net/wireless/bcm4319/include/pcicfg.h b/drivers/net/wireless/bcm4319/include/pcicfg.h
deleted file mode 100644 (file)
index 898962c..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * pcicfg.h: PCI configuration constants and structures.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: pcicfg.h,v 1.41.12.3 2008/06/26 22:49:41 Exp $
- */
-
-
-#ifndef        _h_pcicfg_
-#define        _h_pcicfg_
-
-
-#define        PCI_CFG_VID             0
-#define        PCI_CFG_CMD             4
-#define        PCI_CFG_REV             8
-#define        PCI_CFG_BAR0            0x10
-#define        PCI_CFG_BAR1            0x14
-#define        PCI_BAR0_WIN            0x80    
-#define        PCI_INT_STATUS          0x90    
-#define        PCI_INT_MASK            0x94    
-
-#define PCIE_EXTCFG_OFFSET     0x100
-#define        PCI_BAR0_PCIREGS_OFFSET (6 * 1024)      
-#define        PCI_BAR0_PCISBR_OFFSET  (4 * 1024)      
-
-#define PCI_BAR0_WINSZ         (16 * 1024)     
-
-
-#define        PCI_16KB0_PCIREGS_OFFSET (8 * 1024)     
-#define        PCI_16KB0_CCREGS_OFFSET (12 * 1024)     
-#define PCI_16KBB0_WINSZ       (16 * 1024)     
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/proto/802.11.h b/drivers/net/wireless/bcm4319/include/proto/802.11.h
deleted file mode 100644 (file)
index fd26317..0000000
+++ /dev/null
@@ -1,1433 +0,0 @@
-/*
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * Fundamental types and constants relating to 802.11
- *
- * $Id: 802.11.h,v 9.219.4.1.4.5.6.11 2010/02/09 13:23:26 Exp $
- */
-
-
-#ifndef _802_11_H_
-#define _802_11_H_
-
-#ifndef _TYPEDEFS_H_
-#include <typedefs.h>
-#endif
-
-#ifndef _NET_ETHERNET_H_
-#include <proto/ethernet.h>
-#endif
-
-#include <proto/wpa.h>
-
-
-#include <packed_section_start.h>
-
-
-#define DOT11_TU_TO_US                 1024    
-
-
-#define DOT11_A3_HDR_LEN               24      
-#define DOT11_A4_HDR_LEN               30      
-#define DOT11_MAC_HDR_LEN              DOT11_A3_HDR_LEN        
-#define DOT11_FCS_LEN                  4       
-#define DOT11_ICV_LEN                  4       
-#define DOT11_ICV_AES_LEN              8       
-#define DOT11_QOS_LEN                  2       
-#define DOT11_HTC_LEN                  4       
-
-#define DOT11_KEY_INDEX_SHIFT          6       
-#define DOT11_IV_LEN                   4       
-#define DOT11_IV_TKIP_LEN              8       
-#define DOT11_IV_AES_OCB_LEN           4       
-#define DOT11_IV_AES_CCM_LEN           8       
-#define DOT11_IV_MAX_LEN               8       
-
-
-#define DOT11_MAX_MPDU_BODY_LEN                2304    
-
-#define DOT11_MAX_MPDU_LEN             (DOT11_A4_HDR_LEN + \
-                                        DOT11_QOS_LEN + \
-                                        DOT11_IV_AES_CCM_LEN + \
-                                        DOT11_MAX_MPDU_BODY_LEN + \
-                                        DOT11_ICV_LEN + \
-                                        DOT11_FCS_LEN) 
-
-#define DOT11_MAX_SSID_LEN             32      
-
-
-#define DOT11_DEFAULT_RTS_LEN          2347    
-#define DOT11_MAX_RTS_LEN              2347    
-
-
-#define DOT11_MIN_FRAG_LEN             256     
-#define DOT11_MAX_FRAG_LEN             2346    
-#define DOT11_DEFAULT_FRAG_LEN         2346    
-
-
-#define DOT11_MIN_BEACON_PERIOD                1       
-#define DOT11_MAX_BEACON_PERIOD                0xFFFF  
-
-
-#define DOT11_MIN_DTIM_PERIOD          1       
-#define DOT11_MAX_DTIM_PERIOD          0xFF    
-
-
-#define DOT11_LLC_SNAP_HDR_LEN         8       
-#define DOT11_OUI_LEN                  3       
-BWL_PRE_PACKED_STRUCT struct dot11_llc_snap_header {
-       uint8   dsap;                           
-       uint8   ssap;                           
-       uint8   ctl;                            
-       uint8   oui[DOT11_OUI_LEN];             
-       uint16  type;                           
-} BWL_POST_PACKED_STRUCT;
-
-
-#define RFC1042_HDR_LEN        (ETHER_HDR_LEN + DOT11_LLC_SNAP_HDR_LEN)        
-
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_header {
-       uint16                  fc;             
-       uint16                  durid;          
-       struct ether_addr       a1;             
-       struct ether_addr       a2;             
-       struct ether_addr       a3;             
-       uint16                  seq;            
-       struct ether_addr       a4;             
-} BWL_POST_PACKED_STRUCT;
-
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_rts_frame {
-       uint16                  fc;             
-       uint16                  durid;          
-       struct ether_addr       ra;             
-       struct ether_addr       ta;             
-} BWL_POST_PACKED_STRUCT;
-#define        DOT11_RTS_LEN           16              
-
-BWL_PRE_PACKED_STRUCT struct dot11_cts_frame {
-       uint16                  fc;             
-       uint16                  durid;          
-       struct ether_addr       ra;             
-} BWL_POST_PACKED_STRUCT;
-#define        DOT11_CTS_LEN           10              
-
-BWL_PRE_PACKED_STRUCT struct dot11_ack_frame {
-       uint16                  fc;             
-       uint16                  durid;          
-       struct ether_addr       ra;             
-} BWL_POST_PACKED_STRUCT;
-#define        DOT11_ACK_LEN           10              
-
-BWL_PRE_PACKED_STRUCT struct dot11_ps_poll_frame {
-       uint16                  fc;             
-       uint16                  durid;          
-       struct ether_addr       bssid;          
-       struct ether_addr       ta;             
-} BWL_POST_PACKED_STRUCT;
-#define        DOT11_PS_POLL_LEN       16              
-
-BWL_PRE_PACKED_STRUCT struct dot11_cf_end_frame {
-       uint16                  fc;             
-       uint16                  durid;          
-       struct ether_addr       ra;             
-       struct ether_addr       bssid;          
-} BWL_POST_PACKED_STRUCT;
-#define        DOT11_CS_END_LEN        16              
-
-BWL_PRE_PACKED_STRUCT struct dot11_action_wifi_vendor_specific {
-       uint8   category;
-       uint8   OUI[3];
-       uint8   type;
-       uint8   subtype;
-       uint8   data[1040];
-       struct dot11_action_wifi_vendor_specific* next_node;
-} BWL_POST_PACKED_STRUCT;
-
-typedef struct dot11_action_wifi_vendor_specific dot11_action_wifi_vendor_specific_t;
-
-#define DOT11_BA_CTL_POLICY_NORMAL     0x0000  
-#define DOT11_BA_CTL_POLICY_NOACK      0x0001  
-#define DOT11_BA_CTL_POLICY_MASK       0x0001  
-
-#define DOT11_BA_CTL_MTID              0x0002  
-#define DOT11_BA_CTL_COMPRESSED                0x0004  
-
-#define DOT11_BA_CTL_NUMMSDU_MASK      0x0FC0  
-#define DOT11_BA_CTL_NUMMSDU_SHIFT     6       
-
-#define DOT11_BA_CTL_TID_MASK          0xF000  
-#define DOT11_BA_CTL_TID_SHIFT         12      
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_ctl_header {
-       uint16                  fc;             
-       uint16                  durid;          
-       struct ether_addr       ra;             
-       struct ether_addr       ta;             
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_CTL_HDR_LEN      16              
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_bar {
-       uint16                  bar_control;    
-       uint16                  seqnum;         
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_BAR_LEN          4               
-
-#define DOT11_BA_BITMAP_LEN    128             
-#define DOT11_BA_CMP_BITMAP_LEN        8               
-
-BWL_PRE_PACKED_STRUCT struct dot11_ba {
-       uint16                  ba_control;     
-       uint16                  seqnum;         
-       uint8                   bitmap[DOT11_BA_BITMAP_LEN];    
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_BA_LEN           4               
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_management_header {
-       uint16                  fc;             
-       uint16                  durid;          
-       struct ether_addr       da;             
-       struct ether_addr       sa;             
-       struct ether_addr       bssid;          
-       uint16                  seq;            
-} BWL_POST_PACKED_STRUCT;
-#define        DOT11_MGMT_HDR_LEN      24              
-
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_bcn_prb {
-       uint32                  timestamp[2];
-       uint16                  beacon_interval;
-       uint16                  capability;
-} BWL_POST_PACKED_STRUCT;
-#define        DOT11_BCN_PRB_LEN       12              
-
-BWL_PRE_PACKED_STRUCT struct dot11_auth {
-       uint16                  alg;            
-       uint16                  seq;            
-       uint16                  status;         
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_AUTH_FIXED_LEN   6               
-
-BWL_PRE_PACKED_STRUCT struct dot11_assoc_req {
-       uint16                  capability;     
-       uint16                  listen;         
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_ASSOC_REQ_FIXED_LEN      4       
-
-BWL_PRE_PACKED_STRUCT struct dot11_reassoc_req {
-       uint16                  capability;     
-       uint16                  listen;         
-       struct ether_addr       ap;             
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_REASSOC_REQ_FIXED_LEN    10      
-
-BWL_PRE_PACKED_STRUCT struct dot11_assoc_resp {
-       uint16                  capability;     
-       uint16                  status;         
-       uint16                  aid;            
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_ASSOC_RESP_FIXED_LEN     6       
-
-BWL_PRE_PACKED_STRUCT struct dot11_action_measure {
-       uint8   category;
-       uint8   action;
-       uint8   token;
-       uint8   data[1];
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_ACTION_MEASURE_LEN       3       
-
-BWL_PRE_PACKED_STRUCT struct dot11_action_ht_ch_width {
-       uint8   category;
-       uint8   action;
-       uint8   ch_width;
-} BWL_POST_PACKED_STRUCT;
-
-BWL_PRE_PACKED_STRUCT struct dot11_action_ht_mimops {
-       uint8   category;
-       uint8   action;
-       uint8   control;
-} BWL_POST_PACKED_STRUCT;
-
-#define SM_PWRSAVE_ENABLE      1
-#define SM_PWRSAVE_MODE                2
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_power_cnst {
-       uint8 id;
-       uint8 len;
-       uint8 power;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_power_cnst dot11_power_cnst_t;
-
-BWL_PRE_PACKED_STRUCT struct dot11_power_cap {
-       uint8 min;
-       uint8 max;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_power_cap dot11_power_cap_t;
-
-BWL_PRE_PACKED_STRUCT struct dot11_tpc_rep {
-       uint8 id;
-       uint8 len;
-       uint8 tx_pwr;
-       uint8 margin;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_tpc_rep dot11_tpc_rep_t;
-#define DOT11_MNG_IE_TPC_REPORT_LEN    2       
-
-BWL_PRE_PACKED_STRUCT struct dot11_supp_channels {
-       uint8 id;
-       uint8 len;
-       uint8 first_channel;
-       uint8 num_channels;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_supp_channels dot11_supp_channels_t;
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_extch {
-       uint8   id;             
-       uint8   len;            
-       uint8   extch;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_extch dot11_extch_ie_t;
-
-BWL_PRE_PACKED_STRUCT struct dot11_brcm_extch {
-       uint8   id;             
-       uint8   len;            
-       uint8   oui[3];         
-       uint8   type;           
-       uint8   extch;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_brcm_extch dot11_brcm_extch_ie_t;
-
-#define BRCM_EXTCH_IE_LEN      5
-#define BRCM_EXTCH_IE_TYPE     53      
-#define DOT11_EXTCH_IE_LEN     1
-#define DOT11_EXT_CH_MASK      0x03    
-#define DOT11_EXT_CH_UPPER     0x01    
-#define DOT11_EXT_CH_LOWER     0x03    
-#define DOT11_EXT_CH_NONE      0x00    
-
-BWL_PRE_PACKED_STRUCT struct dot11_action_frmhdr {
-       uint8   category;
-       uint8   action;
-       uint8   data[1];
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_ACTION_FRMHDR_LEN        2
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_channel_switch {
-       uint8 id;       
-       uint8 len;      
-       uint8 mode;     
-       uint8 channel;  
-       uint8 count;    
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_channel_switch dot11_chan_switch_ie_t;
-
-#define DOT11_SWITCH_IE_LEN    3       
-
-#define DOT11_CSA_MODE_ADVISORY                0       
-#define DOT11_CSA_MODE_NO_TX           1       
-
-BWL_PRE_PACKED_STRUCT struct dot11_action_switch_channel {
-       uint8   category;
-       uint8   action;
-       dot11_chan_switch_ie_t chan_switch_ie;  
-       dot11_brcm_extch_ie_t extch_ie;         
-} BWL_POST_PACKED_STRUCT;
-
-BWL_PRE_PACKED_STRUCT struct dot11_csa_body {
-       uint8 mode;     
-       uint8 reg;      
-       uint8 channel;  
-       uint8 count;    
-} BWL_POST_PACKED_STRUCT;
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_ext_csa {
-       uint8 id;       
-       uint8 len;      
-       struct dot11_csa_body b; 
-} BWL_POST_PACKED_STRUCT;
-
-BWL_PRE_PACKED_STRUCT struct dot11y_action_ext_csa {
-       uint8   category;
-       uint8   action;
-       struct dot11_csa_body b;        
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_ext_csa dot11_ext_csa_ie_t;
-#define DOT11_EXT_CSA_IE_LEN   4       
-
-BWL_PRE_PACKED_STRUCT struct dot11_action_ext_csa {
-       uint8   category;
-       uint8   action;
-       dot11_ext_csa_ie_t chan_switch_ie;      
-} BWL_POST_PACKED_STRUCT;
-
-BWL_PRE_PACKED_STRUCT struct dot11_obss_coex {
-       uint8   id;
-       uint8   len;
-       uint8   info;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_obss_coex dot11_obss_coex_t;
-#define DOT11_OBSS_COEXINFO_LEN        1       
-
-#define        DOT11_OBSS_COEX_INFO_REQ                0x01
-#define        DOT11_OBSS_COEX_40MHZ_INTOLERANT        0x02
-#define        DOT11_OBSS_COEX_20MHZ_WIDTH_REQ 0x04
-
-BWL_PRE_PACKED_STRUCT struct dot11_obss_chanlist {
-       uint8   id;
-       uint8   len;
-       uint8   regclass;
-       uint8   chanlist[1];
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_obss_chanlist dot11_obss_chanlist_t;
-#define DOT11_OBSS_CHANLIST_FIXED_LEN  1       
-
-BWL_PRE_PACKED_STRUCT struct dot11_extcap_ie {
-       uint8 id;
-       uint8 len;
-       uint8 cap;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_extcap_ie dot11_extcap_ie_t;
-#define DOT11_EXTCAP_LEN       1
-
-
-
-#define DOT11_MEASURE_TYPE_BASIC       0       
-#define DOT11_MEASURE_TYPE_CCA                 1       
-#define DOT11_MEASURE_TYPE_RPI         2       
-
-
-#define DOT11_MEASURE_MODE_ENABLE      (1<<1)  
-#define DOT11_MEASURE_MODE_REQUEST     (1<<2)  
-#define DOT11_MEASURE_MODE_REPORT      (1<<3)  
-
-#define DOT11_MEASURE_MODE_LATE        (1<<0)  
-#define DOT11_MEASURE_MODE_INCAPABLE   (1<<1)  
-#define DOT11_MEASURE_MODE_REFUSED     (1<<2)  
-
-#define DOT11_MEASURE_BASIC_MAP_BSS    ((uint8)(1<<0)) 
-#define DOT11_MEASURE_BASIC_MAP_OFDM   ((uint8)(1<<1)) 
-#define DOT11_MEASURE_BASIC_MAP_UKNOWN ((uint8)(1<<2)) 
-#define DOT11_MEASURE_BASIC_MAP_RADAR  ((uint8)(1<<3)) 
-#define DOT11_MEASURE_BASIC_MAP_UNMEAS ((uint8)(1<<4)) 
-
-BWL_PRE_PACKED_STRUCT struct dot11_meas_req {
-       uint8 id;
-       uint8 len;
-       uint8 token;
-       uint8 mode;
-       uint8 type;
-       uint8 channel;
-       uint8 start_time[8];
-       uint16 duration;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_meas_req dot11_meas_req_t;
-#define DOT11_MNG_IE_MREQ_LEN 14       
-
-#define DOT11_MNG_IE_MREQ_FIXED_LEN 3  
-
-BWL_PRE_PACKED_STRUCT struct dot11_meas_rep {
-       uint8 id;
-       uint8 len;
-       uint8 token;
-       uint8 mode;
-       uint8 type;
-       BWL_PRE_PACKED_STRUCT union
-       {
-               BWL_PRE_PACKED_STRUCT struct {
-                       uint8 channel;
-                       uint8 start_time[8];
-                       uint16 duration;
-                       uint8 map;
-               } BWL_POST_PACKED_STRUCT basic;
-               uint8 data[1];
-       } BWL_POST_PACKED_STRUCT rep;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_meas_rep dot11_meas_rep_t;
-
-
-#define DOT11_MNG_IE_MREP_FIXED_LEN    3       
-
-BWL_PRE_PACKED_STRUCT struct dot11_meas_rep_basic {
-       uint8 channel;
-       uint8 start_time[8];
-       uint16 duration;
-       uint8 map;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_meas_rep_basic dot11_meas_rep_basic_t;
-#define DOT11_MEASURE_BASIC_REP_LEN    12      
-
-BWL_PRE_PACKED_STRUCT struct dot11_quiet {
-       uint8 id;
-       uint8 len;
-       uint8 count;    
-       uint8 period;   
-       uint16 duration;        
-       uint16 offset;  
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_quiet dot11_quiet_t;
-
-BWL_PRE_PACKED_STRUCT struct chan_map_tuple {
-       uint8 channel;
-       uint8 map;
-} BWL_POST_PACKED_STRUCT;
-typedef struct chan_map_tuple chan_map_tuple_t;
-
-BWL_PRE_PACKED_STRUCT struct dot11_ibss_dfs {
-       uint8 id;
-       uint8 len;
-       uint8 eaddr[ETHER_ADDR_LEN];
-       uint8 interval;
-       chan_map_tuple_t map[1];
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_ibss_dfs dot11_ibss_dfs_t;
-
-
-#define WME_OUI                        "\x00\x50\xf2"  
-#define WME_VER                        1       
-#define WME_TYPE               2       
-#define WME_SUBTYPE_IE         0       
-#define WME_SUBTYPE_PARAM_IE   1       
-#define WME_SUBTYPE_TSPEC      2       
-
-
-#define AC_BE                  0       
-#define AC_BK                  1       
-#define AC_VI                  2       
-#define AC_VO                  3       
-#define AC_COUNT               4       
-
-typedef uint8 ac_bitmap_t;     
-
-#define AC_BITMAP_NONE         0x0     
-#define AC_BITMAP_ALL          0xf     
-#define AC_BITMAP_TST(ab, ac)  (((ab) & (1 << (ac))) != 0)
-#define AC_BITMAP_SET(ab, ac)  (((ab) |= (1 << (ac))))
-#define AC_BITMAP_RESET(ab, ac) (((ab) &= ~(1 << (ac))))
-
-
-BWL_PRE_PACKED_STRUCT struct wme_ie {
-       uint8 oui[3];
-       uint8 type;
-       uint8 subtype;
-       uint8 version;
-       uint8 qosinfo;
-} BWL_POST_PACKED_STRUCT;
-typedef struct wme_ie wme_ie_t;
-#define WME_IE_LEN 7   
-
-BWL_PRE_PACKED_STRUCT struct edcf_acparam {
-       uint8   ACI;
-       uint8   ECW;
-       uint16  TXOP;           
-} BWL_POST_PACKED_STRUCT;
-typedef struct edcf_acparam edcf_acparam_t;
-
-
-BWL_PRE_PACKED_STRUCT struct wme_param_ie {
-       uint8 oui[3];
-       uint8 type;
-       uint8 subtype;
-       uint8 version;
-       uint8 qosinfo;
-       uint8 rsvd;
-       edcf_acparam_t acparam[AC_COUNT];
-} BWL_POST_PACKED_STRUCT;
-typedef struct wme_param_ie wme_param_ie_t;
-#define WME_PARAM_IE_LEN            24          
-
-
-#define WME_QI_AP_APSD_MASK         0x80        
-#define WME_QI_AP_APSD_SHIFT        7           
-#define WME_QI_AP_COUNT_MASK        0x0f        
-#define WME_QI_AP_COUNT_SHIFT       0           
-
-
-#define WME_QI_STA_MAXSPLEN_MASK    0x60        
-#define WME_QI_STA_MAXSPLEN_SHIFT   5           
-#define WME_QI_STA_APSD_ALL_MASK    0xf         
-#define WME_QI_STA_APSD_ALL_SHIFT   0           
-#define WME_QI_STA_APSD_BE_MASK     0x8         
-#define WME_QI_STA_APSD_BE_SHIFT    3           
-#define WME_QI_STA_APSD_BK_MASK     0x4         
-#define WME_QI_STA_APSD_BK_SHIFT    2           
-#define WME_QI_STA_APSD_VI_MASK     0x2         
-#define WME_QI_STA_APSD_VI_SHIFT    1           
-#define WME_QI_STA_APSD_VO_MASK     0x1         
-#define WME_QI_STA_APSD_VO_SHIFT    0           
-
-
-#define EDCF_AIFSN_MIN               1           
-#define EDCF_AIFSN_MAX               15          
-#define EDCF_AIFSN_MASK              0x0f        
-#define EDCF_ACM_MASK                0x10        
-#define EDCF_ACI_MASK                0x60        
-#define EDCF_ACI_SHIFT               5           
-#define EDCF_AIFSN_SHIFT             12          
-
-
-#define EDCF_ECW_MIN                 0           
-#define EDCF_ECW_MAX                 15          
-#define EDCF_ECW2CW(exp)             ((1 << (exp)) - 1)
-#define EDCF_ECWMIN_MASK             0x0f        
-#define EDCF_ECWMAX_MASK             0xf0        
-#define EDCF_ECWMAX_SHIFT            4           
-
-
-#define EDCF_TXOP_MIN                0           
-#define EDCF_TXOP_MAX                65535       
-#define EDCF_TXOP2USEC(txop)         ((txop) << 5)
-
-
-#define NON_EDCF_AC_BE_ACI_STA          0x02
-
-
-#define EDCF_AC_BE_ACI_STA           0x03      
-#define EDCF_AC_BE_ECW_STA           0xA4      
-#define EDCF_AC_BE_TXOP_STA          0x0000    
-#define EDCF_AC_BK_ACI_STA           0x27      
-#define EDCF_AC_BK_ECW_STA           0xA4      
-#define EDCF_AC_BK_TXOP_STA          0x0000    
-#define EDCF_AC_VI_ACI_STA           0x42      
-#define EDCF_AC_VI_ECW_STA           0x43      
-#define EDCF_AC_VI_TXOP_STA          0x005e    
-#define EDCF_AC_VO_ACI_STA           0x62      
-#define EDCF_AC_VO_ECW_STA           0x32      
-#define EDCF_AC_VO_TXOP_STA          0x002f    
-
-
-#define EDCF_AC_BE_ACI_AP            0x03      
-#define EDCF_AC_BE_ECW_AP            0x64      
-#define EDCF_AC_BE_TXOP_AP           0x0000    
-#define EDCF_AC_BK_ACI_AP            0x27      
-#define EDCF_AC_BK_ECW_AP            0xA4      
-#define EDCF_AC_BK_TXOP_AP           0x0000    
-#define EDCF_AC_VI_ACI_AP            0x41      
-#define EDCF_AC_VI_ECW_AP            0x43      
-#define EDCF_AC_VI_TXOP_AP           0x005e    
-#define EDCF_AC_VO_ACI_AP            0x61      
-#define EDCF_AC_VO_ECW_AP            0x32      
-#define EDCF_AC_VO_TXOP_AP           0x002f    
-
-
-BWL_PRE_PACKED_STRUCT struct edca_param_ie {
-       uint8 qosinfo;
-       uint8 rsvd;
-       edcf_acparam_t acparam[AC_COUNT];
-} BWL_POST_PACKED_STRUCT;
-typedef struct edca_param_ie edca_param_ie_t;
-#define EDCA_PARAM_IE_LEN            18          
-
-
-BWL_PRE_PACKED_STRUCT struct qos_cap_ie {
-       uint8 qosinfo;
-} BWL_POST_PACKED_STRUCT;
-typedef struct qos_cap_ie qos_cap_ie_t;
-
-BWL_PRE_PACKED_STRUCT struct dot11_qbss_load_ie {
-       uint8 id;                       
-       uint8 length;
-       uint16 station_count;           
-       uint8 channel_utilization;      
-       uint16 aac;                     
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_qbss_load_ie dot11_qbss_load_ie_t;
-
-
-#define FIXED_MSDU_SIZE 0x8000         
-#define MSDU_SIZE_MASK 0x7fff          
-
-
-
-#define        INTEGER_SHIFT   13      
-#define FRACTION_MASK  0x1FFF  
-
-
-BWL_PRE_PACKED_STRUCT struct dot11_management_notification {
-       uint8 category;                 
-       uint8 action;
-       uint8 token;
-       uint8 status;
-       uint8 data[1];                  
-} BWL_POST_PACKED_STRUCT;
-#define DOT11_MGMT_NOTIFICATION_LEN 4  
-
-
-#define WME_ADDTS_REQUEST      0       
-#define WME_ADDTS_RESPONSE     1       
-#define WME_DELTS_REQUEST      2       
-
-
-#define WME_ADMISSION_ACCEPTED         0       
-#define WME_INVALID_PARAMETERS         1       
-#define WME_ADMISSION_REFUSED          3       
-
-
-#define BCN_PRB_SSID(body) ((char*)(body) + DOT11_BCN_PRB_LEN)
-
-
-#define DOT11_OPEN_SYSTEM      0       
-#define DOT11_SHARED_KEY       1       
-
-#define DOT11_OPEN_SHARED      2       
-#define DOT11_CHALLENGE_LEN    128     
-
-
-#define FC_PVER_MASK           0x3     
-#define FC_PVER_SHIFT          0       
-#define FC_TYPE_MASK           0xC     
-#define FC_TYPE_SHIFT          2       
-#define FC_SUBTYPE_MASK                0xF0    
-#define FC_SUBTYPE_SHIFT       4       
-#define FC_TODS                        0x100   
-#define FC_TODS_SHIFT          8       
-#define FC_FROMDS              0x200   
-#define FC_FROMDS_SHIFT                9       
-#define FC_MOREFRAG            0x400   
-#define FC_MOREFRAG_SHIFT      10      
-#define FC_RETRY               0x800   
-#define FC_RETRY_SHIFT         11      
-#define FC_PM                  0x1000  
-#define FC_PM_SHIFT            12      
-#define FC_MOREDATA            0x2000  
-#define FC_MOREDATA_SHIFT      13      
-#define FC_WEP                 0x4000  
-#define FC_WEP_SHIFT           14      
-#define FC_ORDER               0x8000  
-#define FC_ORDER_SHIFT         15      
-
-
-#define SEQNUM_SHIFT           4       
-#define SEQNUM_MAX             0x1000  
-#define FRAGNUM_MASK           0xF     
-
-
-
-
-#define FC_TYPE_MNG            0       
-#define FC_TYPE_CTL            1       
-#define FC_TYPE_DATA           2       
-
-
-#define FC_SUBTYPE_ASSOC_REQ           0       
-#define FC_SUBTYPE_ASSOC_RESP          1       
-#define FC_SUBTYPE_REASSOC_REQ         2       
-#define FC_SUBTYPE_REASSOC_RESP                3       
-#define FC_SUBTYPE_PROBE_REQ           4       
-#define FC_SUBTYPE_PROBE_RESP          5       
-#define FC_SUBTYPE_BEACON              8       
-#define FC_SUBTYPE_ATIM                        9       
-#define FC_SUBTYPE_DISASSOC            10      
-#define FC_SUBTYPE_AUTH                        11      
-#define FC_SUBTYPE_DEAUTH              12      
-#define FC_SUBTYPE_ACTION              13      
-#define FC_SUBTYPE_ACTION_NOACK                14      
-
-
-#define FC_SUBTYPE_CTL_WRAPPER         7       
-#define FC_SUBTYPE_BLOCKACK_REQ                8       
-#define FC_SUBTYPE_BLOCKACK            9       
-#define FC_SUBTYPE_PS_POLL             10      
-#define FC_SUBTYPE_RTS                 11      
-#define FC_SUBTYPE_CTS                 12      
-#define FC_SUBTYPE_ACK                 13      
-#define FC_SUBTYPE_CF_END              14      
-#define FC_SUBTYPE_CF_END_ACK          15      
-
-
-#define FC_SUBTYPE_DATA                        0       
-#define FC_SUBTYPE_DATA_CF_ACK         1       
-#define FC_SUBTYPE_DATA_CF_POLL                2       
-#define FC_SUBTYPE_DATA_CF_ACK_POLL    3       
-#define FC_SUBTYPE_NULL                        4       
-#define FC_SUBTYPE_CF_ACK              5       
-#define FC_SUBTYPE_CF_POLL             6       
-#define FC_SUBTYPE_CF_ACK_POLL         7       
-#define FC_SUBTYPE_QOS_DATA            8       
-#define FC_SUBTYPE_QOS_DATA_CF_ACK     9       
-#define FC_SUBTYPE_QOS_DATA_CF_POLL    10      
-#define FC_SUBTYPE_QOS_DATA_CF_ACK_POLL        11      
-#define FC_SUBTYPE_QOS_NULL            12      
-#define FC_SUBTYPE_QOS_CF_POLL         14      
-#define FC_SUBTYPE_QOS_CF_ACK_POLL     15      
-
-
-#define FC_SUBTYPE_ANY_QOS(s)          (((s) & 8) != 0)
-#define FC_SUBTYPE_ANY_NULL(s)         (((s) & 4) != 0)
-#define FC_SUBTYPE_ANY_CF_POLL(s)      (((s) & 2) != 0)
-#define FC_SUBTYPE_ANY_CF_ACK(s)       (((s) & 1) != 0)
-
-
-#define FC_KIND_MASK           (FC_TYPE_MASK | FC_SUBTYPE_MASK)        
-
-#define FC_KIND(t, s)  (((t) << FC_TYPE_SHIFT) | ((s) << FC_SUBTYPE_SHIFT))    
-
-#define FC_SUBTYPE(fc) (((fc) & FC_SUBTYPE_MASK) >> FC_SUBTYPE_SHIFT)  
-#define FC_TYPE(fc)    (((fc) & FC_TYPE_MASK) >> FC_TYPE_SHIFT)        
-
-#define FC_ASSOC_REQ   FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ASSOC_REQ)      
-#define FC_ASSOC_RESP  FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ASSOC_RESP)     
-#define FC_REASSOC_REQ FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_REASSOC_REQ)    
-#define FC_REASSOC_RESP        FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_REASSOC_RESP)   
-#define FC_PROBE_REQ   FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_PROBE_REQ)      
-#define FC_PROBE_RESP  FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_PROBE_RESP)     
-#define FC_BEACON      FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_BEACON)         
-#define FC_DISASSOC    FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_DISASSOC)       
-#define FC_AUTH                FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_AUTH)           
-#define FC_DEAUTH      FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_DEAUTH)         
-#define FC_ACTION      FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ACTION)         
-#define FC_ACTION_NOACK        FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ACTION_NOACK)   
-
-#define FC_CTL_WRAPPER FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CTL_WRAPPER)    
-#define FC_BLOCKACK_REQ        FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_BLOCKACK_REQ)   
-#define FC_BLOCKACK    FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_BLOCKACK)       
-#define FC_PS_POLL     FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_PS_POLL)        
-#define FC_RTS         FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_RTS)            
-#define FC_CTS         FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CTS)            
-#define FC_ACK         FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_ACK)            
-#define FC_CF_END      FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CF_END)         
-#define FC_CF_END_ACK  FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CF_END_ACK)     
-
-#define FC_DATA                FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_DATA)          
-#define FC_NULL_DATA   FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_NULL)          
-#define FC_DATA_CF_ACK FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_DATA_CF_ACK)   
-#define FC_QOS_DATA    FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_QOS_DATA)      
-#define FC_QOS_NULL    FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_QOS_NULL)      
-
-
-
-
-#define QOS_PRIO_SHIFT         0       
-#define QOS_PRIO_MASK          0x0007  
-#define QOS_PRIO(qos)          (((qos) & QOS_PRIO_MASK) >> QOS_PRIO_SHIFT)     
-
-
-#define QOS_TID_SHIFT          0       
-#define QOS_TID_MASK           0x000f  
-#define QOS_TID(qos)           (((qos) & QOS_TID_MASK) >> QOS_TID_SHIFT)       
-
-
-#define QOS_EOSP_SHIFT         4       
-#define QOS_EOSP_MASK          0x0010  
-#define QOS_EOSP(qos)          (((qos) & QOS_EOSP_MASK) >> QOS_EOSP_SHIFT)     
-
-
-#define QOS_ACK_NORMAL_ACK     0       
-#define QOS_ACK_NO_ACK         1       
-#define QOS_ACK_NO_EXP_ACK     2       
-#define QOS_ACK_BLOCK_ACK      3       
-#define QOS_ACK_SHIFT          5       
-#define QOS_ACK_MASK           0x0060  
-#define QOS_ACK(qos)           (((qos) & QOS_ACK_MASK) >> QOS_ACK_SHIFT)       
-
-
-#define QOS_AMSDU_SHIFT                7       
-#define QOS_AMSDU_MASK         0x0080  
-
-
-
-
-
-
-#define DOT11_MNG_AUTH_ALGO_LEN                2       
-#define DOT11_MNG_AUTH_SEQ_LEN         2       
-#define DOT11_MNG_BEACON_INT_LEN       2       
-#define DOT11_MNG_CAP_LEN              2       
-#define DOT11_MNG_AP_ADDR_LEN          6       
-#define DOT11_MNG_LISTEN_INT_LEN       2       
-#define DOT11_MNG_REASON_LEN           2       
-#define DOT11_MNG_AID_LEN              2       
-#define DOT11_MNG_STATUS_LEN           2       
-#define DOT11_MNG_TIMESTAMP_LEN                8       
-
-
-#define DOT11_AID_MASK                 0x3fff  
-
-
-#define DOT11_RC_RESERVED              0       
-#define DOT11_RC_UNSPECIFIED           1       
-#define DOT11_RC_AUTH_INVAL            2       
-#define DOT11_RC_DEAUTH_LEAVING                3       
-#define DOT11_RC_INACTIVITY            4       
-#define DOT11_RC_BUSY                  5       
-#define DOT11_RC_INVAL_CLASS_2         6       
-#define DOT11_RC_INVAL_CLASS_3         7       
-#define DOT11_RC_DISASSOC_LEAVING      8       
-#define DOT11_RC_NOT_AUTH              9       
-#define DOT11_RC_BAD_PC                        10      
-#define DOT11_RC_BAD_CHANNELS          11      
-
-
-
-#define DOT11_RC_UNSPECIFIED_QOS       32      
-#define DOT11_RC_INSUFFCIENT_BW                33      
-#define DOT11_RC_EXCESSIVE_FRAMES      34      
-#define DOT11_RC_TX_OUTSIDE_TXOP       35      
-#define DOT11_RC_LEAVING_QBSS          36      
-#define DOT11_RC_BAD_MECHANISM         37      
-#define DOT11_RC_SETUP_NEEDED          38      
-#define DOT11_RC_TIMEOUT               39      
-
-#define DOT11_RC_MAX                   23      
-
-
-#define DOT11_SC_SUCCESS               0       
-#define DOT11_SC_FAILURE               1       
-#define DOT11_SC_CAP_MISMATCH          10      
-#define DOT11_SC_REASSOC_FAIL          11      
-#define DOT11_SC_ASSOC_FAIL            12      
-#define DOT11_SC_AUTH_MISMATCH         13      
-#define DOT11_SC_AUTH_SEQ              14      
-#define DOT11_SC_AUTH_CHALLENGE_FAIL   15      
-#define DOT11_SC_AUTH_TIMEOUT          16      
-#define DOT11_SC_ASSOC_BUSY_FAIL       17      
-#define DOT11_SC_ASSOC_RATE_MISMATCH   18      
-#define DOT11_SC_ASSOC_SHORT_REQUIRED  19      
-#define DOT11_SC_ASSOC_PBCC_REQUIRED   20      
-#define DOT11_SC_ASSOC_AGILITY_REQUIRED        21      
-#define DOT11_SC_ASSOC_SPECTRUM_REQUIRED       22      
-#define DOT11_SC_ASSOC_BAD_POWER_CAP   23      
-#define DOT11_SC_ASSOC_BAD_SUP_CHANNELS        24      
-#define DOT11_SC_ASSOC_SHORTSLOT_REQUIRED      25      
-#define DOT11_SC_ASSOC_ERPBCC_REQUIRED 26      
-#define DOT11_SC_ASSOC_DSSOFDM_REQUIRED        27      
-
-#define        DOT11_SC_DECLINED               37      
-#define        DOT11_SC_INVALID_PARAMS         38      
-
-
-#define DOT11_MNG_DS_PARAM_LEN                 1       
-#define DOT11_MNG_IBSS_PARAM_LEN               2       
-
-
-#define DOT11_MNG_TIM_FIXED_LEN                        3       
-#define DOT11_MNG_TIM_DTIM_COUNT               0       
-#define DOT11_MNG_TIM_DTIM_PERIOD              1       
-#define DOT11_MNG_TIM_BITMAP_CTL               2       
-#define DOT11_MNG_TIM_PVB                      3       
-
-
-#define TLV_TAG_OFF            0       
-#define TLV_LEN_OFF            1       
-#define TLV_HDR_LEN            2       
-#define TLV_BODY_OFF           2       
-
-
-#define DOT11_MNG_SSID_ID                      0       
-#define DOT11_MNG_RATES_ID                     1       
-#define DOT11_MNG_FH_PARMS_ID                  2       
-#define DOT11_MNG_DS_PARMS_ID                  3       
-#define DOT11_MNG_CF_PARMS_ID                  4       
-#define DOT11_MNG_TIM_ID                       5       
-#define DOT11_MNG_IBSS_PARMS_ID                        6       
-#define DOT11_MNG_COUNTRY_ID                   7       
-#define DOT11_MNG_HOPPING_PARMS_ID             8       
-#define DOT11_MNG_HOPPING_TABLE_ID             9       
-#define DOT11_MNG_REQUEST_ID                   10      
-#define DOT11_MNG_QBSS_LOAD_ID                         11      
-#define DOT11_MNG_EDCA_PARAM_ID                        12      
-#define DOT11_MNG_CHALLENGE_ID                 16      
-#define DOT11_MNG_PWR_CONSTRAINT_ID            32      
-#define DOT11_MNG_PWR_CAP_ID                   33      
-#define DOT11_MNG_TPC_REQUEST_ID               34      
-#define DOT11_MNG_TPC_REPORT_ID                        35      
-#define DOT11_MNG_SUPP_CHANNELS_ID             36      
-#define DOT11_MNG_CHANNEL_SWITCH_ID            37      
-#define DOT11_MNG_MEASURE_REQUEST_ID           38      
-#define DOT11_MNG_MEASURE_REPORT_ID            39      
-#define DOT11_MNG_QUIET_ID                     40      
-#define DOT11_MNG_IBSS_DFS_ID                  41      
-#define DOT11_MNG_ERP_ID                       42      
-#define DOT11_MNG_TS_DELAY_ID                  43      
-#define        DOT11_MNG_HT_CAP                        45      
-#define DOT11_MNG_QOS_CAP_ID                   46      
-#define DOT11_MNG_NONERP_ID                    47      
-#define DOT11_MNG_RSN_ID                       48      
-#define DOT11_MNG_EXT_RATES_ID                 50      
-#define        DOT11_MNG_REGCLASS_ID                   59      
-#define DOT11_MNG_EXT_CSA_ID                   60      
-#define        DOT11_MNG_HT_ADD                        61      
-#define        DOT11_MNG_EXT_CHANNEL_OFFSET            62      
-#define DOT11_MNG_WAPI_ID                              68      
-#define        DOT11_MNG_HT_BSS_COEXINFO_ID            72      
-#define        DOT11_MNG_HT_BSS_CHANNEL_REPORT_ID      73      
-#define        DOT11_MNG_HT_OBSS_ID                    74      
-#define        DOT11_MNG_EXT_CAP                       127     
-#define DOT11_MNG_WPA_ID                       221     
-#define DOT11_MNG_PROPR_ID                     221     
-
-
-#define DOT11_RATE_BASIC                       0x80    
-#define DOT11_RATE_MASK                                0x7F    
-
-
-#define DOT11_MNG_ERP_LEN                      1       
-#define DOT11_MNG_NONERP_PRESENT               0x01    
-#define DOT11_MNG_USE_PROTECTION               0x02    
-#define DOT11_MNG_BARKER_PREAMBLE              0x04    
-
-#define DOT11_MGN_TS_DELAY_LEN         4       
-#define TS_DELAY_FIELD_SIZE                    4       
-
-
-#define DOT11_CAP_ESS                          0x0001  
-#define DOT11_CAP_IBSS                         0x0002  
-#define DOT11_CAP_POLLABLE                     0x0004  
-#define DOT11_CAP_POLL_RQ                      0x0008  
-#define DOT11_CAP_PRIVACY                      0x0010  
-#define DOT11_CAP_SHORT                                0x0020  
-#define DOT11_CAP_PBCC                         0x0040  
-#define DOT11_CAP_AGILITY                      0x0080  
-#define DOT11_CAP_SPECTRUM                     0x0100  
-#define DOT11_CAP_SHORTSLOT                    0x0400  
-#define DOT11_CAP_CCK_OFDM                     0x2000  
-
-
-#define DOT11_OBSS_COEX_MNG_SUPPORT    0x01    
-
-
-#define DOT11_ACTION_HDR_LEN           2       
-#define DOT11_ACTION_CAT_ERR_MASK      0x80    
-#define DOT11_ACTION_CAT_MASK          0x7F    
-#define DOT11_ACTION_CAT_SPECT_MNG     0       
-#define DOT11_ACTION_CAT_BLOCKACK      3       
-#define DOT11_ACTION_CAT_PUBLIC                4       
-#define DOT11_ACTION_CAT_HT            7       
-#define DOT11_ACTION_CAT_VS                    127     
-#define DOT11_ACTION_NOTIFICATION      0x11    
-
-#define DOT11_ACTION_ID_M_REQ          0       
-#define DOT11_ACTION_ID_M_REP          1       
-#define DOT11_ACTION_ID_TPC_REQ                2       
-#define DOT11_ACTION_ID_TPC_REP                3       
-#define DOT11_ACTION_ID_CHANNEL_SWITCH 4       
-#define DOT11_ACTION_ID_EXT_CSA                5       
-
-
-#define DOT11_ACTION_ID_HT_CH_WIDTH    0       
-#define DOT11_ACTION_ID_HT_MIMO_PS     1       
-
-
-#define DOT11_PUB_ACTION_BSS_COEX_MNG  0       
-#define DOT11_PUB_ACTION_CHANNEL_SWITCH        4       
-
-
-#define DOT11_BA_ACTION_ADDBA_REQ      0       
-#define DOT11_BA_ACTION_ADDBA_RESP     1       
-#define DOT11_BA_ACTION_DELBA          2       
-
-
-#define DOT11_ADDBA_PARAM_AMSDU_SUP    0x0001  
-#define DOT11_ADDBA_PARAM_POLICY_MASK  0x0002  
-#define DOT11_ADDBA_PARAM_POLICY_SHIFT 1       
-#define DOT11_ADDBA_PARAM_TID_MASK     0x003c  
-#define DOT11_ADDBA_PARAM_TID_SHIFT    2       
-#define DOT11_ADDBA_PARAM_BSIZE_MASK   0xffc0  
-#define DOT11_ADDBA_PARAM_BSIZE_SHIFT  6       
-
-#define DOT11_ADDBA_POLICY_DELAYED     0       
-#define DOT11_ADDBA_POLICY_IMMEDIATE   1       
-
-BWL_PRE_PACKED_STRUCT struct dot11_addba_req {
-       uint8 category;                         
-       uint8 action;                           
-       uint8 token;                            
-       uint16 addba_param_set;                 
-       uint16 timeout;                         
-       uint16 start_seqnum;                    
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_addba_req dot11_addba_req_t;
-#define DOT11_ADDBA_REQ_LEN            9       
-
-BWL_PRE_PACKED_STRUCT struct dot11_addba_resp {
-       uint8 category;                         
-       uint8 action;                           
-       uint8 token;                            
-       uint16 status;                          
-       uint16 addba_param_set;                 
-       uint16 timeout;                         
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_addba_resp dot11_addba_resp_t;
-#define DOT11_ADDBA_RESP_LEN           9       
-
-
-#define DOT11_DELBA_PARAM_INIT_MASK    0x0800  
-#define DOT11_DELBA_PARAM_INIT_SHIFT   11      
-#define DOT11_DELBA_PARAM_TID_MASK     0xf000  
-#define DOT11_DELBA_PARAM_TID_SHIFT    12      
-
-BWL_PRE_PACKED_STRUCT struct dot11_delba {
-       uint8 category;                         
-       uint8 action;                           
-       uint16 delba_param_set;                 
-       uint16 reason;                          
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_delba dot11_delba_t;
-#define DOT11_DELBA_LEN                        6       
-
-
-#define DOT11_BSSTYPE_INFRASTRUCTURE           0       
-#define DOT11_BSSTYPE_INDEPENDENT              1       
-#define DOT11_BSSTYPE_ANY                      2       
-#define DOT11_SCANTYPE_ACTIVE                  0       
-#define DOT11_SCANTYPE_PASSIVE                 1       
-
-
-#define PREN_PREAMBLE          24      
-#define PREN_MM_EXT            8       
-#define PREN_PREAMBLE_EXT      4       
-
-
-#define NPHY_RIFS_TIME         2       
-
-
-#define APHY_SLOT_TIME         9       
-#define APHY_SIFS_TIME         16      
-#define APHY_DIFS_TIME         (APHY_SIFS_TIME + (2 * APHY_SLOT_TIME)) 
-#define APHY_PREAMBLE_TIME     16      
-#define APHY_SIGNAL_TIME       4       
-#define APHY_SYMBOL_TIME       4       
-#define APHY_SERVICE_NBITS     16      
-#define APHY_TAIL_NBITS                6       
-#define        APHY_CWMIN              15      
-
-
-#define BPHY_SLOT_TIME         20      
-#define BPHY_SIFS_TIME         10      
-#define BPHY_DIFS_TIME         50      
-#define BPHY_PLCP_TIME         192     
-#define BPHY_PLCP_SHORT_TIME   96      
-#define        BPHY_CWMIN              31      
-
-
-#define DOT11_OFDM_SIGNAL_EXTENSION    6       
-
-#define PHY_CWMAX              1023    
-
-#define        DOT11_MAXNUMFRAGS       16      
-
-
-typedef struct d11cnt {
-       uint32          txfrag;         
-       uint32          txmulti;        
-       uint32          txfail;         
-       uint32          txretry;        
-       uint32          txretrie;       
-       uint32          rxdup;          
-       uint32          txrts;          
-       uint32          txnocts;        
-       uint32          txnoack;        
-       uint32          rxfrag;         
-       uint32          rxmulti;        
-       uint32          rxcrc;          
-       uint32          txfrmsnt;       
-       uint32          rxundec;        
-} d11cnt_t;
-
-
-#define BRCM_PROP_OUI          "\x00\x90\x4C"  
-
-
-
-
-BWL_PRE_PACKED_STRUCT struct brcm_prop_ie_s {
-       uint8 id;               
-       uint8 len;              
-       uint8 oui[3];           
-       uint8 type;             
-       uint16 cap;             
-} BWL_POST_PACKED_STRUCT;
-typedef struct brcm_prop_ie_s brcm_prop_ie_t;
-
-#define BRCM_PROP_IE_LEN       6       
-
-#define DPT_IE_TYPE            2
-
-
-#define BRCM_OUI               "\x00\x10\x18"  
-
-
-BWL_PRE_PACKED_STRUCT struct brcm_ie {
-       uint8   id;             
-       uint8   len;            
-       uint8   oui[3];         
-       uint8   ver;            
-       uint8   assoc;          
-       uint8   flags;          
-       uint8   flags1;         
-       uint16  amsdu_mtu_pref; 
-} BWL_POST_PACKED_STRUCT;
-typedef        struct brcm_ie brcm_ie_t;
-#define BRCM_IE_LEN            11      
-#define BRCM_IE_VER            2       
-#define BRCM_IE_LEGACY_AES_VER 1       
-
-
-#ifdef WLAFTERBURNER
-#define        BRF_ABCAP               0x1     
-#define        BRF_ABRQRD              0x2     
-#define BRF_ABCOUNTER_MASK     0xf0    
-#define BRF_ABCOUNTER_SHIFT    4       
-#endif 
-#define        BRF_LZWDS               0x4     
-#define        BRF_BLOCKACK            0x8     
-
-
-#define        BRF1_AMSDU              0x1     
-#define BRF1_WMEPS             0x4     
-#define BRF1_PSOFIX            0x8     
-
-#ifdef WLAFTERBURNER
-#define AB_WDS_TIMEOUT_MAX     15      
-#define AB_WDS_TIMEOUT_MIN     1       
-#endif 
-
-#define AB_GUARDCOUNT  10              
-
-#define MCSSET_LEN     16      
-#define MAX_MCS_NUM    (128)   
-
-BWL_PRE_PACKED_STRUCT struct ht_cap_ie {
-       uint16  cap;
-       uint8   params;
-       uint8   supp_mcs[MCSSET_LEN];
-       uint16  ext_htcap;
-       uint32  txbf_cap;
-       uint8   as_cap;
-} BWL_POST_PACKED_STRUCT;
-typedef struct ht_cap_ie ht_cap_ie_t;
-
-
-
-BWL_PRE_PACKED_STRUCT struct ht_prop_cap_ie {
-       uint8   id;             
-       uint8   len;            
-       uint8   oui[3];         
-       uint8   type;           
-       ht_cap_ie_t cap_ie;
-} BWL_POST_PACKED_STRUCT;
-typedef struct ht_prop_cap_ie ht_prop_cap_ie_t;
-#define HT_PROP_IE_OVERHEAD    4       
-#define HT_CAP_IE_LEN  26
-#define HT_CAP_IE_TYPE 51
-
-#define HT_CAP_LDPC_CODING     0x0001  
-#define HT_CAP_40MHZ           0x0002  
-#define HT_CAP_MIMO_PS_MASK    0x000C  
-#define HT_CAP_MIMO_PS_SHIFT   0x0002  
-#define HT_CAP_MIMO_PS_OFF     0x0003  
-#define HT_CAP_MIMO_PS_RTS     0x0001  
-#define HT_CAP_MIMO_PS_ON      0x0000  
-#define HT_CAP_GF              0x0010  
-#define HT_CAP_SHORT_GI_20     0x0020  
-#define HT_CAP_SHORT_GI_40     0x0040  
-#define HT_CAP_TX_STBC         0x0080  
-#define HT_CAP_RX_STBC_MASK    0x0300  
-#define HT_CAP_RX_STBC_SHIFT   8       
-#define HT_CAP_DELAYED_BA      0x0400  
-#define HT_CAP_MAX_AMSDU       0x0800  
-#define HT_CAP_DSSS_CCK        0x1000  
-#define HT_CAP_PSMP            0x2000  
-#define HT_CAP_40MHZ_INTOLERANT 0x4000 
-#define HT_CAP_LSIG_TXOP       0x8000  
-
-#define HT_CAP_RX_STBC_NO              0x0     
-#define HT_CAP_RX_STBC_ONE_STREAM      0x1     
-#define HT_CAP_RX_STBC_TWO_STREAM      0x2     
-#define HT_CAP_RX_STBC_THREE_STREAM    0x3     
-
-#define HT_MAX_AMSDU           7935    
-#define HT_MIN_AMSDU           3835    
-
-#define HT_PARAMS_RX_FACTOR_MASK       0x03    
-#define HT_PARAMS_DENSITY_MASK         0x1C    
-#define HT_PARAMS_DENSITY_SHIFT        2       
-
-
-#define AMPDU_MAX_MPDU_DENSITY 7       
-#define AMPDU_RX_FACTOR_64K    3       
-#define AMPDU_RX_FACTOR_BASE   8*1024  
-#define AMPDU_DELIMITER_LEN    4       
-
-#define HT_CAP_EXT_PCO                 0x0001
-#define HT_CAP_EXT_PCO_TTIME_MASK      0x0006
-#define HT_CAP_EXT_PCO_TTIME_SHIFT     1
-#define HT_CAP_EXT_MCS_FEEDBACK_MASK   0x0300
-#define HT_CAP_EXT_MCS_FEEDBACK_SHIFT  8
-#define HT_CAP_EXT_HTC                 0x0400
-#define HT_CAP_EXT_RD_RESP             0x0800
-
-BWL_PRE_PACKED_STRUCT struct ht_add_ie {
-       uint8   ctl_ch;                 
-       uint8   byte1;                  
-       uint16  opmode;                 
-       uint16  misc_bits;              
-       uint8   basic_mcs[MCSSET_LEN];  
-} BWL_POST_PACKED_STRUCT;
-typedef struct ht_add_ie ht_add_ie_t;
-
-
-
-BWL_PRE_PACKED_STRUCT struct ht_prop_add_ie {
-       uint8   id;             
-       uint8   len;            
-       uint8   oui[3];         
-       uint8   type;           
-       ht_add_ie_t add_ie;
-} BWL_POST_PACKED_STRUCT;
-typedef struct ht_prop_add_ie ht_prop_add_ie_t;
-
-#define HT_ADD_IE_LEN  22
-#define HT_ADD_IE_TYPE 52
-
-
-#define HT_BW_ANY              0x04    
-#define HT_RIFS_PERMITTED      0x08    
-
-
-#define HT_OPMODE_MASK         0x0003  
-#define HT_OPMODE_SHIFT        0       
-#define HT_OPMODE_PURE         0x0000  
-#define HT_OPMODE_OPTIONAL     0x0001  
-#define HT_OPMODE_HT20IN40     0x0002  
-#define HT_OPMODE_MIXED        0x0003  
-#define HT_OPMODE_NONGF        0x0004  
-#define DOT11N_TXBURST         0x0008  
-#define DOT11N_OBSS_NONHT      0x0010  
-
-
-#define HT_BASIC_STBC_MCS      0x007f  
-#define HT_DUAL_STBC_PROT      0x0080  
-#define HT_SECOND_BCN          0x0100  
-#define HT_LSIG_TXOP           0x0200  
-#define HT_PCO_ACTIVE          0x0400  
-#define HT_PCO_PHASE           0x0800  
-#define HT_DUALCTS_PROTECTION  0x0080  
-
-
-#define DOT11N_2G_TXBURST_LIMIT        6160    
-#define DOT11N_5G_TXBURST_LIMIT        3080    
-
-
-#define GET_HT_OPMODE(add_ie)          ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_MASK) \
-                                       >> HT_OPMODE_SHIFT)
-#define HT_MIXEDMODE_PRESENT(add_ie)   ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_MASK) \
-                                       == HT_OPMODE_MIXED)     
-#define HT_HT20_PRESENT(add_ie)        ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_MASK) \
-                                       == HT_OPMODE_HT20IN40)  
-#define HT_OPTIONAL_PRESENT(add_ie)    ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_MASK) \
-                                       == HT_OPMODE_OPTIONAL)  
-#define HT_USE_PROTECTION(add_ie)      (HT_HT20_PRESENT((add_ie)) || \
-                                       HT_MIXEDMODE_PRESENT((add_ie))) 
-#define HT_NONGF_PRESENT(add_ie)       ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_NONGF) \
-                                       == HT_OPMODE_NONGF)     
-#define DOT11N_TXBURST_PRESENT(add_ie) ((ltoh16_ua(&add_ie->opmode) & DOT11N_TXBURST) \
-                                       == DOT11N_TXBURST)      
-#define DOT11N_OBSS_NONHT_PRESENT(add_ie)      ((ltoh16_ua(&add_ie->opmode) & DOT11N_OBSS_NONHT) \
-                                       == DOT11N_OBSS_NONHT)   
-
-BWL_PRE_PACKED_STRUCT struct obss_params {
-       uint16  passive_dwell;
-       uint16  active_dwell;
-       uint16  bss_widthscan_interval;
-       uint16  passive_total;
-       uint16  active_total;
-       uint16  chanwidth_transition_dly;
-       uint16  activity_threshold;
-} BWL_POST_PACKED_STRUCT;
-typedef struct obss_params obss_params_t;
-
-BWL_PRE_PACKED_STRUCT struct dot11_obss_ie {
-       uint8   id;
-       uint8   len;
-       obss_params_t obss_params;
-} BWL_POST_PACKED_STRUCT;
-typedef struct dot11_obss_ie dot11_obss_ie_t;
-#define DOT11_OBSS_SCAN_IE_LEN sizeof(obss_params_t)   
-
-
-BWL_PRE_PACKED_STRUCT struct vndr_ie {
-       uchar id;
-       uchar len;
-       uchar oui [3];
-       uchar data [1];         
-} BWL_POST_PACKED_STRUCT;
-typedef struct vndr_ie vndr_ie_t;
-
-#define VNDR_IE_HDR_LEN                2       
-#define VNDR_IE_MIN_LEN                3       
-#define VNDR_IE_MAX_LEN                256     
-
-
-#define WPA_VERSION            1       
-#define WPA_OUI                        "\x00\x50\xF2"  
-
-#define WPA2_VERSION           1       
-#define WPA2_VERSION_LEN       2       
-#define WPA2_OUI               "\x00\x0F\xAC"  
-
-#define WPA_OUI_LEN    3       
-
-
-#define RSN_AKM_NONE           0       
-#define RSN_AKM_UNSPECIFIED    1       
-#define RSN_AKM_PSK            2       
-
-
-#define DOT11_MAX_DEFAULT_KEYS 4       
-#define DOT11_MAX_KEY_SIZE     32      
-#define DOT11_MAX_IV_SIZE      16      
-#define DOT11_EXT_IV_FLAG      (1<<5)  
-#define DOT11_WPA_KEY_RSC_LEN   8       
-
-#define WEP1_KEY_SIZE          5       
-#define WEP1_KEY_HEX_SIZE      10      
-#define WEP128_KEY_SIZE                13      
-#define WEP128_KEY_HEX_SIZE    26      
-#define TKIP_MIC_SIZE          8       
-#define TKIP_EOM_SIZE          7       
-#define TKIP_EOM_FLAG          0x5a    
-#define TKIP_KEY_SIZE          32      
-#define TKIP_MIC_AUTH_TX       16      
-#define TKIP_MIC_AUTH_RX       24      
-#define TKIP_MIC_SUP_RX                TKIP_MIC_AUTH_TX        
-#define TKIP_MIC_SUP_TX                TKIP_MIC_AUTH_RX        
-#define AES_KEY_SIZE           16      
-#define AES_MIC_SIZE           8       
-
-#define SMS4_KEY_LEN           16
-#define SMS4_WPI_CBC_MAC_LEN   16
-
-
-#include <packed_section_end.h>
-
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/proto/802.11e.h b/drivers/net/wireless/bcm4319/include/proto/802.11e.h
deleted file mode 100644 (file)
index 1dd6f45..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * 802.11e protocol header file
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: 802.11e.h,v 1.5.56.1 2008/11/20 00:51:18 Exp $
- */
-
-#ifndef _802_11e_H_
-#define _802_11e_H_
-
-#ifndef _TYPEDEFS_H_
-#include <typedefs.h>
-#endif
-
-/* This marks the start of a packed structure section. */
-#include <packed_section_start.h>
-
-
-/* WME Traffic Specification (TSPEC) element */
-#define WME_TSPEC_HDR_LEN           2           /* WME TSPEC header length */
-#define WME_TSPEC_BODY_OFF          2           /* WME TSPEC body offset */
-
-#define WME_CATEGORY_CODE_OFFSET       0               /* WME Category code offset */
-#define WME_ACTION_CODE_OFFSET         1               /* WME Action code offset */
-#define WME_TOKEN_CODE_OFFSET          2               /* WME Token code offset */
-#define WME_STATUS_CODE_OFFSET         3               /* WME Status code offset */
-
-BWL_PRE_PACKED_STRUCT struct tsinfo {
-       uint8 octets[3];
-} BWL_POST_PACKED_STRUCT;
-
-typedef struct tsinfo tsinfo_t;
-
-/* 802.11e TSPEC IE */
-typedef BWL_PRE_PACKED_STRUCT struct tspec {
-       uint8 oui[DOT11_OUI_LEN];       /* WME_OUI */
-       uint8 type;                                     /* WME_TYPE */
-       uint8 subtype;                          /* WME_SUBTYPE_TSPEC */
-       uint8 version;                          /* WME_VERSION */
-       tsinfo_t tsinfo;                        /* TS Info bit field */
-       uint16 nom_msdu_size;           /* (Nominal or fixed) MSDU Size (bytes) */
-       uint16 max_msdu_size;           /* Maximum MSDU Size (bytes) */
-       uint32 min_srv_interval;        /* Minimum Service Interval (us) */
-       uint32 max_srv_interval;        /* Maximum Service Interval (us) */
-       uint32 inactivity_interval;     /* Inactivity Interval (us) */
-       uint32 suspension_interval; /* Suspension Interval (us) */
-       uint32 srv_start_time;          /* Service Start Time (us) */
-       uint32 min_data_rate;           /* Minimum Data Rate (bps) */
-       uint32 mean_data_rate;          /* Mean Data Rate (bps) */
-       uint32 peak_data_rate;          /* Peak Data Rate (bps) */
-       uint32 max_burst_size;          /* Maximum Burst Size (bytes) */
-       uint32 delay_bound;                     /* Delay Bound (us) */
-       uint32 min_phy_rate;            /* Minimum PHY Rate (bps) */
-       uint16 surplus_bw;                      /* Surplus Bandwidth Allowance (range 1.0-8.0) */
-       uint16 medium_time;                     /* Medium Time (32 us/s periods) */
-} BWL_POST_PACKED_STRUCT tspec_t;
-
-#define WME_TSPEC_LEN  (sizeof(tspec_t))               /* not including 2-bytes of header */
-
-/* ts_info */
-/* 802.1D priority is duplicated - bits 13-11 AND bits 3-1 */
-#define TS_INFO_TID_SHIFT              1       /* TS info. TID shift */
-#define TS_INFO_TID_MASK               (0xf << TS_INFO_TID_SHIFT)      /* TS info. TID mask */
-#define TS_INFO_CONTENTION_SHIFT       7       /* TS info. contention shift */
-#define TS_INFO_CONTENTION_MASK        (0x1 << TS_INFO_CONTENTION_SHIFT) /* TS info. contention mask */
-#define TS_INFO_DIRECTION_SHIFT        5       /* TS info. direction shift */
-#define TS_INFO_DIRECTION_MASK (0x3 << TS_INFO_DIRECTION_SHIFT) /* TS info. direction mask */
-#define TS_INFO_PSB_SHIFT              2               /* TS info. PSB bit Shift */
-#define TS_INFO_PSB_MASK               (1 << TS_INFO_PSB_SHIFT)        /* TS info. PSB mask */
-#define TS_INFO_UPLINK                 (0 << TS_INFO_DIRECTION_SHIFT)  /* TS info. uplink */
-#define TS_INFO_DOWNLINK               (1 << TS_INFO_DIRECTION_SHIFT)  /* TS info. downlink */
-#define TS_INFO_BIDIRECTIONAL  (3 << TS_INFO_DIRECTION_SHIFT)  /* TS info. bidirectional */
-#define TS_INFO_USER_PRIO_SHIFT        3       /* TS info. user priority shift */
-/* TS info. user priority mask */
-#define TS_INFO_USER_PRIO_MASK (0x7 << TS_INFO_USER_PRIO_SHIFT)
-
-/* Macro to get/set bit(s) field in TSINFO */
-#define WLC_CAC_GET_TID(pt)    ((((pt).octets[0]) & TS_INFO_TID_MASK) >> TS_INFO_TID_SHIFT)
-#define WLC_CAC_GET_DIR(pt)    ((((pt).octets[0]) & \
-       TS_INFO_DIRECTION_MASK) >> TS_INFO_DIRECTION_SHIFT)
-#define WLC_CAC_GET_PSB(pt)    ((((pt).octets[1]) & TS_INFO_PSB_MASK) >> TS_INFO_PSB_SHIFT)
-#define WLC_CAC_GET_USER_PRIO(pt)      ((((pt).octets[1]) & \
-       TS_INFO_USER_PRIO_MASK) >> TS_INFO_USER_PRIO_SHIFT)
-
-#define WLC_CAC_SET_TID(pt, id)        ((((pt).octets[0]) & (~TS_INFO_TID_MASK)) | \
-       ((id) << TS_INFO_TID_SHIFT))
-#define WLC_CAC_SET_USER_PRIO(pt, prio)        ((((pt).octets[0]) & (~TS_INFO_USER_PRIO_MASK)) | \
-       ((prio) << TS_INFO_USER_PRIO_SHIFT))
-
-/* 802.11e QBSS Load IE */
-#define QBSS_LOAD_IE_LEN               5       /* QBSS Load IE length */
-#define QBSS_LOAD_AAC_OFF              3       /* AAC offset in IE */
-
-#define CAC_ADDTS_RESP_TIMEOUT         300     /* default ADDTS response timeout in ms */
-
-/* 802.11e ADDTS status code */
-#define DOT11E_STATUS_ADMISSION_ACCEPTED       0       /* TSPEC Admission accepted status */
-#define DOT11E_STATUS_ADDTS_INVALID_PARAM      1       /* TSPEC invalid parameter status */
-#define DOT11E_STATUS_ADDTS_REFUSED_NSBW       3       /* ADDTS refused (non-sufficient BW) */
-#define DOT11E_STATUS_ADDTS_REFUSED_AWHILE     47      /* ADDTS refused but could retry later */
-
-/* 802.11e DELTS status code */
-#define DOT11E_STATUS_QSTA_LEAVE_QBSS          36      /* STA leave QBSS */
-#define DOT11E_STATUS_END_TS                           37      /* END TS */
-#define DOT11E_STATUS_UNKNOWN_TS                       38      /* UNKNOWN TS */
-#define DOT11E_STATUS_QSTA_REQ_TIMEOUT         39      /* STA ADDTS request timeout */
-
-
-/* This marks the end of a packed structure section. */
-#include <packed_section_end.h>
-
-#endif /* _802_11e_CAC_H_ */
diff --git a/drivers/net/wireless/bcm4319/include/proto/802.1d.h b/drivers/net/wireless/bcm4319/include/proto/802.1d.h
deleted file mode 100644 (file)
index 45c728b..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * Fundamental types and constants relating to 802.1D
- *
- * $Id: 802.1d.h,v 9.3 2007/04/10 21:33:06 Exp $
- */
-
-
-#ifndef _802_1_D_
-#define _802_1_D_
-
-
-#define        PRIO_8021D_NONE         2       
-#define        PRIO_8021D_BK           1       
-#define        PRIO_8021D_BE           0       
-#define        PRIO_8021D_EE           3       
-#define        PRIO_8021D_CL           4       
-#define        PRIO_8021D_VI           5       
-#define        PRIO_8021D_VO           6       
-#define        PRIO_8021D_NC           7       
-#define        MAXPRIO                 7       
-#define NUMPRIO                        (MAXPRIO + 1)
-
-#define ALLPRIO                -1      
-
-
-#define PRIO2PREC(prio) \
-       (((prio) == PRIO_8021D_NONE || (prio) == PRIO_8021D_BE) ? ((prio^2)) : (prio))
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/proto/bcmeth.h b/drivers/net/wireless/bcm4319/include/proto/bcmeth.h
deleted file mode 100644 (file)
index fdb5a2a..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Broadcom Ethernettype  protocol definitions
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: bcmeth.h,v 9.9.46.1 2008/11/20 00:51:20 Exp $
- */
-
-
-
-
-#ifndef _BCMETH_H_
-#define _BCMETH_H_
-
-#ifndef _TYPEDEFS_H_
-#include <typedefs.h>
-#endif
-
-
-#include <packed_section_start.h>
-
-
-
-
-
-
-
-#define        BCMILCP_SUBTYPE_RATE            1
-#define        BCMILCP_SUBTYPE_LINK            2
-#define        BCMILCP_SUBTYPE_CSA             3
-#define        BCMILCP_SUBTYPE_LARQ            4
-#define BCMILCP_SUBTYPE_VENDOR         5
-#define        BCMILCP_SUBTYPE_FLH             17
-
-#define BCMILCP_SUBTYPE_VENDOR_LONG    32769
-#define BCMILCP_SUBTYPE_CERT           32770
-#define BCMILCP_SUBTYPE_SES            32771
-
-
-#define BCMILCP_BCM_SUBTYPE_RESERVED           0
-#define BCMILCP_BCM_SUBTYPE_EVENT              1
-#define BCMILCP_BCM_SUBTYPE_SES                        2
-
-
-#define BCMILCP_BCM_SUBTYPE_DPT                        4
-
-#define BCMILCP_BCM_SUBTYPEHDR_MINLENGTH       8
-#define BCMILCP_BCM_SUBTYPEHDR_VERSION         0
-
-
-typedef BWL_PRE_PACKED_STRUCT struct bcmeth_hdr
-{
-       uint16  subtype;        
-       uint16  length;
-       uint8   version;        
-       uint8   oui[3];         
-       
-       uint16  usr_subtype;
-} BWL_POST_PACKED_STRUCT bcmeth_hdr_t;
-
-
-
-#include <packed_section_end.h>
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/proto/bcmevent.h b/drivers/net/wireless/bcm4319/include/proto/bcmevent.h
deleted file mode 100644 (file)
index 46c04d3..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Broadcom Event  protocol definitions
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- *
- * Dependencies: proto/bcmeth.h
- *
- * $Id: bcmevent.h,v 9.34.4.1.20.16 2009/09/25 23:52:38 Exp $
- *
- */
-
-
-
-
-#ifndef _BCMEVENT_H_
-#define _BCMEVENT_H_
-
-#ifndef _TYPEDEFS_H_
-#include <typedefs.h>
-#endif
-
-
-#include <packed_section_start.h>
-
-#define BCM_EVENT_MSG_VERSION          1       
-#define BCM_MSG_IFNAME_MAX             16      
-
-
-#define WLC_EVENT_MSG_LINK             0x01    
-#define WLC_EVENT_MSG_FLUSHTXQ         0x02    
-#define WLC_EVENT_MSG_GROUP            0x04    
-
-
-typedef BWL_PRE_PACKED_STRUCT struct
-{
-       uint16  version;
-       uint16  flags;                  
-       uint32  event_type;             
-       uint32  status;                 
-       uint32  reason;                 
-       uint32  auth_type;              
-       uint32  datalen;                
-       struct ether_addr       addr;   
-       char    ifname[BCM_MSG_IFNAME_MAX]; 
-} BWL_POST_PACKED_STRUCT wl_event_msg_t;
-
-
-typedef BWL_PRE_PACKED_STRUCT struct bcm_event {
-       struct ether_header eth;
-       bcmeth_hdr_t            bcm_hdr;
-       wl_event_msg_t          event;
-       
-} BWL_POST_PACKED_STRUCT bcm_event_t;
-
-#define BCM_MSG_LEN    (sizeof(bcm_event_t) - sizeof(bcmeth_hdr_t) - sizeof(struct ether_header))
-
-
-#define WLC_E_SET_SSID         0       
-#define WLC_E_JOIN             1       
-#define WLC_E_START            2       
-#define WLC_E_AUTH             3       
-#define WLC_E_AUTH_IND         4       
-#define WLC_E_DEAUTH           5       
-#define WLC_E_DEAUTH_IND       6       
-#define WLC_E_ASSOC            7       
-#define WLC_E_ASSOC_IND                8       
-#define WLC_E_REASSOC          9       
-#define WLC_E_REASSOC_IND      10      
-#define WLC_E_DISASSOC         11      
-#define WLC_E_DISASSOC_IND     12      
-#define WLC_E_QUIET_START      13      
-#define WLC_E_QUIET_END                14      
-#define WLC_E_BEACON_RX                15      
-#define WLC_E_LINK             16      
-#define WLC_E_MIC_ERROR                17      
-#define WLC_E_NDIS_LINK                18      
-#define WLC_E_ROAM             19      
-#define WLC_E_TXFAIL           20      
-#define WLC_E_PMKID_CACHE      21      
-#define WLC_E_RETROGRADE_TSF   22      
-#define WLC_E_PRUNE            23      
-#define WLC_E_AUTOAUTH         24      
-#define WLC_E_EAPOL_MSG                25      
-#define WLC_E_SCAN_COMPLETE    26      
-#define WLC_E_ADDTS_IND                27      
-#define WLC_E_DELTS_IND                28      
-#define WLC_E_BCNSENT_IND      29      
-#define WLC_E_BCNRX_MSG                30      
-#define WLC_E_BCNLOST_MSG      31      
-#define WLC_E_ROAM_PREP                32      
-#define WLC_E_PFN_NET_FOUND    33      
-#define WLC_E_PFN_NET_LOST     34      
-#define WLC_E_RESET_COMPLETE   35
-#define WLC_E_JOIN_START       36
-#define WLC_E_ROAM_START       37
-#define WLC_E_ASSOC_START      38
-#define WLC_E_IBSS_ASSOC       39
-#define WLC_E_RADIO            40
-#define WLC_E_PSM_WATCHDOG     41      
-#define WLC_E_PROBREQ_MSG       44      
-#define WLC_E_SCAN_CONFIRM_IND  45
-#define WLC_E_PSK_SUP  46      
-#define WLC_E_COUNTRY_CODE_CHANGED 47
-#define        WLC_E_EXCEEDED_MEDIUM_TIME 48   
-#define WLC_E_ICV_ERROR                49      
-#define WLC_E_UNICAST_DECODE_ERROR 50 
-#define WLC_E_MULTICAST_DECODE_ERROR 51 
-#define WLC_E_TRACE 52
-#define WLC_E_IF               54      
-#define WLC_E_RSSI             56      
-#define WLC_E_PFN_SCAN_COMPLETE        57      
-#define WLC_E_ACTION_FRAME      58      
-#define WLC_E_ACTION_FRAME_COMPLETE 59  
-
-#define WLC_E_ESCAN_RESULT 69               
-#define WLC_E_WAKE_EVENT       70      
-#define WLC_E_LAST             71      
-       
-
-
-
-#define WLC_E_STATUS_SUCCESS           0       
-#define WLC_E_STATUS_FAIL              1       
-#define WLC_E_STATUS_TIMEOUT           2       
-#define WLC_E_STATUS_NO_NETWORKS       3       
-#define WLC_E_STATUS_ABORT             4       
-#define WLC_E_STATUS_NO_ACK            5       
-#define WLC_E_STATUS_UNSOLICITED       6       
-#define WLC_E_STATUS_ATTEMPT           7       
-#define WLC_E_STATUS_PARTIAL           8       
-#define WLC_E_STATUS_NEWSCAN   9       
-#define WLC_E_STATUS_NEWASSOC  10      
-#define WLC_E_STATUS_11HQUIET  11      
-#define WLC_E_STATUS_SUPPRESS  12      
-#define WLC_E_STATUS_NOCHANS   13      
-#define WLC_E_STATUS_CCXFASTRM 14      
-#define WLC_E_STATUS_CS_ABORT  15      
-
-
-#define WLC_E_REASON_INITIAL_ASSOC     0       
-#define WLC_E_REASON_LOW_RSSI          1       
-#define WLC_E_REASON_DEAUTH            2       
-#define WLC_E_REASON_DISASSOC          3       
-#define WLC_E_REASON_BCNS_LOST         4       
-#define WLC_E_REASON_FAST_ROAM_FAILED  5       
-#define WLC_E_REASON_DIRECTED_ROAM     6       
-#define WLC_E_REASON_TSPEC_REJECTED    7       
-#define WLC_E_REASON_BETTER_AP         8       
-
-
-#define WLC_E_PRUNE_ENCR_MISMATCH      1       
-#define WLC_E_PRUNE_BCAST_BSSID                2       
-#define WLC_E_PRUNE_MAC_DENY           3       
-#define WLC_E_PRUNE_MAC_NA             4       
-#define WLC_E_PRUNE_REG_PASSV          5       
-#define WLC_E_PRUNE_SPCT_MGMT          6       
-#define WLC_E_PRUNE_RADAR              7       
-#define WLC_E_RSN_MISMATCH             8       
-#define WLC_E_PRUNE_NO_COMMON_RATES    9       
-#define WLC_E_PRUNE_BASIC_RATES                10      
-#define WLC_E_PRUNE_CIPHER_NA          12      
-#define WLC_E_PRUNE_KNOWN_STA          13      
-#define WLC_E_PRUNE_WDS_PEER           15      
-#define WLC_E_PRUNE_QBSS_LOAD          16      
-#define WLC_E_PRUNE_HOME_AP            17      
-
-
-#define WLC_E_SUP_OTHER                                0       
-#define WLC_E_SUP_DECRYPT_KEY_DATA     1       
-#define WLC_E_SUP_BAD_UCAST_WEP128     2       
-#define WLC_E_SUP_BAD_UCAST_WEP40      3       
-#define WLC_E_SUP_UNSUP_KEY_LEN                4       
-#define WLC_E_SUP_PW_KEY_CIPHER                5       
-#define WLC_E_SUP_MSG3_TOO_MANY_IE     6       
-#define WLC_E_SUP_MSG3_IE_MISMATCH     7       
-#define WLC_E_SUP_NO_INSTALL_FLAG      8       
-#define WLC_E_SUP_MSG3_NO_GTK          9       
-#define WLC_E_SUP_GRP_KEY_CIPHER       10      
-#define WLC_E_SUP_GRP_MSG1_NO_GTK      11      
-#define WLC_E_SUP_GTK_DECRYPT_FAIL     12      
-#define WLC_E_SUP_SEND_FAIL                    13      
-#define WLC_E_SUP_DEAUTH                       14      
-#define WLC_E_SUP_WPA_PSK_TMO       15  
-
-
-#define WLC_E_IF_ADD           1       
-#define WLC_E_IF_DEL           2       
-
-
-#include <packed_section_end.h>
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/proto/bcmip.h b/drivers/net/wireless/bcm4319/include/proto/bcmip.h
deleted file mode 100644 (file)
index 9d2fd6f..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * Fundamental constants relating to IP Protocol
- *
- * $Id: bcmip.h,v 9.16.186.4 2009/01/27 04:25:25 Exp $
- */
-
-
-#ifndef _bcmip_h_
-#define _bcmip_h_
-
-#ifndef _TYPEDEFS_H_
-#include <typedefs.h>
-#endif
-
-
-#include <packed_section_start.h>
-
-
-
-#define IP_VER_OFFSET          0x0     
-#define IP_VER_MASK            0xf0    
-#define IP_VER_SHIFT           4       
-#define IP_VER_4               4       
-#define IP_VER_6               6       
-
-#define IP_VER(ip_body) \
-       ((((uint8 *)(ip_body))[IP_VER_OFFSET] & IP_VER_MASK) >> IP_VER_SHIFT)
-
-#define IP_PROT_ICMP           0x1     
-#define IP_PROT_TCP            0x6     
-#define IP_PROT_UDP            0x11    
-
-
-#define IPV4_VER_HL_OFFSET     0       
-#define IPV4_TOS_OFFSET                1       
-#define IPV4_PKTLEN_OFFSET     2       
-#define IPV4_PKTFLAG_OFFSET    6       
-#define IPV4_PROT_OFFSET       9       
-#define IPV4_CHKSUM_OFFSET     10      
-#define IPV4_SRC_IP_OFFSET     12      
-#define IPV4_DEST_IP_OFFSET    16      
-#define IPV4_OPTIONS_OFFSET    20      
-
-
-#define IPV4_VER_MASK          0xf0    
-#define IPV4_VER_SHIFT         4       
-
-#define IPV4_HLEN_MASK         0x0f    
-#define IPV4_HLEN(ipv4_body)   (4 * (((uint8 *)(ipv4_body))[IPV4_VER_HL_OFFSET] & IPV4_HLEN_MASK))
-
-#define IPV4_ADDR_LEN          4       
-
-#define IPV4_ADDR_NULL(a)      ((((uint8 *)(a))[0] | ((uint8 *)(a))[1] | \
-                                 ((uint8 *)(a))[2] | ((uint8 *)(a))[3]) == 0)
-
-#define IPV4_ADDR_BCAST(a)     ((((uint8 *)(a))[0] & ((uint8 *)(a))[1] & \
-                                 ((uint8 *)(a))[2] & ((uint8 *)(a))[3]) == 0xff)
-
-#define        IPV4_TOS_DSCP_MASK      0xfc    
-#define        IPV4_TOS_DSCP_SHIFT     2       
-
-#define        IPV4_TOS(ipv4_body)     (((uint8 *)(ipv4_body))[IPV4_TOS_OFFSET])
-
-#define        IPV4_TOS_PREC_MASK      0xe0    
-#define        IPV4_TOS_PREC_SHIFT     5       
-
-#define IPV4_TOS_LOWDELAY      0x10    
-#define IPV4_TOS_THROUGHPUT    0x8     
-#define IPV4_TOS_RELIABILITY   0x4     
-
-#define IPV4_PROT(ipv4_body)   (((uint8 *)(ipv4_body))[IPV4_PROT_OFFSET])
-
-#define IPV4_FRAG_RESV         0x8000  
-#define IPV4_FRAG_DONT         0x4000  
-#define IPV4_FRAG_MORE         0x2000  
-#define IPV4_FRAG_OFFSET_MASK  0x1fff  
-
-#define IPV4_ADDR_STR_LEN      16      
-
-
-BWL_PRE_PACKED_STRUCT struct ipv4_addr {
-       uint8   addr[IPV4_ADDR_LEN];
-} BWL_POST_PACKED_STRUCT;
-
-BWL_PRE_PACKED_STRUCT struct ipv4_hdr {
-       uint8   version_ihl;            
-       uint8   tos;                    
-       uint16  tot_len;                
-       uint16  id;
-       uint16  frag;                   
-       uint8   ttl;                    
-       uint8   prot;                   
-       uint16  hdr_chksum;             
-       uint8   src_ip[IPV4_ADDR_LEN];  
-       uint8   dst_ip[IPV4_ADDR_LEN];  
-} BWL_POST_PACKED_STRUCT;
-
-
-#define IPV6_PAYLOAD_LEN_OFFSET        4       
-#define IPV6_NEXT_HDR_OFFSET   6       
-#define IPV6_HOP_LIMIT_OFFSET  7       
-#define IPV6_SRC_IP_OFFSET     8       
-#define IPV6_DEST_IP_OFFSET    24      
-
-
-#define IPV6_TRAFFIC_CLASS(ipv6_body) \
-       (((((uint8 *)(ipv6_body))[0] & 0x0f) << 4) | \
-        ((((uint8 *)(ipv6_body))[1] & 0xf0) >> 4))
-
-#define IPV6_FLOW_LABEL(ipv6_body) \
-       (((((uint8 *)(ipv6_body))[1] & 0x0f) << 16) | \
-        (((uint8 *)(ipv6_body))[2] << 8) | \
-        (((uint8 *)(ipv6_body))[3]))
-
-#define IPV6_PAYLOAD_LEN(ipv6_body) \
-       ((((uint8 *)(ipv6_body))[IPV6_PAYLOAD_LEN_OFFSET + 0] << 8) | \
-        ((uint8 *)(ipv6_body))[IPV6_PAYLOAD_LEN_OFFSET + 1])
-
-#define IPV6_NEXT_HDR(ipv6_body) \
-       (((uint8 *)(ipv6_body))[IPV6_NEXT_HDR_OFFSET])
-
-#define IPV6_PROT(ipv6_body)   IPV6_NEXT_HDR(ipv6_body)
-
-#define IPV6_ADDR_LEN          16      
-
-
-#ifndef IP_TOS
-#define IP_TOS(ip_body) \
-       (IP_VER(ip_body) == IP_VER_4 ? IPV4_TOS(ip_body) : \
-        IP_VER(ip_body) == IP_VER_6 ? IPV6_TRAFFIC_CLASS(ip_body) : 0)
-#endif
-
-
-
-#include <packed_section_end.h>
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/proto/eapol.h b/drivers/net/wireless/bcm4319/include/proto/eapol.h
deleted file mode 100644 (file)
index 95e76ff..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * 802.1x EAPOL definitions
- *
- * See
- * IEEE Std 802.1X-2001
- * IEEE 802.1X RADIUS Usage Guidelines
- *
- * Copyright (C) 2002 Broadcom Corporation
- *
- * $Id: eapol.h,v 9.18.260.1.2.1.6.6 2009/04/08 05:00:08 Exp $
- */
-
-#ifndef _eapol_h_
-#define _eapol_h_
-
-#ifndef _TYPEDEFS_H_
-#include <typedefs.h>
-#endif
-
-/* This marks the start of a packed structure section. */
-#include <packed_section_start.h>
-
-#define AKW_BLOCK_LEN  8       /* The only def we need here */
-
-/* EAPOL for 802.3/Ethernet */
-typedef struct {
-       struct ether_header eth;        /* 802.3/Ethernet header */
-       unsigned char version;          /* EAPOL protocol version */
-       unsigned char type;             /* EAPOL type */
-       unsigned short length;          /* Length of body */
-       unsigned char body[1];          /* Body (optional) */
-} eapol_header_t;
-
-#define EAPOL_HEADER_LEN 18
-
-/* EAPOL version */
-#define WPA2_EAPOL_VERSION     2
-#define WPA_EAPOL_VERSION      1
-#define LEAP_EAPOL_VERSION     1
-#define SES_EAPOL_VERSION      1
-
-/* EAPOL types */
-#define EAP_PACKET             0
-#define EAPOL_START            1
-#define EAPOL_LOGOFF           2
-#define EAPOL_KEY              3
-#define EAPOL_ASF              4
-
-/* EAPOL-Key types */
-#define EAPOL_RC4_KEY          1
-#define EAPOL_WPA2_KEY         2       /* 802.11i/WPA2 */
-#define EAPOL_WPA_KEY          254     /* WPA */
-
-/* RC4 EAPOL-Key header field sizes */
-#define EAPOL_KEY_REPLAY_LEN   8
-#define EAPOL_KEY_IV_LEN       16
-#define EAPOL_KEY_SIG_LEN      16
-
-/* RC4 EAPOL-Key */
-typedef BWL_PRE_PACKED_STRUCT struct {
-       unsigned char type;                     /* Key Descriptor Type */
-       unsigned short length;                  /* Key Length (unaligned) */
-       unsigned char replay[EAPOL_KEY_REPLAY_LEN];     /* Replay Counter */
-       unsigned char iv[EAPOL_KEY_IV_LEN];             /* Key IV */
-       unsigned char index;                            /* Key Flags & Index */
-       unsigned char signature[EAPOL_KEY_SIG_LEN];     /* Key Signature */
-       unsigned char key[1];                           /* Key (optional) */
-} BWL_POST_PACKED_STRUCT eapol_key_header_t;
-
-#define EAPOL_KEY_HEADER_LEN   44
-
-/* RC4 EAPOL-Key flags */
-#define EAPOL_KEY_FLAGS_MASK   0x80
-#define EAPOL_KEY_BROADCAST    0
-#define EAPOL_KEY_UNICAST      0x80
-
-/* RC4 EAPOL-Key index */
-#define EAPOL_KEY_INDEX_MASK   0x7f
-
-/* WPA/802.11i/WPA2 EAPOL-Key header field sizes */
-#define EAPOL_WPA_KEY_REPLAY_LEN       8
-#define EAPOL_WPA_KEY_NONCE_LEN                32
-#define EAPOL_WPA_KEY_IV_LEN           16
-#define EAPOL_WPA_KEY_ID_LEN           8
-#define EAPOL_WPA_KEY_RSC_LEN          8
-#define EAPOL_WPA_KEY_MIC_LEN          16
-#define EAPOL_WPA_KEY_DATA_LEN         (EAPOL_WPA_MAX_KEY_SIZE + AKW_BLOCK_LEN)
-#define EAPOL_WPA_MAX_KEY_SIZE         32
-
-/* WPA EAPOL-Key */
-typedef BWL_PRE_PACKED_STRUCT struct {
-       unsigned char type;             /* Key Descriptor Type */
-       unsigned short key_info;        /* Key Information (unaligned) */
-       unsigned short key_len;         /* Key Length (unaligned) */
-       unsigned char replay[EAPOL_WPA_KEY_REPLAY_LEN]; /* Replay Counter */
-       unsigned char nonce[EAPOL_WPA_KEY_NONCE_LEN];   /* Nonce */
-       unsigned char iv[EAPOL_WPA_KEY_IV_LEN];         /* Key IV */
-       unsigned char rsc[EAPOL_WPA_KEY_RSC_LEN];       /* Key RSC */
-       unsigned char id[EAPOL_WPA_KEY_ID_LEN];         /* WPA:Key ID, 802.11i/WPA2: Reserved */
-       unsigned char mic[EAPOL_WPA_KEY_MIC_LEN];       /* Key MIC */
-       unsigned short data_len;                        /* Key Data Length */
-       unsigned char data[EAPOL_WPA_KEY_DATA_LEN];     /* Key data */
-} BWL_POST_PACKED_STRUCT eapol_wpa_key_header_t;
-
-#define EAPOL_WPA_KEY_LEN              95
-
-/* WPA/802.11i/WPA2 KEY KEY_INFO bits */
-#define WPA_KEY_DESC_V1                0x01
-#define WPA_KEY_DESC_V2                0x02
-#define WPA_KEY_PAIRWISE       0x08
-#define WPA_KEY_INSTALL                0x40
-#define WPA_KEY_ACK            0x80
-#define WPA_KEY_MIC            0x100
-#define WPA_KEY_SECURE         0x200
-#define WPA_KEY_ERROR          0x400
-#define WPA_KEY_REQ            0x800
-
-/* WPA-only KEY KEY_INFO bits */
-#define WPA_KEY_INDEX_0                0x00
-#define WPA_KEY_INDEX_1                0x10
-#define WPA_KEY_INDEX_2                0x20
-#define WPA_KEY_INDEX_3                0x30
-#define WPA_KEY_INDEX_MASK     0x30
-#define WPA_KEY_INDEX_SHIFT    0x04
-
-/* 802.11i/WPA2-only KEY KEY_INFO bits */
-#define WPA_KEY_ENCRYPTED_DATA 0x1000
-
-/* Key Data encapsulation */
-typedef BWL_PRE_PACKED_STRUCT struct {
-       uint8 type;
-       uint8 length;
-       uint8 oui[3];
-       uint8 subtype;
-       uint8 data[1];
-} BWL_POST_PACKED_STRUCT eapol_wpa2_encap_data_t;
-
-#define EAPOL_WPA2_ENCAP_DATA_HDR_LEN  6
-
-#define WPA2_KEY_DATA_SUBTYPE_GTK      1
-#define WPA2_KEY_DATA_SUBTYPE_STAKEY   2
-#define WPA2_KEY_DATA_SUBTYPE_MAC      3
-#define WPA2_KEY_DATA_SUBTYPE_PMKID    4
-
-/* GTK encapsulation */
-typedef BWL_PRE_PACKED_STRUCT struct {
-       uint8   flags;
-       uint8   reserved;
-       uint8   gtk[EAPOL_WPA_MAX_KEY_SIZE];
-} BWL_POST_PACKED_STRUCT eapol_wpa2_key_gtk_encap_t;
-
-#define EAPOL_WPA2_KEY_GTK_ENCAP_HDR_LEN       2
-
-#define WPA2_GTK_INDEX_MASK    0x03
-#define WPA2_GTK_INDEX_SHIFT   0x00
-
-#define WPA2_GTK_TRANSMIT      0x04
-
-/* STAKey encapsulation */
-typedef BWL_PRE_PACKED_STRUCT struct {
-       uint8   reserved[2];
-       uint8   mac[ETHER_ADDR_LEN];
-       uint8   stakey[EAPOL_WPA_MAX_KEY_SIZE];
-} BWL_POST_PACKED_STRUCT eapol_wpa2_key_stakey_encap_t;
-
-#define WPA2_KEY_DATA_PAD      0xdd
-
-
-/* This marks the end of a packed structure section. */
-#include <packed_section_end.h>
-
-#endif /* _eapol_h_ */
diff --git a/drivers/net/wireless/bcm4319/include/proto/ethernet.h b/drivers/net/wireless/bcm4319/include/proto/ethernet.h
deleted file mode 100644 (file)
index 9ad2ea0..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * From FreeBSD 2.2.7: Fundamental constants relating to ethernet.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: ethernet.h,v 9.45.56.5 2010/02/22 22:04:36 Exp $
- */
-
-
-#ifndef _NET_ETHERNET_H_             
-#define _NET_ETHERNET_H_
-
-#ifndef _TYPEDEFS_H_
-#include "typedefs.h"
-#endif
-
-
-#include <packed_section_start.h>
-
-
-
-#define        ETHER_ADDR_LEN          6
-
-
-#define        ETHER_TYPE_LEN          2
-
-
-#define        ETHER_CRC_LEN           4
-
-
-#define        ETHER_HDR_LEN           (ETHER_ADDR_LEN * 2 + ETHER_TYPE_LEN)
-
-
-#define        ETHER_MIN_LEN           64
-
-
-#define        ETHER_MIN_DATA          46
-
-
-#define        ETHER_MAX_LEN           1518
-
-
-#define        ETHER_MAX_DATA          1500
-
-
-#define ETHER_TYPE_MIN         0x0600          
-#define        ETHER_TYPE_IP           0x0800          
-#define ETHER_TYPE_ARP         0x0806          
-#define ETHER_TYPE_8021Q       0x8100          
-#define        ETHER_TYPE_BRCM         0x886c          
-#define        ETHER_TYPE_802_1X       0x888e          
-#define ETHER_TYPE_WAI         0x88b4          
-#ifdef BCMWPA2
-#define        ETHER_TYPE_802_1X_PREAUTH 0x88c7        
-#endif
-
-
-#define        ETHER_BRCM_SUBTYPE_LEN  4       
-#define        ETHER_BRCM_CRAM         1       
-
-
-#define ETHER_DEST_OFFSET      (0 * ETHER_ADDR_LEN)    
-#define ETHER_SRC_OFFSET       (1 * ETHER_ADDR_LEN)    
-#define ETHER_TYPE_OFFSET      (2 * ETHER_ADDR_LEN)    
-
-
-#define        ETHER_IS_VALID_LEN(foo) \
-       ((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
-
-
-#ifndef __INCif_etherh       
-
-BWL_PRE_PACKED_STRUCT struct ether_header {
-       uint8   ether_dhost[ETHER_ADDR_LEN];
-       uint8   ether_shost[ETHER_ADDR_LEN];
-       uint16  ether_type;
-} BWL_POST_PACKED_STRUCT;
-
-
-BWL_PRE_PACKED_STRUCT struct   ether_addr {
-       uint8 octet[ETHER_ADDR_LEN];
-} BWL_POST_PACKED_STRUCT;
-#endif 
-
-
-#define ETHER_SET_LOCALADDR(ea)        (((uint8 *)(ea))[0] = (((uint8 *)(ea))[0] | 2))
-#define ETHER_IS_LOCALADDR(ea)         (((uint8 *)(ea))[0] & 2)
-#define ETHER_CLR_LOCALADDR(ea)        (((uint8 *)(ea))[0] = (((uint8 *)(ea))[0] & 0xd))
-#define ETHER_TOGGLE_LOCALADDR(ea)     (((uint8 *)(ea))[0] = (((uint8 *)(ea))[0] ^ 2))
-
-
-#define ETHER_SET_UNICAST(ea)  (((uint8 *)(ea))[0] = (((uint8 *)(ea))[0] & ~1))
-
-
-#define ETHER_ISMULTI(ea) (((const uint8 *)(ea))[0] & 1)
-
-
-
-#define        ether_cmp(a, b) (!(((short*)a)[0] == ((short*)b)[0]) | \
-                        !(((short*)a)[1] == ((short*)b)[1]) | \
-                        !(((short*)a)[2] == ((short*)b)[2]))
-
-
-#define        ether_copy(s, d) { \
-               ((short*)d)[0] = ((short*)s)[0]; \
-               ((short*)d)[1] = ((short*)s)[1]; \
-               ((short*)d)[2] = ((short*)s)[2]; }
-
-
-static const struct ether_addr ether_bcast = {{255, 255, 255, 255, 255, 255}};
-static const struct ether_addr ether_null = {{0, 0, 0, 0, 0, 0}};
-
-#define ETHER_ISBCAST(ea)      ((((uint8 *)(ea))[0] &          \
-                                 ((uint8 *)(ea))[1] &          \
-                                 ((uint8 *)(ea))[2] &          \
-                                 ((uint8 *)(ea))[3] &          \
-                                 ((uint8 *)(ea))[4] &          \
-                                 ((uint8 *)(ea))[5]) == 0xff)
-#define ETHER_ISNULLADDR(ea)   ((((uint8 *)(ea))[0] |          \
-                                 ((uint8 *)(ea))[1] |          \
-                                 ((uint8 *)(ea))[2] |          \
-                                 ((uint8 *)(ea))[3] |          \
-                                 ((uint8 *)(ea))[4] |          \
-                                 ((uint8 *)(ea))[5]) == 0)
-
-
-
-#include <packed_section_end.h>
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/proto/sdspi.h b/drivers/net/wireless/bcm4319/include/proto/sdspi.h
deleted file mode 100644 (file)
index 7739e68..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SD-SPI Protocol Standard
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sdspi.h,v 9.1.20.1 2008/05/06 22:59:19 Exp $
- */
-
-#define SPI_START_M            BITFIELD_MASK(1)        /* Bit [31]     - Start Bit */
-#define SPI_START_S            31
-#define SPI_DIR_M              BITFIELD_MASK(1)        /* Bit [30]     - Direction */
-#define SPI_DIR_S              30
-#define SPI_CMD_INDEX_M                BITFIELD_MASK(6)        /* Bits [29:24] - Command number */
-#define SPI_CMD_INDEX_S                24
-#define SPI_RW_M               BITFIELD_MASK(1)        /* Bit [23]     - Read=0, Write=1 */
-#define SPI_RW_S               23
-#define SPI_FUNC_M             BITFIELD_MASK(3)        /* Bits [22:20] - Function Number */
-#define SPI_FUNC_S             20
-#define SPI_RAW_M              BITFIELD_MASK(1)        /* Bit [19]     - Read After Wr */
-#define SPI_RAW_S              19
-#define SPI_STUFF_M            BITFIELD_MASK(1)        /* Bit [18]     - Stuff bit */
-#define SPI_STUFF_S            18
-#define SPI_BLKMODE_M          BITFIELD_MASK(1)        /* Bit [19]     - Blockmode 1=blk */
-#define SPI_BLKMODE_S          19
-#define SPI_OPCODE_M           BITFIELD_MASK(1)        /* Bit [18]     - OP Code */
-#define SPI_OPCODE_S           18
-#define SPI_ADDR_M             BITFIELD_MASK(17)       /* Bits [17:1]  - Address */
-#define SPI_ADDR_S             1
-#define SPI_STUFF0_M           BITFIELD_MASK(1)        /* Bit [0]      - Stuff bit */
-#define SPI_STUFF0_S           0
-
-#define SPI_RSP_START_M                BITFIELD_MASK(1)        /* Bit [7]      - Start Bit (always 0) */
-#define SPI_RSP_START_S                7
-#define SPI_RSP_PARAM_ERR_M    BITFIELD_MASK(1)        /* Bit [6]      - Parameter Error */
-#define SPI_RSP_PARAM_ERR_S    6
-#define SPI_RSP_RFU5_M         BITFIELD_MASK(1)        /* Bit [5]      - RFU (Always 0) */
-#define SPI_RSP_RFU5_S         5
-#define SPI_RSP_FUNC_ERR_M     BITFIELD_MASK(1)        /* Bit [4]      - Function number error */
-#define SPI_RSP_FUNC_ERR_S     4
-#define SPI_RSP_CRC_ERR_M      BITFIELD_MASK(1)        /* Bit [3]      - COM CRC Error */
-#define SPI_RSP_CRC_ERR_S      3
-#define SPI_RSP_ILL_CMD_M      BITFIELD_MASK(1)        /* Bit [2]      - Illegal Command error */
-#define SPI_RSP_ILL_CMD_S      2
-#define SPI_RSP_RFU1_M         BITFIELD_MASK(1)        /* Bit [1]      - RFU (Always 0) */
-#define SPI_RSP_RFU1_S         1
-#define SPI_RSP_IDLE_M         BITFIELD_MASK(1)        /* Bit [0]      - In idle state */
-#define SPI_RSP_IDLE_S         0
-
-/* SD-SPI Protocol Definitions */
-#define SDSPI_COMMAND_LEN      6       /* Number of bytes in an SD command */
-#define SDSPI_START_BLOCK      0xFE    /* SD Start Block Token */
-#define SDSPI_IDLE_PAD         0xFF    /* SD-SPI idle value for MOSI */
-#define SDSPI_START_BIT_MASK   0x80
diff --git a/drivers/net/wireless/bcm4319/include/proto/vlan.h b/drivers/net/wireless/bcm4319/include/proto/vlan.h
deleted file mode 100644 (file)
index 670bc44..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 802.1Q VLAN protocol definitions
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: vlan.h,v 9.4.196.2 2008/12/07 21:19:20 Exp $
- */
-
-
-#ifndef _vlan_h_
-#define _vlan_h_
-
-#ifndef _TYPEDEFS_H_
-#include <typedefs.h>
-#endif
-
-
-#include <packed_section_start.h>
-
-#define VLAN_VID_MASK          0xfff   
-#define        VLAN_CFI_SHIFT          12      
-#define VLAN_PRI_SHIFT         13      
-
-#define VLAN_PRI_MASK          7       
-
-#define        VLAN_TAG_LEN            4
-#define        VLAN_TAG_OFFSET         (2 * ETHER_ADDR_LEN)    
-
-#define VLAN_TPID              0x8100  
-
-struct ethervlan_header {
-       uint8   ether_dhost[ETHER_ADDR_LEN];
-       uint8   ether_shost[ETHER_ADDR_LEN];
-       uint16  vlan_type;              
-       uint16  vlan_tag;               
-       uint16  ether_type;
-};
-
-#define        ETHERVLAN_HDR_LEN       (ETHER_HDR_LEN + VLAN_TAG_LEN)
-
-
-
-#include <packed_section_end.h>
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/proto/wpa.h b/drivers/net/wireless/bcm4319/include/proto/wpa.h
deleted file mode 100644 (file)
index f5d0cd5..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Fundamental types and constants relating to WPA
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: wpa.h,v 1.16.166.1.20.1 2008/11/20 00:51:31 Exp $
- */
-
-
-#ifndef _proto_wpa_h_
-#define _proto_wpa_h_
-
-#include <typedefs.h>
-#include <proto/ethernet.h>
-
-
-
-#include <packed_section_start.h>
-
-
-
-
-#define DOT11_RC_INVALID_WPA_IE                13      
-#define DOT11_RC_MIC_FAILURE           14      
-#define DOT11_RC_4WH_TIMEOUT           15      
-#define DOT11_RC_GTK_UPDATE_TIMEOUT    16      
-#define DOT11_RC_WPA_IE_MISMATCH       17      
-#define DOT11_RC_INVALID_MC_CIPHER     18      
-#define DOT11_RC_INVALID_UC_CIPHER     19      
-#define DOT11_RC_INVALID_AKMP          20      
-#define DOT11_RC_BAD_WPA_VERSION       21      
-#define DOT11_RC_INVALID_WPA_CAP       22      
-#define DOT11_RC_8021X_AUTH_FAIL       23      
-
-#define WPA2_PMKID_LEN 16
-
-
-typedef BWL_PRE_PACKED_STRUCT struct
-{
-       uint8 tag;      
-       uint8 length;   
-       uint8 oui[3];   
-       uint8 oui_type; 
-       BWL_PRE_PACKED_STRUCT struct {
-               uint8 low;
-               uint8 high;
-       } BWL_POST_PACKED_STRUCT version;       
-} BWL_POST_PACKED_STRUCT wpa_ie_fixed_t;
-#define WPA_IE_OUITYPE_LEN     4
-#define WPA_IE_FIXED_LEN       8
-#define WPA_IE_TAG_FIXED_LEN   6
-
-typedef BWL_PRE_PACKED_STRUCT struct {
-       uint8 tag;      
-       uint8 length;   
-       BWL_PRE_PACKED_STRUCT struct {
-               uint8 low;
-               uint8 high;
-       } BWL_POST_PACKED_STRUCT version;       
-} BWL_POST_PACKED_STRUCT wpa_rsn_ie_fixed_t;
-#define WPA_RSN_IE_FIXED_LEN   4
-#define WPA_RSN_IE_TAG_FIXED_LEN       2
-typedef uint8 wpa_pmkid_t[WPA2_PMKID_LEN];
-
-
-typedef BWL_PRE_PACKED_STRUCT struct
-{
-       uint8 oui[3];
-       uint8 type;
-} BWL_POST_PACKED_STRUCT wpa_suite_t, wpa_suite_mcast_t;
-#define WPA_SUITE_LEN  4
-
-
-typedef BWL_PRE_PACKED_STRUCT struct
-{
-       BWL_PRE_PACKED_STRUCT struct {
-               uint8 low;
-               uint8 high;
-       } BWL_POST_PACKED_STRUCT count;
-       wpa_suite_t list[1];
-} BWL_POST_PACKED_STRUCT wpa_suite_ucast_t, wpa_suite_auth_key_mgmt_t;
-#define WPA_IE_SUITE_COUNT_LEN 2
-typedef BWL_PRE_PACKED_STRUCT struct
-{
-       BWL_PRE_PACKED_STRUCT struct {
-               uint8 low;
-               uint8 high;
-       } BWL_POST_PACKED_STRUCT count;
-       wpa_pmkid_t list[1];
-} BWL_POST_PACKED_STRUCT wpa_pmkid_list_t;
-
-
-#define WPA_CIPHER_NONE                0       
-#define WPA_CIPHER_WEP_40      1       
-#define WPA_CIPHER_TKIP                2       
-#define WPA_CIPHER_AES_OCB     3       
-#define WPA_CIPHER_AES_CCM     4       
-#define WPA_CIPHER_WEP_104     5       
-
-#define IS_WPA_CIPHER(cipher)  ((cipher) == WPA_CIPHER_NONE || \
-                                (cipher) == WPA_CIPHER_WEP_40 || \
-                                (cipher) == WPA_CIPHER_WEP_104 || \
-                                (cipher) == WPA_CIPHER_TKIP || \
-                                (cipher) == WPA_CIPHER_AES_OCB || \
-                                (cipher) == WPA_CIPHER_AES_CCM)
-
-
-#define WPA_TKIP_CM_DETECT     60      
-#define WPA_TKIP_CM_BLOCK      60      
-
-
-#define RSN_CAP_LEN            2       
-
-
-#define RSN_CAP_PREAUTH                        0x0001
-#define RSN_CAP_NOPAIRWISE             0x0002
-#define RSN_CAP_PTK_REPLAY_CNTR_MASK   0x000C
-#define RSN_CAP_PTK_REPLAY_CNTR_SHIFT  2
-#define RSN_CAP_GTK_REPLAY_CNTR_MASK   0x0030
-#define RSN_CAP_GTK_REPLAY_CNTR_SHIFT  4
-#define RSN_CAP_1_REPLAY_CNTR          0
-#define RSN_CAP_2_REPLAY_CNTRS         1
-#define RSN_CAP_4_REPLAY_CNTRS         2
-#define RSN_CAP_16_REPLAY_CNTRS                3
-
-
-#define WPA_CAP_4_REPLAY_CNTRS         RSN_CAP_4_REPLAY_CNTRS
-#define WPA_CAP_16_REPLAY_CNTRS                RSN_CAP_16_REPLAY_CNTRS
-#define WPA_CAP_REPLAY_CNTR_SHIFT      RSN_CAP_PTK_REPLAY_CNTR_SHIFT
-#define WPA_CAP_REPLAY_CNTR_MASK       RSN_CAP_PTK_REPLAY_CNTR_MASK
-
-
-#define WPA_CAP_LEN    RSN_CAP_LEN     
-
-#define        WPA_CAP_WPA2_PREAUTH            RSN_CAP_PREAUTH
-
-
-
-#include <packed_section_end.h>
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/sbchipc.h b/drivers/net/wireless/bcm4319/include/sbchipc.h
deleted file mode 100644 (file)
index 05b3fd8..0000000
+++ /dev/null
@@ -1,1027 +0,0 @@
-/*
- * SiliconBackplane Chipcommon core hardware definitions.
- *
- * The chipcommon core provides chip identification, SB control,
- * jtag, 0/1/2 uarts, clock frequency control, a watchdog interrupt timer,
- * gpio interface, extbus, and support for serial and parallel flashes.
- *
- * $Id: sbchipc.h,v 13.103.2.5.4.5.2.9 2009/07/03 14:23:21 Exp $
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- */
-
-
-#ifndef        _SBCHIPC_H
-#define        _SBCHIPC_H
-
-#ifndef _LANGUAGE_ASSEMBLY
-
-
-#ifndef PAD
-#define        _PADLINE(line)  pad ## line
-#define        _XSTR(line)     _PADLINE(line)
-#define        PAD             _XSTR(__LINE__)
-#endif 
-
-typedef volatile struct {
-       uint32  chipid;                 
-       uint32  capabilities;
-       uint32  corecontrol;            
-       uint32  bist;
-
-       
-       uint32  otpstatus;              
-       uint32  otpcontrol;
-       uint32  otpprog;
-       uint32  PAD;
-
-       
-       uint32  intstatus;              
-       uint32  intmask;
-       uint32  chipcontrol;            
-       uint32  chipstatus;             
-
-       
-       uint32  jtagcmd;                
-       uint32  jtagir;
-       uint32  jtagdr;
-       uint32  jtagctrl;
-
-       
-       uint32  flashcontrol;           
-       uint32  flashaddress;
-       uint32  flashdata;
-       uint32  PAD[1];
-
-       
-       uint32  broadcastaddress;       
-       uint32  broadcastdata;
-
-       
-       uint32  gpiopullup;             
-       uint32  gpiopulldown;           
-       uint32  gpioin;                 
-       uint32  gpioout;
-       uint32  gpioouten;
-       uint32  gpiocontrol;
-       uint32  gpiointpolarity;
-       uint32  gpiointmask;
-
-       
-       uint32  gpioevent;
-       uint32  gpioeventintmask;
-
-       
-       uint32  watchdog;               
-
-       
-       uint32  gpioeventintpolarity;
-
-       
-       uint32  gpiotimerval;           
-       uint32  gpiotimeroutmask;
-
-       
-       uint32  clockcontrol_n;         
-       uint32  clockcontrol_sb;        
-       uint32  clockcontrol_pci;       
-       uint32  clockcontrol_m2;        
-       uint32  clockcontrol_m3;        
-       uint32  clkdiv;                 
-       uint32  PAD[2];
-
-       
-       uint32  pll_on_delay;           
-       uint32  fref_sel_delay;
-       uint32  slow_clk_ctl;           
-       uint32  PAD[1];
-
-       
-       uint32  system_clk_ctl;         
-       uint32  clkstatestretch;
-       uint32  PAD[13];
-
-       
-       uint32  eromptr;
-
-       
-       uint32  pcmcia_config;          
-       uint32  pcmcia_memwait;
-       uint32  pcmcia_attrwait;
-       uint32  pcmcia_iowait;
-       uint32  ide_config;
-       uint32  ide_memwait;
-       uint32  ide_attrwait;
-       uint32  ide_iowait;
-       uint32  prog_config;
-       uint32  prog_waitcount;
-       uint32  flash_config;
-       uint32  flash_waitcount;
-       uint32  PAD[4];
-       uint32  PAD[40];
-
-
-       
-       uint32  clk_ctl_st;             
-       uint32  hw_war;
-       uint32  PAD[70];
-
-       
-       uint8   uart0data;              
-       uint8   uart0imr;
-       uint8   uart0fcr;
-       uint8   uart0lcr;
-       uint8   uart0mcr;
-       uint8   uart0lsr;
-       uint8   uart0msr;
-       uint8   uart0scratch;
-       uint8   PAD[248];               
-
-       uint8   uart1data;              
-       uint8   uart1imr;
-       uint8   uart1fcr;
-       uint8   uart1lcr;
-       uint8   uart1mcr;
-       uint8   uart1lsr;
-       uint8   uart1msr;
-       uint8   uart1scratch;
-       uint32  PAD[126];
-
-       
-       uint32  pmucontrol;             
-       uint32  pmucapabilities;
-       uint32  pmustatus;
-       uint32  res_state;
-       uint32  res_pending;
-       uint32  pmutimer;
-       uint32  min_res_mask;
-       uint32  max_res_mask;
-       uint32  res_table_sel;
-       uint32  res_dep_mask;
-       uint32  res_updn_timer;
-       uint32  res_timer;
-       uint32  clkstretch;
-       uint32  pmuwatchdog;
-       uint32  gpiosel;                
-       uint32  gpioenable;             
-       uint32  res_req_timer_sel;
-       uint32  res_req_timer;
-       uint32  res_req_mask;
-       uint32  PAD;
-       uint32  chipcontrol_addr;       
-       uint32  chipcontrol_data;       
-       uint32  regcontrol_addr;
-       uint32  regcontrol_data;
-       uint32  pllcontrol_addr;
-       uint32  pllcontrol_data;
-       uint32  PAD[102];
-       uint16  otp[768];
-} chipcregs_t;
-
-#endif 
-
-#define        CC_CHIPID               0
-#define        CC_CAPABILITIES         4
-#define CC_OTPST               0x10
-#define CC_CHIPST              0x2c
-#define        CC_JTAGCMD              0x30
-#define        CC_JTAGIR               0x34
-#define        CC_JTAGDR               0x38
-#define        CC_JTAGCTRL             0x3c
-#define        CC_WATCHDOG             0x80
-#define        CC_CLKC_N               0x90
-#define        CC_CLKC_M0              0x94
-#define        CC_CLKC_M1              0x98
-#define        CC_CLKC_M2              0x9c
-#define        CC_CLKC_M3              0xa0
-#define        CC_CLKDIV               0xa4
-#define        CC_SYS_CLK_CTL          0xc0
-#define        CC_CLK_CTL_ST           SI_CLK_CTL_ST
-#define        CC_EROMPTR              0xfc
-#define        PMU_CTL                 0x600
-#define        PMU_CAP                 0x604
-#define        PMU_ST                  0x608
-#define PMU_RES_STATE          0x60c
-#define PMU_TIMER              0x614
-#define        PMU_MIN_RES_MASK        0x618
-#define        PMU_MAX_RES_MASK        0x61c
-#define PMU_REG_CONTROL_ADDR   0x658
-#define PMU_REG_CONTROL_DATA   0x65C
-#define PMU_PLL_CONTROL_ADDR   0x660
-#define PMU_PLL_CONTROL_DATA   0x664
-#define        CC_OTP                  0x800           
-
-
-#define        CID_ID_MASK             0x0000ffff      
-#define        CID_REV_MASK            0x000f0000      
-#define        CID_REV_SHIFT           16              
-#define        CID_PKG_MASK            0x00f00000      
-#define        CID_PKG_SHIFT           20              
-#define        CID_CC_MASK             0x0f000000      
-#define CID_CC_SHIFT           24
-#define        CID_TYPE_MASK           0xf0000000      
-#define CID_TYPE_SHIFT         28
-
-
-#define        CC_CAP_UARTS_MASK       0x00000003      
-#define CC_CAP_MIPSEB          0x00000004      
-#define CC_CAP_UCLKSEL         0x00000018      
-#define CC_CAP_UINTCLK         0x00000008      
-#define CC_CAP_UARTGPIO                0x00000020      
-#define CC_CAP_EXTBUS_MASK     0x000000c0      
-#define CC_CAP_EXTBUS_NONE     0x00000000      
-#define CC_CAP_EXTBUS_FULL     0x00000040      
-#define CC_CAP_EXTBUS_PROG     0x00000080      
-#define        CC_CAP_FLASH_MASK       0x00000700      
-#define        CC_CAP_PLL_MASK         0x00038000      
-#define CC_CAP_PWR_CTL         0x00040000      
-#define CC_CAP_OTPSIZE         0x00380000      
-#define CC_CAP_OTPSIZE_SHIFT   19              
-#define CC_CAP_OTPSIZE_BASE    5               
-#define CC_CAP_JTAGP           0x00400000      
-#define CC_CAP_ROM             0x00800000      
-#define CC_CAP_BKPLN64         0x08000000      
-#define        CC_CAP_PMU              0x10000000      
-#define        CC_CAP_ECI              0x20000000      
-
-
-#define PLL_NONE               0x00000000
-#define PLL_TYPE1              0x00010000      
-#define PLL_TYPE2              0x00020000      
-#define PLL_TYPE3              0x00030000      
-#define PLL_TYPE4              0x00008000      
-#define PLL_TYPE5              0x00018000      
-#define PLL_TYPE6              0x00028000      
-#define PLL_TYPE7              0x00038000      
-
-
-#define        ILP_CLOCK               32000
-
-
-#define        ALP_CLOCK               20000000
-
-
-#define        HT_CLOCK                80000000
-
-
-#define CC_UARTCLKO            0x00000001      
-#define        CC_SE                   0x00000002      
-#define CC_UARTCLKEN           0x00000008      
-
-
-#define CHIPCTRL_4321A0_DEFAULT        0x3a4
-#define CHIPCTRL_4321A1_DEFAULT        0x0a4
-#define CHIPCTRL_4321_PLL_DOWN 0x800000        
-
-
-#define OTPS_OL_MASK           0x000000ff
-#define OTPS_OL_MFG            0x00000001      
-#define OTPS_OL_OR1            0x00000002      
-#define OTPS_OL_OR2            0x00000004      
-#define OTPS_OL_GU             0x00000008      
-#define OTPS_GUP_MASK          0x00000f00
-#define OTPS_GUP_SHIFT         8
-#define OTPS_GUP_HW            0x00000100      
-#define OTPS_GUP_SW            0x00000200      
-#define OTPS_GUP_CI            0x00000400      
-#define OTPS_GUP_FUSE          0x00000800      
-#define OTPS_READY             0x00001000
-#define OTPS_RV(x)             (1 << (16 + (x)))       
-#define OTPS_RV_MASK           0x0fff0000
-
-
-#define OTPC_PROGSEL           0x00000001
-#define OTPC_PCOUNT_MASK       0x0000000e
-#define OTPC_PCOUNT_SHIFT      1
-#define OTPC_VSEL_MASK         0x000000f0
-#define OTPC_VSEL_SHIFT                4
-#define OTPC_TMM_MASK          0x00000700
-#define OTPC_TMM_SHIFT         8
-#define OTPC_ODM               0x00000800
-#define OTPC_PROGEN            0x80000000
-
-
-#define OTPP_COL_MASK          0x000000ff
-#define OTPP_COL_SHIFT         0
-#define OTPP_ROW_MASK          0x0000ff00
-#define OTPP_ROW_SHIFT         8
-#define OTPP_OC_MASK           0x0f000000
-#define OTPP_OC_SHIFT          24
-#define OTPP_READERR           0x10000000
-#define OTPP_VALUE_MASK                0x20000000
-#define OTPP_VALUE_SHIFT       29
-#define OTPP_START_BUSY                0x80000000
-
-
-#define OTPPOC_READ            0
-#define OTPPOC_BIT_PROG                1
-#define OTPPOC_VERIFY          3
-#define OTPPOC_INIT            4
-#define OTPPOC_SET             5
-#define OTPPOC_RESET           6
-#define OTPPOC_OCST            7
-#define OTPPOC_ROW_LOCK                8
-#define OTPPOC_PRESCN_TEST     9
-
-
-#define JCMD_START             0x80000000
-#define JCMD_BUSY              0x80000000
-#define JCMD_STATE_MASK                0x60000000
-#define JCMD_STATE_TLR         0x00000000      
-#define JCMD_STATE_PIR         0x20000000      
-#define JCMD_STATE_PDR         0x40000000      
-#define JCMD_STATE_RTI         0x60000000      
-#define JCMD0_ACC_MASK         0x0000f000
-#define JCMD0_ACC_IRDR         0x00000000
-#define JCMD0_ACC_DR           0x00001000
-#define JCMD0_ACC_IR           0x00002000
-#define JCMD0_ACC_RESET                0x00003000
-#define JCMD0_ACC_IRPDR                0x00004000
-#define JCMD0_ACC_PDR          0x00005000
-#define JCMD0_IRW_MASK         0x00000f00
-#define JCMD_ACC_MASK          0x000f0000      
-#define JCMD_ACC_IRDR          0x00000000
-#define JCMD_ACC_DR            0x00010000
-#define JCMD_ACC_IR            0x00020000
-#define JCMD_ACC_RESET         0x00030000
-#define JCMD_ACC_IRPDR         0x00040000
-#define JCMD_ACC_PDR           0x00050000
-#define JCMD_ACC_PIR           0x00060000
-#define JCMD_ACC_IRDR_I                0x00070000      
-#define JCMD_ACC_DR_I          0x00080000      
-#define JCMD_IRW_MASK          0x00001f00
-#define JCMD_IRW_SHIFT         8
-#define JCMD_DRW_MASK          0x0000003f
-
-
-#define JCTRL_FORCE_CLK                4               
-#define JCTRL_EXT_EN           2               
-#define JCTRL_EN               1               
-
-
-#define        CLKD_SFLASH             0x0f000000
-#define        CLKD_SFLASH_SHIFT       24
-#define        CLKD_OTP                0x000f0000
-#define        CLKD_OTP_SHIFT          16
-#define        CLKD_JTAG               0x00000f00
-#define        CLKD_JTAG_SHIFT         8
-#define        CLKD_UART               0x000000ff
-
-
-#define        CI_GPIO                 0x00000001      
-#define        CI_EI                   0x00000002      
-#define        CI_TEMP                 0x00000004      
-#define        CI_SIRQ                 0x00000008      
-#define        CI_ECI                  0x00000010      
-#define        CI_PMU                  0x00000020      
-#define        CI_UART                 0x00000040      
-#define        CI_WDRESET              0x80000000      
-
-
-#define SCC_SS_MASK            0x00000007      
-#define        SCC_SS_LPO              0x00000000      
-#define        SCC_SS_XTAL             0x00000001      
-#define        SCC_SS_PCI              0x00000002      
-#define SCC_LF                 0x00000200      
-#define SCC_LP                 0x00000400      
-#define SCC_FS                 0x00000800      
-#define SCC_IP                 0x00001000      
-#define SCC_XC                 0x00002000      
-#define SCC_XP                 0x00004000      
-#define SCC_CD_MASK            0xffff0000      
-#define SCC_CD_SHIFT           16
-
-
-#define        SYCC_IE                 0x00000001      
-#define        SYCC_AE                 0x00000002      
-#define        SYCC_FP                 0x00000004      
-#define        SYCC_AR                 0x00000008      
-#define        SYCC_HR                 0x00000010      
-#define SYCC_CD_MASK           0xffff0000      
-#define SYCC_CD_SHIFT          16
-
-
-#define        CF_EN                   0x00000001      
-#define        CF_EM_MASK              0x0000000e      
-#define        CF_EM_SHIFT             1
-#define        CF_EM_FLASH             0               
-#define        CF_EM_SYNC              2               
-#define        CF_EM_PCMCIA            4               
-#define        CF_DS                   0x00000010      
-#define        CF_BS                   0x00000020      
-#define        CF_CD_MASK              0x000000c0      
-#define        CF_CD_SHIFT             6
-#define        CF_CD_DIV2              0x00000000      
-#define        CF_CD_DIV3              0x00000040      
-#define        CF_CD_DIV4              0x00000080      
-#define        CF_CE                   0x00000100      
-#define        CF_SB                   0x00000200      
-
-
-#define        PM_W0_MASK              0x0000003f      
-#define        PM_W1_MASK              0x00001f00      
-#define        PM_W1_SHIFT             8
-#define        PM_W2_MASK              0x001f0000      
-#define        PM_W2_SHIFT             16
-#define        PM_W3_MASK              0x1f000000      
-#define        PM_W3_SHIFT             24
-
-
-#define        PA_W0_MASK              0x0000003f      
-#define        PA_W1_MASK              0x00001f00      
-#define        PA_W1_SHIFT             8
-#define        PA_W2_MASK              0x001f0000      
-#define        PA_W2_SHIFT             16
-#define        PA_W3_MASK              0x1f000000      
-#define        PA_W3_SHIFT             24
-
-
-#define        PI_W0_MASK              0x0000003f      
-#define        PI_W1_MASK              0x00001f00      
-#define        PI_W1_SHIFT             8
-#define        PI_W2_MASK              0x001f0000      
-#define        PI_W2_SHIFT             16
-#define        PI_W3_MASK              0x1f000000      
-#define        PI_W3_SHIFT             24
-
-
-#define        PW_W0_MASK              0x0000001f      
-#define        PW_W1_MASK              0x00001f00      
-#define        PW_W1_SHIFT             8
-#define        PW_W2_MASK              0x001f0000      
-#define        PW_W2_SHIFT             16
-#define        PW_W3_MASK              0x1f000000      
-#define        PW_W3_SHIFT             24
-
-#define PW_W0                  0x0000000c
-#define PW_W1                  0x00000a00
-#define PW_W2                  0x00020000
-#define PW_W3                  0x01000000
-
-
-#define        FW_W0_MASK              0x0000003f      
-#define        FW_W1_MASK              0x00001f00      
-#define        FW_W1_SHIFT             8
-#define        FW_W2_MASK              0x001f0000      
-#define        FW_W2_SHIFT             16
-#define        FW_W3_MASK              0x1f000000      
-#define        FW_W3_SHIFT             24
-
-
-#define WATCHDOG_CLOCK         48000000        
-#define WATCHDOG_CLOCK_5354    32000           
-
-
-#define        PCTL_ILP_DIV_MASK       0xffff0000
-#define        PCTL_ILP_DIV_SHIFT      16
-#define PCTL_PLL_PLLCTL_UPD    0x00000400      
-#define PCTL_NOILP_ON_WAIT     0x00000200      
-#define        PCTL_HT_REQ_EN          0x00000100
-#define        PCTL_ALP_REQ_EN         0x00000080
-#define        PCTL_XTALFREQ_MASK      0x0000007c
-#define        PCTL_XTALFREQ_SHIFT     2
-#define        PCTL_ILP_DIV_EN         0x00000002
-#define        PCTL_LPO_SEL            0x00000001
-
-
-#define CSTRETCH_HT            0xffff0000
-#define CSTRETCH_ALP           0x0000ffff
-
-
-#define GPIO_ONTIME_SHIFT      16
-
-
-#define        CN_N1_MASK              0x3f            
-#define        CN_N2_MASK              0x3f00          
-#define        CN_N2_SHIFT             8
-#define        CN_PLLC_MASK            0xf0000         
-#define        CN_PLLC_SHIFT           16
-
-
-#define        CC_M1_MASK              0x3f            
-#define        CC_M2_MASK              0x3f00          
-#define        CC_M2_SHIFT             8
-#define        CC_M3_MASK              0x3f0000        
-#define        CC_M3_SHIFT             16
-#define        CC_MC_MASK              0x1f000000      
-#define        CC_MC_SHIFT             24
-
-
-#define        CC_F6_2                 0x02            
-#define        CC_F6_3                 0x03            
-#define        CC_F6_4                 0x05            
-#define        CC_F6_5                 0x09
-#define        CC_F6_6                 0x11
-#define        CC_F6_7                 0x21
-
-#define        CC_F5_BIAS              5               
-
-#define        CC_MC_BYPASS            0x08
-#define        CC_MC_M1                0x04
-#define        CC_MC_M1M2              0x02
-#define        CC_MC_M1M2M3            0x01
-#define        CC_MC_M1M3              0x11
-
-
-#define        CC_T2_BIAS              2               
-#define        CC_T2M2_BIAS            3               
-
-#define        CC_T2MC_M1BYP           1
-#define        CC_T2MC_M2BYP           2
-#define        CC_T2MC_M3BYP           4
-
-
-#define        CC_T6_MMASK             1               
-#define        CC_T6_M0                120000000       
-#define        CC_T6_M1                100000000       
-#define        SB2MIPS_T6(sb)          (2 * (sb))
-
-
-#define        CC_CLOCK_BASE1          24000000        
-#define CC_CLOCK_BASE2         12500000        
-
-
-#define        CLKC_5350_N             0x0311
-#define        CLKC_5350_M             0x04020009
-
-
-#define FLASH_NONE             0x000           
-#define SFLASH_ST              0x100           
-#define SFLASH_AT              0x200           
-#define        PFLASH                  0x700           
-
-
-#define        CC_CFG_EN               0x0001          
-#define        CC_CFG_EM_MASK          0x000e          
-#define        CC_CFG_EM_ASYNC         0x0000          
-#define        CC_CFG_EM_SYNC          0x0002          
-#define        CC_CFG_EM_PCMCIA        0x0004          
-#define        CC_CFG_EM_IDE           0x0006          
-#define        CC_CFG_DS               0x0010          
-#define        CC_CFG_CD_MASK          0x00e0          
-#define        CC_CFG_CE               0x0100          
-#define        CC_CFG_SB               0x0200          
-#define        CC_CFG_IS               0x0400          
-
-
-#define        CC_EB_BASE              0x1a000000      
-#define        CC_EB_PCMCIA_MEM        0x1a000000      
-#define        CC_EB_PCMCIA_IO         0x1a200000      
-#define        CC_EB_PCMCIA_CFG        0x1a400000      
-#define        CC_EB_IDE               0x1a800000      
-#define        CC_EB_PCMCIA1_MEM       0x1a800000      
-#define        CC_EB_PCMCIA1_IO        0x1aa00000      
-#define        CC_EB_PCMCIA1_CFG       0x1ac00000      
-#define        CC_EB_PROGIF            0x1b000000      
-
-
-
-#define SFLASH_OPCODE          0x000000ff
-#define SFLASH_ACTION          0x00000700
-#define        SFLASH_CS_ACTIVE        0x00001000      
-#define SFLASH_START           0x80000000
-#define SFLASH_BUSY            SFLASH_START
-
-
-#define        SFLASH_ACT_OPONLY       0x0000          
-#define        SFLASH_ACT_OP1D         0x0100          
-#define        SFLASH_ACT_OP3A         0x0200          
-#define        SFLASH_ACT_OP3A1D       0x0300          
-#define        SFLASH_ACT_OP3A4D       0x0400          
-#define        SFLASH_ACT_OP3A4X4D     0x0500          
-#define        SFLASH_ACT_OP3A1X4D     0x0700          
-
-
-#define SFLASH_ST_WREN         0x0006          
-#define SFLASH_ST_WRDIS                0x0004          
-#define SFLASH_ST_RDSR         0x0105          
-#define SFLASH_ST_WRSR         0x0101          
-#define SFLASH_ST_READ         0x0303          
-#define SFLASH_ST_PP           0x0302          
-#define SFLASH_ST_SE           0x02d8          
-#define SFLASH_ST_BE           0x00c7          
-#define SFLASH_ST_DP           0x00b9          
-#define SFLASH_ST_RES          0x03ab          
-#define SFLASH_ST_CSA          0x1000          
-
-
-#define SFLASH_ST_WIP          0x01            
-#define SFLASH_ST_WEL          0x02            
-#define SFLASH_ST_BP_MASK      0x1c            
-#define SFLASH_ST_BP_SHIFT     2
-#define SFLASH_ST_SRWD         0x80            
-
-
-#define SFLASH_AT_READ                         0x07e8
-#define SFLASH_AT_PAGE_READ                    0x07d2
-#define SFLASH_AT_BUF1_READ
-#define SFLASH_AT_BUF2_READ
-#define SFLASH_AT_STATUS                       0x01d7
-#define SFLASH_AT_BUF1_WRITE                   0x0384
-#define SFLASH_AT_BUF2_WRITE                   0x0387
-#define SFLASH_AT_BUF1_ERASE_PROGRAM           0x0283
-#define SFLASH_AT_BUF2_ERASE_PROGRAM           0x0286
-#define SFLASH_AT_BUF1_PROGRAM                 0x0288
-#define SFLASH_AT_BUF2_PROGRAM                 0x0289
-#define SFLASH_AT_PAGE_ERASE                   0x0281
-#define SFLASH_AT_BLOCK_ERASE                  0x0250
-#define SFLASH_AT_BUF1_WRITE_ERASE_PROGRAM     0x0382
-#define SFLASH_AT_BUF2_WRITE_ERASE_PROGRAM     0x0385
-#define SFLASH_AT_BUF1_LOAD                    0x0253
-#define SFLASH_AT_BUF2_LOAD                    0x0255
-#define SFLASH_AT_BUF1_COMPARE                 0x0260
-#define SFLASH_AT_BUF2_COMPARE                 0x0261
-#define SFLASH_AT_BUF1_REPROGRAM               0x0258
-#define SFLASH_AT_BUF2_REPROGRAM               0x0259
-
-
-#define SFLASH_AT_READY                                0x80
-#define SFLASH_AT_MISMATCH                     0x40
-#define SFLASH_AT_ID_MASK                      0x38
-#define SFLASH_AT_ID_SHIFT                     3
-
-
-
-#define UART_RX                0       
-#define UART_TX                0       
-#define UART_DLL       0       
-#define UART_IER       1       
-#define UART_DLM       1       
-#define UART_IIR       2       
-#define UART_FCR       2       
-#define UART_LCR       3       
-#define UART_MCR       4       
-#define UART_LSR       5       
-#define UART_MSR       6       
-#define UART_SCR       7       
-#define UART_LCR_DLAB  0x80    
-#define UART_LCR_WLEN8 0x03    
-#define UART_MCR_OUT2  0x08    
-#define UART_MCR_LOOP  0x10    
-#define UART_LSR_RX_FIFO       0x80    
-#define UART_LSR_TDHR          0x40    
-#define UART_LSR_THRE          0x20    
-#define UART_LSR_BREAK         0x10    
-#define UART_LSR_FRAMING       0x08    
-#define UART_LSR_PARITY                0x04    
-#define UART_LSR_OVERRUN       0x02    
-#define UART_LSR_RXRDY         0x01    
-#define UART_FCR_FIFO_ENABLE 1 
-
-
-#define UART_IIR_FIFO_MASK     0xc0    
-#define UART_IIR_INT_MASK      0xf     
-#define UART_IIR_MDM_CHG       0x0     
-#define UART_IIR_NOINT         0x1     
-#define UART_IIR_THRE          0x2     
-#define UART_IIR_RCVD_DATA     0x4     
-#define UART_IIR_RCVR_STATUS   0x6     
-#define UART_IIR_CHAR_TIME     0xc     
-
-
-#define UART_IER_EDSSI 8       
-#define UART_IER_ELSI  4       
-#define UART_IER_ETBEI  2      
-#define UART_IER_ERBFI 1       
-
-
-#define        PST_INTPEND     0x0040
-#define        PST_SBCLKST     0x0030
-#define        PST_SBCLKST_ILP 0x0010
-#define        PST_SBCLKST_ALP 0x0020
-#define        PST_SBCLKST_HT  0x0030
-#define        PST_ALPAVAIL    0x0008
-#define        PST_HTAVAIL     0x0004
-#define        PST_RESINIT     0x0003
-
-
-#define PCAP_REV_MASK  0x000000ff
-#define PCAP_RC_MASK   0x00001f00
-#define PCAP_RC_SHIFT  8
-#define PCAP_TC_MASK   0x0001e000
-#define PCAP_TC_SHIFT  13
-#define PCAP_PC_MASK   0x001e0000
-#define PCAP_PC_SHIFT  17
-#define PCAP_VC_MASK   0x01e00000
-#define PCAP_VC_SHIFT  21
-#define PCAP_CC_MASK   0x1e000000
-#define PCAP_CC_SHIFT  25
-#define PCAP5_PC_MASK  0x003e0000      
-#define PCAP5_PC_SHIFT 17
-#define PCAP5_VC_MASK  0x07c00000
-#define PCAP5_VC_SHIFT 22
-#define PCAP5_CC_MASK  0xf8000000
-#define PCAP5_CC_SHIFT 27
-
-
-
-#define        PRRT_TIME_MASK  0x03ff
-#define        PRRT_INTEN      0x0400
-#define        PRRT_REQ_ACTIVE 0x0800
-#define        PRRT_ALP_REQ    0x1000
-#define        PRRT_HT_REQ     0x2000
-
-
-#define PMURES_BIT(bit)        (1 << (bit))
-
-
-#define PMURES_MAX_RESNUM      30
-
-
-
-
-#define        PMU0_PLL0_PLLCTL0               0
-#define        PMU0_PLL0_PC0_PDIV_MASK         1
-#define        PMU0_PLL0_PC0_PDIV_FREQ         25000
-#define PMU0_PLL0_PC0_DIV_ARM_MASK     0x00000038
-#define PMU0_PLL0_PC0_DIV_ARM_SHIFT    3
-#define PMU0_PLL0_PC0_DIV_ARM_BASE     8
-
-
-#define PMU0_PLL0_PC0_DIV_ARM_110MHZ   0
-#define PMU0_PLL0_PC0_DIV_ARM_97_7MHZ  1
-#define PMU0_PLL0_PC0_DIV_ARM_88MHZ    2
-#define PMU0_PLL0_PC0_DIV_ARM_80MHZ    3 
-#define PMU0_PLL0_PC0_DIV_ARM_73_3MHZ  4
-#define PMU0_PLL0_PC0_DIV_ARM_67_7MHZ  5
-#define PMU0_PLL0_PC0_DIV_ARM_62_9MHZ  6
-#define PMU0_PLL0_PC0_DIV_ARM_58_6MHZ  7
-
-
-#define        PMU0_PLL0_PLLCTL1               1
-#define        PMU0_PLL0_PC1_WILD_INT_MASK     0xf0000000
-#define        PMU0_PLL0_PC1_WILD_INT_SHIFT    28
-#define        PMU0_PLL0_PC1_WILD_FRAC_MASK    0x0fffff00
-#define        PMU0_PLL0_PC1_WILD_FRAC_SHIFT   8
-#define        PMU0_PLL0_PC1_STOP_MOD          0x00000040
-
-
-#define        PMU0_PLL0_PLLCTL2               2
-#define        PMU0_PLL0_PC2_WILD_INT_MASK     0xf
-#define        PMU0_PLL0_PC2_WILD_INT_SHIFT    4
-
-
-#define RES4328_EXT_SWITCHER_PWM       0       
-#define RES4328_BB_SWITCHER_PWM                1       
-#define RES4328_BB_SWITCHER_BURST      2       
-#define RES4328_BB_EXT_SWITCHER_BURST  3       
-#define RES4328_ILP_REQUEST            4       
-#define RES4328_RADIO_SWITCHER_PWM     5       
-#define RES4328_RADIO_SWITCHER_BURST   6       
-#define RES4328_ROM_SWITCH             7       
-#define RES4328_PA_REF_LDO             8       
-#define RES4328_RADIO_LDO              9       
-#define RES4328_AFE_LDO                        10      
-#define RES4328_PLL_LDO                        11      
-#define RES4328_BG_FILTBYP             12      
-#define RES4328_TX_FILTBYP             13      
-#define RES4328_RX_FILTBYP             14      
-#define RES4328_XTAL_PU                        15      
-#define RES4328_XTAL_EN                        16      
-#define RES4328_BB_PLL_FILTBYP         17      
-#define RES4328_RF_PLL_FILTBYP         18      
-#define RES4328_BB_PLL_PU              19      
-
-#define RES5354_EXT_SWITCHER_PWM       0       
-#define RES5354_BB_SWITCHER_PWM                1       
-#define RES5354_BB_SWITCHER_BURST      2       
-#define RES5354_BB_EXT_SWITCHER_BURST  3       
-#define RES5354_ILP_REQUEST            4       
-#define RES5354_RADIO_SWITCHER_PWM     5       
-#define RES5354_RADIO_SWITCHER_BURST   6       
-#define RES5354_ROM_SWITCH             7       
-#define RES5354_PA_REF_LDO             8       
-#define RES5354_RADIO_LDO              9       
-#define RES5354_AFE_LDO                        10      
-#define RES5354_PLL_LDO                        11      
-#define RES5354_BG_FILTBYP             12      
-#define RES5354_TX_FILTBYP             13      
-#define RES5354_RX_FILTBYP             14      
-#define RES5354_XTAL_PU                        15      
-#define RES5354_XTAL_EN                        16      
-#define RES5354_BB_PLL_FILTBYP         17      
-#define RES5354_RF_PLL_FILTBYP         18      
-#define RES5354_BB_PLL_PU              19      
-
-
-
-#define DOT11MAC_880MHZ_CLK_DIVISOR_SHIFT 8
-#define DOT11MAC_880MHZ_CLK_DIVISOR_MASK (0xFF << DOT11MAC_880MHZ_CLK_DIVISOR_SHIFT)
-#define DOT11MAC_880MHZ_CLK_DIVISOR_VAL  (0xE << DOT11MAC_880MHZ_CLK_DIVISOR_SHIFT)
-
-
-#define PMU2_PHY_PLL_PLLCTL            4
-#define PMU2_SI_PLL_PLLCTL             10
-
-
-#define RES4325_BUCK_BOOST_BURST       0       
-#define RES4325_CBUCK_BURST            1       
-#define RES4325_CBUCK_PWM              2       
-#define RES4325_CLDO_CBUCK_BURST       3       
-#define RES4325_CLDO_CBUCK_PWM         4       
-#define RES4325_BUCK_BOOST_PWM         5       
-#define RES4325_ILP_REQUEST            6       
-#define RES4325_ABUCK_BURST            7       
-#define RES4325_ABUCK_PWM              8       
-#define RES4325_LNLDO1_PU              9       
-#define RES4325_OTP_PU                 10      
-#define RES4325_LNLDO3_PU              11      
-#define RES4325_LNLDO4_PU              12      
-#define RES4325_XTAL_PU                        13      
-#define RES4325_ALP_AVAIL              14      
-#define RES4325_RX_PWRSW_PU            15      
-#define RES4325_TX_PWRSW_PU            16      
-#define RES4325_RFPLL_PWRSW_PU         17      
-#define RES4325_LOGEN_PWRSW_PU         18      
-#define RES4325_AFE_PWRSW_PU           19      
-#define RES4325_BBPLL_PWRSW_PU         20      
-#define RES4325_HT_AVAIL               21      
-
-
-#define RES4325B0_CBUCK_LPOM           1       
-#define RES4325B0_CBUCK_BURST          2       
-#define RES4325B0_CBUCK_PWM            3       
-#define RES4325B0_CLDO_PU              4       
-
-
-#define RES4325C1_OTP_PWRSW_PU         10      
-#define RES4325C1_LNLDO2_PU            12      
-
-
-#define CST4325_SPROM_OTP_SEL_MASK     0x00000003
-#define CST4325_DEFCIS_SEL             0       
-#define CST4325_SPROM_SEL              1       
-#define CST4325_OTP_SEL                        2       
-#define CST4325_OTP_PWRDN              3       
-#define CST4325_SDIO_USB_MODE_MASK     0x00000004
-#define CST4325_SDIO_USB_MODE_SHIFT    2
-#define CST4325_RCAL_VALID_MASK                0x00000008
-#define CST4325_RCAL_VALID_SHIFT       3
-#define CST4325_RCAL_VALUE_MASK                0x000001f0
-#define CST4325_RCAL_VALUE_SHIFT       4
-#define CST4325_PMUTOP_2B_MASK                 0x00000200      
-#define CST4325_PMUTOP_2B_SHIFT        9
-
-#define RES4329_RESERVED0              0       
-#define RES4329_CBUCK_LPOM             1       
-#define RES4329_CBUCK_BURST            2       
-#define RES4329_CBUCK_PWM              3       
-#define RES4329_CLDO_PU                        4       
-#define RES4329_PALDO_PU               5       
-#define RES4329_ILP_REQUEST            6       
-#define RES4329_RESERVED7              7       
-#define RES4329_RESERVED8              8       
-#define RES4329_LNLDO1_PU              9       
-#define RES4329_OTP_PU                 10      
-#define RES4329_RESERVED11             11      
-#define RES4329_LNLDO2_PU              12      
-#define RES4329_XTAL_PU                        13      
-#define RES4329_ALP_AVAIL              14      
-#define RES4329_RX_PWRSW_PU            15      
-#define RES4329_TX_PWRSW_PU            16      
-#define RES4329_RFPLL_PWRSW_PU         17      
-#define RES4329_LOGEN_PWRSW_PU         18      
-#define RES4329_AFE_PWRSW_PU           19      
-#define RES4329_BBPLL_PWRSW_PU         20      
-#define RES4329_HT_AVAIL               21      
-
-#define CST4329_SPROM_OTP_SEL_MASK     0x00000003
-#define CST4329_DEFCIS_SEL             0       
-#define CST4329_SPROM_SEL              1       
-#define CST4329_OTP_SEL                        2       
-#define CST4329_OTP_PWRDN              3       
-#define CST4329_SPI_SDIO_MODE_MASK     0x00000004
-#define CST4329_SPI_SDIO_MODE_SHIFT    2
-
-
-#define RES4312_SWITCHER_BURST         0       
-#define RES4312_SWITCHER_PWM           1       
-#define RES4312_PA_REF_LDO             2       
-#define RES4312_CORE_LDO_BURST         3       
-#define RES4312_CORE_LDO_PWM           4       
-#define RES4312_RADIO_LDO              5       
-#define RES4312_ILP_REQUEST            6       
-#define RES4312_BG_FILTBYP             7       
-#define RES4312_TX_FILTBYP             8       
-#define RES4312_RX_FILTBYP             9       
-#define RES4312_XTAL_PU                        10      
-#define RES4312_ALP_AVAIL              11      
-#define RES4312_BB_PLL_FILTBYP         12      
-#define RES4312_RF_PLL_FILTBYP         13      
-#define RES4312_HT_AVAIL               14      
-
-#define RES4322_RF_LDO                 0
-#define RES4322_ILP_REQUEST            1
-#define RES4322_XTAL_PU                        2
-#define RES4322_ALP_AVAIL              3
-#define RES4322_SI_PLL_ON              4
-#define RES4322_HT_SI_AVAIL            5
-#define RES4322_PHY_PLL_ON             6
-#define RES4322_HT_PHY_AVAIL           7
-#define RES4322_OTP_PU                 8
-
-
-#define CST4322_XTAL_FREQ_20_40MHZ     0x00000020
-#define CST4322_SPROM_OTP_SEL_MASK     0x000000c0
-#define CST4322_SPROM_OTP_SEL_SHIFT    6
-#define CST4322_NO_SPROM_OTP           0       
-#define CST4322_SPROM_PRESENT          1       
-#define CST4322_OTP_PRESENT            2       
-#define CST4322_PCI_OR_USB             0x00000100
-#define CST4322_BOOT_MASK              0x00000600
-#define CST4322_BOOT_SHIFT             9
-#define CST4322_BOOT_FROM_SRAM         0       
-#define CST4322_BOOT_FROM_ROM          1       
-#define CST4322_BOOT_FROM_FLASH                2       
-#define CST4322_BOOT_FROM_INVALID      3
-#define CST4322_ILP_DIV_EN             0x00000800
-#define CST4322_FLASH_TYPE_MASK                0x00001000
-#define CST4322_FLASH_TYPE_SHIFT       12
-#define CST4322_FLASH_TYPE_SHIFT_ST    0       
-#define CST4322_FLASH_TYPE_SHIFT_ATMEL 1       
-#define CST4322_ARM_TAP_SEL            0x00002000
-#define CST4322_RES_INIT_MODE_MASK     0x0000c000
-#define CST4322_RES_INIT_MODE_SHIFT    14
-#define CST4322_RES_INIT_MODE_ILPAVAIL 0       
-#define CST4322_RES_INIT_MODE_ILPREQ   1       
-#define CST4322_RES_INIT_MODE_ALPAVAIL 2       
-#define CST4322_RES_INIT_MODE_HTAVAIL  3       
-#define CST4322_PCIPLLCLK_GATING       0x00010000
-#define CST4322_CLK_SWITCH_PCI_TO_ALP  0x00020000
-#define CST4322_PCI_CARDBUS_MODE       0x00040000
-
-#define RES4315_CBUCK_LPOM             1       
-#define RES4315_CBUCK_BURST            2       
-#define RES4315_CBUCK_PWM              3       
-#define RES4315_CLDO_PU                        4       
-#define RES4315_PALDO_PU               5       
-#define RES4315_ILP_REQUEST            6       
-#define RES4315_LNLDO1_PU              9       
-#define RES4315_OTP_PU                 10      
-#define RES4315_LNLDO2_PU              12      
-#define RES4315_XTAL_PU                        13      
-#define RES4315_ALP_AVAIL              14      
-#define RES4315_RX_PWRSW_PU            15      
-#define RES4315_TX_PWRSW_PU            16      
-#define RES4315_RFPLL_PWRSW_PU         17      
-#define RES4315_LOGEN_PWRSW_PU         18      
-#define RES4315_AFE_PWRSW_PU           19      
-#define RES4315_BBPLL_PWRSW_PU         20      
-#define RES4315_HT_AVAIL               21      
-
-#define CST4315_SPROM_OTP_SEL_MASK     0x00000003      
-#define CST4315_DEFCIS_SEL             0x00000000      
-#define CST4315_SPROM_SEL              0x00000001      
-#define CST4315_OTP_SEL                        0x00000002      
-#define CST4315_OTP_PWRDN              0x00000003      
-#define CST4315_SDIO_MODE              0x00000004      
-#define CST4315_RCAL_VALID             0x00000008
-#define CST4315_RCAL_VALUE_MASK                0x000001f0
-#define CST4315_RCAL_VALUE_SHIFT       4
-#define CST4315_PALDO_EXTPNP           0x00000200      
-#define CST4315_CBUCK_MODE_MASK                0x00000c00
-#define CST4315_CBUCK_MODE_BURST       0x00000400
-#define CST4315_CBUCK_MODE_LPBURST     0x00000c00
-
-
-#define PMU_MAX_TRANSITION_DLY 15000
-
-
-#define PMURES_UP_TRANSITION   2
-
-
-
-
-
-#define ECI_BW_20   0x0
-#define ECI_BW_25   0x1
-#define ECI_BW_30   0x2
-#define ECI_BW_35   0x3
-#define ECI_BW_40   0x4
-#define ECI_BW_45   0x5
-#define ECI_BW_50   0x6
-#define ECI_BW_ALL  0x7
-
-
-#define WLAN_NUM_ANT1 TXANT_0
-#define WLAN_NUM_ANT2 TXANT_1
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/sbconfig.h b/drivers/net/wireless/bcm4319/include/sbconfig.h
deleted file mode 100644 (file)
index da18ccb..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Broadcom SiliconBackplane hardware register definitions.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sbconfig.h,v 13.67.30.1 2008/05/07 20:17:27 Exp $
- */
-
-
-#ifndef        _SBCONFIG_H
-#define        _SBCONFIG_H
-
-
-#ifndef PAD
-#define        _PADLINE(line)  pad ## line
-#define        _XSTR(line)     _PADLINE(line)
-#define        PAD             _XSTR(__LINE__)
-#endif
-
-
-#define SB_BUS_SIZE            0x10000         
-#define SB_BUS_BASE(b)         (SI_ENUM_BASE + (b) * SB_BUS_SIZE)
-#define        SB_BUS_MAXCORES         (SB_BUS_SIZE / SI_CORE_SIZE)    
-
-
-#define        SBCONFIGOFF             0xf00           
-#define        SBCONFIGSIZE            256             
-
-#define SBIPSFLAG              0x08
-#define SBTPSFLAG              0x18
-#define        SBTMERRLOGA             0x48            
-#define        SBTMERRLOG              0x50            
-#define SBADMATCH3             0x60
-#define SBADMATCH2             0x68
-#define SBADMATCH1             0x70
-#define SBIMSTATE              0x90
-#define SBINTVEC               0x94
-#define SBTMSTATELOW           0x98
-#define SBTMSTATEHIGH          0x9c
-#define SBBWA0                 0xa0
-#define SBIMCONFIGLOW          0xa8
-#define SBIMCONFIGHIGH         0xac
-#define SBADMATCH0             0xb0
-#define SBTMCONFIGLOW          0xb8
-#define SBTMCONFIGHIGH         0xbc
-#define SBBCONFIG              0xc0
-#define SBBSTATE               0xc8
-#define SBACTCNFG              0xd8
-#define        SBFLAGST                0xe8
-#define SBIDLOW                        0xf8
-#define SBIDHIGH               0xfc
-
-
-
-#define SBIMERRLOGA            0xea8
-#define SBIMERRLOG             0xeb0
-#define SBTMPORTCONNID0                0xed8
-#define SBTMPORTLOCK0          0xef8
-
-#ifndef _LANGUAGE_ASSEMBLY
-
-typedef volatile struct _sbconfig {
-       uint32  PAD[2];
-       uint32  sbipsflag;              
-       uint32  PAD[3];
-       uint32  sbtpsflag;              
-       uint32  PAD[11];
-       uint32  sbtmerrloga;            
-       uint32  PAD;
-       uint32  sbtmerrlog;             
-       uint32  PAD[3];
-       uint32  sbadmatch3;             
-       uint32  PAD;
-       uint32  sbadmatch2;             
-       uint32  PAD;
-       uint32  sbadmatch1;             
-       uint32  PAD[7];
-       uint32  sbimstate;              
-       uint32  sbintvec;               
-       uint32  sbtmstatelow;           
-       uint32  sbtmstatehigh;          
-       uint32  sbbwa0;                 
-       uint32  PAD;
-       uint32  sbimconfiglow;          
-       uint32  sbimconfighigh;         
-       uint32  sbadmatch0;             
-       uint32  PAD;
-       uint32  sbtmconfiglow;          
-       uint32  sbtmconfighigh;         
-       uint32  sbbconfig;              
-       uint32  PAD;
-       uint32  sbbstate;               
-       uint32  PAD[3];
-       uint32  sbactcnfg;              
-       uint32  PAD[3];
-       uint32  sbflagst;               
-       uint32  PAD[3];
-       uint32  sbidlow;                
-       uint32  sbidhigh;               
-} sbconfig_t;
-
-#endif 
-
-
-#define        SBIPS_INT1_MASK         0x3f            
-#define        SBIPS_INT1_SHIFT        0
-#define        SBIPS_INT2_MASK         0x3f00          
-#define        SBIPS_INT2_SHIFT        8
-#define        SBIPS_INT3_MASK         0x3f0000        
-#define        SBIPS_INT3_SHIFT        16
-#define        SBIPS_INT4_MASK         0x3f000000      
-#define        SBIPS_INT4_SHIFT        24
-
-
-#define        SBTPS_NUM0_MASK         0x3f            
-#define        SBTPS_F0EN0             0x40            
-
-
-#define        SBTMEL_CM               0x00000007      
-#define        SBTMEL_CI               0x0000ff00      
-#define        SBTMEL_EC               0x0f000000      
-#define        SBTMEL_ME               0x80000000      
-
-
-#define        SBIM_PC                 0xf             
-#define        SBIM_AP_MASK            0x30            
-#define        SBIM_AP_BOTH            0x00            
-#define        SBIM_AP_TS              0x10            
-#define        SBIM_AP_TK              0x20            
-#define        SBIM_AP_RSV             0x30            
-#define        SBIM_IBE                0x20000         
-#define        SBIM_TO                 0x40000         
-#define        SBIM_BY                 0x01800000      
-#define        SBIM_RJ                 0x02000000      
-
-
-#define        SBTML_RESET             0x0001          
-#define        SBTML_REJ_MASK          0x0006          
-#define        SBTML_REJ               0x0002          
-#define        SBTML_TMPREJ            0x0004          
-
-#define        SBTML_SICF_SHIFT        16              
-
-
-#define        SBTMH_SERR              0x0001          
-#define        SBTMH_INT               0x0002          
-#define        SBTMH_BUSY              0x0004          
-#define        SBTMH_TO                0x0020          
-
-#define        SBTMH_SISF_SHIFT        16              
-
-
-#define        SBBWA_TAB0_MASK         0xffff          
-#define        SBBWA_TAB1_MASK         0xffff          
-#define        SBBWA_TAB1_SHIFT        16
-
-
-#define        SBIMCL_STO_MASK         0x7             
-#define        SBIMCL_RTO_MASK         0x70            
-#define        SBIMCL_RTO_SHIFT        4
-#define        SBIMCL_CID_MASK         0xff0000        
-#define        SBIMCL_CID_SHIFT        16
-
-
-#define        SBIMCH_IEM_MASK         0xc             
-#define        SBIMCH_TEM_MASK         0x30            
-#define        SBIMCH_TEM_SHIFT        4
-#define        SBIMCH_BEM_MASK         0xc0            
-#define        SBIMCH_BEM_SHIFT        6
-
-
-#define        SBAM_TYPE_MASK          0x3             
-#define        SBAM_AD64               0x4             
-#define        SBAM_ADINT0_MASK        0xf8            
-#define        SBAM_ADINT0_SHIFT       3
-#define        SBAM_ADINT1_MASK        0x1f8           
-#define        SBAM_ADINT1_SHIFT       3
-#define        SBAM_ADINT2_MASK        0x1f8           
-#define        SBAM_ADINT2_SHIFT       3
-#define        SBAM_ADEN               0x400           
-#define        SBAM_ADNEG              0x800           
-#define        SBAM_BASE0_MASK         0xffffff00      
-#define        SBAM_BASE0_SHIFT        8
-#define        SBAM_BASE1_MASK         0xfffff000      
-#define        SBAM_BASE1_SHIFT        12
-#define        SBAM_BASE2_MASK         0xffff0000      
-#define        SBAM_BASE2_SHIFT        16
-
-
-#define        SBTMCL_CD_MASK          0xff            
-#define        SBTMCL_CO_MASK          0xf800          
-#define        SBTMCL_CO_SHIFT         11
-#define        SBTMCL_IF_MASK          0xfc0000        
-#define        SBTMCL_IF_SHIFT         18
-#define        SBTMCL_IM_MASK          0x3000000       
-#define        SBTMCL_IM_SHIFT         24
-
-
-#define        SBTMCH_BM_MASK          0x3             
-#define        SBTMCH_RM_MASK          0x3             
-#define        SBTMCH_RM_SHIFT         2
-#define        SBTMCH_SM_MASK          0x30            
-#define        SBTMCH_SM_SHIFT         4
-#define        SBTMCH_EM_MASK          0x300           
-#define        SBTMCH_EM_SHIFT         8
-#define        SBTMCH_IM_MASK          0xc00           
-#define        SBTMCH_IM_SHIFT         10
-
-
-#define        SBBC_LAT_MASK           0x3             
-#define        SBBC_MAX0_MASK          0xf0000         
-#define        SBBC_MAX0_SHIFT         16
-#define        SBBC_MAX1_MASK          0xf00000        
-#define        SBBC_MAX1_SHIFT         20
-
-
-#define        SBBS_SRD                0x1             
-#define        SBBS_HRD                0x2             
-
-
-#define        SBIDL_CS_MASK           0x3             
-#define        SBIDL_AR_MASK           0x38            
-#define        SBIDL_AR_SHIFT          3
-#define        SBIDL_SYNCH             0x40            
-#define        SBIDL_INIT              0x80            
-#define        SBIDL_MINLAT_MASK       0xf00           
-#define        SBIDL_MINLAT_SHIFT      8
-#define        SBIDL_MAXLAT            0xf000          
-#define        SBIDL_MAXLAT_SHIFT      12
-#define        SBIDL_FIRST             0x10000         
-#define        SBIDL_CW_MASK           0xc0000         
-#define        SBIDL_CW_SHIFT          18
-#define        SBIDL_TP_MASK           0xf00000        
-#define        SBIDL_TP_SHIFT          20
-#define        SBIDL_IP_MASK           0xf000000       
-#define        SBIDL_IP_SHIFT          24
-#define        SBIDL_RV_MASK           0xf0000000      
-#define        SBIDL_RV_SHIFT          28
-#define        SBIDL_RV_2_2            0x00000000      
-#define        SBIDL_RV_2_3            0x10000000      
-
-
-#define        SBIDH_RC_MASK           0x000f          
-#define        SBIDH_RCE_MASK          0x7000          
-#define        SBIDH_RCE_SHIFT         8
-#define        SBCOREREV(sbidh) \
-       ((((sbidh) & SBIDH_RCE_MASK) >> SBIDH_RCE_SHIFT) | ((sbidh) & SBIDH_RC_MASK))
-#define        SBIDH_CC_MASK           0x8ff0          
-#define        SBIDH_CC_SHIFT          4
-#define        SBIDH_VC_MASK           0xffff0000      
-#define        SBIDH_VC_SHIFT          16
-
-#define        SB_COMMIT               0xfd8           
-
-
-#define        SB_VEND_BCM             0x4243          
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/sbhnddma.h b/drivers/net/wireless/bcm4319/include/sbhnddma.h
deleted file mode 100644 (file)
index 7681395..0000000
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Generic Broadcom Home Networking Division (HND) DMA engine HW interface
- * This supports the following chips: BCM42xx, 44xx, 47xx .
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sbhnddma.h,v 13.11.250.5.16.1 2009/07/21 14:04:51 Exp $
- */
-
-
-#ifndef        _sbhnddma_h_
-#define        _sbhnddma_h_
-
-
-
-
-
-
-
-typedef volatile struct {
-       uint32  control;                
-       uint32  addr;                   
-       uint32  ptr;                    
-       uint32  status;                 
-} dma32regs_t;
-
-typedef volatile struct {
-       dma32regs_t     xmt;            
-       dma32regs_t     rcv;            
-} dma32regp_t;
-
-typedef volatile struct {      
-       uint32  fifoaddr;               
-       uint32  fifodatalow;            
-       uint32  fifodatahigh;           
-       uint32  pad;                    
-} dma32diag_t;
-
-
-typedef volatile struct {
-       uint32  ctrl;           
-       uint32  addr;           
-} dma32dd_t;
-
-
-#define        D32RINGALIGN_BITS       12
-#define        D32MAXRINGSZ    (1 << D32RINGALIGN_BITS)
-#define        D32RINGALIGN    (1 << D32RINGALIGN_BITS)
-#define        D32MAXDD        (D32MAXRINGSZ / sizeof (dma32dd_t))
-
-
-#define        XC_XE           ((uint32)1 << 0)        
-#define        XC_SE           ((uint32)1 << 1)        
-#define        XC_LE           ((uint32)1 << 2)        
-#define        XC_FL           ((uint32)1 << 4)        
-#define        XC_PD           ((uint32)1 << 11)       
-#define        XC_AE           ((uint32)3 << 16)       
-#define        XC_AE_SHIFT     16
-
-
-#define        XP_LD_MASK      0xfff                   
-
-
-#define        XS_CD_MASK      0x0fff                  
-#define        XS_XS_MASK      0xf000                  
-#define        XS_XS_SHIFT     12
-#define        XS_XS_DISABLED  0x0000                  
-#define        XS_XS_ACTIVE    0x1000                  
-#define        XS_XS_IDLE      0x2000                  
-#define        XS_XS_STOPPED   0x3000                  
-#define        XS_XS_SUSP      0x4000                  
-#define        XS_XE_MASK      0xf0000                 
-#define        XS_XE_SHIFT     16
-#define        XS_XE_NOERR     0x00000                 
-#define        XS_XE_DPE       0x10000                 
-#define        XS_XE_DFU       0x20000                 
-#define        XS_XE_BEBR      0x30000                 
-#define        XS_XE_BEDA      0x40000                 
-#define        XS_AD_MASK      0xfff00000              
-#define        XS_AD_SHIFT     20
-
-
-#define        RC_RE           ((uint32)1 << 0)        
-#define        RC_RO_MASK      0xfe                    
-#define        RC_RO_SHIFT     1
-#define        RC_FM           ((uint32)1 << 8)        
-#define        RC_SH           ((uint32)1 << 9)        
-#define        RC_OC           ((uint32)1 << 10)       
-#define        RC_PD           ((uint32)1 << 11)       
-#define        RC_AE           ((uint32)3 << 16)       
-#define        RC_AE_SHIFT     16
-
-
-#define        RP_LD_MASK      0xfff                   
-
-
-#define        RS_CD_MASK      0x0fff                  
-#define        RS_RS_MASK      0xf000                  
-#define        RS_RS_SHIFT     12
-#define        RS_RS_DISABLED  0x0000                  
-#define        RS_RS_ACTIVE    0x1000                  
-#define        RS_RS_IDLE      0x2000                  
-#define        RS_RS_STOPPED   0x3000                  
-#define        RS_RE_MASK      0xf0000                 
-#define        RS_RE_SHIFT     16
-#define        RS_RE_NOERR     0x00000                 
-#define        RS_RE_DPE       0x10000                 
-#define        RS_RE_DFO       0x20000                 
-#define        RS_RE_BEBW      0x30000                 
-#define        RS_RE_BEDA      0x40000                 
-#define        RS_AD_MASK      0xfff00000              
-#define        RS_AD_SHIFT     20
-
-
-#define        FA_OFF_MASK     0xffff                  
-#define        FA_SEL_MASK     0xf0000                 
-#define        FA_SEL_SHIFT    16
-#define        FA_SEL_XDD      0x00000                 
-#define        FA_SEL_XDP      0x10000                 
-#define        FA_SEL_RDD      0x40000                 
-#define        FA_SEL_RDP      0x50000                 
-#define        FA_SEL_XFD      0x80000                 
-#define        FA_SEL_XFP      0x90000                 
-#define        FA_SEL_RFD      0xc0000                 
-#define        FA_SEL_RFP      0xd0000                 
-#define        FA_SEL_RSD      0xe0000                 
-#define        FA_SEL_RSP      0xf0000                 
-
-
-#define        CTRL_BC_MASK    0x1fff                  
-#define        CTRL_AE         ((uint32)3 << 16)       
-#define        CTRL_AE_SHIFT   16
-#define        CTRL_EOT        ((uint32)1 << 28)       
-#define        CTRL_IOC        ((uint32)1 << 29)       
-#define        CTRL_EOF        ((uint32)1 << 30)       
-#define        CTRL_SOF        ((uint32)1 << 31)       
-
-
-#define        CTRL_CORE_MASK  0x0ff00000
-
-
-
-
-typedef volatile struct {
-       uint32  control;                
-       uint32  ptr;                    
-       uint32  addrlow;                
-       uint32  addrhigh;               
-       uint32  status0;                
-       uint32  status1;                
-} dma64regs_t;
-
-typedef volatile struct {
-       dma64regs_t     tx;             
-       dma64regs_t     rx;             
-} dma64regp_t;
-
-typedef volatile struct {              
-       uint32  fifoaddr;               
-       uint32  fifodatalow;            
-       uint32  fifodatahigh;           
-       uint32  pad;                    
-} dma64diag_t;
-
-
-typedef volatile struct {
-       uint32  ctrl1;          
-       uint32  ctrl2;          
-       uint32  addrlow;        
-       uint32  addrhigh;       
-} dma64dd_t;
-
-
-#define D64RINGALIGN_BITS 13   
-#define        D64MAXRINGSZ    (1 << D64RINGALIGN_BITS)
-#define        D64RINGALIGN    (1 << D64RINGALIGN_BITS)
-#define        D64MAXDD        (D64MAXRINGSZ / sizeof (dma64dd_t))
-
-
-#define        D64_XC_XE               0x00000001      
-#define        D64_XC_SE               0x00000002      
-#define        D64_XC_LE               0x00000004      
-#define        D64_XC_FL               0x00000010      
-#define        D64_XC_PD               0x00000800      
-#define        D64_XC_AE               0x00030000      
-#define        D64_XC_AE_SHIFT         16
-
-
-#define        D64_XP_LD_MASK          0x00000fff      
-
-
-#define        D64_XS0_CD_MASK         0x00001fff      
-#define        D64_XS0_XS_MASK         0xf0000000      
-#define        D64_XS0_XS_SHIFT                28
-#define        D64_XS0_XS_DISABLED     0x00000000      
-#define        D64_XS0_XS_ACTIVE       0x10000000      
-#define        D64_XS0_XS_IDLE         0x20000000      
-#define        D64_XS0_XS_STOPPED      0x30000000      
-#define        D64_XS0_XS_SUSP         0x40000000      
-
-#define        D64_XS1_AD_MASK         0x0001ffff      
-#define        D64_XS1_XE_MASK         0xf0000000      
-#define        D64_XS1_XE_SHIFT                28
-#define        D64_XS1_XE_NOERR        0x00000000      
-#define        D64_XS1_XE_DPE          0x10000000      
-#define        D64_XS1_XE_DFU          0x20000000      
-#define        D64_XS1_XE_DTE          0x30000000      
-#define        D64_XS1_XE_DESRE        0x40000000      
-#define        D64_XS1_XE_COREE        0x50000000      
-
-
-#define        D64_RC_RE               0x00000001      
-#define        D64_RC_RO_MASK          0x000000fe      
-#define        D64_RC_RO_SHIFT         1
-#define        D64_RC_FM               0x00000100      
-#define        D64_RC_SH               0x00000200      
-#define        D64_RC_OC               0x00000400      
-#define        D64_RC_PD               0x00000800      
-#define        D64_RC_AE               0x00030000      
-#define        D64_RC_AE_SHIFT         16
-
-
-#define        D64_RP_LD_MASK          0x00000fff      
-
-
-#define        D64_RS0_CD_MASK         0x00001fff      
-#define        D64_RS0_RS_MASK         0xf0000000      
-#define        D64_RS0_RS_SHIFT                28
-#define        D64_RS0_RS_DISABLED     0x00000000      
-#define        D64_RS0_RS_ACTIVE       0x10000000      
-#define        D64_RS0_RS_IDLE         0x20000000      
-#define        D64_RS0_RS_STOPPED      0x30000000      
-#define        D64_RS0_RS_SUSP         0x40000000      
-
-#define        D64_RS1_AD_MASK         0x0001ffff      
-#define        D64_RS1_RE_MASK         0xf0000000      
-#define        D64_RS1_RE_SHIFT                28
-#define        D64_RS1_RE_NOERR        0x00000000      
-#define        D64_RS1_RE_DPO          0x10000000      
-#define        D64_RS1_RE_DFU          0x20000000      
-#define        D64_RS1_RE_DTE          0x30000000      
-#define        D64_RS1_RE_DESRE        0x40000000      
-#define        D64_RS1_RE_COREE        0x50000000      
-
-
-#define        D64_FA_OFF_MASK         0xffff          
-#define        D64_FA_SEL_MASK         0xf0000         
-#define        D64_FA_SEL_SHIFT        16
-#define        D64_FA_SEL_XDD          0x00000         
-#define        D64_FA_SEL_XDP          0x10000         
-#define        D64_FA_SEL_RDD          0x40000         
-#define        D64_FA_SEL_RDP          0x50000         
-#define        D64_FA_SEL_XFD          0x80000         
-#define        D64_FA_SEL_XFP          0x90000         
-#define        D64_FA_SEL_RFD          0xc0000         
-#define        D64_FA_SEL_RFP          0xd0000         
-#define        D64_FA_SEL_RSD          0xe0000         
-#define        D64_FA_SEL_RSP          0xf0000         
-
-
-#define        D64_CTRL1_EOT           ((uint32)1 << 28)       
-#define        D64_CTRL1_IOC           ((uint32)1 << 29)       
-#define        D64_CTRL1_EOF           ((uint32)1 << 30)       
-#define        D64_CTRL1_SOF           ((uint32)1 << 31)       
-
-
-#define        D64_CTRL2_BC_MASK       0x00007fff      
-#define        D64_CTRL2_AE            0x00030000      
-#define        D64_CTRL2_AE_SHIFT      16
-#define D64_CTRL2_PARITY       0x00040000      
-
-
-#define        D64_CTRL_CORE_MASK      0x0ff00000
-
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/sbpcmcia.h b/drivers/net/wireless/bcm4319/include/sbpcmcia.h
deleted file mode 100644 (file)
index d6d8033..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * BCM43XX Sonics SiliconBackplane PCMCIA core hardware definitions.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sbpcmcia.h,v 13.31.4.1.2.3.8.7 2009/06/22 05:14:24 Exp $
- */
-
-
-#ifndef        _SBPCMCIA_H
-#define        _SBPCMCIA_H
-
-
-
-
-#define        PCMCIA_FCR              (0x700 / 2)
-
-#define        FCR0_OFF                0
-#define        FCR1_OFF                (0x40 / 2)
-#define        FCR2_OFF                (0x80 / 2)
-#define        FCR3_OFF                (0xc0 / 2)
-
-#define        PCMCIA_FCR0             (0x700 / 2)
-#define        PCMCIA_FCR1             (0x740 / 2)
-#define        PCMCIA_FCR2             (0x780 / 2)
-#define        PCMCIA_FCR3             (0x7c0 / 2)
-
-
-
-#define        PCMCIA_COR              0
-
-#define        COR_RST                 0x80
-#define        COR_LEV                 0x40
-#define        COR_IRQEN               0x04
-#define        COR_BLREN               0x01
-#define        COR_FUNEN               0x01
-
-
-#define        PCICIA_FCSR             (2 / 2)
-#define        PCICIA_PRR              (4 / 2)
-#define        PCICIA_SCR              (6 / 2)
-#define        PCICIA_ESR              (8 / 2)
-
-
-#define PCM_MEMOFF             0x0000
-#define F0_MEMOFF              0x1000
-#define F1_MEMOFF              0x2000
-#define F2_MEMOFF              0x3000
-#define F3_MEMOFF              0x4000
-
-
-#define MEM_ADDR0              (0x728 / 2)
-#define MEM_ADDR1              (0x72a / 2)
-#define MEM_ADDR2              (0x72c / 2)
-
-
-#define PCMCIA_ADDR0           (0x072e / 2)
-#define PCMCIA_ADDR1           (0x0730 / 2)
-#define PCMCIA_ADDR2           (0x0732 / 2)
-
-#define MEM_SEG                        (0x0734 / 2)
-#define SROM_CS                        (0x0736 / 2)
-#define SROM_DATAL             (0x0738 / 2)
-#define SROM_DATAH             (0x073a / 2)
-#define SROM_ADDRL             (0x073c / 2)
-#define SROM_ADDRH             (0x073e / 2)
-#define        SROM_INFO2              (0x0772 / 2)    
-#define        SROM_INFO               (0x07be / 2)    
-
-
-#define SROM_IDLE              0
-#define SROM_WRITE             1
-#define SROM_READ              2
-#define SROM_WEN               4
-#define SROM_WDS               7
-#define SROM_DONE              8
-
-
-#define        SRI_SZ_MASK             0x03
-#define        SRI_BLANK               0x04
-#define        SRI_OTP                 0x80
-
-
-
-#define SBTML_INT_ACK          0x40000         
-#define SBTML_INT_EN           0x20000         
-
-
-#define SBTMH_INT_STATUS       0x40000         
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/sbsdio.h b/drivers/net/wireless/bcm4319/include/sbsdio.h
deleted file mode 100644 (file)
index 75aaf4d..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * SDIO device core hardware definitions.
- * sdio is a portion of the pcmcia core in core rev 3 - rev 8
- *
- * SDIO core support 1bit, 4 bit SDIO mode as well as SPI mode.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sbsdio.h,v 13.29.4.1.22.3 2009/03/11 20:26:57 Exp $
- */
-
-#ifndef        _SBSDIO_H
-#define        _SBSDIO_H
-
-#define SBSDIO_NUM_FUNCTION            3       /* as of sdiod rev 0, supports 3 functions */
-
-/* function 1 miscellaneous registers */
-#define SBSDIO_SPROM_CS                        0x10000         /* sprom command and status */
-#define SBSDIO_SPROM_INFO              0x10001         /* sprom info register */
-#define SBSDIO_SPROM_DATA_LOW          0x10002         /* sprom indirect access data byte 0 */
-#define SBSDIO_SPROM_DATA_HIGH         0x10003         /* sprom indirect access data byte 1 */
-#define SBSDIO_SPROM_ADDR_LOW          0x10004         /* sprom indirect access addr byte 0 */
-#define SBSDIO_SPROM_ADDR_HIGH         0x10005         /* sprom indirect access addr byte 0 */
-#define SBSDIO_CHIP_CTRL_DATA          0x10006         /* xtal_pu (gpio) output */
-#define SBSDIO_CHIP_CTRL_EN            0x10007         /* xtal_pu (gpio) enable */
-#define SBSDIO_WATERMARK               0x10008         /* rev < 7, watermark for sdio device */
-#define SBSDIO_DEVICE_CTL              0x10009         /* control busy signal generation */
-
-/* registers introduced in rev 8, some content (mask/bits) defs in sbsdpcmdev.h */
-#define SBSDIO_FUNC1_SBADDRLOW         0x1000A         /* SB Address Window Low (b15) */
-#define SBSDIO_FUNC1_SBADDRMID         0x1000B         /* SB Address Window Mid (b23:b16) */
-#define SBSDIO_FUNC1_SBADDRHIGH                0x1000C         /* SB Address Window High (b31:b24)    */
-#define SBSDIO_FUNC1_FRAMECTRL         0x1000D         /* Frame Control (frame term/abort) */
-#define SBSDIO_FUNC1_CHIPCLKCSR                0x1000E         /* ChipClockCSR (ALP/HT ctl/status) */
-#define SBSDIO_FUNC1_SDIOPULLUP        0x1000F         /* SdioPullUp (on cmd, d0-d2) */
-#define SBSDIO_FUNC1_WFRAMEBCLO                0x10019         /* Write Frame Byte Count Low */
-#define SBSDIO_FUNC1_WFRAMEBCHI                0x1001A         /* Write Frame Byte Count High */
-#define SBSDIO_FUNC1_RFRAMEBCLO                0x1001B         /* Read Frame Byte Count Low */
-#define SBSDIO_FUNC1_RFRAMEBCHI                0x1001C         /* Read Frame Byte Count High */
-
-#define SBSDIO_FUNC1_MISC_REG_START    0x10000         /* f1 misc register start */
-#define SBSDIO_FUNC1_MISC_REG_LIMIT    0x1001C         /* f1 misc register end */
-
-/* SBSDIO_SPROM_CS */
-#define SBSDIO_SPROM_IDLE              0
-#define SBSDIO_SPROM_WRITE             1
-#define SBSDIO_SPROM_READ              2
-#define SBSDIO_SPROM_WEN               4
-#define SBSDIO_SPROM_WDS               7
-#define SBSDIO_SPROM_DONE              8
-
-/* SBSDIO_SPROM_INFO */
-#define SROM_SZ_MASK                   0x03            /* SROM size, 1: 4k, 2: 16k */
-#define SROM_BLANK                     0x04            /* depreciated in corerev 6 */
-#define        SROM_OTP                        0x80            /* OTP present */
-
-/* SBSDIO_CHIP_CTRL */
-#define SBSDIO_CHIP_CTRL_XTAL          0x01            /* or'd with onchip xtal_pu,
-                                                        * 1: power on oscillator
-                                                        * (for 4318 only)
-                                                        */
-/* SBSDIO_WATERMARK */
-#define SBSDIO_WATERMARK_MASK          0x7f            /* number of words - 1 for sd device
-                                                        * to wait before sending data to host
-                                                        */
-
-/* SBSDIO_DEVICE_CTL */
-#define SBSDIO_DEVCTL_SETBUSY          0x01            /* 1: device will assert busy signal when
-                                                        * receiving CMD53
-                                                        */
-#define SBSDIO_DEVCTL_SPI_INTR_SYNC    0x02            /* 1: assertion of sdio interrupt is
-                                                        * synchronous to the sdio clock
-                                                        */
-#define SBSDIO_DEVCTL_CA_INT_ONLY      0x04            /* 1: mask all interrupts to host
-                                                        * except the chipActive (rev 8)
-                                                        */
-#define SBSDIO_DEVCTL_PADS_ISO         0x08            /* 1: isolate internal sdio signals, put
-                                                        * external pads in tri-state; requires
-                                                        * sdio bus power cycle to clear (rev 9)
-                                                        */
-#define SBSDIO_DEVCTL_SB_RST_CTL       0x30            /* Force SD->SB reset mapping (rev 11) */
-#define SBSDIO_DEVCTL_RST_CORECTL      0x00            /*   Determined by CoreControl bit */
-#define SBSDIO_DEVCTL_RST_BPRESET      0x10            /*   Force backplane reset */
-#define SBSDIO_DEVCTL_RST_NOBPRESET    0x20            /*   Force no backplane reset */
-
-
-/* SBSDIO_FUNC1_CHIPCLKCSR */
-#define SBSDIO_FORCE_ALP               0x01            /* Force ALP request to backplane */
-#define SBSDIO_FORCE_HT                        0x02            /* Force HT request to backplane */
-#define SBSDIO_FORCE_ILP               0x04            /* Force ILP request to backplane */
-#define SBSDIO_ALP_AVAIL_REQ           0x08            /* Make ALP ready (power up xtal) */
-#define SBSDIO_HT_AVAIL_REQ            0x10            /* Make HT ready (power up PLL) */
-#define SBSDIO_FORCE_HW_CLKREQ_OFF     0x20            /* Squelch clock requests from HW */
-#define SBSDIO_ALP_AVAIL               0x40            /* Status: ALP is ready */
-#define SBSDIO_HT_AVAIL                        0x80            /* Status: HT is ready */
-/* In rev8, actual avail bits followed original docs */
-#define SBSDIO_Rev8_HT_AVAIL           0x40
-#define SBSDIO_Rev8_ALP_AVAIL          0x80
-
-#define SBSDIO_AVBITS                  (SBSDIO_HT_AVAIL | SBSDIO_ALP_AVAIL)
-#define SBSDIO_ALPAV(regval)           ((regval) & SBSDIO_AVBITS)
-#define SBSDIO_HTAV(regval)            (((regval) & SBSDIO_AVBITS) == SBSDIO_AVBITS)
-#define SBSDIO_ALPONLY(regval)         (SBSDIO_ALPAV(regval) && !SBSDIO_HTAV(regval))
-#define SBSDIO_CLKAV(regval, alponly)  (SBSDIO_ALPAV(regval) && \
-                                       (alponly ? 1 : SBSDIO_HTAV(regval)))
-
-/* SBSDIO_FUNC1_SDIOPULLUP */
-#define SBSDIO_PULLUP_D0               0x01            /* Enable D0/MISO pullup */
-#define SBSDIO_PULLUP_D1               0x02            /* Enable D1/INT# pullup */
-#define SBSDIO_PULLUP_D2               0x04            /* Enable D2 pullup */
-#define SBSDIO_PULLUP_CMD              0x08            /* Enable CMD/MOSI pullup */
-#define SBSDIO_PULLUP_ALL              0x0f            /* All valid bits */
-
-/* function 1 OCP space */
-#define SBSDIO_SB_OFT_ADDR_MASK                0x07FFF         /* sb offset addr is <= 15 bits, 32k */
-#define SBSDIO_SB_OFT_ADDR_LIMIT       0x08000
-#define SBSDIO_SB_ACCESS_2_4B_FLAG     0x08000         /* with b15, maps to 32-bit SB access */
-
-/* some duplication with sbsdpcmdev.h here */
-/* valid bits in SBSDIO_FUNC1_SBADDRxxx regs */
-#define SBSDIO_SBADDRLOW_MASK          0x80            /* Valid bits in SBADDRLOW */
-#define SBSDIO_SBADDRMID_MASK          0xff            /* Valid bits in SBADDRMID */
-#define SBSDIO_SBADDRHIGH_MASK         0xffU           /* Valid bits in SBADDRHIGH */
-#define SBSDIO_SBWINDOW_MASK           0xffff8000      /* Address bits from SBADDR regs */
-
-/* direct(mapped) cis space */
-#define SBSDIO_CIS_BASE_COMMON         0x1000          /* MAPPED common CIS address */
-#define SBSDIO_CIS_SIZE_LIMIT          0x200           /* maximum bytes in one CIS */
-#define SBSDIO_OTP_CIS_SIZE_LIMIT       0x078           /* maximum bytes OTP CIS */
-
-#define SBSDIO_CIS_OFT_ADDR_MASK       0x1FFFF         /* cis offset addr is < 17 bits */
-
-#define SBSDIO_CIS_MANFID_TUPLE_LEN    6               /* manfid tuple length, include tuple,
-                                                        * link bytes
-                                                        */
-
-/* indirect cis access (in sprom) */
-#define SBSDIO_SPROM_CIS_OFFSET                0x8             /* 8 control bytes first, CIS starts from
-                                                        * 8th byte
-                                                        */
-
-#define SBSDIO_BYTEMODE_DATALEN_MAX    64              /* sdio byte mode: maximum length of one
-                                                        * data comamnd
-                                                        */
-
-#define SBSDIO_CORE_ADDR_MASK          0x1FFFF         /* sdio core function one address mask */
-
-#endif /* _SBSDIO_H */
diff --git a/drivers/net/wireless/bcm4319/include/sbsdpcmdev.h b/drivers/net/wireless/bcm4319/include/sbsdpcmdev.h
deleted file mode 100644 (file)
index 7c7c7e4..0000000
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Broadcom SiliconBackplane SDIO/PCMCIA hardware-specific device core support
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sbsdpcmdev.h,v 13.29.4.1.4.6.6.2 2008/12/31 21:16:51 Exp $
- */
-
-#ifndef        _sbsdpcmdev_h_
-#define        _sbsdpcmdev_h_
-
-/* cpp contortions to concatenate w/arg prescan */
-#ifndef PAD
-#define        _PADLINE(line)  pad ## line
-#define        _XSTR(line)     _PADLINE(line)
-#define        PAD             _XSTR(__LINE__)
-#endif /* PAD */
-
-
-typedef volatile struct {
-       dma64regs_t     xmt;            /* dma tx */
-       uint32 PAD[2];
-       dma64regs_t     rcv;            /* dma rx */
-       uint32 PAD[2];
-} dma64p_t;
-
-/* dma64 sdiod corerev >= 1 */
-typedef volatile struct {
-       dma64p_t dma64regs[2];
-       dma64diag_t dmafifo;            /* DMA Diagnostic Regs, 0x280-0x28c */
-       uint32 PAD[92];
-} sdiodma64_t;
-
-/* dma32 sdiod corerev == 0 */
-typedef volatile struct {
-       dma32regp_t dma32regs[2];       /* dma tx & rx, 0x200-0x23c */
-       dma32diag_t dmafifo;            /* DMA Diagnostic Regs, 0x240-0x24c */
-       uint32 PAD[108];
-} sdiodma32_t;
-
-/* dma32 regs for pcmcia core */
-typedef volatile struct {
-       dma32regp_t dmaregs;            /* DMA Regs, 0x200-0x21c, rev8 */
-       dma32diag_t dmafifo;            /* DMA Diagnostic Regs, 0x220-0x22c */
-       uint32 PAD[116];
-} pcmdma32_t;
-
-/* core registers */
-typedef volatile struct {
-       uint32 corecontrol;             /* CoreControl, 0x000, rev8 */
-       uint32 corestatus;              /* CoreStatus, 0x004, rev8  */
-       uint32 PAD[1];
-       uint32 biststatus;              /* BistStatus, 0x00c, rev8  */
-
-       /* PCMCIA access */
-       uint16 pcmciamesportaladdr;     /* PcmciaMesPortalAddr, 0x010, rev8   */
-       uint16 PAD[1];
-       uint16 pcmciamesportalmask;     /* PcmciaMesPortalMask, 0x014, rev8   */
-       uint16 PAD[1];
-       uint16 pcmciawrframebc;         /* PcmciaWrFrameBC, 0x018, rev8   */
-       uint16 PAD[1];
-       uint16 pcmciaunderflowtimer;    /* PcmciaUnderflowTimer, 0x01c, rev8   */
-       uint16 PAD[1];
-
-       /* interrupt */
-       uint32 intstatus;               /* IntStatus, 0x020, rev8   */
-       uint32 hostintmask;             /* IntHostMask, 0x024, rev8   */
-       uint32 intmask;                 /* IntSbMask, 0x028, rev8   */
-       uint32 sbintstatus;             /* SBIntStatus, 0x02c, rev8   */
-       uint32 sbintmask;               /* SBIntMask, 0x030, rev8   */
-       uint32 PAD[3];
-       uint32 tosbmailbox;             /* ToSBMailbox, 0x040, rev8   */
-       uint32 tohostmailbox;           /* ToHostMailbox, 0x044, rev8   */
-       uint32 tosbmailboxdata;         /* ToSbMailboxData, 0x048, rev8   */
-       uint32 tohostmailboxdata;       /* ToHostMailboxData, 0x04c, rev8   */
-
-       /* synchronized access to registers in SDIO clock domain */
-       uint32 sdioaccess;              /* SdioAccess, 0x050, rev8   */
-       uint32 PAD[3];
-
-       /* PCMCIA frame control */
-       uint8  pcmciaframectrl;         /* pcmciaFrameCtrl, 0x060, rev8   */
-       uint8  PAD[3];
-       uint8  pcmciawatermark;         /* pcmciaWaterMark, 0x064, rev8   */
-       uint8  PAD[155];
-
-       /* interrupt batching control */
-       uint32 intrcvlazy;              /* IntRcvLazy, 0x100, rev8 */
-       uint32 PAD[3];
-
-       /* counters */
-       uint32 cmd52rd;                 /* Cmd52RdCount, 0x110, rev8, SDIO: cmd52 reads */
-       uint32 cmd52wr;                 /* Cmd52WrCount, 0x114, rev8, SDIO: cmd52 writes */
-       uint32 cmd53rd;                 /* Cmd53RdCount, 0x118, rev8, SDIO: cmd53 reads */
-       uint32 cmd53wr;                 /* Cmd53WrCount, 0x11c, rev8, SDIO: cmd53 writes */
-       uint32 abort;                   /* AbortCount, 0x120, rev8, SDIO: aborts */
-       uint32 datacrcerror;            /* DataCrcErrorCount, 0x124, rev8, SDIO: frames w/bad CRC */
-       uint32 rdoutofsync;             /* RdOutOfSyncCount, 0x128, rev8, SDIO/PCMCIA: Rd Frm OOS */
-       uint32 wroutofsync;             /* RdOutOfSyncCount, 0x12c, rev8, SDIO/PCMCIA: Wr Frm OOS */
-       uint32 writebusy;               /* WriteBusyCount, 0x130, rev8, SDIO: dev asserted "busy" */
-       uint32 readwait;                /* ReadWaitCount, 0x134, rev8, SDIO: read: no data avail */
-       uint32 readterm;                /* ReadTermCount, 0x138, rev8, SDIO: rd frm terminates */
-       uint32 writeterm;               /* WriteTermCount, 0x13c, rev8, SDIO: wr frm terminates */
-       uint32 PAD[40];
-       uint32 clockctlstatus;          /* ClockCtlStatus, 0x1e0, rev8 */
-       uint32 PAD[7];
-
-       /* DMA engines */
-       volatile union {
-               pcmdma32_t pcm32;
-               sdiodma32_t sdiod32;
-               sdiodma64_t sdiod64;
-       } dma;
-
-       /* SDIO/PCMCIA CIS region */
-       char cis[512];                  /* 512 byte CIS, 0x400-0x5ff, rev6 */
-
-       /* PCMCIA function control registers */
-       char pcmciafcr[256];            /* PCMCIA FCR, 0x600-6ff, rev6 */
-       uint16 PAD[55];
-
-       /* PCMCIA backplane access */
-       uint16 backplanecsr;            /* BackplaneCSR, 0x76E, rev6 */
-       uint16 backplaneaddr0;          /* BackplaneAddr0, 0x770, rev6 */
-       uint16 backplaneaddr1;          /* BackplaneAddr1, 0x772, rev6 */
-       uint16 backplaneaddr2;          /* BackplaneAddr2, 0x774, rev6 */
-       uint16 backplaneaddr3;          /* BackplaneAddr3, 0x776, rev6 */
-       uint16 backplanedata0;          /* BackplaneData0, 0x778, rev6 */
-       uint16 backplanedata1;          /* BackplaneData1, 0x77a, rev6 */
-       uint16 backplanedata2;          /* BackplaneData2, 0x77c, rev6 */
-       uint16 backplanedata3;          /* BackplaneData3, 0x77e, rev6 */
-       uint16 PAD[31];
-
-       /* sprom "size" & "blank" info */
-       uint16 spromstatus;             /* SPROMStatus, 0x7BE, rev2 */
-       uint32 PAD[464];
-
-       /* Sonics SiliconBackplane registers */
-       sbconfig_t sbconfig;            /* SbConfig Regs, 0xf00-0xfff, rev8 */
-} sdpcmd_regs_t;
-
-/* corecontrol */
-#define CC_CISRDY      (1 << 0)        /* CIS Ready */
-#define CC_BPRESEN     (1 << 1)        /* CCCR RES signal causes backplane reset */
-#define CC_F2RDY       (1 << 2)        /* set CCCR IOR2 bit */
-#define CC_CLRPADSISO  (1 << 3)        /* clear SDIO pads isolation bit (rev 11) */
-
-/* corestatus */
-#define CS_PCMCIAMODE  (1 << 0)        /* Device Mode; 0=SDIO, 1=PCMCIA */
-#define CS_SMARTDEV    (1 << 1)        /* 1=smartDev enabled */
-#define CS_F2ENABLED   (1 << 2)        /* 1=host has enabled the device */
-
-#define PCMCIA_MES_PA_MASK     0x7fff  /* PCMCIA Message Portal Address Mask */
-#define PCMCIA_MES_PM_MASK     0x7fff  /* PCMCIA Message Portal Mask Mask */
-#define PCMCIA_WFBC_MASK       0xffff  /* PCMCIA Write Frame Byte Count Mask */
-#define PCMCIA_UT_MASK         0x07ff  /* PCMCIA Underflow Timer Mask */
-
-/* intstatus */
-#define I_SMB_SW0      (1 << 0)        /* To SB Mail S/W interrupt 0 */
-#define I_SMB_SW1      (1 << 1)        /* To SB Mail S/W interrupt 1 */
-#define I_SMB_SW2      (1 << 2)        /* To SB Mail S/W interrupt 2 */
-#define I_SMB_SW3      (1 << 3)        /* To SB Mail S/W interrupt 3 */
-#define I_SMB_SW_MASK  0x0000000f      /* To SB Mail S/W interrupts mask */
-#define I_SMB_SW_SHIFT 0               /* To SB Mail S/W interrupts shift */
-#define I_HMB_SW0      (1 << 4)        /* To Host Mail S/W interrupt 0 */
-#define I_HMB_SW1      (1 << 5)        /* To Host Mail S/W interrupt 1 */
-#define I_HMB_SW2      (1 << 6)        /* To Host Mail S/W interrupt 2 */
-#define I_HMB_SW3      (1 << 7)        /* To Host Mail S/W interrupt 3 */
-#define I_HMB_SW_MASK  0x000000f0      /* To Host Mail S/W interrupts mask */
-#define I_HMB_SW_SHIFT 4               /* To Host Mail S/W interrupts shift */
-#define I_WR_OOSYNC    (1 << 8)        /* Write Frame Out Of Sync */
-#define I_RD_OOSYNC    (1 << 9)        /* Read Frame Out Of Sync */
-#define        I_PC            (1 << 10)       /* descriptor error */
-#define        I_PD            (1 << 11)       /* data error */
-#define        I_DE            (1 << 12)       /* Descriptor protocol Error */
-#define        I_RU            (1 << 13)       /* Receive descriptor Underflow */
-#define        I_RO            (1 << 14)       /* Receive fifo Overflow */
-#define        I_XU            (1 << 15)       /* Transmit fifo Underflow */
-#define        I_RI            (1 << 16)       /* Receive Interrupt */
-#define I_BUSPWR       (1 << 17)       /* SDIO Bus Power Change (rev 9) */
-#define        I_XI            (1 << 24)       /* Transmit Interrupt */
-#define I_RF_TERM      (1 << 25)       /* Read Frame Terminate */
-#define I_WF_TERM      (1 << 26)       /* Write Frame Terminate */
-#define I_PCMCIA_XU    (1 << 27)       /* PCMCIA Transmit FIFO Underflow */
-#define I_SBINT                (1 << 28)       /* sbintstatus Interrupt */
-#define I_CHIPACTIVE   (1 << 29)       /* chip transitioned from doze to active state */
-#define I_SRESET       (1 << 30)       /* CCCR RES interrupt */
-#define I_IOE2         (1U << 31)      /* CCCR IOE2 Bit Changed */
-#define        I_ERRORS        (I_PC | I_PD | I_DE | I_RU | I_RO | I_XU)       /* DMA Errors */
-#define I_DMA          (I_RI | I_XI | I_ERRORS)
-
-/* sbintstatus */
-#define I_SB_SERR      (1 << 8)        /* Backplane SError (write) */
-#define I_SB_RESPERR   (1 << 9)        /* Backplane Response Error (read) */
-#define I_SB_SPROMERR  (1 << 10)       /* Error accessing the sprom */
-
-/* sdioaccess */
-#define SDA_DATA_MASK  0x000000ff      /* Read/Write Data Mask */
-#define SDA_ADDR_MASK  0x000fff00      /* Read/Write Address Mask */
-#define SDA_ADDR_SHIFT 8               /* Read/Write Address Shift */
-#define SDA_WRITE      0x01000000      /* Write bit  */
-#define SDA_READ       0x00000000      /* Write bit cleared for Read */
-#define SDA_BUSY       0x80000000      /* Busy bit */
-
-/* sdioaccess-accessible register address spaces */
-#define SDA_CCCR_SPACE         0x000   /* sdioAccess CCCR register space */
-#define SDA_F1_FBR_SPACE       0x100   /* sdioAccess F1 FBR register space */
-#define SDA_F2_FBR_SPACE       0x200   /* sdioAccess F2 FBR register space */
-#define SDA_F1_REG_SPACE       0x300   /* sdioAccess F1 core-specific register space */
-
-/* SDA_F1_REG_SPACE sdioaccess-accessible F1 reg space register offsets */
-#define SDA_CHIPCONTROLDATA    0x006   /* ChipControlData */
-#define SDA_CHIPCONTROLENAB    0x007   /* ChipControlEnable */
-#define SDA_F2WATERMARK                0x008   /* Function 2 Watermark */
-#define SDA_DEVICECONTROL      0x009   /* DeviceControl */
-#define SDA_SBADDRLOW          0x00a   /* SbAddrLow */
-#define SDA_SBADDRMID          0x00b   /* SbAddrMid */
-#define SDA_SBADDRHIGH         0x00c   /* SbAddrHigh */
-#define SDA_FRAMECTRL          0x00d   /* FrameCtrl */
-#define SDA_CHIPCLOCKCSR       0x00e   /* ChipClockCSR */
-#define SDA_SDIOPULLUP         0x00f   /* SdioPullUp */
-#define SDA_SDIOWRFRAMEBCLOW   0x019   /* SdioWrFrameBCLow */
-#define SDA_SDIOWRFRAMEBCHIGH  0x01a   /* SdioWrFrameBCHigh */
-#define SDA_SDIORDFRAMEBCLOW   0x01b   /* SdioRdFrameBCLow */
-#define SDA_SDIORDFRAMEBCHIGH  0x01c   /* SdioRdFrameBCHigh */
-
-/* SDA_F2WATERMARK */
-#define SDA_F2WATERMARK_MASK   0x7f    /* F2Watermark Mask */
-
-/* SDA_SBADDRLOW */
-#define SDA_SBADDRLOW_MASK     0x80    /* SbAddrLow Mask */
-
-/* SDA_SBADDRMID */
-#define SDA_SBADDRMID_MASK     0xff    /* SbAddrMid Mask */
-
-/* SDA_SBADDRHIGH */
-#define SDA_SBADDRHIGH_MASK    0xff    /* SbAddrHigh Mask */
-
-/* SDA_FRAMECTRL */
-#define SFC_RF_TERM    (1 << 0)        /* Read Frame Terminate */
-#define SFC_WF_TERM    (1 << 1)        /* Write Frame Terminate */
-#define SFC_CRC4WOOS   (1 << 2)        /* HW reports CRC error for write out of sync */
-#define SFC_ABORTALL   (1 << 3)        /* Abort cancels all in-progress frames */
-
-/* pcmciaframectrl */
-#define PFC_RF_TERM    (1 << 0)        /* Read Frame Terminate */
-#define PFC_WF_TERM    (1 << 1)        /* Write Frame Terminate */
-
-/* intrcvlazy */
-#define        IRL_TO_MASK     0x00ffffff      /* timeout */
-#define        IRL_FC_MASK     0xff000000      /* frame count */
-#define        IRL_FC_SHIFT    24              /* frame count */
-
-/* rx header */
-typedef volatile struct {
-       uint16 len;
-       uint16 flags;
-} sdpcmd_rxh_t;
-
-/* rx header flags */
-#define RXF_CRC                0x0001          /* CRC error detected */
-#define RXF_WOOS       0x0002          /* write frame out of sync */
-#define RXF_WF_TERM    0x0004          /* write frame terminated */
-#define RXF_ABORT      0x0008          /* write frame aborted */
-#define RXF_DISCARD    (RXF_CRC | RXF_WOOS | RXF_WF_TERM | RXF_ABORT)  /* bad frame */
-
-/* HW frame tag */
-#define SDPCM_FRAMETAG_LEN     4       /* HW frametag: 2 bytes len, 2 bytes check val */
-
-#endif /* _sbsdpcmdev_h_ */
diff --git a/drivers/net/wireless/bcm4319/include/sbsocram.h b/drivers/net/wireless/bcm4319/include/sbsocram.h
deleted file mode 100644 (file)
index 5ede0b6..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * BCM47XX Sonics SiliconBackplane embedded ram core
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sbsocram.h,v 13.9.162.2 2008/12/12 14:13:27 Exp $
- */
-
-
-#ifndef        _SBSOCRAM_H
-#define        _SBSOCRAM_H
-
-#ifndef _LANGUAGE_ASSEMBLY
-
-
-#ifndef PAD
-#define        _PADLINE(line)  pad ## line
-#define        _XSTR(line)     _PADLINE(line)
-#define        PAD             _XSTR(__LINE__)
-#endif 
-
-
-typedef volatile struct sbsocramregs {
-       uint32  coreinfo;
-       uint32  bwalloc;
-       uint32  extracoreinfo;
-       uint32  biststat;
-       uint32  bankidx;
-       uint32  standbyctrl;
-
-       uint32  errlogstatus;   
-       uint32  errlogaddr;     
-       
-       uint32  cambankidx;
-       uint32  cambankstandbyctrl;
-       uint32  cambankpatchctrl;
-       uint32  cambankpatchtblbaseaddr;
-       uint32  cambankcmdreg;
-       uint32  cambankdatareg;
-       uint32  cambankmaskreg;
-       uint32  PAD[17];
-       uint32  extmemconfig;
-       uint32  extmemparitycsr;
-       uint32  extmemparityerrdata;
-       uint32  extmemparityerrcnt;
-       uint32  extmemwrctrlandsize;
-       uint32  PAD[84];
-       uint32  workaround;
-       uint32  pwrctl;         
-} sbsocramregs_t;
-
-#endif 
-
-
-#define        SR_COREINFO             0x00
-#define        SR_BWALLOC              0x04
-#define        SR_BISTSTAT             0x0c
-#define        SR_BANKINDEX            0x10
-#define        SR_BANKSTBYCTL          0x14
-#define SR_PWRCTL              0x1e8
-
-
-#define        SRCI_PT_MASK            0x00070000      
-#define        SRCI_PT_SHIFT           16
-
-#define SRCI_PT_OCP_OCP                0
-#define SRCI_PT_AXI_OCP                1
-#define SRCI_PT_ARM7AHB_OCP    2
-#define SRCI_PT_CM3AHB_OCP     3
-#define SRCI_PT_AXI_AXI                4
-#define SRCI_PT_AHB_AXI                5
-
-#define SRCI_LSS_MASK          0x00f00000
-#define SRCI_LSS_SHIFT         20
-#define SRCI_LRS_MASK          0x0f000000
-#define SRCI_LRS_SHIFT         24
-
-
-#define        SRCI_MS0_MASK           0xf
-#define SR_MS0_BASE            16
-
-
-#define        SRCI_ROMNB_MASK         0xf000
-#define        SRCI_ROMNB_SHIFT        12
-#define        SRCI_ROMBSZ_MASK        0xf00
-#define        SRCI_ROMBSZ_SHIFT       8
-#define        SRCI_SRNB_MASK          0xf0
-#define        SRCI_SRNB_SHIFT         4
-#define        SRCI_SRBSZ_MASK         0xf
-#define        SRCI_SRBSZ_SHIFT        0
-
-#define SR_BSZ_BASE            14
-
-
-#define        SRSC_SBYOVR_MASK        0x80000000
-#define        SRSC_SBYOVR_SHIFT       31
-#define        SRSC_SBYOVRVAL_MASK     0x60000000
-#define        SRSC_SBYOVRVAL_SHIFT    29
-#define        SRSC_SBYEN_MASK         0x01000000      
-#define        SRSC_SBYEN_SHIFT        24
-
-
-#define SRPC_PMU_STBYDIS_MASK  0x00000010      
-#define SRPC_PMU_STBYDIS_SHIFT 4
-#define SRPC_STBYOVRVAL_MASK   0x00000008
-#define SRPC_STBYOVRVAL_SHIFT  3
-#define SRPC_STBYOVR_MASK      0x00000007
-#define SRPC_STBYOVR_SHIFT     0
-
-
-#define SRECC_NUM_BANKS_MASK   0x000000F0
-#define SRECC_NUM_BANKS_SHIFT  4
-#define SRECC_BANKSIZE_MASK    0x0000000F
-#define SRECC_BANKSIZE_SHIFT   0
-
-#define SRECC_BANKSIZE(value)   (1 << (value))
-
-
-#define SRCBPC_PATCHENABLE 0x80000000
-
-#define SRP_ADDRESS   0x0001FFFC
-#define SRP_VALID     0x8000
-
-
-#define SRCMD_WRITE  0x00020000
-#define SRCMD_READ   0x00010000
-#define SRCMD_DONE   0x80000000
-
-#define SRCMD_DONE_DLY 1000
-
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/sdio.h b/drivers/net/wireless/bcm4319/include/sdio.h
deleted file mode 100644 (file)
index 280cb84..0000000
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
- * SDIO spec header file
- * Protocol and standard (common) device definitions
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sdio.h,v 13.24.4.1.4.1.16.1 2009/08/12 01:08:02 Exp $
- */
-
-#ifndef        _SDIO_H
-#define        _SDIO_H
-
-
-/* CCCR structure for function 0 */
-typedef volatile struct {
-       uint8   cccr_sdio_rev;          /* RO, cccr and sdio revision */
-       uint8   sd_rev;                 /* RO, sd spec revision */
-       uint8   io_en;                  /* I/O enable */
-       uint8   io_rdy;                 /* I/O ready reg */
-       uint8   intr_ctl;               /* Master and per function interrupt enable control */
-       uint8   intr_status;            /* RO, interrupt pending status */
-       uint8   io_abort;               /* read/write abort or reset all functions */
-       uint8   bus_inter;              /* bus interface control */
-       uint8   capability;             /* RO, card capability */
-
-       uint8   cis_base_low;           /* 0x9 RO, common CIS base address, LSB */
-       uint8   cis_base_mid;
-       uint8   cis_base_high;          /* 0xB RO, common CIS base address, MSB */
-
-       /* suspend/resume registers */
-       uint8   bus_suspend;            /* 0xC */
-       uint8   func_select;            /* 0xD */
-       uint8   exec_flag;              /* 0xE */
-       uint8   ready_flag;             /* 0xF */
-
-       uint8   fn0_blk_size[2];        /* 0x10(LSB), 0x11(MSB) */
-
-       uint8   power_control;          /* 0x12 (SDIO version 1.10) */
-
-       uint8   speed_control;          /* 0x13 */
-} sdio_regs_t;
-
-/* SDIO Device CCCR offsets */
-#define SDIOD_CCCR_REV                 0x00
-#define SDIOD_CCCR_SDREV               0x01
-#define SDIOD_CCCR_IOEN                        0x02
-#define SDIOD_CCCR_IORDY               0x03
-#define SDIOD_CCCR_INTEN               0x04
-#define SDIOD_CCCR_INTPEND             0x05
-#define SDIOD_CCCR_IOABORT             0x06
-#define SDIOD_CCCR_BICTRL              0x07
-#define SDIOD_CCCR_CAPABLITIES         0x08
-#define SDIOD_CCCR_CISPTR_0            0x09
-#define SDIOD_CCCR_CISPTR_1            0x0A
-#define SDIOD_CCCR_CISPTR_2            0x0B
-#define SDIOD_CCCR_BUSSUSP             0x0C
-#define SDIOD_CCCR_FUNCSEL             0x0D
-#define SDIOD_CCCR_EXECFLAGS           0x0E
-#define SDIOD_CCCR_RDYFLAGS            0x0F
-#define SDIOD_CCCR_BLKSIZE_0           0x10
-#define SDIOD_CCCR_BLKSIZE_1           0x11
-#define SDIOD_CCCR_POWER_CONTROL       0x12
-#define SDIOD_CCCR_SPEED_CONTROL       0x13
-
-/* Broadcom extensions (corerev >= 1) */
-#define SDIOD_CCCR_BRCM_SEPINT         0xf2
-
-/* cccr_sdio_rev */
-#define SDIO_REV_SDIOID_MASK   0xf0    /* SDIO spec revision number */
-#define SDIO_REV_CCCRID_MASK   0x0f    /* CCCR format version number */
-
-/* sd_rev */
-#define SD_REV_PHY_MASK                0x0f    /* SD format version number */
-
-/* io_en */
-#define SDIO_FUNC_ENABLE_1     0x02    /* function 1 I/O enable */
-#define SDIO_FUNC_ENABLE_2     0x04    /* function 2 I/O enable */
-
-/* io_rdys */
-#define SDIO_FUNC_READY_1      0x02    /* function 1 I/O ready */
-#define SDIO_FUNC_READY_2      0x04    /* function 2 I/O ready */
-
-/* intr_ctl */
-#define INTR_CTL_MASTER_EN     0x1     /* interrupt enable master */
-#define INTR_CTL_FUNC1_EN      0x2     /* interrupt enable for function 1 */
-#define INTR_CTL_FUNC2_EN      0x4     /* interrupt enable for function 2 */
-
-/* intr_status */
-#define INTR_STATUS_FUNC1      0x2     /* interrupt pending for function 1 */
-#define INTR_STATUS_FUNC2      0x4     /* interrupt pending for function 2 */
-
-/* io_abort */
-#define IO_ABORT_RESET_ALL     0x08    /* I/O card reset */
-#define IO_ABORT_FUNC_MASK     0x07    /* abort selction: function x */
-
-/* bus_inter */
-#define BUS_CARD_DETECT_DIS    0x80    /* Card Detect disable */
-#define BUS_SPI_CONT_INTR_CAP  0x40    /* support continuous SPI interrupt */
-#define BUS_SPI_CONT_INTR_EN   0x20    /* continuous SPI interrupt enable */
-#define BUS_SD_DATA_WIDTH_MASK 0x03    /* bus width mask */
-#define BUS_SD_DATA_WIDTH_4BIT 0x02    /* bus width 4-bit mode */
-#define BUS_SD_DATA_WIDTH_1BIT 0x00    /* bus width 1-bit mode */
-
-/* capability */
-#define SDIO_CAP_4BLS          0x80    /* 4-bit support for low speed card */
-#define SDIO_CAP_LSC           0x40    /* low speed card */
-#define SDIO_CAP_E4MI          0x20    /* enable interrupt between block of data in 4-bit mode */
-#define SDIO_CAP_S4MI          0x10    /* support interrupt between block of data in 4-bit mode */
-#define SDIO_CAP_SBS           0x08    /* support suspend/resume */
-#define SDIO_CAP_SRW           0x04    /* support read wait */
-#define SDIO_CAP_SMB           0x02    /* support multi-block transfer */
-#define SDIO_CAP_SDC           0x01    /* Support Direct commands during multi-byte transfer */
-
-/* power_control */
-#define SDIO_POWER_SMPC                0x01    /* supports master power control (RO) */
-#define SDIO_POWER_EMPC                0x02    /* enable master power control (allow > 200mA) (RW) */
-
-/* speed_control (control device entry into high-speed clocking mode) */
-#define SDIO_SPEED_SHS         0x01    /* supports high-speed [clocking] mode (RO) */
-#define SDIO_SPEED_EHS         0x02    /* enable high-speed [clocking] mode (RW) */
-
-/* brcm sepint */
-#define SDIO_SEPINT_MASK       0x01    /* route sdpcmdev intr onto separate pad (chip-specific) */
-#define SDIO_SEPINT_OE         0x02    /* 1 asserts output enable for above pad */
-#define SDIO_SEPINT_ACT_HI     0x04    /* use active high interrupt level instead of active low */
-
-/* FBR structure for function 1-7, FBR addresses and register offsets */
-typedef volatile struct {
-       uint8   devctr;                 /* device interface, CSA control */
-       uint8   ext_dev;                /* extended standard I/O device type code */
-       uint8   pwr_sel;                /* power selection support */
-       uint8   PAD[6];                 /* reserved */
-
-       uint8   cis_low;                /* CIS LSB */
-       uint8   cis_mid;
-       uint8   cis_high;               /* CIS MSB */
-       uint8   csa_low;                /* code storage area, LSB */
-       uint8   csa_mid;
-       uint8   csa_high;               /* code storage area, MSB */
-       uint8   csa_dat_win;            /* data access window to function */
-
-       uint8   fnx_blk_size[2];        /* block size, little endian */
-} sdio_fbr_t;
-
-/* Maximum number of I/O funcs */
-#define SDIOD_MAX_IOFUNCS              7
-
-/* SDIO Device FBR Start Address  */
-#define SDIOD_FBR_STARTADDR            0x100
-
-/* SDIO Device FBR Size */
-#define SDIOD_FBR_SIZE                 0x100
-
-/* Macro to calculate FBR register base */
-#define SDIOD_FBR_BASE(n)              ((n) * 0x100)
-
-/* Function register offsets */
-#define SDIOD_FBR_DEVCTR               0x00    /* basic info for function */
-#define SDIOD_FBR_EXT_DEV              0x01    /* extended I/O device code */
-#define SDIOD_FBR_PWR_SEL              0x02    /* power selection bits */
-
-/* SDIO Function CIS ptr offset */
-#define SDIOD_FBR_CISPTR_0             0x09
-#define SDIOD_FBR_CISPTR_1             0x0A
-#define SDIOD_FBR_CISPTR_2             0x0B
-
-/* Code Storage Area pointer */
-#define SDIOD_FBR_CSA_ADDR_0           0x0C
-#define SDIOD_FBR_CSA_ADDR_1           0x0D
-#define SDIOD_FBR_CSA_ADDR_2           0x0E
-#define SDIOD_FBR_CSA_DATA             0x0F
-
-/* SDIO Function I/O Block Size */
-#define SDIOD_FBR_BLKSIZE_0            0x10
-#define SDIOD_FBR_BLKSIZE_1            0x11
-
-/* devctr */
-#define SDIOD_FBR_DEVCTR_DIC   0x0f    /* device interface code */
-#define SDIOD_FBR_DECVTR_CSA   0x40    /* CSA support flag */
-#define SDIOD_FBR_DEVCTR_CSA_EN        0x80    /* CSA enabled */
-/* interface codes */
-#define SDIOD_DIC_NONE         0       /* SDIO standard interface is not supported */
-#define SDIOD_DIC_UART         1
-#define SDIOD_DIC_BLUETOOTH_A  2
-#define SDIOD_DIC_BLUETOOTH_B  3
-#define SDIOD_DIC_GPS          4
-#define SDIOD_DIC_CAMERA       5
-#define SDIOD_DIC_PHS          6
-#define SDIOD_DIC_WLAN         7
-#define SDIOD_DIC_EXT          0xf     /* extended device interface, read ext_dev register */
-
-/* pwr_sel */
-#define SDIOD_PWR_SEL_SPS      0x01    /* supports power selection */
-#define SDIOD_PWR_SEL_EPS      0x02    /* enable power selection (low-current mode) */
-
-/* misc defines */
-#define SDIO_FUNC_0            0
-#define SDIO_FUNC_1            1
-#define SDIO_FUNC_2            2
-#define SDIO_FUNC_3            3
-#define SDIO_FUNC_4            4
-#define SDIO_FUNC_5            5
-#define SDIO_FUNC_6            6
-#define SDIO_FUNC_7            7
-
-#define SD_CARD_TYPE_UNKNOWN   0       /* bad type or unrecognized */
-#define SD_CARD_TYPE_IO                1       /* IO only card */
-#define SD_CARD_TYPE_MEMORY    2       /* memory only card */
-#define SD_CARD_TYPE_COMBO     3       /* IO and memory combo card */
-
-#define SDIO_MAX_BLOCK_SIZE    2048    /* maximum block size for block mode operation */
-#define SDIO_MIN_BLOCK_SIZE    1       /* minimum block size for block mode operation */
-
-/* Card registers: status bit position */
-#define CARDREG_STATUS_BIT_OUTOFRANGE          31
-#define CARDREG_STATUS_BIT_COMCRCERROR         23
-#define CARDREG_STATUS_BIT_ILLEGALCOMMAND      22
-#define CARDREG_STATUS_BIT_ERROR               19
-#define CARDREG_STATUS_BIT_IOCURRENTSTATE3     12
-#define CARDREG_STATUS_BIT_IOCURRENTSTATE2     11
-#define CARDREG_STATUS_BIT_IOCURRENTSTATE1     10
-#define CARDREG_STATUS_BIT_IOCURRENTSTATE0     9
-#define CARDREG_STATUS_BIT_FUN_NUM_ERROR       4
-
-
-
-#define SD_CMD_GO_IDLE_STATE           0       /* mandatory for SDIO */
-#define SD_CMD_SEND_OPCOND             1
-#define SD_CMD_MMC_SET_RCA             3
-#define SD_CMD_IO_SEND_OP_COND         5       /* mandatory for SDIO */
-#define SD_CMD_SELECT_DESELECT_CARD    7
-#define SD_CMD_SEND_CSD                        9
-#define SD_CMD_SEND_CID                        10
-#define SD_CMD_STOP_TRANSMISSION       12
-#define SD_CMD_SEND_STATUS             13
-#define SD_CMD_GO_INACTIVE_STATE       15
-#define SD_CMD_SET_BLOCKLEN            16
-#define SD_CMD_READ_SINGLE_BLOCK       17
-#define SD_CMD_READ_MULTIPLE_BLOCK     18
-#define SD_CMD_WRITE_BLOCK             24
-#define SD_CMD_WRITE_MULTIPLE_BLOCK    25
-#define SD_CMD_PROGRAM_CSD             27
-#define SD_CMD_SET_WRITE_PROT          28
-#define SD_CMD_CLR_WRITE_PROT          29
-#define SD_CMD_SEND_WRITE_PROT         30
-#define SD_CMD_ERASE_WR_BLK_START      32
-#define SD_CMD_ERASE_WR_BLK_END                33
-#define SD_CMD_ERASE                   38
-#define SD_CMD_LOCK_UNLOCK             42
-#define SD_CMD_IO_RW_DIRECT            52      /* mandatory for SDIO */
-#define SD_CMD_IO_RW_EXTENDED          53      /* mandatory for SDIO */
-#define SD_CMD_APP_CMD                 55
-#define SD_CMD_GEN_CMD                 56
-#define SD_CMD_READ_OCR                        58
-#define SD_CMD_CRC_ON_OFF              59      /* mandatory for SDIO */
-#define SD_ACMD_SD_STATUS              13
-#define SD_ACMD_SEND_NUM_WR_BLOCKS     22
-#define SD_ACMD_SET_WR_BLOCK_ERASE_CNT 23
-#define SD_ACMD_SD_SEND_OP_COND                41
-#define SD_ACMD_SET_CLR_CARD_DETECT    42
-#define SD_ACMD_SEND_SCR               51
-
-/* argument for SD_CMD_IO_RW_DIRECT and SD_CMD_IO_RW_EXTENDED */
-#define SD_IO_OP_READ          0   /* Read_Write: Read */
-#define SD_IO_OP_WRITE         1   /* Read_Write: Write */
-#define SD_IO_RW_NORMAL                0   /* no RAW */
-#define SD_IO_RW_RAW           1   /* RAW */
-#define SD_IO_BYTE_MODE                0   /* Byte Mode */
-#define SD_IO_BLOCK_MODE       1   /* BlockMode */
-#define SD_IO_FIXED_ADDRESS    0   /* fix Address */
-#define SD_IO_INCREMENT_ADDRESS        1   /* IncrementAddress */
-
-/* build SD_CMD_IO_RW_DIRECT Argument */
-#define SDIO_IO_RW_DIRECT_ARG(rw, raw, func, addr, data) \
-       ((((rw) & 1) << 31) | (((func) & 0x7) << 28) | (((raw) & 1) << 27) | \
-        (((addr) & 0x1FFFF) << 9) | ((data) & 0xFF))
-
-/* build SD_CMD_IO_RW_EXTENDED Argument */
-#define SDIO_IO_RW_EXTENDED_ARG(rw, blk, func, addr, inc_addr, count) \
-       ((((rw) & 1) << 31) | (((func) & 0x7) << 28) | (((blk) & 1) << 27) | \
-        (((inc_addr) & 1) << 26) | (((addr) & 0x1FFFF) << 9) | ((count) & 0x1FF))
-
-/* SDIO response parameters */
-#define SD_RSP_NO_NONE                 0
-#define SD_RSP_NO_1                    1
-#define SD_RSP_NO_2                    2
-#define SD_RSP_NO_3                    3
-#define SD_RSP_NO_4                    4
-#define SD_RSP_NO_5                    5
-#define SD_RSP_NO_6                    6
-
-       /* Modified R6 response (to CMD3) */
-#define SD_RSP_MR6_COM_CRC_ERROR       0x8000
-#define SD_RSP_MR6_ILLEGAL_COMMAND     0x4000
-#define SD_RSP_MR6_ERROR               0x2000
-
-       /* Modified R1 in R4 Response (to CMD5) */
-#define SD_RSP_MR1_SBIT                        0x80
-#define SD_RSP_MR1_PARAMETER_ERROR     0x40
-#define SD_RSP_MR1_RFU5                        0x20
-#define SD_RSP_MR1_FUNC_NUM_ERROR      0x10
-#define SD_RSP_MR1_COM_CRC_ERROR       0x08
-#define SD_RSP_MR1_ILLEGAL_COMMAND     0x04
-#define SD_RSP_MR1_RFU1                        0x02
-#define SD_RSP_MR1_IDLE_STATE          0x01
-
-       /* R5 response (to CMD52 and CMD53) */
-#define SD_RSP_R5_COM_CRC_ERROR                0x80
-#define SD_RSP_R5_ILLEGAL_COMMAND      0x40
-#define SD_RSP_R5_IO_CURRENTSTATE1     0x20
-#define SD_RSP_R5_IO_CURRENTSTATE0     0x10
-#define SD_RSP_R5_ERROR                        0x08
-#define SD_RSP_R5_RFU                  0x04
-#define SD_RSP_R5_FUNC_NUM_ERROR       0x02
-#define SD_RSP_R5_OUT_OF_RANGE         0x01
-
-#define SD_RSP_R5_ERRBITS              0xCB
-
-
-/* ------------------------------------------------
- *  SDIO Commands and responses
- *
- *  I/O only commands are:
- *      CMD0, CMD3, CMD5, CMD7, CMD15, CMD52, CMD53
- * ------------------------------------------------
- */
-
-/* SDIO Commands */
-#define SDIOH_CMD_0            0
-#define SDIOH_CMD_3            3
-#define SDIOH_CMD_5            5
-#define SDIOH_CMD_7            7
-#define SDIOH_CMD_15           15
-#define SDIOH_CMD_52           52
-#define SDIOH_CMD_53           53
-#define SDIOH_CMD_59           59
-
-/* SDIO Command Responses */
-#define SDIOH_RSP_NONE         0
-#define SDIOH_RSP_R1           1
-#define SDIOH_RSP_R2           2
-#define SDIOH_RSP_R3           3
-#define SDIOH_RSP_R4           4
-#define SDIOH_RSP_R5           5
-#define SDIOH_RSP_R6           6
-
-/*
- *  SDIO Response Error flags
- */
-#define SDIOH_RSP5_ERROR_FLAGS 0xCB
-
-/* ------------------------------------------------
- * SDIO Command structures. I/O only commands are:
- *
- *     CMD0, CMD3, CMD5, CMD7, CMD15, CMD52, CMD53
- * ------------------------------------------------
- */
-
-#define CMD5_OCR_M             BITFIELD_MASK(24)
-#define CMD5_OCR_S             0
-
-#define CMD7_RCA_M             BITFIELD_MASK(16)
-#define CMD7_RCA_S             16
-
-#define CMD_15_RCA_M           BITFIELD_MASK(16)
-#define CMD_15_RCA_S           16
-
-#define CMD52_DATA_M           BITFIELD_MASK(8)  /* Bits [7:0]    - Write Data/Stuff bits of CMD52
-                                                  */
-#define CMD52_DATA_S           0
-#define CMD52_REG_ADDR_M       BITFIELD_MASK(17) /* Bits [25:9]   - register address */
-#define CMD52_REG_ADDR_S       9
-#define CMD52_RAW_M            BITFIELD_MASK(1)  /* Bit  27       - Read after Write flag */
-#define CMD52_RAW_S            27
-#define CMD52_FUNCTION_M       BITFIELD_MASK(3)  /* Bits [30:28]  - Function number */
-#define CMD52_FUNCTION_S       28
-#define CMD52_RW_FLAG_M                BITFIELD_MASK(1)  /* Bit  31       - R/W flag */
-#define CMD52_RW_FLAG_S                31
-
-
-#define CMD53_BYTE_BLK_CNT_M   BITFIELD_MASK(9) /* Bits [8:0]     - Byte/Block Count of CMD53 */
-#define CMD53_BYTE_BLK_CNT_S   0
-#define CMD53_REG_ADDR_M       BITFIELD_MASK(17) /* Bits [25:9]   - register address */
-#define CMD53_REG_ADDR_S       9
-#define CMD53_OP_CODE_M                BITFIELD_MASK(1)  /* Bit  26       - R/W Operation Code */
-#define CMD53_OP_CODE_S                26
-#define CMD53_BLK_MODE_M       BITFIELD_MASK(1)  /* Bit  27       - Block Mode */
-#define CMD53_BLK_MODE_S       27
-#define CMD53_FUNCTION_M       BITFIELD_MASK(3)  /* Bits [30:28]  - Function number */
-#define CMD53_FUNCTION_S       28
-#define CMD53_RW_FLAG_M                BITFIELD_MASK(1)  /* Bit  31       - R/W flag */
-#define CMD53_RW_FLAG_S                31
-
-/* ------------------------------------------------------
- * SDIO Command Response structures for SD1 and SD4 modes
- *  -----------------------------------------------------
- */
-#define RSP4_IO_OCR_M          BITFIELD_MASK(24) /* Bits [23:0]  - Card's OCR Bits [23:0] */
-#define RSP4_IO_OCR_S          0
-#define RSP4_STUFF_M           BITFIELD_MASK(3)  /* Bits [26:24] - Stuff bits */
-#define RSP4_STUFF_S           24
-#define RSP4_MEM_PRESENT_M     BITFIELD_MASK(1)  /* Bit  27      - Memory present */
-#define RSP4_MEM_PRESENT_S     27
-#define RSP4_NUM_FUNCS_M       BITFIELD_MASK(3)  /* Bits [30:28] - Number of I/O funcs */
-#define RSP4_NUM_FUNCS_S       28
-#define RSP4_CARD_READY_M      BITFIELD_MASK(1)  /* Bit  31      - SDIO card ready */
-#define RSP4_CARD_READY_S      31
-
-#define RSP6_STATUS_M          BITFIELD_MASK(16) /* Bits [15:0]  - Card status bits [19,22,23,12:0]
-                                                  */
-#define RSP6_STATUS_S          0
-#define RSP6_IO_RCA_M          BITFIELD_MASK(16) /* Bits [31:16] - RCA bits[31-16] */
-#define RSP6_IO_RCA_S          16
-
-#define RSP1_AKE_SEQ_ERROR_M   BITFIELD_MASK(1)  /* Bit 3       - Authentication seq error */
-#define RSP1_AKE_SEQ_ERROR_S   3
-#define RSP1_APP_CMD_M         BITFIELD_MASK(1)  /* Bit 5       - Card expects ACMD */
-#define RSP1_APP_CMD_S         5
-#define RSP1_READY_FOR_DATA_M  BITFIELD_MASK(1)  /* Bit 8       - Ready for data (buff empty) */
-#define RSP1_READY_FOR_DATA_S  8
-#define RSP1_CURR_STATE_M      BITFIELD_MASK(4)  /* Bits [12:9] - State of card
-                                                  * when Cmd was received
-                                                  */
-#define RSP1_CURR_STATE_S      9
-#define RSP1_EARSE_RESET_M     BITFIELD_MASK(1)  /* Bit 13   - Erase seq cleared */
-#define RSP1_EARSE_RESET_S     13
-#define RSP1_CARD_ECC_DISABLE_M        BITFIELD_MASK(1)  /* Bit 14   - Card ECC disabled */
-#define RSP1_CARD_ECC_DISABLE_S        14
-#define RSP1_WP_ERASE_SKIP_M   BITFIELD_MASK(1)  /* Bit 15   - Partial blocks erased due to W/P */
-#define RSP1_WP_ERASE_SKIP_S   15
-#define RSP1_CID_CSD_OVERW_M   BITFIELD_MASK(1)  /* Bit 16   - Illegal write to CID or R/O bits
-                                                  * of CSD
-                                                  */
-#define RSP1_CID_CSD_OVERW_S   16
-#define RSP1_ERROR_M           BITFIELD_MASK(1)  /* Bit 19   - General/Unknown error */
-#define RSP1_ERROR_S           19
-#define RSP1_CC_ERROR_M                BITFIELD_MASK(1)  /* Bit 20   - Internal Card Control error */
-#define RSP1_CC_ERROR_S                20
-#define RSP1_CARD_ECC_FAILED_M BITFIELD_MASK(1)  /* Bit 21   - Card internal ECC failed
-                                                  * to correct data
-                                                  */
-#define RSP1_CARD_ECC_FAILED_S 21
-#define RSP1_ILLEGAL_CMD_M     BITFIELD_MASK(1)  /* Bit 22   - Cmd not legal for the card state */
-#define RSP1_ILLEGAL_CMD_S     22
-#define RSP1_COM_CRC_ERROR_M   BITFIELD_MASK(1)  /* Bit 23   - CRC check of previous command failed
-                                                  */
-#define RSP1_COM_CRC_ERROR_S   23
-#define RSP1_LOCK_UNLOCK_FAIL_M        BITFIELD_MASK(1)  /* Bit 24   - Card lock-unlock Cmd Seq error */
-#define RSP1_LOCK_UNLOCK_FAIL_S        24
-#define RSP1_CARD_LOCKED_M     BITFIELD_MASK(1)  /* Bit 25   - Card locked by the host */
-#define RSP1_CARD_LOCKED_S     25
-#define RSP1_WP_VIOLATION_M    BITFIELD_MASK(1)  /* Bit 26   - Attempt to program
-                                                  * write-protected blocks
-                                                  */
-#define RSP1_WP_VIOLATION_S    26
-#define RSP1_ERASE_PARAM_M     BITFIELD_MASK(1)  /* Bit 27   - Invalid erase blocks */
-#define RSP1_ERASE_PARAM_S     27
-#define RSP1_ERASE_SEQ_ERR_M   BITFIELD_MASK(1)  /* Bit 28   - Erase Cmd seq error */
-#define RSP1_ERASE_SEQ_ERR_S   28
-#define RSP1_BLK_LEN_ERR_M     BITFIELD_MASK(1)  /* Bit 29   - Block length error */
-#define RSP1_BLK_LEN_ERR_S     29
-#define RSP1_ADDR_ERR_M                BITFIELD_MASK(1)  /* Bit 30   - Misaligned address */
-#define RSP1_ADDR_ERR_S                30
-#define RSP1_OUT_OF_RANGE_M    BITFIELD_MASK(1)  /* Bit 31   - Cmd arg was out of range */
-#define RSP1_OUT_OF_RANGE_S    31
-
-
-#define RSP5_DATA_M            BITFIELD_MASK(8)  /* Bits [0:7]   - data */
-#define RSP5_DATA_S            0
-#define RSP5_FLAGS_M           BITFIELD_MASK(8)  /* Bit  [15:8]  - Rsp flags */
-#define RSP5_FLAGS_S           8
-#define RSP5_STUFF_M           BITFIELD_MASK(16) /* Bits [31:16] - Stuff bits */
-#define RSP5_STUFF_S           16
-
-/* ----------------------------------------------
- * SDIO Command Response structures for SPI mode
- * ----------------------------------------------
- */
-#define SPIRSP4_IO_OCR_M       BITFIELD_MASK(16) /* Bits [15:0]    - Card's OCR Bits [23:8] */
-#define SPIRSP4_IO_OCR_S       0
-#define SPIRSP4_STUFF_M                BITFIELD_MASK(3)  /* Bits [18:16]   - Stuff bits */
-#define SPIRSP4_STUFF_S                16
-#define SPIRSP4_MEM_PRESENT_M  BITFIELD_MASK(1)  /* Bit  19        - Memory present */
-#define SPIRSP4_MEM_PRESENT_S  19
-#define SPIRSP4_NUM_FUNCS_M    BITFIELD_MASK(3)  /* Bits [22:20]   - Number of I/O funcs */
-#define SPIRSP4_NUM_FUNCS_S    20
-#define SPIRSP4_CARD_READY_M   BITFIELD_MASK(1)  /* Bit  23        - SDIO card ready */
-#define SPIRSP4_CARD_READY_S   23
-#define SPIRSP4_IDLE_STATE_M   BITFIELD_MASK(1)  /* Bit  24        - idle state */
-#define SPIRSP4_IDLE_STATE_S   24
-#define SPIRSP4_ILLEGAL_CMD_M  BITFIELD_MASK(1)  /* Bit  26        - Illegal Cmd error */
-#define SPIRSP4_ILLEGAL_CMD_S  26
-#define SPIRSP4_COM_CRC_ERROR_M        BITFIELD_MASK(1)  /* Bit  27        - COM CRC error */
-#define SPIRSP4_COM_CRC_ERROR_S        27
-#define SPIRSP4_FUNC_NUM_ERROR_M       BITFIELD_MASK(1)  /* Bit  28        - Function number error
-                                                          */
-#define SPIRSP4_FUNC_NUM_ERROR_S       28
-#define SPIRSP4_PARAM_ERROR_M  BITFIELD_MASK(1)  /* Bit  30        - Parameter Error Bit */
-#define SPIRSP4_PARAM_ERROR_S  30
-#define SPIRSP4_START_BIT_M    BITFIELD_MASK(1)  /* Bit  31        - Start Bit */
-#define SPIRSP4_START_BIT_S    31
-
-#define SPIRSP5_DATA_M                 BITFIELD_MASK(8)  /* Bits [23:16]   - R/W Data */
-#define SPIRSP5_DATA_S                 16
-#define SPIRSP5_IDLE_STATE_M           BITFIELD_MASK(1)  /* Bit  24        - Idle state */
-#define SPIRSP5_IDLE_STATE_S           24
-#define SPIRSP5_ILLEGAL_CMD_M          BITFIELD_MASK(1)  /* Bit  26        - Illegal Cmd error */
-#define SPIRSP5_ILLEGAL_CMD_S          26
-#define SPIRSP5_COM_CRC_ERROR_M                BITFIELD_MASK(1)  /* Bit  27        - COM CRC error */
-#define SPIRSP5_COM_CRC_ERROR_S                27
-#define SPIRSP5_FUNC_NUM_ERROR_M       BITFIELD_MASK(1)  /* Bit  28        - Function number error
-                                                          */
-#define SPIRSP5_FUNC_NUM_ERROR_S       28
-#define SPIRSP5_PARAM_ERROR_M          BITFIELD_MASK(1)  /* Bit  30        - Parameter Error Bit */
-#define SPIRSP5_PARAM_ERROR_S          30
-#define SPIRSP5_START_BIT_M            BITFIELD_MASK(1)  /* Bit  31        - Start Bit */
-#define SPIRSP5_START_BIT_S            31
-
-/* RSP6 card status format; Pg 68 Physical Layer spec v 1.10 */
-#define RSP6STAT_AKE_SEQ_ERROR_M       BITFIELD_MASK(1)  /* Bit 3      - Authentication seq error
-                                                          */
-#define RSP6STAT_AKE_SEQ_ERROR_S       3
-#define RSP6STAT_APP_CMD_M             BITFIELD_MASK(1)  /* Bit 5      - Card expects ACMD */
-#define RSP6STAT_APP_CMD_S             5
-#define RSP6STAT_READY_FOR_DATA_M      BITFIELD_MASK(1)  /* Bit 8      - Ready for data
-                                                          * (buff empty)
-                                                          */
-#define RSP6STAT_READY_FOR_DATA_S      8
-#define RSP6STAT_CURR_STATE_M          BITFIELD_MASK(4)  /* Bits [12:9] - Card state at
-                                                          * Cmd reception
-                                                          */
-#define RSP6STAT_CURR_STATE_S          9
-#define RSP6STAT_ERROR_M               BITFIELD_MASK(1)  /* Bit 13  - General/Unknown error Bit 19
-                                                          */
-#define RSP6STAT_ERROR_S               13
-#define RSP6STAT_ILLEGAL_CMD_M         BITFIELD_MASK(1)  /* Bit 14  - Illegal cmd for
-                                                          * card state Bit 22
-                                                          */
-#define RSP6STAT_ILLEGAL_CMD_S         14
-#define RSP6STAT_COM_CRC_ERROR_M       BITFIELD_MASK(1)  /* Bit 15  - CRC previous command
-                                                          * failed Bit 23
-                                                          */
-#define RSP6STAT_COM_CRC_ERROR_S       15
-
-#define SDIOH_XFER_TYPE_READ    SD_IO_OP_READ
-#define SDIOH_XFER_TYPE_WRITE   SD_IO_OP_WRITE
-
-#endif /* _SDIO_H */
diff --git a/drivers/net/wireless/bcm4319/include/sdioh.h b/drivers/net/wireless/bcm4319/include/sdioh.h
deleted file mode 100644 (file)
index 8123452..0000000
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * SDIO Host Controller Spec header file
- * Register map and definitions for the Standard Host Controller
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sdioh.h,v 13.13.18.1.16.3 2009/12/08 22:34:21 Exp $
- */
-
-#ifndef        _SDIOH_H
-#define        _SDIOH_H
-
-#define SD_SysAddr                     0x000
-#define SD_BlockSize                   0x004
-#define SD_BlockCount                  0x006
-#define SD_Arg0                                0x008
-#define SD_Arg1                        0x00A
-#define SD_TransferMode                        0x00C
-#define SD_Command                     0x00E
-#define SD_Response0                   0x010
-#define SD_Response1                   0x012
-#define SD_Response2                   0x014
-#define SD_Response3                   0x016
-#define SD_Response4                   0x018
-#define SD_Response5                   0x01A
-#define SD_Response6                   0x01C
-#define SD_Response7                   0x01E
-#define SD_BufferDataPort0             0x020
-#define SD_BufferDataPort1             0x022
-#define SD_PresentState                        0x024
-#define SD_HostCntrl                   0x028
-#define SD_PwrCntrl                    0x029
-#define SD_BlockGapCntrl               0x02A
-#define SD_WakeupCntrl                         0x02B
-#define SD_ClockCntrl                  0x02C
-#define SD_TimeoutCntrl                0x02E
-#define SD_SoftwareReset               0x02F
-#define SD_IntrStatus                  0x030
-#define SD_ErrorIntrStatus             0x032
-#define SD_IntrStatusEnable            0x034
-#define SD_ErrorIntrStatusEnable       0x036
-#define SD_IntrSignalEnable            0x038
-#define SD_ErrorIntrSignalEnable       0x03A
-#define SD_CMD12ErrorStatus            0x03C
-#define SD_Capabilities                        0x040
-#define SD_Capabilities_Reserved       0x044
-#define SD_MaxCurCap                   0x048
-#define SD_MaxCurCap_Reserved          0x04C
-#define SD_ADMA_SysAddr                        0x58
-#define SD_SlotInterruptStatus         0x0FC
-#define SD_HostControllerVersion       0x0FE
-
-/* SD specific registers in PCI config space */
-#define SD_SlotInfo    0x40
-
-/* SD_Capabilities reg (0x040) */
-#define CAP_TO_CLKFREQ_M       BITFIELD_MASK(6)
-#define CAP_TO_CLKFREQ_S       0
-#define CAP_TO_CLKUNIT_M       BITFIELD_MASK(1)
-#define CAP_TO_CLKUNIT_S       7
-#define CAP_BASECLK_M          BITFIELD_MASK(6)
-#define CAP_BASECLK_S          8
-#define CAP_MAXBLOCK_M                 BITFIELD_MASK(2)
-#define CAP_MAXBLOCK_S         16
-#define CAP_ADMA2_M            BITFIELD_MASK(1)
-#define CAP_ADMA2_S            19
-#define CAP_ADMA1_M            BITFIELD_MASK(1)
-#define CAP_ADMA1_S            20
-#define CAP_HIGHSPEED_M                BITFIELD_MASK(1)
-#define CAP_HIGHSPEED_S                21
-#define CAP_DMA_M              BITFIELD_MASK(1)
-#define CAP_DMA_S              22
-#define CAP_SUSPEND_M          BITFIELD_MASK(1)
-#define CAP_SUSPEND_S          23
-#define CAP_VOLT_3_3_M         BITFIELD_MASK(1)
-#define CAP_VOLT_3_3_S         24
-#define CAP_VOLT_3_0_M         BITFIELD_MASK(1)
-#define CAP_VOLT_3_0_S         25
-#define CAP_VOLT_1_8_M         BITFIELD_MASK(1)
-#define CAP_VOLT_1_8_S         26
-#define CAP_64BIT_HOST_M       BITFIELD_MASK(1)
-#define CAP_64BIT_HOST_S       28
-
-/* SD_MaxCurCap reg (0x048) */
-#define CAP_CURR_3_3_M         BITFIELD_MASK(8)
-#define CAP_CURR_3_3_S         0
-#define CAP_CURR_3_0_M         BITFIELD_MASK(8)
-#define CAP_CURR_3_0_S         8
-#define CAP_CURR_1_8_M         BITFIELD_MASK(8)
-#define CAP_CURR_1_8_S         16
-
-/* SD_SysAddr: Offset 0x0000, Size 4 bytes */
-
-/* SD_BlockSize: Offset 0x004, Size 2 bytes */
-#define BLKSZ_BLKSZ_M          BITFIELD_MASK(12)
-#define BLKSZ_BLKSZ_S          0
-#define BLKSZ_BNDRY_M          BITFIELD_MASK(3)
-#define BLKSZ_BNDRY_S          12
-
-/* SD_BlockCount: Offset 0x006, size 2 bytes */
-
-/* SD_Arg0: Offset 0x008, size = 4 bytes  */
-/* SD_TransferMode Offset 0x00C, size = 2 bytes */
-#define XFER_DMA_ENABLE_M      BITFIELD_MASK(1)
-#define XFER_DMA_ENABLE_S      0
-#define XFER_BLK_COUNT_EN_M    BITFIELD_MASK(1)
-#define XFER_BLK_COUNT_EN_S    1
-#define XFER_CMD_12_EN_M       BITFIELD_MASK(1)
-#define XFER_CMD_12_EN_S       2
-#define XFER_DATA_DIRECTION_M  BITFIELD_MASK(1)
-#define XFER_DATA_DIRECTION_S  4
-#define XFER_MULTI_BLOCK_M     BITFIELD_MASK(1)
-#define XFER_MULTI_BLOCK_S     5
-
-/* SD_Command: Offset 0x00E, size = 2 bytes */
-/* resp_type field */
-#define RESP_TYPE_NONE                 0
-#define RESP_TYPE_136                  1
-#define RESP_TYPE_48                   2
-#define RESP_TYPE_48_BUSY      3
-/* type field */
-#define CMD_TYPE_NORMAL                0
-#define CMD_TYPE_SUSPEND       1
-#define CMD_TYPE_RESUME                2
-#define CMD_TYPE_ABORT         3
-
-#define CMD_RESP_TYPE_M                BITFIELD_MASK(2)        /* Bits [0-1]   - Response type */
-#define CMD_RESP_TYPE_S                0
-#define CMD_CRC_EN_M           BITFIELD_MASK(1)        /* Bit 3        - CRC enable */
-#define CMD_CRC_EN_S           3
-#define CMD_INDEX_EN_M         BITFIELD_MASK(1)        /* Bit 4        - Enable index checking */
-#define CMD_INDEX_EN_S         4
-#define CMD_DATA_EN_M          BITFIELD_MASK(1)        /* Bit 5        - Using DAT line */
-#define CMD_DATA_EN_S          5
-#define CMD_TYPE_M             BITFIELD_MASK(2)        /* Bit [6-7]    - Normal, abort, resume, etc
-                                                        */
-#define CMD_TYPE_S             6
-#define CMD_INDEX_M            BITFIELD_MASK(6)        /* Bits [8-13]  - Command number */
-#define CMD_INDEX_S            8
-
-/* SD_BufferDataPort0  : Offset 0x020, size = 2 or 4 bytes */
-/* SD_BufferDataPort1  : Offset 0x022, size = 2 bytes */
-/* SD_PresentState     : Offset 0x024, size = 4 bytes */
-#define PRES_CMD_INHIBIT_M     BITFIELD_MASK(1)        /* Bit 0        May use CMD */
-#define PRES_CMD_INHIBIT_S     0
-#define PRES_DAT_INHIBIT_M     BITFIELD_MASK(1)        /* Bit 1        May use DAT */
-#define PRES_DAT_INHIBIT_S     1
-#define PRES_DAT_BUSY_M                BITFIELD_MASK(1)        /* Bit 2        DAT is busy */
-#define PRES_DAT_BUSY_S                2
-#define PRES_PRESENT_RSVD_M    BITFIELD_MASK(5)        /* Bit [3-7]    rsvd */
-#define PRES_PRESENT_RSVD_S    3
-#define PRES_WRITE_ACTIVE_M    BITFIELD_MASK(1)        /* Bit 8        Write is active */
-#define PRES_WRITE_ACTIVE_S    8
-#define PRES_READ_ACTIVE_M     BITFIELD_MASK(1)        /* Bit 9        Read is active */
-#define PRES_READ_ACTIVE_S     9
-#define PRES_WRITE_DATA_RDY_M  BITFIELD_MASK(1)        /* Bit 10       Write buf is avail */
-#define PRES_WRITE_DATA_RDY_S  10
-#define PRES_READ_DATA_RDY_M   BITFIELD_MASK(1)        /* Bit 11       Read buf data avail */
-#define PRES_READ_DATA_RDY_S   11
-#define PRES_CARD_PRESENT_M    BITFIELD_MASK(1)        /* Bit 16       Card present - debounced */
-#define PRES_CARD_PRESENT_S    16
-#define PRES_CARD_STABLE_M     BITFIELD_MASK(1)        /* Bit 17       Debugging */
-#define PRES_CARD_STABLE_S     17
-#define PRES_CARD_PRESENT_RAW_M        BITFIELD_MASK(1)        /* Bit 18       Not debounced */
-#define PRES_CARD_PRESENT_RAW_S        18
-#define PRES_WRITE_ENABLED_M   BITFIELD_MASK(1)        /* Bit 19       Write protected? */
-#define PRES_WRITE_ENABLED_S   19
-#define PRES_DAT_SIGNAL_M      BITFIELD_MASK(4)        /* Bit [20-23]  Debugging */
-#define PRES_DAT_SIGNAL_S      20
-#define PRES_CMD_SIGNAL_M      BITFIELD_MASK(1)        /* Bit 24       Debugging */
-#define PRES_CMD_SIGNAL_S      24
-
-/* SD_HostCntrl: Offset 0x028, size = 1 bytes */
-#define HOST_LED_M             BITFIELD_MASK(1)        /* Bit 0        LED On/Off */
-#define HOST_LED_S             0
-#define HOST_DATA_WIDTH_M      BITFIELD_MASK(1)        /* Bit 1        4 bit enable */
-#define HOST_DATA_WIDTH_S      1
-#define HOST_HI_SPEED_EN_M     BITFIELD_MASK(1)        /* Bit 2        High speed vs low speed */
-#define HOST_DMA_SEL_S         3
-#define HOST_DMA_SEL_M         BITFIELD_MASK(2)        /* Bit 4:3      DMA Select */
-#define HOST_HI_SPEED_EN_S     2
-
-/* misc defines */
-#define SD1_MODE               0x1     /* SD Host Cntrlr Spec */
-#define SD4_MODE               0x2     /* SD Host Cntrlr Spec */
-
-/* SD_PwrCntrl: Offset 0x029, size = 1 bytes */
-#define PWR_BUS_EN_M           BITFIELD_MASK(1)        /* Bit 0        Power the bus */
-#define PWR_BUS_EN_S           0
-#define PWR_VOLTS_M            BITFIELD_MASK(3)        /* Bit [1-3]    Voltage Select */
-#define PWR_VOLTS_S            1
-
-/* SD_SoftwareReset: Offset 0x02F, size = 1 byte */
-#define SW_RESET_ALL_M         BITFIELD_MASK(1)        /* Bit 0        Reset All */
-#define SW_RESET_ALL_S         0
-#define SW_RESET_CMD_M         BITFIELD_MASK(1)        /* Bit 1        CMD Line Reset */
-#define SW_RESET_CMD_S         1
-#define SW_RESET_DAT_M         BITFIELD_MASK(1)        /* Bit 2        DAT Line Reset */
-#define SW_RESET_DAT_S         2
-
-/* SD_IntrStatus: Offset 0x030, size = 2 bytes */
-/* Defs also serve SD_IntrStatusEnable and SD_IntrSignalEnable */
-#define INTSTAT_CMD_COMPLETE_M         BITFIELD_MASK(1)        /* Bit 0 */
-#define INTSTAT_CMD_COMPLETE_S         0
-#define INTSTAT_XFER_COMPLETE_M                BITFIELD_MASK(1)
-#define INTSTAT_XFER_COMPLETE_S                1
-#define INTSTAT_BLOCK_GAP_EVENT_M      BITFIELD_MASK(1)
-#define INTSTAT_BLOCK_GAP_EVENT_S      2
-#define INTSTAT_DMA_INT_M              BITFIELD_MASK(1)
-#define INTSTAT_DMA_INT_S              3
-#define INTSTAT_BUF_WRITE_READY_M      BITFIELD_MASK(1)
-#define INTSTAT_BUF_WRITE_READY_S      4
-#define INTSTAT_BUF_READ_READY_M       BITFIELD_MASK(1)
-#define INTSTAT_BUF_READ_READY_S       5
-#define INTSTAT_CARD_INSERTION_M       BITFIELD_MASK(1)
-#define INTSTAT_CARD_INSERTION_S       6
-#define INTSTAT_CARD_REMOVAL_M         BITFIELD_MASK(1)
-#define INTSTAT_CARD_REMOVAL_S         7
-#define INTSTAT_CARD_INT_M             BITFIELD_MASK(1)
-#define INTSTAT_CARD_INT_S             8
-#define INTSTAT_ERROR_INT_M            BITFIELD_MASK(1)        /* Bit 15 */
-#define INTSTAT_ERROR_INT_S            15
-
-/* SD_ErrorIntrStatus: Offset 0x032, size = 2 bytes */
-/* Defs also serve SD_ErrorIntrStatusEnable and SD_ErrorIntrSignalEnable */
-#define ERRINT_CMD_TIMEOUT_M           BITFIELD_MASK(1)
-#define ERRINT_CMD_TIMEOUT_S           0
-#define ERRINT_CMD_CRC_M               BITFIELD_MASK(1)
-#define ERRINT_CMD_CRC_S               1
-#define ERRINT_CMD_ENDBIT_M            BITFIELD_MASK(1)
-#define ERRINT_CMD_ENDBIT_S            2
-#define ERRINT_CMD_INDEX_M             BITFIELD_MASK(1)
-#define ERRINT_CMD_INDEX_S             3
-#define ERRINT_DATA_TIMEOUT_M          BITFIELD_MASK(1)
-#define ERRINT_DATA_TIMEOUT_S          4
-#define ERRINT_DATA_CRC_M              BITFIELD_MASK(1)
-#define ERRINT_DATA_CRC_S              5
-#define ERRINT_DATA_ENDBIT_M           BITFIELD_MASK(1)
-#define ERRINT_DATA_ENDBIT_S           6
-#define ERRINT_CURRENT_LIMIT_M         BITFIELD_MASK(1)
-#define ERRINT_CURRENT_LIMIT_S         7
-#define ERRINT_AUTO_CMD12_M            BITFIELD_MASK(1)
-#define ERRINT_AUTO_CMD12_S            8
-#define ERRINT_VENDOR_M                        BITFIELD_MASK(4)
-#define ERRINT_VENDOR_S                        12
-
-/* Also provide definitions in "normal" form to allow combined masks */
-#define ERRINT_CMD_TIMEOUT_BIT         0x0001
-#define ERRINT_CMD_CRC_BIT             0x0002
-#define ERRINT_CMD_ENDBIT_BIT          0x0004
-#define ERRINT_CMD_INDEX_BIT           0x0008
-#define ERRINT_DATA_TIMEOUT_BIT                0x0010
-#define ERRINT_DATA_CRC_BIT            0x0020
-#define ERRINT_DATA_ENDBIT_BIT         0x0040
-#define ERRINT_CURRENT_LIMIT_BIT       0x0080
-#define ERRINT_AUTO_CMD12_BIT          0x0100
-
-/* Masks to select CMD vs. DATA errors */
-#define ERRINT_CMD_ERRS                (ERRINT_CMD_TIMEOUT_BIT | ERRINT_CMD_CRC_BIT |\
-                                ERRINT_CMD_ENDBIT_BIT | ERRINT_CMD_INDEX_BIT)
-#define ERRINT_DATA_ERRS       (ERRINT_DATA_TIMEOUT_BIT | ERRINT_DATA_CRC_BIT |\
-                                ERRINT_DATA_ENDBIT_BIT)
-#define ERRINT_TRANSFER_ERRS   (ERRINT_CMD_ERRS | ERRINT_DATA_ERRS)
-
-/* SD_WakeupCntr_BlockGapCntrl : Offset 0x02A , size = bytes */
-/* SD_ClockCntrl       : Offset 0x02C , size = bytes */
-/* SD_SoftwareReset_TimeoutCntrl       : Offset 0x02E , size = bytes */
-/* SD_IntrStatus       : Offset 0x030 , size = bytes */
-/* SD_ErrorIntrStatus  : Offset 0x032 , size = bytes */
-/* SD_IntrStatusEnable : Offset 0x034 , size = bytes */
-/* SD_ErrorIntrStatusEnable : Offset 0x036 , size = bytes */
-/* SD_IntrSignalEnable : Offset 0x038 , size = bytes */
-/* SD_ErrorIntrSignalEnable : Offset 0x03A , size = bytes */
-/* SD_CMD12ErrorStatus : Offset 0x03C , size = bytes */
-/* SD_Capabilities     : Offset 0x040 , size = bytes */
-/* SD_MaxCurCap                : Offset 0x048 , size = bytes */
-/* SD_MaxCurCap_Reserved: Offset 0x04C , size = bytes */
-/* SD_SlotInterruptStatus: Offset 0x0FC , size = bytes */
-/* SD_HostControllerVersion : Offset 0x0FE , size = bytes */
-
-#endif /* _SDIOH_H */
diff --git a/drivers/net/wireless/bcm4319/include/sdiovar.h b/drivers/net/wireless/bcm4319/include/sdiovar.h
deleted file mode 100644 (file)
index 0179d4c..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Structure used by apps whose drivers access SDIO drivers.
- * Pulled out separately so dhdu and wlu can both use it.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sdiovar.h,v 13.5.14.2.16.2 2009/12/08 22:34:21 Exp $
- */
-
-#ifndef _sdiovar_h_
-#define _sdiovar_h_
-
-#include <typedefs.h>
-
-/* require default structure packing */
-#define BWL_DEFAULT_PACKING
-#include <packed_section_start.h>
-
-typedef struct sdreg {
-       int func;
-       int offset;
-       int value;
-} sdreg_t;
-
-/* Common msglevel constants */
-#define SDH_ERROR_VAL          0x0001  /* Error */
-#define SDH_TRACE_VAL          0x0002  /* Trace */
-#define SDH_INFO_VAL           0x0004  /* Info */
-#define SDH_DEBUG_VAL          0x0008  /* Debug */
-#define SDH_DATA_VAL           0x0010  /* Data */
-#define SDH_CTRL_VAL           0x0020  /* Control Regs */
-#define SDH_LOG_VAL            0x0040  /* Enable bcmlog */
-#define SDH_DMA_VAL            0x0080  /* DMA */
-
-#define NUM_PREV_TRANSACTIONS  16
-
-
-#include <packed_section_end.h>
-
-#endif /* _sdiovar_h_ */
diff --git a/drivers/net/wireless/bcm4319/include/siutils.h b/drivers/net/wireless/bcm4319/include/siutils.h
deleted file mode 100644 (file)
index cb9f140..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Misc utility routines for accessing the SOC Interconnects
- * of Broadcom HNBU chips.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: siutils.h,v 13.197.4.2.4.3.8.16 2010/06/23 21:36:05 Exp $
- */
-
-
-#ifndef        _siutils_h_
-#define        _siutils_h_
-
-
-struct si_pub {
-       uint    socitype;               
-
-       uint    bustype;                
-       uint    buscoretype;            
-       uint    buscorerev;             
-       uint    buscoreidx;             
-       int     ccrev;                  
-       uint32  cccaps;                 
-       int     pmurev;                 
-       uint32  pmucaps;                
-       uint    boardtype;              
-       uint    boardvendor;            
-       uint    boardflags;             
-       uint    chip;                   
-       uint    chiprev;                
-       uint    chippkg;                
-       uint32  chipst;                 
-       bool    issim;                  
-       uint    socirev;                
-       bool    pci_pr32414;
-};
-
-#if defined(WLC_HIGH) && !defined(WLC_LOW)
-typedef struct si_pub si_t;
-#else
-typedef const struct si_pub si_t;
-#endif
-
-
-#define        SI_OSH          NULL    
-
-
-#define        XTAL                    0x1     
-#define        PLL                     0x2     
-
-
-#define        CLK_FAST                0       
-#define        CLK_DYNAMIC             2       
-
-
-#define GPIO_DRV_PRIORITY      0       
-#define GPIO_APP_PRIORITY      1       
-#define GPIO_HI_PRIORITY       2       
-
-
-#define GPIO_PULLUP            0
-#define GPIO_PULLDN            1
-
-
-#define GPIO_REGEVT            0       
-#define GPIO_REGEVT_INTMSK     1       
-#define GPIO_REGEVT_INTPOL     2       
-
-
-#define SI_DEVPATH_BUFSZ       16      
-
-
-#define        SI_DOATTACH     1
-#define SI_PCIDOWN     2
-#define SI_PCIUP       3
-
-#define        ISSIM_ENAB(sih) 0
-
-
-#if defined(BCMPMUCTL)
-#define PMUCTL_ENAB(sih)       (BCMPMUCTL)
-#else
-#define PMUCTL_ENAB(sih)       ((sih)->cccaps & CC_CAP_PMU)
-#endif
-
-
-#if defined(BCMPMUCTL) && BCMPMUCTL
-#define CCCTL_ENAB(sih)                (0)
-#define CCPLL_ENAB(sih)                (0)
-#else
-#define CCCTL_ENAB(sih)                ((sih)->cccaps & CC_CAP_PWR_CTL)
-#define CCPLL_ENAB(sih)                ((sih)->cccaps & CC_CAP_PLL_MASK)
-#endif
-
-typedef void (*gpio_handler_t)(uint32 stat, void *arg);
-
-
-
-extern si_t *si_attach(uint pcidev, osl_t *osh, void *regs, uint bustype,
-                       void *sdh, char **vars, uint *varsz);
-extern si_t *si_kattach(osl_t *osh);
-extern void si_detach(si_t *sih);
-extern bool si_pci_war16165(si_t *sih);
-
-extern uint si_corelist(si_t *sih, uint coreid[]);
-extern uint si_coreid(si_t *sih);
-extern uint si_flag(si_t *sih);
-extern uint si_intflag(si_t *sih);
-extern uint si_coreidx(si_t *sih);
-extern uint si_coreunit(si_t *sih);
-extern uint si_corevendor(si_t *sih);
-extern uint si_corerev(si_t *sih);
-extern void *si_osh(si_t *sih);
-extern void si_setosh(si_t *sih, osl_t *osh);
-extern uint si_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val);
-extern void *si_coreregs(si_t *sih);
-extern void si_write_wrapperreg(si_t *sih, uint32 offset, uint32 val);
-extern uint32 si_core_cflags(si_t *sih, uint32 mask, uint32 val);
-extern void si_core_cflags_wo(si_t *sih, uint32 mask, uint32 val);
-extern uint32 si_core_sflags(si_t *sih, uint32 mask, uint32 val);
-extern bool si_iscoreup(si_t *sih);
-extern uint si_findcoreidx(si_t *sih, uint coreid, uint coreunit);
-extern void *si_setcoreidx(si_t *sih, uint coreidx);
-extern void *si_setcore(si_t *sih, uint coreid, uint coreunit);
-extern void *si_switch_core(si_t *sih, uint coreid, uint *origidx, uint *intr_val);
-extern void si_restore_core(si_t *sih, uint coreid, uint intr_val);
-extern int si_numaddrspaces(si_t *sih);
-extern uint32 si_addrspace(si_t *sih, uint asidx);
-extern uint32 si_addrspacesize(si_t *sih, uint asidx);
-extern int si_corebist(si_t *sih);
-extern void si_core_reset(si_t *sih, uint32 bits, uint32 resetbits);
-extern void si_core_tofixup(si_t *sih);
-extern void si_core_disable(si_t *sih, uint32 bits);
-extern uint32 si_clock_rate(uint32 pll_type, uint32 n, uint32 m);
-extern uint32 si_clock(si_t *sih);
-extern void si_clock_pmu_spuravoid(si_t *sih, bool spuravoid);
-extern uint32 si_alp_clock(si_t *sih);
-extern uint32 si_ilp_clock(si_t *sih);
-extern void si_pci_setup(si_t *sih, uint coremask);
-extern void si_pcmcia_init(si_t *sih);
-extern void si_setint(si_t *sih, int siflag);
-extern bool si_backplane64(si_t *sih);
-extern void si_register_intr_callback(si_t *sih, void *intrsoff_fn, void *intrsrestore_fn,
-       void *intrsenabled_fn, void *intr_arg);
-extern void si_deregister_intr_callback(si_t *sih);
-extern void si_clkctl_init(si_t *sih);
-extern uint16 si_clkctl_fast_pwrup_delay(si_t *sih);
-extern bool si_clkctl_cc(si_t *sih, uint mode);
-extern int si_clkctl_xtal(si_t *sih, uint what, bool on);
-extern uint32 si_gpiotimerval(si_t *sih, uint32 mask, uint32 val);
-extern bool si_backplane64(si_t *sih);
-extern void si_btcgpiowar(si_t *sih);
-extern bool si_deviceremoved(si_t *sih);
-extern uint32 si_socram_size(si_t *sih);
-
-extern void si_watchdog(si_t *sih, uint ticks);
-extern void si_watchdog_ms(si_t *sih, uint32 ms);
-extern void *si_gpiosetcore(si_t *sih);
-extern uint32 si_gpiocontrol(si_t *sih, uint32 mask, uint32 val, uint8 priority);
-extern uint32 si_gpioouten(si_t *sih, uint32 mask, uint32 val, uint8 priority);
-extern uint32 si_gpioout(si_t *sih, uint32 mask, uint32 val, uint8 priority);
-extern uint32 si_gpioin(si_t *sih);
-extern uint32 si_gpiointpolarity(si_t *sih, uint32 mask, uint32 val, uint8 priority);
-extern uint32 si_gpiointmask(si_t *sih, uint32 mask, uint32 val, uint8 priority);
-extern uint32 si_gpioled(si_t *sih, uint32 mask, uint32 val);
-extern uint32 si_gpioreserve(si_t *sih, uint32 gpio_num, uint8 priority);
-extern uint32 si_gpiorelease(si_t *sih, uint32 gpio_num, uint8 priority);
-extern uint32 si_gpiopull(si_t *sih, bool updown, uint32 mask, uint32 val);
-extern uint32 si_gpioevent(si_t *sih, uint regtype, uint32 mask, uint32 val);
-extern uint32 si_gpio_int_enable(si_t *sih, bool enable);
-
-
-extern void *si_gpio_handler_register(si_t *sih, uint32 e, bool lev, gpio_handler_t cb, void *arg);
-extern void si_gpio_handler_unregister(si_t *sih, void* gpioh);
-extern void si_gpio_handler_process(si_t *sih);
-
-
-extern bool si_pci_pmecap(si_t *sih);
-struct osl_info;
-extern bool si_pci_fastpmecap(struct osl_info *osh);
-extern bool si_pci_pmeclr(si_t *sih);
-extern void si_pci_pmeen(si_t *sih);
-extern uint si_pcie_readreg(void *sih, uint addrtype, uint offset);
-
-extern void si_sdio_init(si_t *sih);
-
-extern uint16 si_d11_devid(si_t *sih);
-extern int si_corepciid(si_t *sih, uint func, uint16 *pcivendor, uint16 *pcidevice,
-       uint8 *pciclass, uint8 *pcisubclass, uint8 *pciprogif, uint8 *pciheader);
-
-#define si_eci_init(sih) (0)
-#define si_eci_notify_bt(sih, type, val, interrupt)  (0)
-
-
-
-extern int si_devpath(si_t *sih, char *path, int size);
-
-extern char *si_getdevpathvar(si_t *sih, const char *name);
-extern int si_getdevpathintvar(si_t *sih, const char *name);
-
-
-extern uint8 si_pcieclkreq(si_t *sih, uint32 mask, uint32 val);
-extern void si_war42780_clkreq(si_t *sih, bool clkreq);
-extern void si_pci_sleep(si_t *sih);
-extern void si_pci_down(si_t *sih);
-extern void si_pci_up(si_t *sih);
-extern void si_pcie_war_ovr_disable(si_t *sih);
-extern void si_pcie_extendL1timer(si_t *sih, bool extend);
-extern int si_pci_fixcfg(si_t *sih);
-
-
-
-
-
-
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/trxhdr.h b/drivers/net/wireless/bcm4319/include/trxhdr.h
deleted file mode 100644 (file)
index 8f5eed9..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * TRX image file header format.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: trxhdr.h,v 13.11.310.1 2008/08/17 12:58:58 Exp $
- */
-
-#include <typedefs.h>
-
-#define TRX_MAGIC      0x30524448      /* "HDR0" */
-#define TRX_VERSION    1               /* Version 1 */
-#define TRX_MAX_LEN    0x3A0000        /* Max length */
-#define TRX_NO_HEADER  1               /* Do not write TRX header */
-#define TRX_GZ_FILES   0x2     /* Contains up to TRX_MAX_OFFSET individual gzip files */
-#define TRX_MAX_OFFSET 3               /* Max number of individual files */
-#define TRX_UNCOMP_IMAGE       0x20    /* Trx contains uncompressed rtecdc.bin image */
-
-struct trx_header {
-       uint32 magic;           /* "HDR0" */
-       uint32 len;             /* Length of file including header */
-       uint32 crc32;           /* 32-bit CRC from flag_version to end of file */
-       uint32 flag_version;    /* 0:15 flags, 16:31 version */
-       uint32 offsets[TRX_MAX_OFFSET]; /* Offsets of partitions from start of header */
-};
-
-/* Compatibility */
-typedef struct trx_header TRXHDR, *PTRXHDR;
diff --git a/drivers/net/wireless/bcm4319/include/typedefs.h b/drivers/net/wireless/bcm4319/include/typedefs.h
deleted file mode 100644 (file)
index 4d9dd76..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: typedefs.h,v 1.85.34.1.2.5 2009/01/27 04:09:40 Exp $
- */
-
-
-#ifndef _TYPEDEFS_H_
-#define _TYPEDEFS_H_
-
-#ifdef SITE_TYPEDEFS
-
-
-
-#include "site_typedefs.h"
-
-#else
-
-
-
-#ifdef __cplusplus
-
-#define TYPEDEF_BOOL
-#ifndef FALSE
-#define FALSE  false
-#endif
-#ifndef TRUE
-#define TRUE   true
-#endif
-
-#else  
-
-
-#endif 
-
-#if defined(__x86_64__)
-#define TYPEDEF_UINTPTR
-typedef unsigned long long int uintptr;
-#endif
-
-
-
-
-#if defined(TARGETOS_nucleus)
-
-#include <stddef.h>
-
-
-#define TYPEDEF_FLOAT_T
-#endif   
-
-#if defined(_NEED_SIZE_T_)
-typedef long unsigned int size_t;
-#endif
-
-#ifdef __DJGPP__
-typedef long unsigned int size_t;
-#endif 
-
-
-
-
-
-#define TYPEDEF_UINT
-#ifndef TARGETENV_android
-#define TYPEDEF_USHORT
-#define TYPEDEF_ULONG
-#endif 
-#ifdef __KERNEL__
-#include <linux/version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
-#define TYPEDEF_BOOL
-#endif 
-#endif 
-
-
-
-
-
-#if defined(__GNUC__) && defined(__STRICT_ANSI__)
-#define TYPEDEF_INT64
-#define TYPEDEF_UINT64
-#endif
-
-
-#if defined(__ICL)
-
-#define TYPEDEF_INT64
-
-#if defined(__STDC__)
-#define TYPEDEF_UINT64
-#endif
-
-#endif 
-
-#if !defined(__DJGPP__) && !defined(TARGETOS_nucleus)
-
-
-#if defined(__KERNEL__)
-
-#include <linux/types.h>       
-
-#else
-
-
-#include <sys/types.h>
-
-#endif 
-
-#endif 
-
-
-
-
-#define USE_TYPEDEF_DEFAULTS
-
-#endif 
-
-
-
-
-#ifdef USE_TYPEDEF_DEFAULTS
-#undef USE_TYPEDEF_DEFAULTS
-
-#ifndef TYPEDEF_BOOL
-typedef         unsigned char  bool;
-#endif
-
-
-
-#ifndef TYPEDEF_UCHAR
-typedef unsigned char  uchar;
-#endif
-
-#ifndef TYPEDEF_USHORT
-typedef unsigned short ushort;
-#endif
-
-#ifndef TYPEDEF_UINT
-typedef unsigned int   uint;
-#endif
-
-#ifndef TYPEDEF_ULONG
-typedef unsigned long  ulong;
-#endif
-
-
-
-#ifndef TYPEDEF_UINT8
-typedef unsigned char  uint8;
-#endif
-
-#ifndef TYPEDEF_UINT16
-typedef unsigned short uint16;
-#endif
-
-#ifndef TYPEDEF_UINT32
-typedef unsigned int   uint32;
-#endif
-
-#ifndef TYPEDEF_UINT64
-typedef unsigned long long uint64;
-#endif
-
-#ifndef TYPEDEF_UINTPTR
-typedef unsigned int   uintptr;
-#endif
-
-#ifndef TYPEDEF_INT8
-typedef signed char    int8;
-#endif
-
-#ifndef TYPEDEF_INT16
-typedef signed short   int16;
-#endif
-
-#ifndef TYPEDEF_INT32
-typedef signed int     int32;
-#endif
-
-#ifndef TYPEDEF_INT64
-typedef signed long long int64;
-#endif
-
-
-
-#ifndef TYPEDEF_FLOAT32
-typedef float          float32;
-#endif
-
-#ifndef TYPEDEF_FLOAT64
-typedef double         float64;
-#endif
-
-
-
-#ifndef TYPEDEF_FLOAT_T
-
-#if defined(FLOAT32)
-typedef float32 float_t;
-#else 
-typedef float64 float_t;
-#endif
-
-#endif 
-
-
-
-#ifndef FALSE
-#define FALSE  0
-#endif
-
-#ifndef TRUE
-#define TRUE   1  
-#endif
-
-#ifndef NULL
-#define        NULL    0
-#endif
-
-#ifndef OFF
-#define        OFF     0
-#endif
-
-#ifndef ON
-#define        ON      1  
-#endif
-
-#define        AUTO    (-1) 
-
-
-
-#ifndef PTRSZ
-#define        PTRSZ   sizeof(char*)
-#endif
-
-
-
-#if defined(__GNUC__)
-       #define BWL_COMPILER_GNU
-#elif defined(__CC_ARM)
-       #define BWL_COMPILER_ARMCC
-#else
-       #error "Unknown compiler!"
-#endif 
-
-
-#ifndef INLINE
-       #if defined(BWL_COMPILER_MICROSOFT)
-               #define INLINE __inline
-       #elif defined(BWL_COMPILER_GNU)
-               #define INLINE __inline__
-       #elif defined(BWL_COMPILER_ARMCC)
-               #define INLINE  __inline
-       #else
-               #define INLINE
-       #endif 
-#endif 
-
-#undef TYPEDEF_BOOL
-#undef TYPEDEF_UCHAR
-#undef TYPEDEF_USHORT
-#undef TYPEDEF_UINT
-#undef TYPEDEF_ULONG
-#undef TYPEDEF_UINT8
-#undef TYPEDEF_UINT16
-#undef TYPEDEF_UINT32
-#undef TYPEDEF_UINT64
-#undef TYPEDEF_UINTPTR
-#undef TYPEDEF_INT8
-#undef TYPEDEF_INT16
-#undef TYPEDEF_INT32
-#undef TYPEDEF_INT64
-#undef TYPEDEF_FLOAT32
-#undef TYPEDEF_FLOAT64
-#undef TYPEDEF_FLOAT_T
-
-#endif 
-
-
-#define UNUSED_PARAMETER(x) (void)(x)
-
-
-#include <bcmdefs.h>
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/include/wlioctl.h b/drivers/net/wireless/bcm4319/include/wlioctl.h
deleted file mode 100644 (file)
index d346945..0000000
+++ /dev/null
@@ -1,1661 +0,0 @@
-/*
- * Custom OID/ioctl definitions for
- * Broadcom 802.11abg Networking Device Driver
- *
- * Definitions subject to change without notice.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: wlioctl.h,v 1.601.4.15.2.14.2.61 2010/05/04 20:26:25 Exp $
- */
-
-
-#ifndef _wlioctl_h_
-#define        _wlioctl_h_
-
-#include <typedefs.h>
-#include <proto/ethernet.h>
-#include <proto/bcmeth.h>
-#include <proto/bcmevent.h>
-#include <proto/802.11.h>
-#include <bcmwifi.h>
-
-
-
-#define ACTION_FRAME_SIZE 1040
-
-typedef struct wl_action_frame {
-       struct ether_addr       da;
-       uint16                          len;
-       uint32                          packetId;
-       uint8                           data[ACTION_FRAME_SIZE];
-} wl_action_frame_t;
-
-#define WL_WIFI_ACTION_FRAME_SIZE sizeof(struct wl_action_frame)
-
-
-#define BWL_DEFAULT_PACKING
-#include <packed_section_start.h>
-
-#define RWL_ACTION_WIFI_CATEGORY       127  
-#define RWL_WIFI_OUI_BYTE1             0x90 
-#define RWL_WIFI_OUI_BYTE2             0x4C
-#define RWL_WIFI_OUI_BYTE3             0x0F
-#define RWL_WIFI_ACTION_FRAME_SIZE     sizeof(struct dot11_action_wifi_vendor_specific)
-#define RWL_WIFI_DEFAULT                0x00
-#define RWL_WIFI_FIND_MY_PEER          0x09 
-#define RWL_WIFI_FOUND_PEER            0x0A 
-#define RWL_ACTION_WIFI_FRAG_TYPE      0x55 
-
-typedef struct ssid_info
-{
-       uint8           ssid_len;               
-       uint8           ssid[32];               
-} ssid_info_t;
-
-typedef struct cnt_rx
-{
-       uint32 cnt_rxundec;
-       uint32 cnt_rxframe;
-} cnt_rx_t;
-
-
-
-#define RWL_REF_MAC_ADDRESS_OFFSET     17
-#define RWL_DUT_MAC_ADDRESS_OFFSET     23
-#define RWL_WIFI_CLIENT_CHANNEL_OFFSET 50
-#define RWL_WIFI_SERVER_CHANNEL_OFFSET 51
-
-
-
-
-
-#define        WL_BSS_INFO_VERSION     108             
-
-
-typedef struct wl_bss_info {
-       uint32          version;                
-       uint32          length;                 
-       struct ether_addr BSSID;
-       uint16          beacon_period;          
-       uint16          capability;             
-       uint8           SSID_len;
-       uint8           SSID[32];
-       struct {
-               uint    count;                  
-               uint8   rates[16];              
-       } rateset;                              
-       chanspec_t      chanspec;               
-       uint16          atim_window;            
-       uint8           dtim_period;            
-       int16           RSSI;                   
-       int8            phy_noise;              
-
-       uint8           n_cap;                  
-       uint32          nbss_cap;               
-       uint8           ctl_ch;                 
-       uint32          reserved32[1];          
-       uint8           flags;                  
-       uint8           reserved[3];            
-       uint8           basic_mcs[MCSSET_LEN];  
-
-       uint16          ie_offset;              
-       uint32          ie_length;              
-       
-       
-} wl_bss_info_t;
-
-typedef struct wlc_ssid {
-       uint32          SSID_len;
-       uchar           SSID[32];
-} wlc_ssid_t;
-
-
-#define WL_BSSTYPE_INFRA 1
-#define WL_BSSTYPE_INDEP 0
-#define WL_BSSTYPE_ANY   2
-
-
-#define WL_SCANFLAGS_PASSIVE 0x01
-#define WL_SCANFLAGS_PROHIBITED        0x04
-
-typedef struct wl_scan_params {
-       wlc_ssid_t ssid;                
-       struct ether_addr bssid;        
-       int8 bss_type;                  
-       int8 scan_type;         
-       int32 nprobes;                  
-       int32 active_time;              
-       int32 passive_time;             
-       int32 home_time;                
-       int32 channel_num;              
-       uint16 channel_list[1];         
-} wl_scan_params_t;
-
-#define WL_SCAN_PARAMS_FIXED_SIZE 64
-
-
-#define WL_SCAN_PARAMS_COUNT_MASK 0x0000ffff
-#define WL_SCAN_PARAMS_NSSID_SHIFT 16
-
-#define WL_SCAN_ACTION_START      1
-#define WL_SCAN_ACTION_CONTINUE   2
-#define WL_SCAN_ACTION_ABORT      3
-
-#define ISCAN_REQ_VERSION 1
-
-
-typedef struct wl_iscan_params {
-       uint32 version;
-       uint16 action;
-       uint16 scan_duration;
-       wl_scan_params_t params;
-} wl_iscan_params_t;
-
-#define WL_ISCAN_PARAMS_FIXED_SIZE (OFFSETOF(wl_iscan_params_t, params) + sizeof(wlc_ssid_t))
-
-typedef struct wl_scan_results {
-       uint32 buflen;
-       uint32 version;
-       uint32 count;
-       wl_bss_info_t bss_info[1];
-} wl_scan_results_t;
-
-#define WL_SCAN_RESULTS_FIXED_SIZE 12
-
-
-#define WL_SCAN_RESULTS_SUCCESS        0
-#define WL_SCAN_RESULTS_PARTIAL        1
-#define WL_SCAN_RESULTS_PENDING        2
-#define WL_SCAN_RESULTS_ABORTED        3
-#define WL_SCAN_RESULTS_NO_MEM 4
-
-#define ESCAN_REQ_VERSION 1
-
-typedef struct wl_escan_params {
-       uint32 version;
-       uint16 action;
-       uint16 sync_id;
-       wl_scan_params_t params;
-} wl_escan_params_t;
-
-#define WL_ESCAN_PARAMS_FIXED_SIZE (OFFSETOF(wl_escan_params_t, params) + sizeof(wlc_ssid_t))
-
-typedef struct wl_escan_result {
-       uint32 buflen;
-       uint32 version;
-       uint16 sync_id;
-       uint16 bss_count;
-       wl_bss_info_t bss_info[1];
-} wl_escan_result_t;
-
-#define WL_ESCAN_RESULTS_FIXED_SIZE (sizeof(wl_escan_result_t) - sizeof(wl_bss_info_t))
-
-
-typedef struct wl_iscan_results {
-       uint32 status;
-       wl_scan_results_t results;
-} wl_iscan_results_t;
-
-#define WL_ISCAN_RESULTS_FIXED_SIZE \
-       (WL_SCAN_RESULTS_FIXED_SIZE + OFFSETOF(wl_iscan_results_t, results))
-
-#define WL_NUMRATES            16      
-typedef struct wl_rateset {
-       uint32  count;                  
-       uint8   rates[WL_NUMRATES];     
-} wl_rateset_t;
-
-
-typedef struct wl_uint32_list {
-       
-       uint32 count;
-       
-       uint32 element[1];
-} wl_uint32_list_t;
-
-
-typedef struct wl_assoc_params {
-       struct ether_addr bssid;        
-       uint16 bssid_cnt;               
-       int32 chanspec_num;             
-       chanspec_t chanspec_list[1];    
-} wl_assoc_params_t;
-#define WL_ASSOC_PARAMS_FIXED_SIZE     (sizeof(wl_assoc_params_t) - sizeof(chanspec_t))
-
-
-typedef wl_assoc_params_t wl_reassoc_params_t;
-#define WL_REASSOC_PARAMS_FIXED_SIZE   WL_ASSOC_PARAMS_FIXED_SIZE
-
-
-typedef struct wl_join_params {
-       wlc_ssid_t ssid;
-       wl_assoc_params_t params;       
-} wl_join_params_t;
-#define WL_JOIN_PARAMS_FIXED_SIZE      (sizeof(wl_join_params_t) - sizeof(chanspec_t))
-
-#define WLC_CNTRY_BUF_SZ       4               
-
-
-typedef enum sup_auth_status {
-       
-       WLC_SUP_DISCONNECTED = 0,
-       WLC_SUP_CONNECTING,
-       WLC_SUP_IDREQUIRED,
-       WLC_SUP_AUTHENTICATING,
-       WLC_SUP_AUTHENTICATED,
-       WLC_SUP_KEYXCHANGE,
-       WLC_SUP_KEYED,
-       WLC_SUP_TIMEOUT,
-       WLC_SUP_LAST_BASIC_STATE,
-
-       
-       WLC_SUP_KEYXCHANGE_WAIT_M1 = WLC_SUP_AUTHENTICATED,
-                                       
-       WLC_SUP_KEYXCHANGE_PREP_M2 = WLC_SUP_KEYXCHANGE,
-                                       
-       WLC_SUP_KEYXCHANGE_WAIT_M3 = WLC_SUP_LAST_BASIC_STATE,
-                                       
-       WLC_SUP_KEYXCHANGE_PREP_M4,             
-       WLC_SUP_KEYXCHANGE_WAIT_G1,             
-       WLC_SUP_KEYXCHANGE_PREP_G2              
-} sup_auth_status_t;
-
-
-#define        CRYPTO_ALGO_OFF                 0
-#define        CRYPTO_ALGO_WEP1                1
-#define        CRYPTO_ALGO_TKIP                2
-#define        CRYPTO_ALGO_WEP128              3
-#define CRYPTO_ALGO_AES_CCM            4
-#define CRYPTO_ALGO_AES_OCB_MSDU       5
-#define CRYPTO_ALGO_AES_OCB_MPDU       6
-#define CRYPTO_ALGO_NALG               7
-#define CRYPTO_ALGO_SMS4               11
-
-#define WSEC_GEN_MIC_ERROR     0x0001
-#define WSEC_GEN_REPLAY                0x0002
-#define WSEC_GEN_ICV_ERROR     0x0004
-
-#define WL_SOFT_KEY    (1 << 0)        
-#define WL_PRIMARY_KEY (1 << 1)        
-#define WL_KF_RES_4    (1 << 4)        
-#define WL_KF_RES_5    (1 << 5)        
-#define WL_IBSS_PEER_GROUP_KEY (1 << 6)        
-
-typedef struct wl_wsec_key {
-       uint32          index;          
-       uint32          len;            
-       uint8           data[DOT11_MAX_KEY_SIZE];       
-       uint32          pad_1[18];
-       uint32          algo;           
-       uint32          flags;          
-       uint32          pad_2[2];
-       int             pad_3;
-       int             iv_initialized; 
-       int             pad_4;
-       
-       struct {
-               uint32  hi;             
-               uint16  lo;             
-       } rxiv;
-       uint32          pad_5[2];
-       struct ether_addr ea;           
-} wl_wsec_key_t;
-
-#define WSEC_MIN_PSK_LEN       8
-#define WSEC_MAX_PSK_LEN       64
-
-
-#define WSEC_PASSPHRASE                (1<<0)
-
-
-typedef struct {
-       ushort  key_len;                
-       ushort  flags;                  
-       uint8   key[WSEC_MAX_PSK_LEN];  
-} wsec_pmk_t;
-
-
-#define WEP_ENABLED            0x0001
-#define TKIP_ENABLED           0x0002
-#define AES_ENABLED            0x0004
-#define WSEC_SWFLAG            0x0008
-#define SES_OW_ENABLED         0x0040  
-#define SMS4_ENABLED           0x0100
-
-
-#define WPA_AUTH_DISABLED      0x0000  
-#define WPA_AUTH_NONE          0x0001  
-#define WPA_AUTH_UNSPECIFIED   0x0002  
-#define WPA_AUTH_PSK           0x0004  
-       
-#define WPA2_AUTH_UNSPECIFIED  0x0040  
-#define WPA2_AUTH_PSK          0x0080  
-#define BRCM_AUTH_PSK           0x0100  
-#define BRCM_AUTH_DPT          0x0200  
-#define WPA_AUTH_WAPI          0x0400  
-
-#define WPA_AUTH_PFN_ANY       0xffffffff      
-
-
-#define        MAXPMKID                16
-
-typedef struct _pmkid {
-       struct ether_addr       BSSID;
-       uint8                   PMKID[WPA2_PMKID_LEN];
-} pmkid_t;
-
-typedef struct _pmkid_list {
-       uint32  npmkid;
-       pmkid_t pmkid[1];
-} pmkid_list_t;
-
-typedef struct _pmkid_cand {
-       struct ether_addr       BSSID;
-       uint8                   preauth;
-} pmkid_cand_t;
-
-typedef struct _pmkid_cand_list {
-       uint32  npmkid_cand;
-       pmkid_cand_t    pmkid_cand[1];
-} pmkid_cand_list_t;
-
-
-
-
-typedef struct {
-       uint32  val;
-       struct ether_addr ea;
-} scb_val_t;
-
-
-
-typedef struct channel_info {
-       int hw_channel;
-       int target_channel;
-       int scan_channel;
-} channel_info_t;
-
-
-struct maclist {
-       uint count;                     
-       struct ether_addr ea[1];        
-};
-
-
-typedef struct get_pktcnt {
-       uint rx_good_pkt;
-       uint rx_bad_pkt;
-       uint tx_good_pkt;
-       uint tx_bad_pkt;
-       uint rx_ocast_good_pkt; 
-} get_pktcnt_t;
-
-
-typedef struct wl_ioctl {
-       uint cmd;       
-       void *buf;      
-       uint len;       
-       uint8 set;      
-       uint used;      
-       uint needed;    
-} wl_ioctl_t;
-
-
-
-#define WLC_IOCTL_MAGIC                0x14e46c77
-
-
-#define WLC_IOCTL_VERSION      1
-
-#define        WLC_IOCTL_MAXLEN        8192    
-#define        WLC_IOCTL_SMLEN         256             
-#define        WLC_IOCTL_MEDLEN        1536    
-
-
-
-#define WLC_GET_MAGIC                          0
-#define WLC_GET_VERSION                                1
-#define WLC_UP                                 2
-#define WLC_DOWN                               3
-#define WLC_GET_LOOP                           4
-#define WLC_SET_LOOP                           5
-#define WLC_DUMP                               6
-#define WLC_GET_MSGLEVEL                       7
-#define WLC_SET_MSGLEVEL                       8
-#define WLC_GET_PROMISC                                9
-#define WLC_SET_PROMISC                                10
-#define WLC_GET_RATE                           12
-#define WLC_GET_INSTANCE                       14
-#define WLC_GET_INFRA                          19
-#define WLC_SET_INFRA                          20
-#define WLC_GET_AUTH                           21
-#define WLC_SET_AUTH                           22
-#define WLC_GET_BSSID                          23
-#define WLC_SET_BSSID                          24
-#define WLC_GET_SSID                           25
-#define WLC_SET_SSID                           26
-#define WLC_RESTART                            27
-#define WLC_GET_CHANNEL                                29
-#define WLC_SET_CHANNEL                                30
-#define WLC_GET_SRL                            31
-#define WLC_SET_SRL                            32
-#define WLC_GET_LRL                            33
-#define WLC_SET_LRL                            34
-#define WLC_GET_PLCPHDR                                35
-#define WLC_SET_PLCPHDR                                36
-#define WLC_GET_RADIO                          37
-#define WLC_SET_RADIO                          38
-#define WLC_GET_PHYTYPE                                39
-#define WLC_DUMP_RATE                          40
-#define WLC_SET_RATE_PARAMS                    41
-#define WLC_GET_KEY                            44
-#define WLC_SET_KEY                            45
-#define WLC_GET_REGULATORY                     46
-#define WLC_SET_REGULATORY                     47
-#define WLC_GET_PASSIVE_SCAN                   48
-#define WLC_SET_PASSIVE_SCAN                   49
-#define WLC_SCAN                               50
-#define WLC_SCAN_RESULTS                       51
-#define WLC_DISASSOC                           52
-#define WLC_REASSOC                            53
-#define WLC_GET_ROAM_TRIGGER                   54
-#define WLC_SET_ROAM_TRIGGER                   55
-#define WLC_GET_ROAM_DELTA                     56
-#define WLC_SET_ROAM_DELTA                     57
-#define WLC_GET_ROAM_SCAN_PERIOD               58
-#define WLC_SET_ROAM_SCAN_PERIOD               59
-#define WLC_EVM                                        60      
-#define WLC_GET_TXANT                          61
-#define WLC_SET_TXANT                          62
-#define WLC_GET_ANTDIV                         63
-#define WLC_SET_ANTDIV                         64
-#define WLC_GET_CLOSED                         67
-#define WLC_SET_CLOSED                         68
-#define WLC_GET_MACLIST                                69
-#define WLC_SET_MACLIST                                70
-#define WLC_GET_RATESET                                71
-#define WLC_SET_RATESET                                72
-#define WLC_LONGTRAIN                          74
-#define WLC_GET_BCNPRD                         75
-#define WLC_SET_BCNPRD                         76
-#define WLC_GET_DTIMPRD                                77
-#define WLC_SET_DTIMPRD                                78
-#define WLC_GET_SROM                           79
-#define WLC_SET_SROM                           80
-#define WLC_GET_WEP_RESTRICT                   81
-#define WLC_SET_WEP_RESTRICT                   82
-#define WLC_GET_COUNTRY                                83
-#define WLC_SET_COUNTRY                                84
-#define WLC_GET_PM                             85
-#define WLC_SET_PM                             86
-#define WLC_GET_WAKE                           87
-#define WLC_SET_WAKE                           88
-#define WLC_GET_FORCELINK                      90      
-#define WLC_SET_FORCELINK                      91      
-#define WLC_FREQ_ACCURACY                      92      
-#define WLC_CARRIER_SUPPRESS                   93      
-#define WLC_GET_PHYREG                         94
-#define WLC_SET_PHYREG                         95
-#define WLC_GET_RADIOREG                       96
-#define WLC_SET_RADIOREG                       97
-#define WLC_GET_REVINFO                                98
-#define WLC_GET_UCANTDIV                       99
-#define WLC_SET_UCANTDIV                       100
-#define WLC_R_REG                              101
-#define WLC_W_REG                              102
-
-#define WLC_GET_MACMODE                                105
-#define WLC_SET_MACMODE                                106
-#define WLC_GET_MONITOR                                107
-#define WLC_SET_MONITOR                                108
-#define WLC_GET_GMODE                          109
-#define WLC_SET_GMODE                          110
-#define WLC_GET_LEGACY_ERP                     111
-#define WLC_SET_LEGACY_ERP                     112
-#define WLC_GET_RX_ANT                         113
-#define WLC_GET_CURR_RATESET                   114     
-#define WLC_GET_SCANSUPPRESS                   115
-#define WLC_SET_SCANSUPPRESS                   116
-#define WLC_GET_AP                             117
-#define WLC_SET_AP                             118
-#define WLC_GET_EAP_RESTRICT                   119
-#define WLC_SET_EAP_RESTRICT                   120
-#define WLC_SCB_AUTHORIZE                      121
-#define WLC_SCB_DEAUTHORIZE                    122
-#define WLC_GET_WDSLIST                                123
-#define WLC_SET_WDSLIST                                124
-#define WLC_GET_ATIM                           125
-#define WLC_SET_ATIM                           126
-#define WLC_GET_RSSI                           127
-#define WLC_GET_PHYANTDIV                      128
-#define WLC_SET_PHYANTDIV                      129
-#define WLC_AP_RX_ONLY                         130
-#define WLC_GET_TX_PATH_PWR                    131
-#define WLC_SET_TX_PATH_PWR                    132
-#define WLC_GET_WSEC                           133
-#define WLC_SET_WSEC                           134
-#define WLC_GET_PHY_NOISE                      135
-#define WLC_GET_BSS_INFO                       136
-#define WLC_GET_PKTCNTS                                137
-#define WLC_GET_LAZYWDS                                138
-#define WLC_SET_LAZYWDS                                139
-#define WLC_GET_BANDLIST                       140
-#define WLC_GET_BAND                           141
-#define WLC_SET_BAND                           142
-#define WLC_SCB_DEAUTHENTICATE                 143
-#define WLC_GET_SHORTSLOT                      144
-#define WLC_GET_SHORTSLOT_OVERRIDE             145
-#define WLC_SET_SHORTSLOT_OVERRIDE             146
-#define WLC_GET_SHORTSLOT_RESTRICT             147
-#define WLC_SET_SHORTSLOT_RESTRICT             148
-#define WLC_GET_GMODE_PROTECTION               149
-#define WLC_GET_GMODE_PROTECTION_OVERRIDE      150
-#define WLC_SET_GMODE_PROTECTION_OVERRIDE      151
-#define WLC_UPGRADE                            152
-#define WLC_GET_IGNORE_BCNS                    155
-#define WLC_SET_IGNORE_BCNS                    156
-#define WLC_GET_SCB_TIMEOUT                    157
-#define WLC_SET_SCB_TIMEOUT                    158
-#define WLC_GET_ASSOCLIST                      159
-#define WLC_GET_CLK                            160
-#define WLC_SET_CLK                            161
-#define WLC_GET_UP                             162
-#define WLC_OUT                                        163
-#define WLC_GET_WPA_AUTH                       164
-#define WLC_SET_WPA_AUTH                       165
-#define WLC_GET_UCFLAGS                                166
-#define WLC_SET_UCFLAGS                                167
-#define WLC_GET_PWRIDX                         168
-#define WLC_SET_PWRIDX                         169
-#define WLC_GET_TSSI                           170
-#define WLC_GET_SUP_RATESET_OVERRIDE           171
-#define WLC_SET_SUP_RATESET_OVERRIDE           172
-#define WLC_GET_PROTECTION_CONTROL             178
-#define WLC_SET_PROTECTION_CONTROL             179
-#define WLC_GET_PHYLIST                                180
-#define WLC_ENCRYPT_STRENGTH                   181     
-#define WLC_DECRYPT_STATUS                     182     
-#define WLC_GET_KEY_SEQ                                183
-#define WLC_GET_SCAN_CHANNEL_TIME              184
-#define WLC_SET_SCAN_CHANNEL_TIME              185
-#define WLC_GET_SCAN_UNASSOC_TIME              186
-#define WLC_SET_SCAN_UNASSOC_TIME              187
-#define WLC_GET_SCAN_HOME_TIME                 188
-#define WLC_SET_SCAN_HOME_TIME                 189
-#define WLC_GET_SCAN_NPROBES                   190
-#define WLC_SET_SCAN_NPROBES                   191
-#define WLC_GET_PRB_RESP_TIMEOUT               192
-#define WLC_SET_PRB_RESP_TIMEOUT               193
-#define WLC_GET_ATTEN                          194
-#define WLC_SET_ATTEN                          195
-#define WLC_GET_SHMEM                          196     
-#define WLC_SET_SHMEM                          197     
-#define WLC_SET_WSEC_TEST                      200
-#define WLC_SCB_DEAUTHENTICATE_FOR_REASON      201
-#define WLC_TKIP_COUNTERMEASURES               202
-#define WLC_GET_PIOMODE                                203
-#define WLC_SET_PIOMODE                                204
-#define WLC_SET_ASSOC_PREFER                   205
-#define WLC_GET_ASSOC_PREFER                   206
-#define WLC_SET_ROAM_PREFER                    207
-#define WLC_GET_ROAM_PREFER                    208
-#define WLC_SET_LED                            209
-#define WLC_GET_LED                            210
-#define WLC_GET_INTERFERENCE_MODE              211
-#define WLC_SET_INTERFERENCE_MODE              212
-#define WLC_GET_CHANNEL_QA                     213
-#define WLC_START_CHANNEL_QA                   214
-#define WLC_GET_CHANNEL_SEL                    215
-#define WLC_START_CHANNEL_SEL                  216
-#define WLC_GET_VALID_CHANNELS                 217
-#define WLC_GET_FAKEFRAG                       218
-#define WLC_SET_FAKEFRAG                       219
-#define WLC_GET_PWROUT_PERCENTAGE              220
-#define WLC_SET_PWROUT_PERCENTAGE              221
-#define WLC_SET_BAD_FRAME_PREEMPT              222
-#define WLC_GET_BAD_FRAME_PREEMPT              223
-#define WLC_SET_LEAP_LIST                      224
-#define WLC_GET_LEAP_LIST                      225
-#define WLC_GET_CWMIN                          226
-#define WLC_SET_CWMIN                          227
-#define WLC_GET_CWMAX                          228
-#define WLC_SET_CWMAX                          229
-#define WLC_GET_WET                            230
-#define WLC_SET_WET                            231
-#define WLC_GET_PUB                            232
-#define WLC_GET_KEY_PRIMARY                    235
-#define WLC_SET_KEY_PRIMARY                    236
-#define WLC_GET_ACI_ARGS                       238
-#define WLC_SET_ACI_ARGS                       239
-#define WLC_UNSET_CALLBACK                     240
-#define WLC_SET_CALLBACK                       241
-#define WLC_GET_RADAR                          242
-#define WLC_SET_RADAR                          243
-#define WLC_SET_SPECT_MANAGMENT                        244
-#define WLC_GET_SPECT_MANAGMENT                        245
-#define WLC_WDS_GET_REMOTE_HWADDR              246     
-#define WLC_WDS_GET_WPA_SUP                    247
-#define WLC_SET_CS_SCAN_TIMER                  248
-#define WLC_GET_CS_SCAN_TIMER                  249
-#define WLC_MEASURE_REQUEST                    250
-#define WLC_INIT                               251
-#define WLC_SEND_QUIET                         252
-#define WLC_KEEPALIVE                  253
-#define WLC_SEND_PWR_CONSTRAINT                        254
-#define WLC_UPGRADE_STATUS                     255
-#define WLC_CURRENT_PWR                                256
-#define WLC_GET_SCAN_PASSIVE_TIME              257
-#define WLC_SET_SCAN_PASSIVE_TIME              258
-#define WLC_LEGACY_LINK_BEHAVIOR               259
-#define WLC_GET_CHANNELS_IN_COUNTRY            260
-#define WLC_GET_COUNTRY_LIST                   261
-#define WLC_GET_VAR                            262     
-#define WLC_SET_VAR                            263     
-#define WLC_NVRAM_GET                          264     
-#define WLC_NVRAM_SET                          265
-#define WLC_NVRAM_DUMP                         266
-#define WLC_REBOOT                             267
-#define WLC_SET_WSEC_PMK                       268
-#define WLC_GET_AUTH_MODE                      269
-#define WLC_SET_AUTH_MODE                      270
-#define WLC_GET_WAKEENTRY                      271
-#define WLC_SET_WAKEENTRY                      272
-#define WLC_NDCONFIG_ITEM                      273     
-#define WLC_NVOTPW                             274
-#define WLC_OTPW                               275
-#define WLC_IOV_BLOCK_GET                      276
-#define WLC_IOV_MODULES_GET                    277
-#define WLC_SOFT_RESET                         278
-#define WLC_GET_ALLOW_MODE                     279
-#define WLC_SET_ALLOW_MODE                     280
-#define WLC_GET_DESIRED_BSSID                  281
-#define WLC_SET_DESIRED_BSSID                  282
-#define        WLC_DISASSOC_MYAP                       283
-#define WLC_GET_NBANDS                         284     
-#define WLC_GET_BANDSTATES                     285     
-#define WLC_GET_WLC_BSS_INFO                   286     
-#define WLC_GET_ASSOC_INFO                     287     
-#define WLC_GET_OID_PHY                                288     
-#define WLC_SET_OID_PHY                                289     
-#define WLC_SET_ASSOC_TIME                     290     
-#define WLC_GET_DESIRED_SSID                   291     
-#define WLC_GET_CHANSPEC                       292     
-#define WLC_GET_ASSOC_STATE                    293     
-#define WLC_SET_PHY_STATE                      294     
-#define WLC_GET_SCAN_PENDING                   295     
-#define WLC_GET_SCANREQ_PENDING                        296     
-#define WLC_GET_PREV_ROAM_REASON               297     
-#define WLC_SET_PREV_ROAM_REASON               298     
-#define WLC_GET_BANDSTATES_PI                  299     
-#define WLC_GET_PHY_STATE                      300     
-#define WLC_GET_BSS_WPA_RSN                    301     
-#define WLC_GET_BSS_WPA2_RSN                   302     
-#define WLC_GET_BSS_BCN_TS                     303     
-#define WLC_GET_INT_DISASSOC                   304     
-#define WLC_SET_NUM_PEERS                      305     
-#define WLC_GET_NUM_BSS                                306     
-#define WLC_LAST                               307     
-
-
-
-#define WL_RADIO_SW_DISABLE            (1<<0)
-#define WL_RADIO_HW_DISABLE            (1<<1)
-#define WL_RADIO_MPC_DISABLE           (1<<2)
-#define WL_RADIO_COUNTRY_DISABLE       (1<<3)  
-
-
-#define WL_TXPWR_OVERRIDE      (1U<<31)
-
-#define WL_PHY_PAVARS_LEN      6       
-
-
-#define WL_DIAG_INTERRUPT                      1       
-#define WL_DIAG_LOOPBACK                       2       
-#define WL_DIAG_MEMORY                         3       
-#define WL_DIAG_LED                            4       
-#define WL_DIAG_REG                            5       
-#define WL_DIAG_SROM                           6       
-#define WL_DIAG_DMA                            7       
-
-#define WL_DIAGERR_SUCCESS                     0
-#define WL_DIAGERR_FAIL_TO_RUN                 1       
-#define WL_DIAGERR_NOT_SUPPORTED               2       
-#define WL_DIAGERR_INTERRUPT_FAIL              3       
-#define WL_DIAGERR_LOOPBACK_FAIL               4       
-#define WL_DIAGERR_SROM_FAIL                   5       
-#define WL_DIAGERR_SROM_BADCRC                 6       
-#define WL_DIAGERR_REG_FAIL                    7       
-#define WL_DIAGERR_MEMORY_FAIL                 8       
-#define WL_DIAGERR_NOMEM                       9       
-#define WL_DIAGERR_DMA_FAIL                    10      
-
-#define WL_DIAGERR_MEMORY_TIMEOUT              11      
-#define WL_DIAGERR_MEMORY_BADPATTERN           12      
-
-
-#define        WLC_BAND_AUTO           0       
-#define        WLC_BAND_5G             1       
-#define        WLC_BAND_2G             2       
-#define        WLC_BAND_ALL            3       
-
-
-#define WL_CHAN_FREQ_RANGE_2G      0
-#define WL_CHAN_FREQ_RANGE_5GL     1
-#define WL_CHAN_FREQ_RANGE_5GM     2
-#define WL_CHAN_FREQ_RANGE_5GH     3
-
-
-#define        WLC_PHY_TYPE_A          0
-#define        WLC_PHY_TYPE_B          1
-#define        WLC_PHY_TYPE_G          2
-#define        WLC_PHY_TYPE_N          4
-#define        WLC_PHY_TYPE_LP         5
-#define        WLC_PHY_TYPE_SSN        6
-#define        WLC_PHY_TYPE_NULL       0xf
-
-
-#define WLC_MACMODE_DISABLED   0       
-#define WLC_MACMODE_DENY       1       
-#define WLC_MACMODE_ALLOW      2       
-
-
-#define GMODE_LEGACY_B         0
-#define GMODE_AUTO             1
-#define GMODE_ONLY             2
-#define GMODE_B_DEFERRED       3
-#define GMODE_PERFORMANCE      4
-#define GMODE_LRS              5
-#define GMODE_MAX              6
-
-
-#define WLC_PLCP_AUTO  -1
-#define WLC_PLCP_SHORT 0
-#define WLC_PLCP_LONG  1
-
-
-#define WLC_PROTECTION_AUTO            -1
-#define WLC_PROTECTION_OFF             0
-#define WLC_PROTECTION_ON              1
-#define WLC_PROTECTION_MMHDR_ONLY      2
-#define WLC_PROTECTION_CTS_ONLY                3
-
-
-#define WLC_PROTECTION_CTL_OFF         0
-#define WLC_PROTECTION_CTL_LOCAL       1
-#define WLC_PROTECTION_CTL_OVERLAP     2
-
-
-#define WLC_N_PROTECTION_OFF           0
-#define WLC_N_PROTECTION_OPTIONAL      1
-#define WLC_N_PROTECTION_20IN40                2
-#define WLC_N_PROTECTION_MIXEDMODE     3
-
-
-#define WLC_N_PREAMBLE_MIXEDMODE       0
-#define WLC_N_PREAMBLE_GF              1
-
-
-#define WLC_N_BW_20ALL                 0
-#define WLC_N_BW_40ALL                 1
-#define WLC_N_BW_20IN2G_40IN5G         2
-
-
-#define WLC_N_TXRX_CHAIN0              0
-#define WLC_N_TXRX_CHAIN1              1
-
-
-#define WLC_N_SGI_20                   0x01
-#define WLC_N_SGI_40                   0x02
-
-
-#define PM_OFF 0
-#define PM_MAX 1
-#define PM_FAST 2
-
-
-#define        INTERFERE_NONE  0       
-#define        NON_WLAN        1       
-#define        WLAN_MANUAL     2       
-#define        WLAN_AUTO       3       
-#define AUTO_ACTIVE    (1 << 7) 
-
-typedef struct wl_aci_args {
-       int enter_aci_thresh; 
-       int exit_aci_thresh; 
-       int usec_spin; 
-       int glitch_delay; 
-       uint16 nphy_adcpwr_enter_thresh;        
-       uint16 nphy_adcpwr_exit_thresh; 
-       uint16 nphy_repeat_ctr;         
-       uint16 nphy_num_samples;        
-       uint16 nphy_undetect_window_sz; 
-       uint16 nphy_b_energy_lo_aci;    
-       uint16 nphy_b_energy_md_aci;    
-       uint16 nphy_b_energy_hi_aci;    
-} wl_aci_args_t;
-
-#define WL_ACI_ARGS_LEGACY_LENGTH      16      
-
-
-
-#define WL_ERROR_VAL           0x00000001
-#define WL_TRACE_VAL           0x00000002
-#define WL_PRHDRS_VAL          0x00000004
-#define WL_PRPKT_VAL           0x00000008
-#define WL_INFORM_VAL          0x00000010
-#define WL_TMP_VAL             0x00000020
-#define WL_OID_VAL             0x00000040
-#define WL_RATE_VAL            0x00000080
-#define WL_ASSOC_VAL           0x00000100
-#define WL_PRUSR_VAL           0x00000200
-#define WL_PS_VAL              0x00000400
-#define WL_TXPWR_VAL           0x00000800
-#define WL_PORT_VAL            0x00001000
-#define WL_DUAL_VAL            0x00002000
-#define WL_WSEC_VAL            0x00004000
-#define WL_WSEC_DUMP_VAL       0x00008000
-#define WL_LOG_VAL             0x00010000
-#define WL_NRSSI_VAL           0x00020000
-#define WL_LOFT_VAL            0x00040000
-#define WL_REGULATORY_VAL      0x00080000
-#define WL_PHYCAL_VAL          0x00100000
-#define WL_RADAR_VAL           0x00200000
-#define WL_MPC_VAL             0x00400000
-#define WL_APSTA_VAL           0x00800000
-#define WL_DFS_VAL             0x01000000
-#define WL_BA_VAL              0x02000000
-#define WL_MBSS_VAL            0x04000000
-#define WL_CAC_VAL             0x08000000
-#define WL_AMSDU_VAL           0x10000000
-#define WL_AMPDU_VAL           0x20000000
-#define WL_FFPLD_VAL           0x40000000
-
-
-#define WL_DPT_VAL             0x00000001
-#define WL_SCAN_VAL            0x00000002
-#define WL_WOWL_VAL            0x00000004
-#define WL_COEX_VAL            0x00000008
-#define WL_RTDC_VAL            0x00000010
-#define WL_BTA_VAL             0x00000040
-
-
-#define        WL_LED_NUMGPIO          16      
-
-
-#define        WL_LED_OFF              0               
-#define        WL_LED_ON               1               
-#define        WL_LED_ACTIVITY         2               
-#define        WL_LED_RADIO            3               
-#define        WL_LED_ARADIO           4               
-#define        WL_LED_BRADIO           5               
-#define        WL_LED_BGMODE           6               
-#define        WL_LED_WI1              7
-#define        WL_LED_WI2              8
-#define        WL_LED_WI3              9
-#define        WL_LED_ASSOC            10              
-#define        WL_LED_INACTIVE         11              
-#define        WL_LED_ASSOCACT         12              
-#define        WL_LED_NUMBEHAVIOR      13
-
-
-#define        WL_LED_BEH_MASK         0x7f            
-#define        WL_LED_AL_MASK          0x80            
-
-
-#define WL_NUMCHANNELS         64
-#define WL_NUMCHANSPECS                100
-
-
-#define WL_WDS_WPA_ROLE_AUTH   0       
-#define WL_WDS_WPA_ROLE_SUP    1       
-#define WL_WDS_WPA_ROLE_AUTO   255     
-
-
-#define WL_EVENTING_MASK_LEN   16
-
-
-#define VNDR_IE_CMD_LEN                4       
-
-
-#define VNDR_IE_BEACON_FLAG    0x1
-#define VNDR_IE_PRBRSP_FLAG    0x2
-#define VNDR_IE_ASSOCRSP_FLAG  0x4
-#define VNDR_IE_AUTHRSP_FLAG   0x8
-#define VNDR_IE_PRBREQ_FLAG    0x10
-#define VNDR_IE_ASSOCREQ_FLAG  0x20
-#define VNDR_IE_CUSTOM_FLAG            0x100 
-
-#define VNDR_IE_INFO_HDR_LEN   (sizeof(uint32))
-
-typedef struct {
-       uint32 pktflag;                 
-       vndr_ie_t vndr_ie_data;         
-} vndr_ie_info_t;
-
-typedef struct {
-       int iecount;                    
-       vndr_ie_info_t vndr_ie_list[1]; 
-} vndr_ie_buf_t;
-
-typedef struct {
-       char cmd[VNDR_IE_CMD_LEN];      
-       vndr_ie_buf_t vndr_ie_buffer;   
-} vndr_ie_setbuf_t;
-
-
-
-
-#define WL_JOIN_PREF_RSSI      1       
-#define WL_JOIN_PREF_WPA       2       
-#define WL_JOIN_PREF_BAND      3       
-
-
-#define WLJP_BAND_ASSOC_PREF   255     
-
-
-#define WL_WPA_ACP_MCS_ANY     "\x00\x00\x00\x00"
-
-struct tsinfo_arg {
-       uint8 octets[3];
-};
-
-
-#define        NFIFO                   6       
-
-#define        WL_CNT_T_VERSION        5       
-#define        WL_CNT_EXT_T_VERSION    1
-
-typedef struct {
-       uint16  version;        
-       uint16  length;         
-
-       
-       uint32  txframe;        
-       uint32  txbyte;         
-       uint32  txretrans;      
-       uint32  txerror;        
-       uint32  txctl;          
-       uint32  txprshort;      
-       uint32  txserr;         
-       uint32  txnobuf;        
-       uint32  txnoassoc;      
-       uint32  txrunt;         
-       uint32  txchit;         
-       uint32  txcmiss;        
-
-       
-       uint32  txuflo;         
-       uint32  txphyerr;       
-       uint32  txphycrs;
-
-       
-       uint32  rxframe;        
-       uint32  rxbyte;         
-       uint32  rxerror;        
-       uint32  rxctl;          
-       uint32  rxnobuf;        
-       uint32  rxnondata;      
-       uint32  rxbadds;        
-       uint32  rxbadcm;        
-       uint32  rxfragerr;      
-       uint32  rxrunt;         
-       uint32  rxgiant;        
-       uint32  rxnoscb;        
-       uint32  rxbadproto;     
-       uint32  rxbadsrcmac;    
-       uint32  rxbadda;        
-       uint32  rxfilter;       
-
-       
-       uint32  rxoflo;         
-       uint32  rxuflo[NFIFO];  
-
-       uint32  d11cnt_txrts_off;       
-       uint32  d11cnt_rxcrc_off;       
-       uint32  d11cnt_txnocts_off;     
-
-       
-       uint32  dmade;          
-       uint32  dmada;          
-       uint32  dmape;          
-       uint32  reset;          
-       uint32  tbtt;           
-       uint32  txdmawar;
-       uint32  pkt_callback_reg_fail;  
-
-       
-       uint32  txallfrm;       
-       uint32  txrtsfrm;       
-       uint32  txctsfrm;       
-       uint32  txackfrm;       
-       uint32  txdnlfrm;       
-       uint32  txbcnfrm;       
-       uint32  txfunfl[8];     
-       uint32  txtplunfl;      
-       uint32  txphyerror;     
-       uint32  rxfrmtoolong;   
-       uint32  rxfrmtooshrt;   
-       uint32  rxinvmachdr;    
-       uint32  rxbadfcs;       
-       uint32  rxbadplcp;      
-       uint32  rxcrsglitch;    
-       uint32  rxstrt;         
-       uint32  rxdfrmucastmbss; 
-       uint32  rxmfrmucastmbss; 
-       uint32  rxcfrmucast;    
-       uint32  rxrtsucast;     
-       uint32  rxctsucast;     
-       uint32  rxackucast;     
-       uint32  rxdfrmocast;    
-       uint32  rxmfrmocast;    
-       uint32  rxcfrmocast;    
-       uint32  rxrtsocast;     
-       uint32  rxctsocast;     
-       uint32  rxdfrmmcast;    
-       uint32  rxmfrmmcast;    
-       uint32  rxcfrmmcast;    
-       uint32  rxbeaconmbss;   
-       uint32  rxdfrmucastobss; 
-       uint32  rxbeaconobss;   
-       uint32  rxrsptmout;     
-       uint32  bcntxcancl;     
-       uint32  rxf0ovfl;       
-       uint32  rxf1ovfl;       
-       uint32  rxf2ovfl;       
-       uint32  txsfovfl;       
-       uint32  pmqovfl;        
-       uint32  rxcgprqfrm;     
-       uint32  rxcgprsqovfl;   
-       uint32  txcgprsfail;    
-       uint32  txcgprssuc;     
-       uint32  prs_timeout;    
-       uint32  rxnack;
-       uint32  frmscons;
-       uint32  txnack;
-       uint32  txglitch_nack;  
-       uint32  txburst;        
-
-       
-       uint32  txfrag;         
-       uint32  txmulti;        
-       uint32  txfail;         
-       uint32  txretry;        
-       uint32  txretrie;       
-       uint32  rxdup;          
-       uint32  txrts;          
-       uint32  txnocts;        
-       uint32  txnoack;        
-       uint32  rxfrag;         
-       uint32  rxmulti;        
-       uint32  rxcrc;          
-       uint32  txfrmsnt;       
-       uint32  rxundec;        
-
-       
-       uint32  tkipmicfaill;   
-       uint32  tkipcntrmsr;    
-       uint32  tkipreplay;     
-       uint32  ccmpfmterr;     
-       uint32  ccmpreplay;     
-       uint32  ccmpundec;      
-       uint32  fourwayfail;    
-       uint32  wepundec;       
-       uint32  wepicverr;      
-       uint32  decsuccess;     
-       uint32  tkipicverr;     
-       uint32  wepexcluded;    
-
-       uint32  txchanrej;      
-       uint32  psmwds;         
-       uint32  phywatchdog;    
-
-       
-       uint32  prq_entries_handled;    
-       uint32  prq_undirected_entries; 
-       uint32  prq_bad_entries;        
-       uint32  atim_suppress_count;    
-       uint32  bcn_template_not_ready; 
-       uint32  bcn_template_not_ready_done; 
-       uint32  late_tbtt_dpc;  
-
-       
-       uint32  rx1mbps;        
-       uint32  rx2mbps;        
-       uint32  rx5mbps5;       
-       uint32  rx6mbps;        
-       uint32  rx9mbps;        
-       uint32  rx11mbps;       
-       uint32  rx12mbps;       
-       uint32  rx18mbps;       
-       uint32  rx24mbps;       
-       uint32  rx36mbps;       
-       uint32  rx48mbps;       
-       uint32  rx54mbps;       
-       uint32  rx108mbps;      
-       uint32  rx162mbps;      
-       uint32  rx216mbps;      
-       uint32  rx270mbps;      
-       uint32  rx324mbps;      
-       uint32  rx378mbps;      
-       uint32  rx432mbps;      
-       uint32  rx486mbps;      
-       uint32  rx540mbps;      
-       
-       uint32  pktengrxducast; 
-       uint32  pktengrxdmcast; 
-} wl_cnt_t;
-
-typedef struct {
-       uint16  version;        
-       uint16  length;         
-
-       uint32 rxampdu_sgi;     
-       uint32 rxampdu_stbc; 
-       uint32 rxmpdu_sgi;      
-       uint32 rxmpdu_stbc;  
-       uint32  rxmcs0_40M;  
-       uint32  rxmcs1_40M;  
-       uint32  rxmcs2_40M;  
-       uint32  rxmcs3_40M;  
-       uint32  rxmcs4_40M;  
-       uint32  rxmcs5_40M;  
-       uint32  rxmcs6_40M;  
-       uint32  rxmcs7_40M;  
-       uint32  rxmcs32_40M;  
-
-       uint32  txfrmsnt_20Mlo;  
-       uint32  txfrmsnt_20Mup;  
-       uint32  txfrmsnt_40M;   
-
-       uint32 rx_20ul;
-} wl_cnt_ext_t;
-
-#define        WL_RXDIV_STATS_T_VERSION        1       
-typedef struct {
-       uint16  version;        
-       uint16  length;         
-
-       uint32 rxant[4];        
-} wl_rxdiv_stats_t;
-
-#define        WL_DELTA_STATS_T_VERSION        1       
-
-typedef struct {
-       uint16 version;     
-       uint16 length;      
-
-       
-       uint32 txframe;     
-       uint32 txbyte;      
-       uint32 txretrans;   
-       uint32 txfail;      
-
-       
-       uint32 rxframe;     
-       uint32 rxbyte;      
-
-       
-       uint32  rx1mbps;        
-       uint32  rx2mbps;        
-       uint32  rx5mbps5;       
-       uint32  rx6mbps;        
-       uint32  rx9mbps;        
-       uint32  rx11mbps;       
-       uint32  rx12mbps;       
-       uint32  rx18mbps;       
-       uint32  rx24mbps;       
-       uint32  rx36mbps;       
-       uint32  rx48mbps;       
-       uint32  rx54mbps;       
-       uint32  rx108mbps;      
-       uint32  rx162mbps;      
-       uint32  rx216mbps;      
-       uint32  rx270mbps;      
-       uint32  rx324mbps;      
-       uint32  rx378mbps;      
-       uint32  rx432mbps;      
-       uint32  rx486mbps;      
-       uint32  rx540mbps;      
-} wl_delta_stats_t;
-
-#define WL_WME_CNT_VERSION     1       
-
-typedef struct {
-       uint32 packets;
-       uint32 bytes;
-} wl_traffic_stats_t;
-
-typedef struct {
-       uint16  version;        
-       uint16  length;         
-
-       wl_traffic_stats_t tx[AC_COUNT];        
-       wl_traffic_stats_t tx_failed[AC_COUNT]; 
-       wl_traffic_stats_t rx[AC_COUNT];        
-       wl_traffic_stats_t rx_failed[AC_COUNT]; 
-
-       wl_traffic_stats_t forward[AC_COUNT];   
-
-       wl_traffic_stats_t tx_expired[AC_COUNT];        
-
-} wl_wme_cnt_t;
-
-
-
-#define WLC_ROAM_TRIGGER_DEFAULT       0 
-#define WLC_ROAM_TRIGGER_BANDWIDTH     1 
-#define WLC_ROAM_TRIGGER_DISTANCE      2 
-#define WLC_ROAM_TRIGGER_MAX_VALUE     2 
-
-
-enum {
-       PFN_LIST_ORDER,
-       PFN_RSSI
-};
-
-enum {
-       DISABLE,
-       ENABLE
-};
-
-#define SORT_CRITERIA_BIT              0
-#define AUTO_NET_SWITCH_BIT            1
-#define ENABLE_BKGRD_SCAN_BIT  2
-#define IMMEDIATE_SCAN_BIT             3
-#define        AUTO_CONNECT_BIT                4
-
-#define SORT_CRITERIA_MASK             0x01
-#define AUTO_NET_SWITCH_MASK   0x02
-#define ENABLE_BKGRD_SCAN_MASK 0x04
-#define IMMEDIATE_SCAN_MASK            0x08
-#define        AUTO_CONNECT_MASK               0x10
-
-#define PFN_VERSION                    1
-
-
-typedef struct wl_pfn_param {
-       int32 version;                  
-       int32 scan_freq;                
-       int32 lost_network_timeout;     
-       int16 flags;                    
-       int16 rssi_margin;              
-} wl_pfn_param_t;
-
-typedef struct wl_pfn {
-       wlc_ssid_t              ssid;                   
-       int32                   bss_type;               
-       int32                   infra;                  
-       int32                   auth;                   
-       uint32                  wpa_auth;               
-       int32                   wsec;                   
-#ifdef WLPFN_AUTO_CONNECT
-       union {
-               wl_wsec_key_t   sec_key;                
-               wsec_pmk_t      wpa_sec_key;            
-       } pfn_security;
-#endif 
-} wl_pfn_t;
-
-
-#define TOE_TX_CSUM_OL         0x00000001
-#define TOE_RX_CSUM_OL         0x00000002
-
-
-#define TOE_ERRTEST_TX_CSUM    0x00000001
-#define TOE_ERRTEST_RX_CSUM    0x00000002
-#define TOE_ERRTEST_RX_CSUM2   0x00000004
-
-struct toe_ol_stats_t {
-       
-       uint32 tx_summed;
-
-       
-       uint32 tx_iph_fill;
-       uint32 tx_tcp_fill;
-       uint32 tx_udp_fill;
-       uint32 tx_icmp_fill;
-
-       
-       uint32 rx_iph_good;
-       uint32 rx_iph_bad;
-       uint32 rx_tcp_good;
-       uint32 rx_tcp_bad;
-       uint32 rx_udp_good;
-       uint32 rx_udp_bad;
-       uint32 rx_icmp_good;
-       uint32 rx_icmp_bad;
-
-       
-       uint32 tx_tcp_errinj;
-       uint32 tx_udp_errinj;
-       uint32 tx_icmp_errinj;
-
-       
-       uint32 rx_tcp_errinj;
-       uint32 rx_udp_errinj;
-       uint32 rx_icmp_errinj;
-};
-
-
-#define ARP_OL_AGENT           0x00000001
-#define ARP_OL_SNOOP           0x00000002
-#define ARP_OL_HOST_AUTO_REPLY 0x00000004
-#define ARP_OL_PEER_AUTO_REPLY 0x00000008
-
-
-#define ARP_ERRTEST_REPLY_PEER 0x1
-#define ARP_ERRTEST_REPLY_HOST 0x2
-
-#define ARP_MULTIHOMING_MAX    8       
-
-
-struct arp_ol_stats_t {
-       uint32  host_ip_entries;        
-       uint32  host_ip_overflow;       
-
-       uint32  arp_table_entries;      
-       uint32  arp_table_overflow;     
-
-       uint32  host_request;           
-       uint32  host_reply;             
-       uint32  host_service;           
-
-       uint32  peer_request;           
-       uint32  peer_request_drop;      
-       uint32  peer_reply;             
-       uint32  peer_reply_drop;        
-       uint32  peer_service;           
-};
-
-
-
-
-
-typedef struct wl_keep_alive_pkt {
-       uint32  period_msec;    
-       uint16  len_bytes;      
-       uint8   data[1];        
-} wl_keep_alive_pkt_t;
-
-#define WL_KEEP_ALIVE_FIXED_LEN                OFFSETOF(wl_keep_alive_pkt_t, data)
-
-
-
-
-
-typedef enum wl_pkt_filter_type {
-       WL_PKT_FILTER_TYPE_PATTERN_MATCH        
-} wl_pkt_filter_type_t;
-
-#define WL_PKT_FILTER_TYPE wl_pkt_filter_type_t
-
-
-typedef struct wl_pkt_filter_pattern {
-       uint32  offset;         
-       uint32  size_bytes;     
-       uint8   mask_and_pattern[1]; 
-} wl_pkt_filter_pattern_t;
-
-
-typedef struct wl_pkt_filter {
-       uint32  id;             
-       uint32  type;           
-       uint32  negate_match;   
-       union {                 
-               wl_pkt_filter_pattern_t pattern;        
-       } u;
-} wl_pkt_filter_t;
-
-#define WL_PKT_FILTER_FIXED_LEN                  OFFSETOF(wl_pkt_filter_t, u)
-#define WL_PKT_FILTER_PATTERN_FIXED_LEN          OFFSETOF(wl_pkt_filter_pattern_t, mask_and_pattern)
-
-
-typedef struct wl_pkt_filter_enable {
-       uint32  id;             
-       uint32  enable;         
-} wl_pkt_filter_enable_t;
-
-
-typedef struct wl_pkt_filter_list {
-       uint32  num;            
-       wl_pkt_filter_t filter[1];      
-} wl_pkt_filter_list_t;
-
-#define WL_PKT_FILTER_LIST_FIXED_LEN     OFFSETOF(wl_pkt_filter_list_t, filter)
-
-
-typedef struct wl_pkt_filter_stats {
-       uint32  num_pkts_matched;       
-       uint32  num_pkts_forwarded;     
-       uint32  num_pkts_discarded;     
-} wl_pkt_filter_stats_t;
-
-
-typedef struct wl_seq_cmd_ioctl {
-       uint32 cmd;             
-       uint32 len;             
-} wl_seq_cmd_ioctl_t;
-
-#define WL_SEQ_CMD_ALIGN_BYTES 4
-
-
-#define WL_SEQ_CMDS_GET_IOCTL_FILTER(cmd) \
-       (((cmd) == WLC_GET_MAGIC)               || \
-        ((cmd) == WLC_GET_VERSION)             || \
-        ((cmd) == WLC_GET_AP)                  || \
-        ((cmd) == WLC_GET_INSTANCE))
-
-
-
-#define WL_PKTENG_PER_TX_START                 0x01
-#define WL_PKTENG_PER_TX_STOP                  0x02
-#define WL_PKTENG_PER_RX_START                 0x04
-#define WL_PKTENG_PER_RX_WITH_ACK_START        0x05
-#define WL_PKTENG_PER_TX_WITH_ACK_START        0x06
-#define WL_PKTENG_PER_RX_STOP                  0x08
-#define WL_PKTENG_PER_MASK                     0xff
-
-#define WL_PKTENG_SYNCHRONOUS                  0x100   
-
-typedef struct wl_pkteng {
-       uint32 flags;
-       uint32 delay;                   
-       uint32 nframes;                 
-       uint32 length;                  
-       uint8  seqno;                   
-       struct ether_addr dest;         
-       struct ether_addr src;          
-} wl_pkteng_t;
-
-#define NUM_80211b_RATES       4
-#define NUM_80211ag_RATES      8
-#define NUM_80211n_RATES       32
-#define NUM_80211_RATES                (NUM_80211b_RATES+NUM_80211ag_RATES+NUM_80211n_RATES)
-typedef struct wl_pkteng_stats {
-       uint32 lostfrmcnt;              
-       int32 rssi;                     
-       int32 snr;                      
-       uint16 rxpktcnt[NUM_80211_RATES+1];
-} wl_pkteng_stats_t;
-
-#define WL_WOWL_MAGIC  (1 << 0)        
-#define WL_WOWL_NET    (1 << 1)        
-#define WL_WOWL_DIS    (1 << 2)        
-#define WL_WOWL_RETR   (1 << 3)        
-#define WL_WOWL_BCN    (1 << 4)        
-#define WL_WOWL_TST    (1 << 5)        
-#define WL_WOWL_BCAST  (1 << 15)       
-
-#define MAGIC_PKT_MINLEN 102   
-
-typedef struct {
-       uint masksize;          
-       uint offset;            
-       uint patternoffset;     
-       uint patternsize;       
-       
-       
-} wl_wowl_pattern_t;
-
-typedef struct {
-       uint                    count;
-       wl_wowl_pattern_t       pattern[1];
-} wl_wowl_pattern_list_t;
-
-typedef struct {
-       uint8   pci_wakeind;    
-       uint16  ucode_wakeind;  
-} wl_wowl_wakeind_t;
-
-
-typedef struct wl_txrate_class {
-       uint8           init_rate;
-       uint8           min_rate;
-       uint8           max_rate;
-} wl_txrate_class_t;
-
-
-
-
-#define WLC_OBSS_SCAN_PASSIVE_DWELL_DEFAULT            100     
-#define WLC_OBSS_SCAN_PASSIVE_DWELL_MIN                        5       
-#define WLC_OBSS_SCAN_PASSIVE_DWELL_MAX                        1000    
-#define WLC_OBSS_SCAN_ACTIVE_DWELL_DEFAULT             20      
-#define WLC_OBSS_SCAN_ACTIVE_DWELL_MIN                 10      
-#define WLC_OBSS_SCAN_ACTIVE_DWELL_MAX                 1000    
-#define WLC_OBSS_SCAN_WIDTHSCAN_INTERVAL_DEFAULT       300     
-#define WLC_OBSS_SCAN_WIDTHSCAN_INTERVAL_MIN           10      
-#define WLC_OBSS_SCAN_WIDTHSCAN_INTERVAL_MAX           900     
-#define WLC_OBSS_SCAN_CHANWIDTH_TRANSITION_DLY_DEFAULT 5
-#define WLC_OBSS_SCAN_CHANWIDTH_TRANSITION_DLY_MIN     5
-#define WLC_OBSS_SCAN_CHANWIDTH_TRANSITION_DLY_MAX     100
-#define WLC_OBSS_SCAN_PASSIVE_TOTAL_PER_CHANNEL_DEFAULT        200     
-#define WLC_OBSS_SCAN_PASSIVE_TOTAL_PER_CHANNEL_MIN    200     
-#define WLC_OBSS_SCAN_PASSIVE_TOTAL_PER_CHANNEL_MAX    10000   
-#define WLC_OBSS_SCAN_ACTIVE_TOTAL_PER_CHANNEL_DEFAULT 20      
-#define WLC_OBSS_SCAN_ACTIVE_TOTAL_PER_CHANNEL_MIN     20      
-#define WLC_OBSS_SCAN_ACTIVE_TOTAL_PER_CHANNEL_MAX     10000   
-#define WLC_OBSS_SCAN_ACTIVITY_THRESHOLD_DEFAULT       25      
-#define WLC_OBSS_SCAN_ACTIVITY_THRESHOLD_MIN           0       
-#define WLC_OBSS_SCAN_ACTIVITY_THRESHOLD_MAX           100     
-
-
-typedef struct wl_obss_scan_arg {
-       int16   passive_dwell;
-       int16   active_dwell;
-       int16   bss_widthscan_interval;
-       int16   passive_total;
-       int16   active_total;
-       int16   chanwidth_transition_delay;
-       int16   activity_threshold;
-} wl_obss_scan_arg_t;
-#define WL_OBSS_SCAN_PARAM_LEN sizeof(wl_obss_scan_arg_t)
-#define WL_MIN_NUM_OBSS_SCAN_ARG 7     
-
-#define WL_COEX_INFO_MASK              0x07
-#define WL_COEX_INFO_REQ               0x01
-#define        WL_COEX_40MHZ_INTOLERANT        0x02
-#define        WL_COEX_WIDTH20                 0x04
-
-typedef struct wl_action_obss_coex_req {
-       uint8 info;
-       uint8 num;
-       uint8 ch_list[1];
-} wl_action_obss_coex_req_t;
-
-
-#define MAX_RSSI_LEVELS 8
-
-
-typedef struct wl_rssi_event {
-       
-       uint32 rate_limit_msec;
-       
-       uint8 num_rssi_levels;
-       
-       int8 rssi_levels[MAX_RSSI_LEVELS];
-} wl_rssi_event_t;
-
-
-
-#define WLFEATURE_DISABLE_11N          0x00000001
-#define WLFEATURE_DISABLE_11N_STBC_TX  0x00000002
-#define WLFEATURE_DISABLE_11N_STBC_RX  0x00000004
-#define WLFEATURE_DISABLE_11N_SGI_TX   0x00000008
-#define WLFEATURE_DISABLE_11N_SGI_RX   0x00000010
-#define WLFEATURE_DISABLE_11N_AMPDU_TX 0x00000020
-#define WLFEATURE_DISABLE_11N_AMPDU_RX 0x00000040
-#define WLFEATURE_DISABLE_11N_GF       0x00000080
-
-
-
-#include <packed_section_end.h>
-
-
-#include <packed_section_start.h>
-
-
-typedef BWL_PRE_PACKED_STRUCT struct sta_prbreq_wps_ie_hdr {
-       struct ether_addr staAddr;
-       uint16 ieLen;
-} BWL_POST_PACKED_STRUCT sta_prbreq_wps_ie_hdr_t;
-
-typedef BWL_PRE_PACKED_STRUCT struct sta_prbreq_wps_ie_data {
-       sta_prbreq_wps_ie_hdr_t hdr;
-       uint8 ieData[1];
-} BWL_POST_PACKED_STRUCT sta_prbreq_wps_ie_data_t;
-
-typedef BWL_PRE_PACKED_STRUCT struct sta_prbreq_wps_ie_list {
-       uint32 totLen;
-       uint8 ieDataList[1];
-} BWL_POST_PACKED_STRUCT sta_prbreq_wps_ie_list_t;
-
-
-#include <packed_section_end.h>
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/linux_osl.c b/drivers/net/wireless/bcm4319/linux_osl.c
deleted file mode 100644 (file)
index 242af39..0000000
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
- * Linux OS Independent Layer
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: linux_osl.c,v 1.125.12.3.8.7 2010/05/04 21:10:04 Exp $
- */
-
-
-#define LINUX_OSL
-#if defined(CHROMIUMOS_COMPAT_WIRELESS)
-#include <linux/sched.h>
-#endif
-#include <typedefs.h>
-#include <bcmendian.h>
-#include <linuxver.h>
-#include <bcmdefs.h>
-#include <osl.h>
-#include <bcmutils.h>
-#include <linux/delay.h>
-#include <pcicfg.h>
-
-#define PCI_CFG_RETRY          10
-
-#define OS_HANDLE_MAGIC                0x1234abcd      
-#define BCM_MEM_FILENAME_LEN   24              
-
-#ifdef DHD_USE_STATIC_BUF
-#define MAX_STATIC_BUF_NUM 16
-#define STATIC_BUF_SIZE        (PAGE_SIZE*2)
-#define STATIC_BUF_TOTAL_LEN (MAX_STATIC_BUF_NUM*STATIC_BUF_SIZE)
-typedef struct bcm_static_buf {
-       struct semaphore static_sem;
-       unsigned char *buf_ptr;
-       unsigned char buf_use[MAX_STATIC_BUF_NUM];
-} bcm_static_buf_t;
-
-static bcm_static_buf_t *bcm_static_buf = 0;
-
-#define MAX_STATIC_PKT_NUM 8
-typedef struct bcm_static_pkt {
-       struct sk_buff *skb_4k[MAX_STATIC_PKT_NUM];
-       struct sk_buff *skb_8k[MAX_STATIC_PKT_NUM];
-       struct semaphore osl_pkt_sem;
-       unsigned char pkt_use[MAX_STATIC_PKT_NUM*2];
-} bcm_static_pkt_t;
-static bcm_static_pkt_t *bcm_static_skb = 0;
-
-#endif 
-typedef struct bcm_mem_link {
-       struct bcm_mem_link *prev;
-       struct bcm_mem_link *next;
-       uint    size;
-       int     line;
-       char    file[BCM_MEM_FILENAME_LEN];
-} bcm_mem_link_t;
-
-struct osl_info {
-       osl_pubinfo_t pub;
-       uint magic;
-       void *pdev;
-       uint malloced;
-       uint failed;
-       uint bustype;
-       bcm_mem_link_t *dbgmem_list;
-};
-
-static int16 linuxbcmerrormap[] =
-{      0,                      
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -E2BIG,                 
-       -E2BIG,                 
-       -EBUSY,                 
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EFAULT,                
-       -ENOMEM,                
-       -EOPNOTSUPP,            
-       -EMSGSIZE,              
-       -EINVAL,                
-       -EPERM,                 
-       -ENOMEM,                
-       -EINVAL,                
-       -ERANGE,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EINVAL,                
-       -EIO,                   
-       -ENODEV,                
-       -EINVAL,                
-       -EIO,                   
-       -EIO,                   
-       -EINVAL,                
-       -EINVAL,                
-
-
-
-#if BCME_LAST != -41
-#error "You need to add a OS error translation in the linuxbcmerrormap \
-       for new error code defined in bcmutils.h"
-#endif 
-};
-
-
-int
-osl_error(int bcmerror)
-{
-       if (bcmerror > 0)
-               bcmerror = 0;
-       else if (bcmerror < BCME_LAST)
-               bcmerror = BCME_ERROR;
-
-       
-       return linuxbcmerrormap[-bcmerror];
-}
-
-void * dhd_os_prealloc(int section, unsigned long size);
-osl_t *
-osl_attach(void *pdev, uint bustype, bool pkttag)
-{
-       osl_t *osh;
-
-       osh = kmalloc(sizeof(osl_t), GFP_ATOMIC);
-       ASSERT(osh);
-
-       bzero(osh, sizeof(osl_t));
-
-       
-       ASSERT(ABS(BCME_LAST) == (ARRAYSIZE(linuxbcmerrormap) - 1));
-
-       osh->magic = OS_HANDLE_MAGIC;
-       osh->malloced = 0;
-       osh->failed = 0;
-       osh->dbgmem_list = NULL;
-       osh->pdev = pdev;
-       osh->pub.pkttag = pkttag;
-       osh->bustype = bustype;
-
-       switch (bustype) {
-               case PCI_BUS:
-               case SI_BUS:
-               case PCMCIA_BUS:
-                       osh->pub.mmbus = TRUE;
-                       break;
-               case JTAG_BUS:
-               case SDIO_BUS:
-               case USB_BUS:
-               case SPI_BUS:
-                       osh->pub.mmbus = FALSE;
-                       break;
-               default:
-                       ASSERT(FALSE);
-                       break;
-       }
-
-#ifdef DHD_USE_STATIC_BUF
-
-
-       if (!bcm_static_buf) {
-               if (!(bcm_static_buf = (bcm_static_buf_t *)dhd_os_prealloc(3, STATIC_BUF_SIZE+
-                       STATIC_BUF_TOTAL_LEN))) {
-                       printk("can not alloc static buf!\n");
-               }
-               else
-                       printk("alloc static buf at %x!\n", (unsigned int)bcm_static_buf);
-
-               
-               init_MUTEX(&bcm_static_buf->static_sem);
-
-               
-               bcm_static_buf->buf_ptr = (unsigned char *)bcm_static_buf + STATIC_BUF_SIZE;
-
-       }
-       
-       if (!bcm_static_skb)
-       {
-               int i;
-               void *skb_buff_ptr = 0;
-               bcm_static_skb = (bcm_static_pkt_t *)((char *)bcm_static_buf + 2048);
-               skb_buff_ptr = dhd_os_prealloc(4, 0);
-
-               bcopy(skb_buff_ptr, bcm_static_skb, sizeof(struct sk_buff *)*16);
-               for (i = 0; i < MAX_STATIC_PKT_NUM*2; i++)
-                       bcm_static_skb->pkt_use[i] = 0;
-
-               init_MUTEX(&bcm_static_skb->osl_pkt_sem);
-       }
-#endif 
-       return osh;
-}
-
-void
-osl_detach(osl_t *osh)
-{
-       if (osh == NULL)
-               return;
-
-#ifdef DHD_USE_STATIC_BUF
-       if (bcm_static_buf) {
-               bcm_static_buf = 0;
-       }
-       if (bcm_static_skb) {
-               bcm_static_skb = 0;
-       }
-#endif 
-       ASSERT(osh->magic == OS_HANDLE_MAGIC);
-       kfree(osh);
-}
-
-
-void*
-osl_pktget(osl_t *osh, uint len)
-{
-       struct sk_buff *skb;
-
-       if ((skb = dev_alloc_skb(len))) {
-               skb_put(skb, len);
-               skb->priority = 0;
-
-
-               osh->pub.pktalloced++;
-       }
-
-       return ((void*) skb);
-}
-
-
-void
-osl_pktfree(osl_t *osh, void *p, bool send)
-{
-       struct sk_buff *skb, *nskb;
-
-       skb = (struct sk_buff*) p;
-
-       if (send && osh->pub.tx_fn)
-               osh->pub.tx_fn(osh->pub.tx_ctx, p, 0);
-
-       
-       while (skb) {
-               nskb = skb->next;
-               skb->next = NULL;
-
-
-               if (skb->destructor) {
-                       
-                       dev_kfree_skb_any(skb);
-               } else {
-                       
-                       dev_kfree_skb(skb);
-               }
-
-               osh->pub.pktalloced--;
-
-               skb = nskb;
-       }
-}
-
-#ifdef DHD_USE_STATIC_BUF
-void*
-osl_pktget_static(osl_t *osh, uint len)
-{
-       int i = 0;
-       struct sk_buff *skb;
-
-       
-       if (len > (PAGE_SIZE*2))
-       {
-               printk("Do we really need this big skb??\n");
-               return osl_pktget(osh, len);
-       }
-
-       
-       down(&bcm_static_skb->osl_pkt_sem);
-       if (len <= PAGE_SIZE)
-       {
-               
-               for (i = 0; i < MAX_STATIC_PKT_NUM; i++)
-               {
-                       if (bcm_static_skb->pkt_use[i] == 0)
-                               break;
-               }
-
-               if (i != MAX_STATIC_PKT_NUM)
-               {
-                       bcm_static_skb->pkt_use[i] = 1;
-                       up(&bcm_static_skb->osl_pkt_sem);
-
-                       skb = bcm_static_skb->skb_4k[i];
-                       skb->tail = skb->data + len;
-                       skb->len = len;
-                       
-                       return skb;
-               }
-       }
-
-       
-       for (i = 0; i < MAX_STATIC_PKT_NUM; i++)
-       {
-               if (bcm_static_skb->pkt_use[i+MAX_STATIC_PKT_NUM] == 0)
-                       break;
-       }
-
-       if (i != MAX_STATIC_PKT_NUM)
-       {
-               bcm_static_skb->pkt_use[i+MAX_STATIC_PKT_NUM] = 1;
-               up(&bcm_static_skb->osl_pkt_sem);
-               skb = bcm_static_skb->skb_8k[i];
-               skb->tail = skb->data + len;
-               skb->len = len;
-               
-               return skb;
-       }
-
-
-       
-       up(&bcm_static_skb->osl_pkt_sem);
-       printk("all static pkt in use!\n");
-       return osl_pktget(osh, len);
-}
-
-
-void
-osl_pktfree_static(osl_t *osh, void *p, bool send)
-{
-       int i;
-       
-       for (i = 0; i < MAX_STATIC_PKT_NUM*2; i++)
-       {
-               if (p == bcm_static_skb->skb_4k[i])
-               {
-                       down(&bcm_static_skb->osl_pkt_sem);
-                       bcm_static_skb->pkt_use[i] = 0;
-                       up(&bcm_static_skb->osl_pkt_sem);
-
-                       
-                       return;
-               }
-       }
-       return osl_pktfree(osh, p, send);
-}
-#endif 
-uint32
-osl_pci_read_config(osl_t *osh, uint offset, uint size)
-{
-       uint val = 0;
-       uint retry = PCI_CFG_RETRY;
-
-       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-
-       
-       ASSERT(size == 4);
-
-       do {
-               pci_read_config_dword(osh->pdev, offset, &val);
-               if (val != 0xffffffff)
-                       break;
-       } while (retry--);
-
-
-       return (val);
-}
-
-void
-osl_pci_write_config(osl_t *osh, uint offset, uint size, uint val)
-{
-       uint retry = PCI_CFG_RETRY;
-
-       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-
-       
-       ASSERT(size == 4);
-
-       do {
-               pci_write_config_dword(osh->pdev, offset, val);
-               if (offset != PCI_BAR0_WIN)
-                       break;
-               if (osl_pci_read_config(osh, offset, size) == val)
-                       break;
-       } while (retry--);
-
-}
-
-
-uint
-osl_pci_bus(osl_t *osh)
-{
-       ASSERT(osh && (osh->magic == OS_HANDLE_MAGIC) && osh->pdev);
-
-       return ((struct pci_dev *)osh->pdev)->bus->number;
-}
-
-
-uint
-osl_pci_slot(osl_t *osh)
-{
-       ASSERT(osh && (osh->magic == OS_HANDLE_MAGIC) && osh->pdev);
-
-       return PCI_SLOT(((struct pci_dev *)osh->pdev)->devfn);
-}
-
-static void
-osl_pcmcia_attr(osl_t *osh, uint offset, char *buf, int size, bool write)
-{
-}
-
-void
-osl_pcmcia_read_attr(osl_t *osh, uint offset, void *buf, int size)
-{
-       osl_pcmcia_attr(osh, offset, (char *) buf, size, FALSE);
-}
-
-void
-osl_pcmcia_write_attr(osl_t *osh, uint offset, void *buf, int size)
-{
-       osl_pcmcia_attr(osh, offset, (char *) buf, size, TRUE);
-}
-
-
-
-void*
-osl_malloc(osl_t *osh, uint size)
-{
-       void *addr;
-
-       
-       if (osh)
-               ASSERT(osh->magic == OS_HANDLE_MAGIC);
-
-#ifdef DHD_USE_STATIC_BUF
-       if (bcm_static_buf)
-       {
-               int i = 0;
-               if ((size >= PAGE_SIZE)&&(size <= STATIC_BUF_SIZE))
-               {
-                       down(&bcm_static_buf->static_sem);
-                       
-                       for (i = 0; i < MAX_STATIC_BUF_NUM; i++)
-                       {
-                               if (bcm_static_buf->buf_use[i] == 0)
-                                       break;
-                       }
-                       
-                       if (i == MAX_STATIC_BUF_NUM)
-                       {
-                               up(&bcm_static_buf->static_sem);
-                               printk("all static buff in use!\n");
-                               goto original;
-                       }
-                       
-                       bcm_static_buf->buf_use[i] = 1;
-                       up(&bcm_static_buf->static_sem);
-
-                       bzero(bcm_static_buf->buf_ptr+STATIC_BUF_SIZE*i, size);
-                       if (osh)
-                               osh->malloced += size;
-
-                       return ((void *)(bcm_static_buf->buf_ptr+STATIC_BUF_SIZE*i));
-               }
-       }
-original:
-#endif 
-
-       if ((addr = kmalloc(size, GFP_ATOMIC)) == NULL) {
-               if (osh)
-                       osh->failed++;
-               return (NULL);
-       }
-       if (osh)
-               osh->malloced += size;
-
-       return (addr);
-}
-
-void
-osl_mfree(osl_t *osh, void *addr, uint size)
-{
-#ifdef DHD_USE_STATIC_BUF
-       if (bcm_static_buf)
-       {
-               if ((addr > (void *)bcm_static_buf) && ((unsigned char *)addr
-                       <= ((unsigned char *)bcm_static_buf + STATIC_BUF_TOTAL_LEN)))
-               {
-                       int buf_idx = 0;
-                       
-                       buf_idx = ((unsigned char *)addr - bcm_static_buf->buf_ptr)/STATIC_BUF_SIZE;
-                       
-                       down(&bcm_static_buf->static_sem);
-                       bcm_static_buf->buf_use[buf_idx] = 0;
-                       up(&bcm_static_buf->static_sem);
-
-                       if (osh) {
-                               ASSERT(osh->magic == OS_HANDLE_MAGIC);
-                               osh->malloced -= size;
-                       }
-                       return;
-               }
-       }
-#endif 
-       if (osh) {
-               ASSERT(osh->magic == OS_HANDLE_MAGIC);
-               osh->malloced -= size;
-       }
-       kfree(addr);
-}
-
-uint
-osl_malloced(osl_t *osh)
-{
-       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-       return (osh->malloced);
-}
-
-uint
-osl_malloc_failed(osl_t *osh)
-{
-       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-       return (osh->failed);
-}
-
-void*
-osl_dma_alloc_consistent(osl_t *osh, uint size, ulong *pap)
-{
-       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-
-       return (pci_alloc_consistent(osh->pdev, size, (dma_addr_t*)pap));
-}
-
-void
-osl_dma_free_consistent(osl_t *osh, void *va, uint size, ulong pa)
-{
-       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-
-       pci_free_consistent(osh->pdev, size, va, (dma_addr_t)pa);
-}
-
-uint
-osl_dma_map(osl_t *osh, void *va, uint size, int direction)
-{
-       int dir;
-
-       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-       dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
-       return (pci_map_single(osh->pdev, va, size, dir));
-}
-
-void
-osl_dma_unmap(osl_t *osh, uint pa, uint size, int direction)
-{
-       int dir;
-
-       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-       dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
-       pci_unmap_single(osh->pdev, (uint32)pa, size, dir);
-}
-
-
-void
-osl_delay(uint usec)
-{
-       uint d;
-
-       while (usec > 0) {
-               d = MIN(usec, 1000);
-               udelay(d);
-               usec -= d;
-       }
-}
-
-
-
-void *
-osl_pktdup(osl_t *osh, void *skb)
-{
-       void * p;
-
-       if ((p = skb_clone((struct sk_buff*)skb, GFP_ATOMIC)) == NULL)
-               return NULL;
-
-       
-       if (osh->pub.pkttag)
-               bzero((void*)((struct sk_buff *)p)->cb, OSL_PKTTAG_SZ);
-
-       
-       osh->pub.pktalloced++;
-       return (p);
-}
diff --git a/drivers/net/wireless/bcm4319/miniopt.c b/drivers/net/wireless/bcm4319/miniopt.c
deleted file mode 100644 (file)
index 6a184a7..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Description.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- * $Id: miniopt.c,v 1.1.6.4 2009/09/25 00:32:01 Exp $
- */
-
-/* ---- Include Files ---------------------------------------------------- */
-
-#include <typedefs.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "miniopt.h"
-
-
-/* ---- Public Variables ------------------------------------------------- */
-/* ---- Private Constants and Types -------------------------------------- */
-
-
-
-/* ---- Private Variables ------------------------------------------------ */
-/* ---- Private Function Prototypes -------------------------------------- */
-/* ---- Functions -------------------------------------------------------- */
-
-/* ----------------------------------------------------------------------- */
-void
-miniopt_init(miniopt_t *t, const char* name, const char* flags, bool longflags)
-{
-       static const char *null_flags = "";
-
-       memset(t, 0, sizeof(miniopt_t));
-       t->name = name;
-       if (flags == NULL)
-               t->flags = null_flags;
-       else
-               t->flags = flags;
-       t->longflags = longflags;
-}
-
-
-/* ----------------------------------------------------------------------- */
-int
-miniopt(miniopt_t *t, char **argv)
-{
-       int keylen;
-       char *p, *eq, *valstr, *endptr = NULL;
-       int err = 0;
-
-       t->consumed = 0;
-       t->positional = FALSE;
-       memset(t->key, 0, MINIOPT_MAXKEY);
-       t->opt = '\0';
-       t->valstr = NULL;
-       t->good_int = FALSE;
-       valstr = NULL;
-
-       if (*argv == NULL) {
-               err = -1;
-               goto exit;
-       }
-
-       p = *argv++;
-       t->consumed++;
-
-       if (!t->opt_end && !strcmp(p, "--")) {
-               t->opt_end = TRUE;
-               if (*argv == NULL) {
-                       err = -1;
-                       goto exit;
-               }
-               p = *argv++;
-               t->consumed++;
-       }
-
-       if (t->opt_end) {
-               t->positional = TRUE;
-               valstr = p;
-       }
-       else if (!strncmp(p, "--", 2)) {
-               eq = strchr(p, '=');
-               if (eq == NULL && !t->longflags) {
-                       fprintf(stderr,
-                               "%s: missing \" = \" in long param \"%s\"\n", t->name, p);
-                       err = 1;
-                       goto exit;
-               }
-               keylen = eq ? (eq - (p + 2)) : (int)strlen(p) - 2;
-               if (keylen > 63) keylen = 63;
-               memcpy(t->key, p + 2, keylen);
-
-               if (eq) {
-                       valstr = eq + 1;
-                       if (*valstr == '\0') {
-                               fprintf(stderr,
-                                       "%s: missing value after \" = \" in long param \"%s\"\n",
-                                       t->name, p);
-                               err = 1;
-                               goto exit;
-                       }
-               }
-       }
-       else if (!strncmp(p, "-", 1)) {
-               t->opt = p[1];
-               if (strlen(p) > 2) {
-                       fprintf(stderr,
-                               "%s: only single char options, error on param \"%s\"\n",
-                               t->name, p);
-                       err = 1;
-                       goto exit;
-               }
-               if (strchr(t->flags, t->opt)) {
-                       /* this is a flag option, no value expected */
-                       valstr = NULL;
-               } else {
-                       if (*argv == NULL) {
-                               fprintf(stderr,
-                               "%s: missing value parameter after \"%s\"\n", t->name, p);
-                               err = 1;
-                               goto exit;
-                       }
-                       valstr = *argv;
-                       argv++;
-                       t->consumed++;
-               }
-       } else {
-               t->positional = TRUE;
-               valstr = p;
-       }
-
-       /* parse valstr as int just in case */
-       if (valstr) {
-               t->uval = (uint)strtoul(valstr, &endptr, 0);
-               t->val = (int)t->uval;
-               t->good_int = (*endptr == '\0');
-       }
-
-       t->valstr = valstr;
-
-exit:
-       if (err == 1)
-               t->opt = '?';
-
-       return err;
-}
diff --git a/drivers/net/wireless/bcm4319/mkclean.sh b/drivers/net/wireless/bcm4319/mkclean.sh
deleted file mode 100755 (executable)
index 2fcad1b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-rm -f *.o
-rm -f ../wifi_power/*.o
-rm -f *.uu
-rm -rf bcm4319
-rm -f .*.cmd
-rm -f ../wifi_power/.*.cmd
-rm -f modules.order Module.symvers
-
-find . -name '*.o' -exec rm -f {} \;
-find . -name '.*.cmd' -exec rm -f {} \;
-
diff --git a/drivers/net/wireless/bcm4319/mkpkg.sh b/drivers/net/wireless/bcm4319/mkpkg.sh
deleted file mode 100755 (executable)
index 224f914..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-echo "Begin to make BCM4319 wifi driver package ..."
-
-RKWLCFGDIR=../wifi_power
-PKGNAME="bcm4319"
-RKPUB="rkpub"
-PKGVER=`grep -r '#define BCM4319_DRV_VERSION' ${RKWLCFGDIR}/wifi_version.h | sed 's/[^"]*\"\([0-9A-Za-z\.]*\)*\"/\1/'`
-
-[ `dirname $0` = '.' ] || exit
-
-
-rm -rf ${RKPUB}
-mkdir -p ${RKPUB}/${PKGNAME}
-
-cp Makefile.${PKGNAME} ${RKPUB}/${PKGNAME}/Makefile
-cp Kconfig.${PKGNAME} ${RKPUB}/${PKGNAME}/Kconfig
-cp ${RKWLCFGDIR}/wifi_power.c ${RKPUB}/${PKGNAME}/wifi_power.c
-cp ${RKWLCFGDIR}/wifi_power.h ${RKPUB}/${PKGNAME}/wifi_power.h
-cp ${RKWLCFGDIR}/wifi_version.h ${RKPUB}/${PKGNAME}/wifi_version.h
-chmod 644 ${RKPUB}/${PKGNAME}/*
-cp -dpR firmware ${RKPUB}/${PKGNAME}/
-find ${RKPUB}/${PKGNAME}/firmware -type d -name '.svn' | xargs rm -rf
-uuencode ${PKGNAME}.o ${PKGNAME}.o > ${RKPUB}/${PKGNAME}/${PKGNAME}.uu
-cd ${RKPUB} && tar -jcvf ${PKGNAME}-${PKGVER}.tar.bz2 ${PKGNAME}
-
-echo "Done"
diff --git a/drivers/net/wireless/bcm4319/sbutils.c b/drivers/net/wireless/bcm4319/sbutils.c
deleted file mode 100644 (file)
index 46cd510..0000000
+++ /dev/null
@@ -1,1004 +0,0 @@
-/*
- * Misc utility routines for accessing chip-specific features
- * of the SiliconBackplane-based Broadcom chips.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: sbutils.c,v 1.662.4.10.2.7.4.2 2010/04/19 05:48:48 Exp $
- */
-
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
-#include <bcmutils.h>
-#include <siutils.h>
-#include <bcmdevs.h>
-#include <hndsoc.h>
-#include <sbchipc.h>
-#include <pcicfg.h>
-#include <sbpcmcia.h>
-
-#include "siutils_priv.h"
-
-/* local prototypes */
-static uint _sb_coreidx(si_info_t *sii, uint32 sba);
-static uint _sb_scan(si_info_t *sii, uint32 sba, void *regs, uint bus, uint32 sbba,
-                     uint ncores);
-static uint32 _sb_coresba(si_info_t *sii);
-static void *_sb_setcoreidx(si_info_t *sii, uint coreidx);
-
-#define        SET_SBREG(sii, r, mask, val)    \
-               W_SBREG((sii), (r), ((R_SBREG((sii), (r)) & ~(mask)) | (val)))
-#define        REGS2SB(va)     (sbconfig_t*) ((int8*)(va) + SBCONFIGOFF)
-
-/* sonicsrev */
-#define        SONICS_2_2      (SBIDL_RV_2_2 >> SBIDL_RV_SHIFT)
-#define        SONICS_2_3      (SBIDL_RV_2_3 >> SBIDL_RV_SHIFT)
-
-#define        R_SBREG(sii, sbr)       sb_read_sbreg((sii), (sbr))
-#define        W_SBREG(sii, sbr, v)    sb_write_sbreg((sii), (sbr), (v))
-#define        AND_SBREG(sii, sbr, v)  W_SBREG((sii), (sbr), (R_SBREG((sii), (sbr)) & (v)))
-#define        OR_SBREG(sii, sbr, v)   W_SBREG((sii), (sbr), (R_SBREG((sii), (sbr)) | (v)))
-
-static uint32
-sb_read_sbreg(si_info_t *sii, volatile uint32 *sbr)
-{
-       uint8 tmp;
-       uint32 val, intr_val = 0;
-
-
-       /*
-        * compact flash only has 11 bits address, while we needs 12 bits address.
-        * MEM_SEG will be OR'd with other 11 bits address in hardware,
-        * so we program MEM_SEG with 12th bit when necessary(access sb regsiters).
-        * For normal PCMCIA bus(CFTable_regwinsz > 2k), do nothing special
-        */
-       if (PCMCIA(sii)) {
-               INTR_OFF(sii, intr_val);
-               tmp = 1;
-               OSL_PCMCIA_WRITE_ATTR(sii->osh, MEM_SEG, &tmp, 1);
-               sbr = (volatile uint32 *)((uintptr)sbr & ~(1 << 11)); /* mask out bit 11 */
-       }
-
-       val = R_REG(sii->osh, sbr);
-
-       if (PCMCIA(sii)) {
-               tmp = 0;
-               OSL_PCMCIA_WRITE_ATTR(sii->osh, MEM_SEG, &tmp, 1);
-               INTR_RESTORE(sii, intr_val);
-       }
-
-       return (val);
-}
-
-static void
-sb_write_sbreg(si_info_t *sii, volatile uint32 *sbr, uint32 v)
-{
-       uint8 tmp;
-       volatile uint32 dummy;
-       uint32 intr_val = 0;
-
-
-       /*
-        * compact flash only has 11 bits address, while we needs 12 bits address.
-        * MEM_SEG will be OR'd with other 11 bits address in hardware,
-        * so we program MEM_SEG with 12th bit when necessary(access sb regsiters).
-        * For normal PCMCIA bus(CFTable_regwinsz > 2k), do nothing special
-        */
-       if (PCMCIA(sii)) {
-               INTR_OFF(sii, intr_val);
-               tmp = 1;
-               OSL_PCMCIA_WRITE_ATTR(sii->osh, MEM_SEG, &tmp, 1);
-               sbr = (volatile uint32 *)((uintptr)sbr & ~(1 << 11)); /* mask out bit 11 */
-       }
-
-       if (BUSTYPE(sii->pub.bustype) == PCMCIA_BUS) {
-#ifdef IL_BIGENDIAN
-               dummy = R_REG(sii->osh, sbr);
-               W_REG(sii->osh, ((volatile uint16 *)sbr + 1), (uint16)((v >> 16) & 0xffff));
-               dummy = R_REG(sii->osh, sbr);
-               W_REG(sii->osh, (volatile uint16 *)sbr, (uint16)(v & 0xffff));
-#else
-               dummy = R_REG(sii->osh, sbr);
-               W_REG(sii->osh, (volatile uint16 *)sbr, (uint16)(v & 0xffff));
-               dummy = R_REG(sii->osh, sbr);
-               W_REG(sii->osh, ((volatile uint16 *)sbr + 1), (uint16)((v >> 16) & 0xffff));
-#endif /* IL_BIGENDIAN */
-       } else
-               W_REG(sii->osh, sbr, v);
-
-       if (PCMCIA(sii)) {
-               tmp = 0;
-               OSL_PCMCIA_WRITE_ATTR(sii->osh, MEM_SEG, &tmp, 1);
-               INTR_RESTORE(sii, intr_val);
-       }
-}
-
-uint
-sb_coreid(si_t *sih)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-
-       return ((R_SBREG(sii, &sb->sbidhigh) & SBIDH_CC_MASK) >> SBIDH_CC_SHIFT);
-}
-
-uint
-sb_flag(si_t *sih)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-
-       return R_SBREG(sii, &sb->sbtpsflag) & SBTPS_NUM0_MASK;
-}
-
-void
-sb_setint(si_t *sih, int siflag)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-       uint32 vec;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-
-       if (siflag == -1)
-               vec = 0;
-       else
-               vec = 1 << siflag;
-       W_SBREG(sii, &sb->sbintvec, vec);
-}
-
-/* return core index of the core with address 'sba' */
-static uint
-_sb_coreidx(si_info_t *sii, uint32 sba)
-{
-       uint i;
-
-       for (i = 0; i < sii->numcores; i ++)
-               if (sba == sii->common_info->coresba[i])
-                       return i;
-       return BADIDX;
-}
-
-/* return core address of the current core */
-static uint32
-_sb_coresba(si_info_t *sii)
-{
-       uint32 sbaddr;
-
-
-       switch (BUSTYPE(sii->pub.bustype)) {
-       case SI_BUS: {
-               sbconfig_t *sb = REGS2SB(sii->curmap);
-               sbaddr = sb_base(R_SBREG(sii, &sb->sbadmatch0));
-               break;
-       }
-
-       case PCI_BUS:
-               sbaddr = OSL_PCI_READ_CONFIG(sii->osh, PCI_BAR0_WIN, sizeof(uint32));
-               break;
-
-       case PCMCIA_BUS: {
-               uint8 tmp = 0;
-               OSL_PCMCIA_READ_ATTR(sii->osh, PCMCIA_ADDR0, &tmp, 1);
-               sbaddr  = (uint32)tmp << 12;
-               OSL_PCMCIA_READ_ATTR(sii->osh, PCMCIA_ADDR1, &tmp, 1);
-               sbaddr |= (uint32)tmp << 16;
-               OSL_PCMCIA_READ_ATTR(sii->osh, PCMCIA_ADDR2, &tmp, 1);
-               sbaddr |= (uint32)tmp << 24;
-               break;
-       }
-
-       case SPI_BUS:
-       case SDIO_BUS:
-               sbaddr = (uint32)(uintptr)sii->curmap;
-               break;
-
-
-       default:
-               sbaddr = BADCOREADDR;
-               break;
-       }
-
-       return sbaddr;
-}
-
-uint
-sb_corevendor(si_t *sih)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-
-       return ((R_SBREG(sii, &sb->sbidhigh) & SBIDH_VC_MASK) >> SBIDH_VC_SHIFT);
-}
-
-uint
-sb_corerev(si_t *sih)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-       uint sbidh;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-       sbidh = R_SBREG(sii, &sb->sbidhigh);
-
-       return (SBCOREREV(sbidh));
-}
-
-/* set core-specific control flags */
-void
-sb_core_cflags_wo(si_t *sih, uint32 mask, uint32 val)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-       uint32 w;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-
-       ASSERT((val & ~mask) == 0);
-
-       /* mask and set */
-       w = (R_SBREG(sii, &sb->sbtmstatelow) & ~(mask << SBTML_SICF_SHIFT)) |
-               (val << SBTML_SICF_SHIFT);
-       W_SBREG(sii, &sb->sbtmstatelow, w);
-}
-
-/* set/clear core-specific control flags */
-uint32
-sb_core_cflags(si_t *sih, uint32 mask, uint32 val)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-       uint32 w;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-
-       ASSERT((val & ~mask) == 0);
-
-       /* mask and set */
-       if (mask || val) {
-               w = (R_SBREG(sii, &sb->sbtmstatelow) & ~(mask << SBTML_SICF_SHIFT)) |
-                       (val << SBTML_SICF_SHIFT);
-               W_SBREG(sii, &sb->sbtmstatelow, w);
-       }
-
-       /* return the new value
-        * for write operation, the following readback ensures the completion of write opration.
-        */
-       return (R_SBREG(sii, &sb->sbtmstatelow) >> SBTML_SICF_SHIFT);
-}
-
-/* set/clear core-specific status flags */
-uint32
-sb_core_sflags(si_t *sih, uint32 mask, uint32 val)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-       uint32 w;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-
-       ASSERT((val & ~mask) == 0);
-       ASSERT((mask & ~SISF_CORE_BITS) == 0);
-
-       /* mask and set */
-       if (mask || val) {
-               w = (R_SBREG(sii, &sb->sbtmstatehigh) & ~(mask << SBTMH_SISF_SHIFT)) |
-                       (val << SBTMH_SISF_SHIFT);
-               W_SBREG(sii, &sb->sbtmstatehigh, w);
-       }
-
-       /* return the new value */
-       return (R_SBREG(sii, &sb->sbtmstatehigh) >> SBTMH_SISF_SHIFT);
-}
-
-bool
-sb_iscoreup(si_t *sih)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-
-       return ((R_SBREG(sii, &sb->sbtmstatelow) &
-                (SBTML_RESET | SBTML_REJ_MASK | (SICF_CLOCK_EN << SBTML_SICF_SHIFT))) ==
-               (SICF_CLOCK_EN << SBTML_SICF_SHIFT));
-}
-
-/*
- * Switch to 'coreidx', issue a single arbitrary 32bit register mask&set operation,
- * switch back to the original core, and return the new value.
- *
- * When using the silicon backplane, no fidleing with interrupts or core switches are needed.
- *
- * Also, when using pci/pcie, we can optimize away the core switching for pci registers
- * and (on newer pci cores) chipcommon registers.
- */
-uint
-sb_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val)
-{
-       uint origidx = 0;
-       uint32 *r = NULL;
-       uint w;
-       uint intr_val = 0;
-       bool fast = FALSE;
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       ASSERT(GOODIDX(coreidx));
-       ASSERT(regoff < SI_CORE_SIZE);
-       ASSERT((val & ~mask) == 0);
-
-       if (coreidx >= SI_MAXCORES)
-               return 0;
-
-       if (BUSTYPE(sii->pub.bustype) == SI_BUS) {
-               /* If internal bus, we can always get at everything */
-               fast = TRUE;
-               /* map if does not exist */
-               if (!sii->common_info->regs[coreidx]) {
-                       sii->common_info->regs[coreidx] =
-                           REG_MAP(sii->common_info->coresba[coreidx], SI_CORE_SIZE);
-                       ASSERT(GOODREGS(sii->common_info->regs[coreidx]));
-               }
-               r = (uint32 *)((uchar *)sii->common_info->regs[coreidx] + regoff);
-       } else if (BUSTYPE(sii->pub.bustype) == PCI_BUS) {
-               /* If pci/pcie, we can get at pci/pcie regs and on newer cores to chipc */
-
-               if ((sii->common_info->coreid[coreidx] == CC_CORE_ID) && SI_FAST(sii)) {
-                       /* Chipc registers are mapped at 12KB */
-
-                       fast = TRUE;
-                       r = (uint32 *)((char *)sii->curmap + PCI_16KB0_CCREGS_OFFSET + regoff);
-               } else if (sii->pub.buscoreidx == coreidx) {
-                       /* pci registers are at either in the last 2KB of an 8KB window
-                        * or, in pcie and pci rev 13 at 8KB
-                        */
-                       fast = TRUE;
-                       if (SI_FAST(sii))
-                               r = (uint32 *)((char *)sii->curmap +
-                                              PCI_16KB0_PCIREGS_OFFSET + regoff);
-                       else
-                               r = (uint32 *)((char *)sii->curmap +
-                                              ((regoff >= SBCONFIGOFF) ?
-                                               PCI_BAR0_PCISBR_OFFSET : PCI_BAR0_PCIREGS_OFFSET) +
-                                              regoff);
-               }
-       }
-
-       if (!fast) {
-               INTR_OFF(sii, intr_val);
-
-               /* save current core index */
-               origidx = si_coreidx(&sii->pub);
-
-               /* switch core */
-               r = (uint32*) ((uchar*)sb_setcoreidx(&sii->pub, coreidx) + regoff);
-       }
-       ASSERT(r != NULL);
-
-       /* mask and set */
-       if (mask || val) {
-               if (regoff >= SBCONFIGOFF) {
-                       w = (R_SBREG(sii, r) & ~mask) | val;
-                       W_SBREG(sii, r, w);
-               } else {
-                       w = (R_REG(sii->osh, r) & ~mask) | val;
-                       W_REG(sii->osh, r, w);
-               }
-       }
-
-       /* readback */
-       if (regoff >= SBCONFIGOFF)
-               w = R_SBREG(sii, r);
-       else {
-               if ((CHIPID(sii->pub.chip) == BCM5354_CHIP_ID) &&
-                   (coreidx == SI_CC_IDX) &&
-                   (regoff == OFFSETOF(chipcregs_t, watchdog))) {
-                       w = val;
-               } else
-                       w = R_REG(sii->osh, r);
-       }
-
-       if (!fast) {
-               /* restore core index */
-               if (origidx != coreidx)
-                       sb_setcoreidx(&sii->pub, origidx);
-
-               INTR_RESTORE(sii, intr_val);
-       }
-
-       return (w);
-}
-
-/* Scan the enumeration space to find all cores starting from the given
- * bus 'sbba'. Append coreid and other info to the lists in 'si'. 'sba'
- * is the default core address at chip POR time and 'regs' is the virtual
- * address that the default core is mapped at. 'ncores' is the number of
- * cores expected on bus 'sbba'. It returns the total number of cores
- * starting from bus 'sbba', inclusive.
- */
-#define SB_MAXBUSES    2
-static uint
-_sb_scan(si_info_t *sii, uint32 sba, void *regs, uint bus, uint32 sbba, uint numcores)
-{
-       uint next;
-       uint ncc = 0;
-       uint i;
-
-       if (bus >= SB_MAXBUSES) {
-               SI_ERROR(("_sb_scan: bus 0x%08x at level %d is too deep to scan\n", sbba, bus));
-               return 0;
-       }
-       SI_MSG(("_sb_scan: scan bus 0x%08x assume %u cores\n", sbba, numcores));
-
-       /* Scan all cores on the bus starting from core 0.
-        * Core addresses must be contiguous on each bus.
-        */
-       for (i = 0, next = sii->numcores; i < numcores && next < SB_BUS_MAXCORES; i++, next++) {
-               sii->common_info->coresba[next] = sbba + (i * SI_CORE_SIZE);
-
-               /* keep and reuse the initial register mapping */
-               if ((BUSTYPE(sii->pub.bustype) == SI_BUS) &&
-                       (sii->common_info->coresba[next] == sba)) {
-                       SI_MSG(("_sb_scan: reuse mapped regs %p for core %u\n", regs, next));
-                       sii->common_info->regs[next] = regs;
-               }
-
-               /* change core to 'next' and read its coreid */
-               sii->curmap = _sb_setcoreidx(sii, next);
-               sii->curidx = next;
-
-               sii->common_info->coreid[next] = sb_coreid(&sii->pub);
-
-               /* core specific processing... */
-               /* chipc provides # cores */
-               if (sii->common_info->coreid[next] == CC_CORE_ID) {
-                       chipcregs_t *cc = (chipcregs_t *)sii->curmap;
-                       uint32 ccrev = sb_corerev(&sii->pub);
-
-                       /* determine numcores - this is the total # cores in the chip */
-                       if (((ccrev == 4) || (ccrev >= 6)))
-                               numcores = (R_REG(sii->osh, &cc->chipid) & CID_CC_MASK) >>
-                                       CID_CC_SHIFT;
-                       else {
-                               /* Older chips */
-                               uint chip = sii->pub.chip;
-
-                               if (chip == BCM4306_CHIP_ID)    /* < 4306c0 */
-                                       numcores = 6;
-                               else if (chip == BCM4704_CHIP_ID)
-                                       numcores = 9;
-                               else if (chip == BCM5365_CHIP_ID)
-                                       numcores = 7;
-                               else {
-                                       SI_ERROR(("sb_chip2numcores: unsupported chip 0x%x\n",
-                                                 chip));
-                                       ASSERT(0);
-                                       numcores = 1;
-                               }
-                       }
-                       SI_MSG(("_sb_scan: there are %u cores in the chip %s\n", numcores,
-                               sii->pub.issim ? "QT" : ""));
-               }
-               /* scan bridged SB(s) and add results to the end of the list */
-               else if (sii->common_info->coreid[next] == OCP_CORE_ID) {
-                       sbconfig_t *sb = REGS2SB(sii->curmap);
-                       uint32 nsbba = R_SBREG(sii, &sb->sbadmatch1);
-                       uint nsbcc;
-
-                       sii->numcores = next + 1;
-
-                       if ((nsbba & 0xfff00000) != SI_ENUM_BASE)
-                               continue;
-                       nsbba &= 0xfffff000;
-                       if (_sb_coreidx(sii, nsbba) != BADIDX)
-                               continue;
-
-                       nsbcc = (R_SBREG(sii, &sb->sbtmstatehigh) & 0x000f0000) >> 16;
-                       nsbcc = _sb_scan(sii, sba, regs, bus + 1, nsbba, nsbcc);
-                       if (sbba == SI_ENUM_BASE)
-                               numcores -= nsbcc;
-                       ncc += nsbcc;
-               }
-       }
-
-       SI_MSG(("_sb_scan: found %u cores on bus 0x%08x\n", i, sbba));
-
-       sii->numcores = i + ncc;
-       return sii->numcores;
-}
-
-/* scan the sb enumerated space to identify all cores */
-void
-sb_scan(si_t *sih, void *regs, uint devid)
-{
-       si_info_t *sii;
-       uint32 origsba;
-
-       sii = SI_INFO(sih);
-
-       /* Save the current core info and validate it later till we know
-        * for sure what is good and what is bad.
-        */
-       origsba = _sb_coresba(sii);
-
-       /* scan all SB(s) starting from SI_ENUM_BASE */
-       sii->numcores = _sb_scan(sii, origsba, regs, 0, SI_ENUM_BASE, 1);
-}
-
-/*
- * This function changes logical "focus" to the indicated core;
- * must be called with interrupts off.
- * Moreover, callers should keep interrupts off during switching out of and back to d11 core
- */
-void *
-sb_setcoreidx(si_t *sih, uint coreidx)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       if (coreidx >= sii->numcores)
-               return (NULL);
-
-       /*
-        * If the user has provided an interrupt mask enabled function,
-        * then assert interrupts are disabled before switching the core.
-        */
-       ASSERT((sii->intrsenabled_fn == NULL) || !(*(sii)->intrsenabled_fn)((sii)->intr_arg));
-
-       sii->curmap = _sb_setcoreidx(sii, coreidx);
-       sii->curidx = coreidx;
-
-       return (sii->curmap);
-}
-
-/* This function changes the logical "focus" to the indicated core.
- * Return the current core's virtual address.
- */
-static void *
-_sb_setcoreidx(si_info_t *sii, uint coreidx)
-{
-       uint32 sbaddr = sii->common_info->coresba[coreidx];
-       void *regs;
-
-       switch (BUSTYPE(sii->pub.bustype)) {
-       case SI_BUS:
-               /* map new one */
-               if (!sii->common_info->regs[coreidx]) {
-                       sii->common_info->regs[coreidx] = REG_MAP(sbaddr, SI_CORE_SIZE);
-                       ASSERT(GOODREGS(sii->common_info->regs[coreidx]));
-               }
-               regs = sii->common_info->regs[coreidx];
-               break;
-
-       case PCI_BUS:
-               /* point bar0 window */
-               OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN, 4, sbaddr);
-               regs = sii->curmap;
-               break;
-
-       case PCMCIA_BUS: {
-               uint8 tmp = (sbaddr >> 12) & 0x0f;
-               OSL_PCMCIA_WRITE_ATTR(sii->osh, PCMCIA_ADDR0, &tmp, 1);
-               tmp = (sbaddr >> 16) & 0xff;
-               OSL_PCMCIA_WRITE_ATTR(sii->osh, PCMCIA_ADDR1, &tmp, 1);
-               tmp = (sbaddr >> 24) & 0xff;
-               OSL_PCMCIA_WRITE_ATTR(sii->osh, PCMCIA_ADDR2, &tmp, 1);
-               regs = sii->curmap;
-               break;
-       }
-       case SPI_BUS:
-       case SDIO_BUS:
-               /* map new one */
-               if (!sii->common_info->regs[coreidx]) {
-                       sii->common_info->regs[coreidx] = (void *)(uintptr)sbaddr;
-                       ASSERT(GOODREGS(sii->common_info->regs[coreidx]));
-               }
-               regs = sii->common_info->regs[coreidx];
-               break;
-
-
-       default:
-               ASSERT(0);
-               regs = NULL;
-               break;
-       }
-
-       return regs;
-}
-
-/* Return the address of sbadmatch0/1/2/3 register */
-static volatile uint32 *
-sb_admatch(si_info_t *sii, uint asidx)
-{
-       sbconfig_t *sb;
-       volatile uint32 *addrm;
-
-       sb = REGS2SB(sii->curmap);
-
-       switch (asidx) {
-       case 0:
-               addrm =  &sb->sbadmatch0;
-               break;
-
-       case 1:
-               addrm =  &sb->sbadmatch1;
-               break;
-
-       case 2:
-               addrm =  &sb->sbadmatch2;
-               break;
-
-       case 3:
-               addrm =  &sb->sbadmatch3;
-               break;
-
-       default:
-               SI_ERROR(("%s: Address space index (%d) out of range\n", __FUNCTION__, asidx));
-               return 0;
-       }
-
-       return (addrm);
-}
-
-/* Return the number of address spaces in current core */
-int
-sb_numaddrspaces(si_t *sih)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-
-       sii = SI_INFO(sih);
-       sb = REGS2SB(sii->curmap);
-
-       /* + 1 because of enumeration space */
-       return ((R_SBREG(sii, &sb->sbidlow) & SBIDL_AR_MASK) >> SBIDL_AR_SHIFT) + 1;
-}
-
-/* Return the address of the nth address space in the current core */
-uint32
-sb_addrspace(si_t *sih, uint asidx)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       return (sb_base(R_SBREG(sii, sb_admatch(sii, asidx))));
-}
-
-/* Return the size of the nth address space in the current core */
-uint32
-sb_addrspacesize(si_t *sih, uint asidx)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       return (sb_size(R_SBREG(sii, sb_admatch(sii, asidx))));
-}
-
-
-/* do buffered registers update */
-void
-sb_commit(si_t *sih)
-{
-       si_info_t *sii;
-       uint origidx;
-       uint intr_val = 0;
-
-       sii = SI_INFO(sih);
-
-       origidx = sii->curidx;
-       ASSERT(GOODIDX(origidx));
-
-       INTR_OFF(sii, intr_val);
-
-       /* switch over to chipcommon core if there is one, else use pci */
-       if (sii->pub.ccrev != NOREV) {
-               chipcregs_t *ccregs = (chipcregs_t *)si_setcore(sih, CC_CORE_ID, 0);
-
-               /* do the buffer registers update */
-               W_REG(sii->osh, &ccregs->broadcastaddress, SB_COMMIT);
-               W_REG(sii->osh, &ccregs->broadcastdata, 0x0);
-       } else
-               ASSERT(0);
-
-       /* restore core index */
-       sb_setcoreidx(sih, origidx);
-       INTR_RESTORE(sii, intr_val);
-}
-
-void
-sb_core_disable(si_t *sih, uint32 bits)
-{
-       si_info_t *sii;
-       volatile uint32 dummy;
-       sbconfig_t *sb;
-
-       sii = SI_INFO(sih);
-
-       ASSERT(GOODREGS(sii->curmap));
-       sb = REGS2SB(sii->curmap);
-
-       /* if core is already in reset, just return */
-       if (R_SBREG(sii, &sb->sbtmstatelow) & SBTML_RESET)
-               return;
-
-       /* if clocks are not enabled, put into reset and return */
-       if ((R_SBREG(sii, &sb->sbtmstatelow) & (SICF_CLOCK_EN << SBTML_SICF_SHIFT)) == 0)
-               goto disable;
-
-       /* set target reject and spin until busy is clear (preserve core-specific bits) */
-       OR_SBREG(sii, &sb->sbtmstatelow, SBTML_REJ);
-       dummy = R_SBREG(sii, &sb->sbtmstatelow);
-       OSL_DELAY(1);
-       SPINWAIT((R_SBREG(sii, &sb->sbtmstatehigh) & SBTMH_BUSY), 100000);
-       if (R_SBREG(sii, &sb->sbtmstatehigh) & SBTMH_BUSY)
-               SI_ERROR(("%s: target state still busy\n", __FUNCTION__));
-
-       if (R_SBREG(sii, &sb->sbidlow) & SBIDL_INIT) {
-               OR_SBREG(sii, &sb->sbimstate, SBIM_RJ);
-               dummy = R_SBREG(sii, &sb->sbimstate);
-               OSL_DELAY(1);
-               SPINWAIT((R_SBREG(sii, &sb->sbimstate) & SBIM_BY), 100000);
-       }
-
-       /* set reset and reject while enabling the clocks */
-       W_SBREG(sii, &sb->sbtmstatelow,
-               (((bits | SICF_FGC | SICF_CLOCK_EN) << SBTML_SICF_SHIFT) |
-                SBTML_REJ | SBTML_RESET));
-       dummy = R_SBREG(sii, &sb->sbtmstatelow);
-       OSL_DELAY(10);
-
-       /* don't forget to clear the initiator reject bit */
-       if (R_SBREG(sii, &sb->sbidlow) & SBIDL_INIT)
-               AND_SBREG(sii, &sb->sbimstate, ~SBIM_RJ);
-
-disable:
-       /* leave reset and reject asserted */
-       W_SBREG(sii, &sb->sbtmstatelow, ((bits << SBTML_SICF_SHIFT) | SBTML_REJ | SBTML_RESET));
-       OSL_DELAY(1);
-}
-
-/* reset and re-enable a core
- * inputs:
- * bits - core specific bits that are set during and after reset sequence
- * resetbits - core specific bits that are set only during reset sequence
- */
-void
-sb_core_reset(si_t *sih, uint32 bits, uint32 resetbits)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-       volatile uint32 dummy;
-
-       sii = SI_INFO(sih);
-       ASSERT(GOODREGS(sii->curmap));
-       sb = REGS2SB(sii->curmap);
-
-       /*
-        * Must do the disable sequence first to work for arbitrary current core state.
-        */
-       sb_core_disable(sih, (bits | resetbits));
-
-       /*
-        * Now do the initialization sequence.
-        */
-
-       /* set reset while enabling the clock and forcing them on throughout the core */
-       W_SBREG(sii, &sb->sbtmstatelow,
-               (((bits | resetbits | SICF_FGC | SICF_CLOCK_EN) << SBTML_SICF_SHIFT) |
-                SBTML_RESET));
-       dummy = R_SBREG(sii, &sb->sbtmstatelow);
-       OSL_DELAY(1);
-
-       if (R_SBREG(sii, &sb->sbtmstatehigh) & SBTMH_SERR) {
-               W_SBREG(sii, &sb->sbtmstatehigh, 0);
-       }
-       if ((dummy = R_SBREG(sii, &sb->sbimstate)) & (SBIM_IBE | SBIM_TO)) {
-               AND_SBREG(sii, &sb->sbimstate, ~(SBIM_IBE | SBIM_TO));
-       }
-
-       /* clear reset and allow it to propagate throughout the core */
-       W_SBREG(sii, &sb->sbtmstatelow,
-               ((bits | resetbits | SICF_FGC | SICF_CLOCK_EN) << SBTML_SICF_SHIFT));
-       dummy = R_SBREG(sii, &sb->sbtmstatelow);
-       OSL_DELAY(1);
-
-       /* leave clock enabled */
-       W_SBREG(sii, &sb->sbtmstatelow, ((bits | SICF_CLOCK_EN) << SBTML_SICF_SHIFT));
-       dummy = R_SBREG(sii, &sb->sbtmstatelow);
-       OSL_DELAY(1);
-}
-
-void
-sb_core_tofixup(si_t *sih)
-{
-       si_info_t *sii;
-       sbconfig_t *sb;
-
-       sii = SI_INFO(sih);
-
-       if ((BUSTYPE(sii->pub.bustype) != PCI_BUS) || PCIE(sii) ||
-           (PCI(sii) && (sii->pub.buscorerev >= 5)))
-               return;
-
-       ASSERT(GOODREGS(sii->curmap));
-       sb = REGS2SB(sii->curmap);
-
-       if (BUSTYPE(sii->pub.bustype) == SI_BUS) {
-               SET_SBREG(sii, &sb->sbimconfiglow,
-                         SBIMCL_RTO_MASK | SBIMCL_STO_MASK,
-                         (0x5 << SBIMCL_RTO_SHIFT) | 0x3);
-       } else {
-               if (sb_coreid(sih) == PCI_CORE_ID) {
-                       SET_SBREG(sii, &sb->sbimconfiglow,
-                                 SBIMCL_RTO_MASK | SBIMCL_STO_MASK,
-                                 (0x3 << SBIMCL_RTO_SHIFT) | 0x2);
-               } else {
-                       SET_SBREG(sii, &sb->sbimconfiglow, (SBIMCL_RTO_MASK | SBIMCL_STO_MASK), 0);
-               }
-       }
-
-       sb_commit(sih);
-}
-
-/*
- * Set the initiator timeout for the "master core".
- * The master core is defined to be the core in control
- * of the chip and so it issues accesses to non-memory
- * locations (Because of dma *any* core can access memeory).
- *
- * The routine uses the bus to decide who is the master:
- *     SI_BUS => mips
- *     JTAG_BUS => chipc
- *     PCI_BUS => pci or pcie
- *     PCMCIA_BUS => pcmcia
- *     SDIO_BUS => pcmcia
- *
- * This routine exists so callers can disable initiator
- * timeouts so accesses to very slow devices like otp
- * won't cause an abort. The routine allows arbitrary
- * settings of the service and request timeouts, though.
- *
- * Returns the timeout state before changing it or -1
- * on error.
- */
-
-#define        TO_MASK (SBIMCL_RTO_MASK | SBIMCL_STO_MASK)
-
-uint32
-sb_set_initiator_to(si_t *sih, uint32 to, uint idx)
-{
-       si_info_t *sii;
-       uint origidx;
-       uint intr_val = 0;
-       uint32 tmp, ret = 0xffffffff;
-       sbconfig_t *sb;
-
-       sii = SI_INFO(sih);
-
-       if ((to & ~TO_MASK) != 0)
-               return ret;
-
-       /* Figure out the master core */
-       if (idx == BADIDX) {
-               switch (BUSTYPE(sii->pub.bustype)) {
-               case PCI_BUS:
-                       idx = sii->pub.buscoreidx;
-                       break;
-               case JTAG_BUS:
-                       idx = SI_CC_IDX;
-                       break;
-               case PCMCIA_BUS:
-               case SDIO_BUS:
-                       idx = si_findcoreidx(sih, PCMCIA_CORE_ID, 0);
-                       break;
-               case SI_BUS:
-                       idx = si_findcoreidx(sih, MIPS33_CORE_ID, 0);
-                       break;
-               default:
-                       ASSERT(0);
-               }
-               if (idx == BADIDX)
-                       return ret;
-       }
-
-       INTR_OFF(sii, intr_val);
-       origidx = si_coreidx(sih);
-
-       sb = REGS2SB(sb_setcoreidx(sih, idx));
-
-       tmp = R_SBREG(sii, &sb->sbimconfiglow);
-       ret = tmp & TO_MASK;
-       W_SBREG(sii, &sb->sbimconfiglow, (tmp & ~TO_MASK) | to);
-
-       sb_commit(sih);
-       sb_setcoreidx(sih, origidx);
-       INTR_RESTORE(sii, intr_val);
-       return ret;
-}
-
-uint32
-sb_base(uint32 admatch)
-{
-       uint32 base;
-       uint type;
-
-       type = admatch & SBAM_TYPE_MASK;
-       ASSERT(type < 3);
-
-       base = 0;
-
-       if (type == 0) {
-               base = admatch & SBAM_BASE0_MASK;
-       } else if (type == 1) {
-               ASSERT(!(admatch & SBAM_ADNEG));        /* neg not supported */
-               base = admatch & SBAM_BASE1_MASK;
-       } else if (type == 2) {
-               ASSERT(!(admatch & SBAM_ADNEG));        /* neg not supported */
-               base = admatch & SBAM_BASE2_MASK;
-       }
-
-       return (base);
-}
-
-uint32
-sb_size(uint32 admatch)
-{
-       uint32 size;
-       uint type;
-
-       type = admatch & SBAM_TYPE_MASK;
-       ASSERT(type < 3);
-
-       size = 0;
-
-       if (type == 0) {
-               size = 1 << (((admatch & SBAM_ADINT0_MASK) >> SBAM_ADINT0_SHIFT) + 1);
-       } else if (type == 1) {
-               ASSERT(!(admatch & SBAM_ADNEG));        /* neg not supported */
-               size = 1 << (((admatch & SBAM_ADINT1_MASK) >> SBAM_ADINT1_SHIFT) + 1);
-       } else if (type == 2) {
-               ASSERT(!(admatch & SBAM_ADNEG));        /* neg not supported */
-               size = 1 << (((admatch & SBAM_ADINT2_MASK) >> SBAM_ADINT2_SHIFT) + 1);
-       }
-
-       return (size);
-}
diff --git a/drivers/net/wireless/bcm4319/siutils.c b/drivers/net/wireless/bcm4319/siutils.c
deleted file mode 100644 (file)
index 1814db0..0000000
+++ /dev/null
@@ -1,1527 +0,0 @@
-/*
- * Misc utility routines for accessing chip-specific features
- * of the SiliconBackplane-based Broadcom chips.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: siutils.c,v 1.662.4.4.4.16.4.28 2010/06/23 21:37:54 Exp $
- */
-
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
-#include <bcmutils.h>
-#include <siutils.h>
-#include <bcmdevs.h>
-#include <hndsoc.h>
-#include <sbchipc.h>
-#include <pcicfg.h>
-#include <sbpcmcia.h>
-#include <sbsocram.h>
-#include <bcmsdh.h>
-#include <sdio.h>
-#include <sbsdio.h>
-#include <sbhnddma.h>
-#include <sbsdpcmdev.h>
-#include <bcmsdpcm.h>
-#include <hndpmu.h>
-
-#include "siutils_priv.h"
-
-/* local prototypes */
-static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh, void *regs,
-                              uint bustype, void *sdh, char **vars, uint *varsz);
-static bool si_buscore_prep(si_info_t *sii, uint bustype, uint devid, void *sdh);
-static bool si_buscore_setup(si_info_t *sii, chipcregs_t *cc, uint bustype, uint32 savewin,
-       uint *origidx, void *regs);
-
-
-/* global variable to indicate reservation/release of gpio's */
-static uint32 si_gpioreservation = 0;
-static void *common_info_alloced = NULL;
-
-/* global flag to prevent shared resources from being initialized multiple times in si_attach() */
-
-/*
- * Allocate a si handle.
- * devid - pci device id (used to determine chip#)
- * osh - opaque OS handle
- * regs - virtual address of initial core registers
- * bustype - pci/pcmcia/sb/sdio/etc
- * vars - pointer to a pointer area for "environment" variables
- * varsz - pointer to int to return the size of the vars
- */
-si_t *
-si_attach(uint devid, osl_t *osh, void *regs,
-                       uint bustype, void *sdh, char **vars, uint *varsz)
-{
-       si_info_t *sii;
-
-       /* alloc si_info_t */
-       if ((sii = MALLOC(osh, sizeof (si_info_t))) == NULL) {
-               SI_ERROR(("si_attach: malloc failed! malloced %d bytes\n", MALLOCED(osh)));
-               return (NULL);
-       }
-
-       if (si_doattach(sii, devid, osh, regs, bustype, sdh, vars, varsz) == NULL) {
-               if (NULL != sii->common_info)
-                       MFREE(osh, sii->common_info, sizeof(si_common_info_t));
-               MFREE(osh, sii, sizeof(si_info_t));
-               return (NULL);
-       }
-       sii->vars = vars ? *vars : NULL;
-       sii->varsz = varsz ? *varsz : 0;
-
-       return (si_t *)sii;
-}
-
-/* global kernel resource */
-static si_info_t ksii;
-
-static uint32  wd_msticks;             /* watchdog timer ticks normalized to ms */
-
-/* generic kernel variant of si_attach() */
-si_t *
-si_kattach(osl_t *osh)
-{
-       static bool ksii_attached = FALSE;
-
-       if (!ksii_attached) {
-               void *regs = REG_MAP(SI_ENUM_BASE, SI_CORE_SIZE);
-
-               if (si_doattach(&ksii, BCM4710_DEVICE_ID, osh, regs,
-                               SI_BUS, NULL,
-                               osh != SI_OSH ? &ksii.vars : NULL,
-                               osh != SI_OSH ? &ksii.varsz : NULL) == NULL) {
-                       if (NULL != ksii.common_info)
-                               MFREE(osh, ksii.common_info, sizeof(si_common_info_t));
-                       SI_ERROR(("si_kattach: si_doattach failed\n"));
-                       REG_UNMAP(regs);
-                       return NULL;
-               }
-               REG_UNMAP(regs);
-
-               /* save ticks normalized to ms for si_watchdog_ms() */
-               if (PMUCTL_ENAB(&ksii.pub)) {
-                       /* based on 32KHz ILP clock */
-                       wd_msticks = 32;
-               } else {
-                       wd_msticks = ALP_CLOCK / 1000;
-               }
-
-               ksii_attached = TRUE;
-               SI_MSG(("si_kattach done. ccrev = %d, wd_msticks = %d\n",
-                       ksii.pub.ccrev, wd_msticks));
-       }
-
-       return &ksii.pub;
-}
-
-
-static bool
-si_buscore_prep(si_info_t *sii, uint bustype, uint devid, void *sdh)
-{
-       /* need to set memseg flag for CF card first before any sb registers access */
-       if (BUSTYPE(bustype) == PCMCIA_BUS)
-               sii->memseg = TRUE;
-
-
-       if (BUSTYPE(bustype) == SDIO_BUS) {
-               int err;
-               uint8 clkset;
-
-               /* Try forcing SDIO core to do ALPAvail request only */
-               clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_ALP_AVAIL_REQ;
-               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
-               if (!err) {
-                       uint8 clkval;
-
-                       /* If register supported, wait for ALPAvail and then force ALP */
-                       clkval = bcmsdh_cfg_read(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, NULL);
-                       if ((clkval & ~SBSDIO_AVBITS) == clkset) {
-                               SPINWAIT(((clkval = bcmsdh_cfg_read(sdh, SDIO_FUNC_1,
-                                       SBSDIO_FUNC1_CHIPCLKCSR, NULL)), !SBSDIO_ALPAV(clkval)),
-                                       PMU_MAX_TRANSITION_DLY);
-                               if (!SBSDIO_ALPAV(clkval)) {
-                                       SI_ERROR(("timeout on ALPAV wait, clkval 0x%02x\n",
-                                               clkval));
-                                       return FALSE;
-                               }
-                               clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_FORCE_ALP;
-                               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR,
-                                       clkset, &err);
-                               OSL_DELAY(65);
-                       }
-               }
-
-               /* Also, disable the extra SDIO pull-ups */
-               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_SDIOPULLUP, 0, NULL);
-       }
-
-
-       return TRUE;
-}
-
-static bool
-si_buscore_setup(si_info_t *sii, chipcregs_t *cc, uint bustype, uint32 savewin,
-       uint *origidx, void *regs)
-{
-       bool pci, pcie;
-       uint i;
-       uint pciidx, pcieidx, pcirev, pcierev;
-
-       cc = si_setcoreidx(&sii->pub, SI_CC_IDX);
-       ASSERT((uintptr)cc);
-
-       /* get chipcommon rev */
-       sii->pub.ccrev = (int)si_corerev(&sii->pub);
-
-       /* get chipcommon chipstatus */
-       if (sii->pub.ccrev >= 11)
-               sii->pub.chipst = R_REG(sii->osh, &cc->chipstatus);
-
-       /* get chipcommon capabilites */
-       sii->pub.cccaps = R_REG(sii->osh, &cc->capabilities);
-
-       /* get pmu rev and caps */
-       if (sii->pub.cccaps & CC_CAP_PMU) {
-               sii->pub.pmucaps = R_REG(sii->osh, &cc->pmucapabilities);
-               sii->pub.pmurev = sii->pub.pmucaps & PCAP_REV_MASK;
-       }
-
-       SI_MSG(("Chipc: rev %d, caps 0x%x, chipst 0x%x pmurev %d, pmucaps 0x%x\n",
-               sii->pub.ccrev, sii->pub.cccaps, sii->pub.chipst, sii->pub.pmurev,
-               sii->pub.pmucaps));
-
-       /* figure out bus/orignal core idx */
-       sii->pub.buscoretype = NODEV_CORE_ID;
-       sii->pub.buscorerev = NOREV;
-       sii->pub.buscoreidx = BADIDX;
-
-       pci = pcie = FALSE;
-       pcirev = pcierev = NOREV;
-       pciidx = pcieidx = BADIDX;
-
-       for (i = 0; i < sii->numcores; i++) {
-               uint cid, crev;
-
-               si_setcoreidx(&sii->pub, i);
-               cid = si_coreid(&sii->pub);
-               crev = si_corerev(&sii->pub);
-
-               /* Display cores found */
-               SI_MSG(("CORE[%d]: id 0x%x rev %d base 0x%x regs 0x%p\n",
-                       i, cid, crev, sii->common_info->coresba[i], sii->common_info->regs[i]));
-
-               if (BUSTYPE(bustype) == PCI_BUS) {
-                       if (cid == PCI_CORE_ID) {
-                               pciidx = i;
-                               pcirev = crev;
-                               pci = TRUE;
-                       } else if (cid == PCIE_CORE_ID) {
-                               pcieidx = i;
-                               pcierev = crev;
-                               pcie = TRUE;
-                       }
-               } else if ((BUSTYPE(bustype) == PCMCIA_BUS) &&
-                          (cid == PCMCIA_CORE_ID)) {
-                       sii->pub.buscorerev = crev;
-                       sii->pub.buscoretype = cid;
-                       sii->pub.buscoreidx = i;
-               }
-               else if (((BUSTYPE(bustype) == SDIO_BUS) ||
-                         (BUSTYPE(bustype) == SPI_BUS)) &&
-                        ((cid == PCMCIA_CORE_ID) ||
-                         (cid == SDIOD_CORE_ID))) {
-                       sii->pub.buscorerev = crev;
-                       sii->pub.buscoretype = cid;
-                       sii->pub.buscoreidx = i;
-               }
-
-               /* find the core idx before entering this func. */
-               if ((savewin && (savewin == sii->common_info->coresba[i])) ||
-                   (regs == sii->common_info->regs[i]))
-                       *origidx = i;
-       }
-
-
-       SI_MSG(("Buscore id/type/rev %d/0x%x/%d\n", sii->pub.buscoreidx, sii->pub.buscoretype,
-               sii->pub.buscorerev));
-
-       if (BUSTYPE(sii->pub.bustype) == SI_BUS && (CHIPID(sii->pub.chip) == BCM4712_CHIP_ID) &&
-           (sii->pub.chippkg != BCM4712LARGE_PKG_ID) && (sii->pub.chiprev <= 3))
-               OR_REG(sii->osh, &cc->slow_clk_ctl, SCC_SS_XTAL);
-
-
-       /* Make sure any on-chip ARM is off (in case strapping is wrong), or downloaded code was
-        * already running.
-        */
-       if ((BUSTYPE(bustype) == SDIO_BUS) || (BUSTYPE(bustype) == SPI_BUS)) {
-               if (si_setcore(&sii->pub, ARM7S_CORE_ID, 0) ||
-                   si_setcore(&sii->pub, ARMCM3_CORE_ID, 0))
-                       si_core_disable(&sii->pub, 0);
-       }
-
-       /* return to the original core */
-       si_setcoreidx(&sii->pub, *origidx);
-
-       return TRUE;
-}
-
-
-
-static si_info_t *
-si_doattach(si_info_t *sii, uint devid, osl_t *osh, void *regs,
-                       uint bustype, void *sdh, char **vars, uint *varsz)
-{
-       struct si_pub *sih = &sii->pub;
-       uint32 w, savewin;
-       chipcregs_t *cc;
-       char *pvars = NULL;
-       uint origidx;
-
-       ASSERT(GOODREGS(regs));
-
-       bzero((uchar*)sii, sizeof(si_info_t));
-
-
-       {
-               if (NULL == (common_info_alloced = (void *)MALLOC(osh, sizeof(si_common_info_t)))) {
-                       SI_ERROR(("si_doattach: malloc failed! malloced %dbytes\n", MALLOCED(osh)));
-                       return (NULL);
-               }
-               bzero((uchar*)(common_info_alloced), sizeof(si_common_info_t));
-       }
-       sii->common_info = (si_common_info_t *)common_info_alloced;
-       sii->common_info->attach_count++;
-
-       savewin = 0;
-
-       sih->buscoreidx = BADIDX;
-
-       sii->curmap = regs;
-       sii->sdh = sdh;
-       sii->osh = osh;
-
-
-       /* find Chipcommon address */
-       if (bustype == PCI_BUS) {
-               savewin = OSL_PCI_READ_CONFIG(sii->osh, PCI_BAR0_WIN, sizeof(uint32));
-               if (!GOODCOREADDR(savewin, SI_ENUM_BASE))
-                       savewin = SI_ENUM_BASE;
-               OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN, 4, SI_ENUM_BASE);
-               cc = (chipcregs_t *)regs;
-       } else
-       if ((bustype == SDIO_BUS) || (bustype == SPI_BUS)) {
-               cc = (chipcregs_t *)sii->curmap;
-       } else {
-               cc = (chipcregs_t *)REG_MAP(SI_ENUM_BASE, SI_CORE_SIZE);
-       }
-
-       sih->bustype = bustype;
-       if (bustype != BUSTYPE(bustype)) {
-               SI_ERROR(("si_doattach: bus type %d does not match configured bus type %d\n",
-                       bustype, BUSTYPE(bustype)));
-               return NULL;
-       }
-
-       /* bus/core/clk setup for register access */
-       if (!si_buscore_prep(sii, bustype, devid, sdh)) {
-               SI_ERROR(("si_doattach: si_core_clk_prep failed %d\n", bustype));
-               return NULL;
-       }
-
-       /* ChipID recognition.
-        *   We assume we can read chipid at offset 0 from the regs arg.
-        *   If we add other chiptypes (or if we need to support old sdio hosts w/o chipcommon),
-        *   some way of recognizing them needs to be added here.
-        */
-       w = R_REG(osh, &cc->chipid);
-       sih->socitype = (w & CID_TYPE_MASK) >> CID_TYPE_SHIFT;
-       /* Might as wll fill in chip id rev & pkg */
-       sih->chip = w & CID_ID_MASK;
-       sih->chiprev = (w & CID_REV_MASK) >> CID_REV_SHIFT;
-       sih->chippkg = (w & CID_PKG_MASK) >> CID_PKG_SHIFT;
-       if ((CHIPID(sih->chip) == BCM4329_CHIP_ID) && (sih->chippkg != BCM4329_289PIN_PKG_ID))
-               sih->chippkg = BCM4329_182PIN_PKG_ID;
-       sih->issim = IS_SIM(sih->chippkg);
-
-       /* scan for cores */
-       if (CHIPTYPE(sii->pub.socitype) == SOCI_SB) {
-               SI_MSG(("Found chip type SB (0x%08x)\n", w));
-               sb_scan(&sii->pub, regs, devid);
-       } else if (CHIPTYPE(sii->pub.socitype) == SOCI_AI) {
-               SI_MSG(("Found chip type AI (0x%08x)\n", w));
-               /* pass chipc address instead of original core base */
-               ai_scan(&sii->pub, (void *)cc, devid);
-       } else {
-               SI_ERROR(("Found chip of unkown type (0x%08x)\n", w));
-               return NULL;
-       }
-       /* no cores found, bail out */
-       if (sii->numcores == 0) {
-               SI_ERROR(("si_doattach: could not find any cores\n"));
-               return NULL;
-       }
-       /* bus/core/clk setup */
-       origidx = SI_CC_IDX;
-       if (!si_buscore_setup(sii, cc, bustype, savewin, &origidx, regs)) {
-               SI_ERROR(("si_doattach: si_buscore_setup failed\n"));
-               return NULL;
-       }
-
-       pvars = NULL;
-
-
-
-               if (sii->pub.ccrev >= 20) {
-                       cc = (chipcregs_t *)si_setcore(sih, CC_CORE_ID, 0);
-                       W_REG(osh, &cc->gpiopullup, 0);
-                       W_REG(osh, &cc->gpiopulldown, 0);
-                       si_setcoreidx(sih, origidx);
-               }
-
-               /* Skip PMU initialization from the Dongle Host.
-                * Firmware will take care of it when it comes up.
-                */
-
-
-
-       return (sii);
-}
-
-/* may be called with core in reset */
-void
-si_detach(si_t *sih)
-{
-       si_info_t *sii;
-       uint idx;
-
-       sii = SI_INFO(sih);
-
-       if (sii == NULL)
-               return;
-
-       if (BUSTYPE(sih->bustype) == SI_BUS)
-               for (idx = 0; idx < SI_MAXCORES; idx++)
-                       if (sii->common_info->regs[idx]) {
-                               REG_UNMAP(sii->common_info->regs[idx]);
-                               sii->common_info->regs[idx] = NULL;
-                       }
-
-
-       if (1 == sii->common_info->attach_count--) {
-               MFREE(sii->osh, sii->common_info, sizeof(si_common_info_t));
-               common_info_alloced = NULL;
-       }
-
-#if !defined(BCMBUSTYPE) || (BCMBUSTYPE == SI_BUS)
-       if (sii != &ksii)
-#endif /* !BCMBUSTYPE || (BCMBUSTYPE == SI_BUS) */
-               MFREE(sii->osh, sii, sizeof(si_info_t));
-}
-
-void *
-si_osh(si_t *sih)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-       return sii->osh;
-}
-
-void
-si_setosh(si_t *sih, osl_t *osh)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-       if (sii->osh != NULL) {
-               SI_ERROR(("osh is already set....\n"));
-               ASSERT(!sii->osh);
-       }
-       sii->osh = osh;
-}
-
-/* register driver interrupt disabling and restoring callback functions */
-void
-si_register_intr_callback(si_t *sih, void *intrsoff_fn, void *intrsrestore_fn,
-                          void *intrsenabled_fn, void *intr_arg)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-       sii->intr_arg = intr_arg;
-       sii->intrsoff_fn = (si_intrsoff_t)intrsoff_fn;
-       sii->intrsrestore_fn = (si_intrsrestore_t)intrsrestore_fn;
-       sii->intrsenabled_fn = (si_intrsenabled_t)intrsenabled_fn;
-       /* save current core id.  when this function called, the current core
-        * must be the core which provides driver functions(il, et, wl, etc.)
-        */
-       sii->dev_coreid = sii->common_info->coreid[sii->curidx];
-}
-
-void
-si_deregister_intr_callback(si_t *sih)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-       sii->intrsoff_fn = NULL;
-}
-
-uint
-si_intflag(si_t *sih)
-{
-       si_info_t *sii = SI_INFO(sih);
-       if (CHIPTYPE(sih->socitype) == SOCI_SB) {
-               sbconfig_t *ccsbr = (sbconfig_t *)((uintptr)((ulong)
-                           (sii->common_info->coresba[SI_CC_IDX]) + SBCONFIGOFF));
-               return R_REG(sii->osh, &ccsbr->sbflagst);
-       } else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return R_REG(sii->osh, ((uint32 *)(uintptr)
-                           (sii->common_info->oob_router + OOB_STATUSA)));
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-uint
-si_flag(si_t *sih)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_flag(sih);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_flag(sih);
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-void
-si_setint(si_t *sih, int siflag)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               sb_setint(sih, siflag);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               ai_setint(sih, siflag);
-       else
-               ASSERT(0);
-}
-
-uint
-si_coreid(si_t *sih)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-       return sii->common_info->coreid[sii->curidx];
-}
-
-uint
-si_coreidx(si_t *sih)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-       return sii->curidx;
-}
-
-/* return the core-type instantiation # of the current core */
-uint
-si_coreunit(si_t *sih)
-{
-       si_info_t *sii;
-       uint idx;
-       uint coreid;
-       uint coreunit;
-       uint i;
-
-       sii = SI_INFO(sih);
-       coreunit = 0;
-
-       idx = sii->curidx;
-
-       ASSERT(GOODREGS(sii->curmap));
-       coreid = si_coreid(sih);
-
-       /* count the cores of our type */
-       for (i = 0; i < idx; i++)
-               if (sii->common_info->coreid[i] == coreid)
-                       coreunit++;
-
-       return (coreunit);
-}
-
-uint
-si_corevendor(si_t *sih)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_corevendor(sih);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_corevendor(sih);
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-bool
-si_backplane64(si_t *sih)
-{
-       return ((sih->cccaps & CC_CAP_BKPLN64) != 0);
-}
-
-uint
-si_corerev(si_t *sih)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_corerev(sih);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_corerev(sih);
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-/* return index of coreid or BADIDX if not found */
-uint
-si_findcoreidx(si_t *sih, uint coreid, uint coreunit)
-{
-       si_info_t *sii;
-       uint found;
-       uint i;
-
-       sii = SI_INFO(sih);
-
-       found = 0;
-
-       for (i = 0; i < sii->numcores; i++)
-               if (sii->common_info->coreid[i] == coreid) {
-                       if (found == coreunit)
-                               return (i);
-                       found++;
-               }
-
-       return (BADIDX);
-}
-
-/* return list of found cores */
-uint
-si_corelist(si_t *sih, uint coreid[])
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       bcopy((uchar*)sii->common_info->coreid, (uchar*)coreid, (sii->numcores * sizeof(uint)));
-       return (sii->numcores);
-}
-
-/* return current register mapping */
-void *
-si_coreregs(si_t *sih)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-       ASSERT(GOODREGS(sii->curmap));
-
-       return (sii->curmap);
-}
-
-/*
- * This function changes logical "focus" to the indicated core;
- * must be called with interrupts off.
- * Moreover, callers should keep interrupts off during switching out of and back to d11 core
- */
-void *
-si_setcore(si_t *sih, uint coreid, uint coreunit)
-{
-       uint idx;
-
-       idx = si_findcoreidx(sih, coreid, coreunit);
-       if (!GOODIDX(idx))
-               return (NULL);
-
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_setcoreidx(sih, idx);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_setcoreidx(sih, idx);
-       else {
-               ASSERT(0);
-               return NULL;
-       }
-}
-
-void *
-si_setcoreidx(si_t *sih, uint coreidx)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_setcoreidx(sih, coreidx);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_setcoreidx(sih, coreidx);
-       else {
-               ASSERT(0);
-               return NULL;
-       }
-}
-
-/* Turn off interrupt as required by sb_setcore, before switch core */
-void *si_switch_core(si_t *sih, uint coreid, uint *origidx, uint *intr_val)
-{
-       void *cc;
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       INTR_OFF(sii, *intr_val);
-       *origidx = sii->curidx;
-       cc = si_setcore(sih, coreid, 0);
-       ASSERT(cc != NULL);
-
-       return cc;
-}
-
-/* restore coreidx and restore interrupt */
-void si_restore_core(si_t *sih, uint coreid, uint intr_val)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       si_setcoreidx(sih, coreid);
-       INTR_RESTORE(sii, intr_val);
-}
-
-int
-si_numaddrspaces(si_t *sih)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_numaddrspaces(sih);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_numaddrspaces(sih);
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-uint32
-si_addrspace(si_t *sih, uint asidx)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_addrspace(sih, asidx);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_addrspace(sih, asidx);
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-uint32
-si_addrspacesize(si_t *sih, uint asidx)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_addrspacesize(sih, asidx);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_addrspacesize(sih, asidx);
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-uint32
-si_core_cflags(si_t *sih, uint32 mask, uint32 val)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_core_cflags(sih, mask, val);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_core_cflags(sih, mask, val);
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-void
-si_core_cflags_wo(si_t *sih, uint32 mask, uint32 val)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               sb_core_cflags_wo(sih, mask, val);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               ai_core_cflags_wo(sih, mask, val);
-       else
-               ASSERT(0);
-}
-
-uint32
-si_core_sflags(si_t *sih, uint32 mask, uint32 val)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_core_sflags(sih, mask, val);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_core_sflags(sih, mask, val);
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-bool
-si_iscoreup(si_t *sih)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_iscoreup(sih);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_iscoreup(sih);
-       else {
-               ASSERT(0);
-               return FALSE;
-       }
-}
-
-void
-si_write_wrapperreg(si_t *sih, uint32 offset, uint32 val)
-{
-       /* only for 4319, no requirement for SOCI_SB */
-       if (CHIPTYPE(sih->socitype) == SOCI_AI) {
-               ai_write_wrap_reg(sih, offset, val);
-       }
-       else
-               return;
-
-       return;
-}
-
-uint
-si_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               return sb_corereg(sih, coreidx, regoff, mask, val);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               return ai_corereg(sih, coreidx, regoff, mask, val);
-       else {
-               ASSERT(0);
-               return 0;
-       }
-}
-
-void
-si_core_disable(si_t *sih, uint32 bits)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               sb_core_disable(sih, bits);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               ai_core_disable(sih, bits);
-}
-
-void
-si_core_reset(si_t *sih, uint32 bits, uint32 resetbits)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               sb_core_reset(sih, bits, resetbits);
-       else if (CHIPTYPE(sih->socitype) == SOCI_AI)
-               ai_core_reset(sih, bits, resetbits);
-}
-
-void
-si_core_tofixup(si_t *sih)
-{
-       if (CHIPTYPE(sih->socitype) == SOCI_SB)
-               sb_core_tofixup(sih);
-}
-
-/* Run bist on current core. Caller needs to take care of core-specific bist hazards */
-int
-si_corebist(si_t *sih)
-{
-       uint32 cflags;
-       int result = 0;
-
-       /* Read core control flags */
-       cflags = si_core_cflags(sih, 0, 0);
-
-       /* Set bist & fgc */
-       si_core_cflags(sih, 0, (SICF_BIST_EN | SICF_FGC));
-
-       /* Wait for bist done */
-       SPINWAIT(((si_core_sflags(sih, 0, 0) & SISF_BIST_DONE) == 0), 100000);
-
-       if (si_core_sflags(sih, 0, 0) & SISF_BIST_ERROR)
-               result = BCME_ERROR;
-
-       /* Reset core control flags */
-       si_core_cflags(sih, 0xffff, cflags);
-
-       return result;
-}
-
-static uint32
-factor6(uint32 x)
-{
-       switch (x) {
-       case CC_F6_2:   return 2;
-       case CC_F6_3:   return 3;
-       case CC_F6_4:   return 4;
-       case CC_F6_5:   return 5;
-       case CC_F6_6:   return 6;
-       case CC_F6_7:   return 7;
-       default:        return 0;
-       }
-}
-
-/* calculate the speed the SI would run at given a set of clockcontrol values */
-uint32
-si_clock_rate(uint32 pll_type, uint32 n, uint32 m)
-{
-       uint32 n1, n2, clock, m1, m2, m3, mc;
-
-       n1 = n & CN_N1_MASK;
-       n2 = (n & CN_N2_MASK) >> CN_N2_SHIFT;
-
-       if (pll_type == PLL_TYPE6) {
-               if (m & CC_T6_MMASK)
-                       return CC_T6_M1;
-               else
-                       return CC_T6_M0;
-       } else if ((pll_type == PLL_TYPE1) ||
-                  (pll_type == PLL_TYPE3) ||
-                  (pll_type == PLL_TYPE4) ||
-                  (pll_type == PLL_TYPE7)) {
-               n1 = factor6(n1);
-               n2 += CC_F5_BIAS;
-       } else if (pll_type == PLL_TYPE2) {
-               n1 += CC_T2_BIAS;
-               n2 += CC_T2_BIAS;
-               ASSERT((n1 >= 2) && (n1 <= 7));
-               ASSERT((n2 >= 5) && (n2 <= 23));
-       } else if (pll_type == PLL_TYPE5) {
-               return (100000000);
-       } else
-               ASSERT(0);
-       /* PLL types 3 and 7 use BASE2 (25Mhz) */
-       if ((pll_type == PLL_TYPE3) ||
-           (pll_type == PLL_TYPE7)) {
-               clock = CC_CLOCK_BASE2 * n1 * n2;
-       } else
-               clock = CC_CLOCK_BASE1 * n1 * n2;
-
-       if (clock == 0)
-               return 0;
-
-       m1 = m & CC_M1_MASK;
-       m2 = (m & CC_M2_MASK) >> CC_M2_SHIFT;
-       m3 = (m & CC_M3_MASK) >> CC_M3_SHIFT;
-       mc = (m & CC_MC_MASK) >> CC_MC_SHIFT;
-
-       if ((pll_type == PLL_TYPE1) ||
-           (pll_type == PLL_TYPE3) ||
-           (pll_type == PLL_TYPE4) ||
-           (pll_type == PLL_TYPE7)) {
-               m1 = factor6(m1);
-               if ((pll_type == PLL_TYPE1) || (pll_type == PLL_TYPE3))
-                       m2 += CC_F5_BIAS;
-               else
-                       m2 = factor6(m2);
-               m3 = factor6(m3);
-
-               switch (mc) {
-               case CC_MC_BYPASS:      return (clock);
-               case CC_MC_M1:          return (clock / m1);
-               case CC_MC_M1M2:        return (clock / (m1 * m2));
-               case CC_MC_M1M2M3:      return (clock / (m1 * m2 * m3));
-               case CC_MC_M1M3:        return (clock / (m1 * m3));
-               default:                return (0);
-               }
-       } else {
-               ASSERT(pll_type == PLL_TYPE2);
-
-               m1 += CC_T2_BIAS;
-               m2 += CC_T2M2_BIAS;
-               m3 += CC_T2_BIAS;
-               ASSERT((m1 >= 2) && (m1 <= 7));
-               ASSERT((m2 >= 3) && (m2 <= 10));
-               ASSERT((m3 >= 2) && (m3 <= 7));
-
-               if ((mc & CC_T2MC_M1BYP) == 0)
-                       clock /= m1;
-               if ((mc & CC_T2MC_M2BYP) == 0)
-                       clock /= m2;
-               if ((mc & CC_T2MC_M3BYP) == 0)
-                       clock /= m3;
-
-               return (clock);
-       }
-}
-
-
-/* set chip watchdog reset timer to fire in 'ticks' */
-void
-si_watchdog(si_t *sih, uint ticks)
-{
-       if (PMUCTL_ENAB(sih)) {
-
-               if ((sih->chip == BCM4319_CHIP_ID) && (sih->chiprev == 0) && (ticks != 0)) {
-                       si_corereg(sih, SI_CC_IDX, OFFSETOF(chipcregs_t, clk_ctl_st), ~0, 0x2);
-                       si_setcore(sih, USB20D_CORE_ID, 0);
-                       si_core_disable(sih, 1);
-                       si_setcore(sih, CC_CORE_ID, 0);
-               }
-
-               if (ticks == 1)
-                       ticks = 2;
-               si_corereg(sih, SI_CC_IDX, OFFSETOF(chipcregs_t, pmuwatchdog), ~0, ticks);
-       } else {
-               /* instant NMI */
-               si_corereg(sih, SI_CC_IDX, OFFSETOF(chipcregs_t, watchdog), ~0, ticks);
-       }
-}
-
-#if !defined(BCMBUSTYPE) || (BCMBUSTYPE == SI_BUS)
-/* trigger watchdog reset after ms milliseconds */
-void
-si_watchdog_ms(si_t *sih, uint32 ms)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       si_watchdog(sih, wd_msticks * ms);
-}
-#endif
-
-
-
-/* initialize the sdio core */
-void
-si_sdio_init(si_t *sih)
-{
-       si_info_t *sii = SI_INFO(sih);
-
-       if (((sih->buscoretype == PCMCIA_CORE_ID) && (sih->buscorerev >= 8)) ||
-           (sih->buscoretype == SDIOD_CORE_ID)) {
-               uint idx;
-               sdpcmd_regs_t *sdpregs;
-
-               /* get the current core index */
-               idx = sii->curidx;
-               ASSERT(idx == si_findcoreidx(sih, D11_CORE_ID, 0));
-
-               /* switch to sdio core */
-               if (!(sdpregs = (sdpcmd_regs_t *)si_setcore(sih, PCMCIA_CORE_ID, 0)))
-                       sdpregs = (sdpcmd_regs_t *)si_setcore(sih, SDIOD_CORE_ID, 0);
-               ASSERT(sdpregs);
-
-               SI_MSG(("si_sdio_init: For PCMCIA/SDIO Corerev %d, enable ints from core %d "
-                       "through SD core %d (%p)\n",
-                       sih->buscorerev, idx, sii->curidx, sdpregs));
-
-               /* enable backplane error and core interrupts */
-               W_REG(sii->osh, &sdpregs->hostintmask, I_SBINT);
-               W_REG(sii->osh, &sdpregs->sbintmask, (I_SB_SERR | I_SB_RESPERR | (1 << idx)));
-
-               /* switch back to previous core */
-               si_setcoreidx(sih, idx);
-       }
-
-       /* enable interrupts */
-       bcmsdh_intr_enable(sii->sdh);
-
-}
-
-
-/* change logical "focus" to the gpio core for optimized access */
-void *
-si_gpiosetcore(si_t *sih)
-{
-       return (si_setcoreidx(sih, SI_CC_IDX));
-}
-
-/* mask&set gpiocontrol bits */
-uint32
-si_gpiocontrol(si_t *sih, uint32 mask, uint32 val, uint8 priority)
-{
-       uint regoff;
-
-       regoff = 0;
-
-       /* gpios could be shared on router platforms
-        * ignore reservation if it's high priority (e.g., test apps)
-        */
-       if ((priority != GPIO_HI_PRIORITY) &&
-           (BUSTYPE(sih->bustype) == SI_BUS) && (val || mask)) {
-               mask = priority ? (si_gpioreservation & mask) :
-                       ((si_gpioreservation | mask) & ~(si_gpioreservation));
-               val &= mask;
-       }
-
-       regoff = OFFSETOF(chipcregs_t, gpiocontrol);
-       return (si_corereg(sih, SI_CC_IDX, regoff, mask, val));
-}
-
-/* mask&set gpio output enable bits */
-uint32
-si_gpioouten(si_t *sih, uint32 mask, uint32 val, uint8 priority)
-{
-       uint regoff;
-
-       regoff = 0;
-
-       /* gpios could be shared on router platforms
-        * ignore reservation if it's high priority (e.g., test apps)
-        */
-       if ((priority != GPIO_HI_PRIORITY) &&
-           (BUSTYPE(sih->bustype) == SI_BUS) && (val || mask)) {
-               mask = priority ? (si_gpioreservation & mask) :
-                       ((si_gpioreservation | mask) & ~(si_gpioreservation));
-               val &= mask;
-       }
-
-       regoff = OFFSETOF(chipcregs_t, gpioouten);
-       return (si_corereg(sih, SI_CC_IDX, regoff, mask, val));
-}
-
-/* mask&set gpio output bits */
-uint32
-si_gpioout(si_t *sih, uint32 mask, uint32 val, uint8 priority)
-{
-       uint regoff;
-
-       regoff = 0;
-
-       /* gpios could be shared on router platforms
-        * ignore reservation if it's high priority (e.g., test apps)
-        */
-       if ((priority != GPIO_HI_PRIORITY) &&
-           (BUSTYPE(sih->bustype) == SI_BUS) && (val || mask)) {
-               mask = priority ? (si_gpioreservation & mask) :
-                       ((si_gpioreservation | mask) & ~(si_gpioreservation));
-               val &= mask;
-       }
-
-       regoff = OFFSETOF(chipcregs_t, gpioout);
-       return (si_corereg(sih, SI_CC_IDX, regoff, mask, val));
-}
-
-/* reserve one gpio */
-uint32
-si_gpioreserve(si_t *sih, uint32 gpio_bitmask, uint8 priority)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       /* only cores on SI_BUS share GPIO's and only applcation users need to
-        * reserve/release GPIO
-        */
-       if ((BUSTYPE(sih->bustype) != SI_BUS) || (!priority)) {
-               ASSERT((BUSTYPE(sih->bustype) == SI_BUS) && (priority));
-               return -1;
-       }
-       /* make sure only one bit is set */
-       if ((!gpio_bitmask) || ((gpio_bitmask) & (gpio_bitmask - 1))) {
-               ASSERT((gpio_bitmask) && !((gpio_bitmask) & (gpio_bitmask - 1)));
-               return -1;
-       }
-
-       /* already reserved */
-       if (si_gpioreservation & gpio_bitmask)
-               return -1;
-       /* set reservation */
-       si_gpioreservation |= gpio_bitmask;
-
-       return si_gpioreservation;
-}
-
-/* release one gpio */
-/*
- * releasing the gpio doesn't change the current value on the GPIO last write value
- * persists till some one overwrites it
- */
-
-uint32
-si_gpiorelease(si_t *sih, uint32 gpio_bitmask, uint8 priority)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       /* only cores on SI_BUS share GPIO's and only applcation users need to
-        * reserve/release GPIO
-        */
-       if ((BUSTYPE(sih->bustype) != SI_BUS) || (!priority)) {
-               ASSERT((BUSTYPE(sih->bustype) == SI_BUS) && (priority));
-               return -1;
-       }
-       /* make sure only one bit is set */
-       if ((!gpio_bitmask) || ((gpio_bitmask) & (gpio_bitmask - 1))) {
-               ASSERT((gpio_bitmask) && !((gpio_bitmask) & (gpio_bitmask - 1)));
-               return -1;
-       }
-
-       /* already released */
-       if (!(si_gpioreservation & gpio_bitmask))
-               return -1;
-
-       /* clear reservation */
-       si_gpioreservation &= ~gpio_bitmask;
-
-       return si_gpioreservation;
-}
-
-/* return the current gpioin register value */
-uint32
-si_gpioin(si_t *sih)
-{
-       si_info_t *sii;
-       uint regoff;
-
-       sii = SI_INFO(sih);
-       regoff = 0;
-
-       regoff = OFFSETOF(chipcregs_t, gpioin);
-       return (si_corereg(sih, SI_CC_IDX, regoff, 0, 0));
-}
-
-/* mask&set gpio interrupt polarity bits */
-uint32
-si_gpiointpolarity(si_t *sih, uint32 mask, uint32 val, uint8 priority)
-{
-       si_info_t *sii;
-       uint regoff;
-
-       sii = SI_INFO(sih);
-       regoff = 0;
-
-       /* gpios could be shared on router platforms */
-       if ((BUSTYPE(sih->bustype) == SI_BUS) && (val || mask)) {
-               mask = priority ? (si_gpioreservation & mask) :
-                       ((si_gpioreservation | mask) & ~(si_gpioreservation));
-               val &= mask;
-       }
-
-       regoff = OFFSETOF(chipcregs_t, gpiointpolarity);
-       return (si_corereg(sih, SI_CC_IDX, regoff, mask, val));
-}
-
-/* mask&set gpio interrupt mask bits */
-uint32
-si_gpiointmask(si_t *sih, uint32 mask, uint32 val, uint8 priority)
-{
-       si_info_t *sii;
-       uint regoff;
-
-       sii = SI_INFO(sih);
-       regoff = 0;
-
-       /* gpios could be shared on router platforms */
-       if ((BUSTYPE(sih->bustype) == SI_BUS) && (val || mask)) {
-               mask = priority ? (si_gpioreservation & mask) :
-                       ((si_gpioreservation | mask) & ~(si_gpioreservation));
-               val &= mask;
-       }
-
-       regoff = OFFSETOF(chipcregs_t, gpiointmask);
-       return (si_corereg(sih, SI_CC_IDX, regoff, mask, val));
-}
-
-/* assign the gpio to an led */
-uint32
-si_gpioled(si_t *sih, uint32 mask, uint32 val)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-       if (sih->ccrev < 16)
-               return -1;
-
-       /* gpio led powersave reg */
-       return (si_corereg(sih, SI_CC_IDX, OFFSETOF(chipcregs_t, gpiotimeroutmask), mask, val));
-}
-
-/* mask&set gpio timer val */
-uint32
-si_gpiotimerval(si_t *sih, uint32 mask, uint32 gpiotimerval)
-{
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       if (sih->ccrev < 16)
-               return -1;
-
-       return (si_corereg(sih, SI_CC_IDX,
-               OFFSETOF(chipcregs_t, gpiotimerval), mask, gpiotimerval));
-}
-
-uint32
-si_gpiopull(si_t *sih, bool updown, uint32 mask, uint32 val)
-{
-       si_info_t *sii;
-       uint offs;
-
-       sii = SI_INFO(sih);
-       if (sih->ccrev < 20)
-               return -1;
-
-       offs = (updown ? OFFSETOF(chipcregs_t, gpiopulldown) : OFFSETOF(chipcregs_t, gpiopullup));
-       return (si_corereg(sih, SI_CC_IDX, offs, mask, val));
-}
-
-uint32
-si_gpioevent(si_t *sih, uint regtype, uint32 mask, uint32 val)
-{
-       si_info_t *sii;
-       uint offs;
-
-       sii = SI_INFO(sih);
-       if (sih->ccrev < 11)
-               return -1;
-
-       if (regtype == GPIO_REGEVT)
-               offs = OFFSETOF(chipcregs_t, gpioevent);
-       else if (regtype == GPIO_REGEVT_INTMSK)
-               offs = OFFSETOF(chipcregs_t, gpioeventintmask);
-       else if (regtype == GPIO_REGEVT_INTPOL)
-               offs = OFFSETOF(chipcregs_t, gpioeventintpolarity);
-       else
-               return -1;
-
-       return (si_corereg(sih, SI_CC_IDX, offs, mask, val));
-}
-
-void *
-si_gpio_handler_register(si_t *sih, uint32 event,
-       bool level, gpio_handler_t cb, void *arg)
-{
-       si_info_t *sii;
-       gpioh_item_t *gi;
-
-       ASSERT(event);
-       ASSERT(cb != NULL);
-
-       sii = SI_INFO(sih);
-       if (sih->ccrev < 11)
-               return NULL;
-
-       if ((gi = MALLOC(sii->osh, sizeof(gpioh_item_t))) == NULL)
-               return NULL;
-
-       bzero(gi, sizeof(gpioh_item_t));
-       gi->event = event;
-       gi->handler = cb;
-       gi->arg = arg;
-       gi->level = level;
-
-       gi->next = sii->gpioh_head;
-       sii->gpioh_head = gi;
-
-       return (void *)(gi);
-}
-
-void
-si_gpio_handler_unregister(si_t *sih, void *gpioh)
-{
-       si_info_t *sii;
-       gpioh_item_t *p, *n;
-
-       sii = SI_INFO(sih);
-       if (sih->ccrev < 11)
-               return;
-
-       ASSERT(sii->gpioh_head != NULL);
-       if ((void*)sii->gpioh_head == gpioh) {
-               sii->gpioh_head = sii->gpioh_head->next;
-               MFREE(sii->osh, gpioh, sizeof(gpioh_item_t));
-               return;
-       } else {
-               p = sii->gpioh_head;
-               n = p->next;
-               while (n) {
-                       if ((void*)n == gpioh) {
-                               p->next = n->next;
-                               MFREE(sii->osh, gpioh, sizeof(gpioh_item_t));
-                               return;
-                       }
-                       p = n;
-                       n = n->next;
-               }
-       }
-
-       ASSERT(0); /* Not found in list */
-}
-
-void
-si_gpio_handler_process(si_t *sih)
-{
-       si_info_t *sii;
-       gpioh_item_t *h;
-       uint32 status;
-       uint32 level = si_gpioin(sih);
-       uint32 edge = si_gpioevent(sih, GPIO_REGEVT, 0, 0);
-
-       sii = SI_INFO(sih);
-       for (h = sii->gpioh_head; h != NULL; h = h->next) {
-               if (h->handler) {
-                       status = (h->level ? level : edge);
-
-                       if (status & h->event)
-                               h->handler(status, h->arg);
-               }
-       }
-
-       si_gpioevent(sih, GPIO_REGEVT, edge, edge); /* clear edge-trigger status */
-}
-
-uint32
-si_gpio_int_enable(si_t *sih, bool enable)
-{
-       si_info_t *sii;
-       uint offs;
-
-       sii = SI_INFO(sih);
-       if (sih->ccrev < 11)
-               return -1;
-
-       offs = OFFSETOF(chipcregs_t, intmask);
-       return (si_corereg(sih, SI_CC_IDX, offs, CI_GPIO, (enable ? CI_GPIO : 0)));
-}
-
-
-/* Return the RAM size of the SOCRAM core */
-uint32
-si_socram_size(si_t *sih)
-{
-       si_info_t *sii;
-       uint origidx;
-       uint intr_val = 0;
-
-       sbsocramregs_t *regs;
-       bool wasup;
-       uint corerev;
-       uint32 coreinfo;
-       uint memsize = 0;
-
-       sii = SI_INFO(sih);
-
-       /* Block ints and save current core */
-       INTR_OFF(sii, intr_val);
-       origidx = si_coreidx(sih);
-
-       /* Switch to SOCRAM core */
-       if (!(regs = si_setcore(sih, SOCRAM_CORE_ID, 0)))
-               goto done;
-
-       /* Get info for determining size */
-       if (!(wasup = si_iscoreup(sih)))
-               si_core_reset(sih, 0, 0);
-       corerev = si_corerev(sih);
-       coreinfo = R_REG(sii->osh, &regs->coreinfo);
-
-       /* Calculate size from coreinfo based on rev */
-       if (corerev == 0)
-               memsize = 1 << (16 + (coreinfo & SRCI_MS0_MASK));
-       else if (corerev < 3) {
-               memsize = 1 << (SR_BSZ_BASE + (coreinfo & SRCI_SRBSZ_MASK));
-               memsize *= (coreinfo & SRCI_SRNB_MASK) >> SRCI_SRNB_SHIFT;
-       } else {
-               uint nb = (coreinfo & SRCI_SRNB_MASK) >> SRCI_SRNB_SHIFT;
-               uint bsz = (coreinfo & SRCI_SRBSZ_MASK);
-               uint lss = (coreinfo & SRCI_LSS_MASK) >> SRCI_LSS_SHIFT;
-               if (lss != 0)
-                       nb --;
-               memsize = nb * (1 << (bsz + SR_BSZ_BASE));
-               if (lss != 0)
-                       memsize += (1 << ((lss - 1) + SR_BSZ_BASE));
-       }
-
-       /* Return to previous state and core */
-       if (!wasup)
-               si_core_disable(sih, 0);
-       si_setcoreidx(sih, origidx);
-
-done:
-       INTR_RESTORE(sii, intr_val);
-
-       return memsize;
-}
-
-
-void
-si_btcgpiowar(si_t *sih)
-{
-       si_info_t *sii;
-       uint origidx;
-       uint intr_val = 0;
-       chipcregs_t *cc;
-
-       sii = SI_INFO(sih);
-
-       /* Make sure that there is ChipCommon core present &&
-        * UART_TX is strapped to 1
-        */
-       if (!(sih->cccaps & CC_CAP_UARTGPIO))
-               return;
-
-       /* si_corereg cannot be used as we have to guarantee 8-bit read/writes */
-       INTR_OFF(sii, intr_val);
-
-       origidx = si_coreidx(sih);
-
-       cc = (chipcregs_t *)si_setcore(sih, CC_CORE_ID, 0);
-       ASSERT(cc != NULL);
-
-       W_REG(sii->osh, &cc->uart0mcr, R_REG(sii->osh, &cc->uart0mcr) | 0x04);
-
-       /* restore the original index */
-       si_setcoreidx(sih, origidx);
-
-       INTR_RESTORE(sii, intr_val);
-}
-
-/* check if the device is removed */
-bool
-si_deviceremoved(si_t *sih)
-{
-       uint32 w;
-       si_info_t *sii;
-
-       sii = SI_INFO(sih);
-
-       switch (BUSTYPE(sih->bustype)) {
-       case PCI_BUS:
-               ASSERT(sii->osh != NULL);
-               w = OSL_PCI_READ_CONFIG(sii->osh, PCI_CFG_VID, sizeof(uint32));
-               if ((w & 0xFFFF) != VENDOR_BROADCOM)
-                       return TRUE;
-               else
-                       return FALSE;
-       default:
-               return FALSE;
-       }
-       return FALSE;
-}
diff --git a/drivers/net/wireless/bcm4319/siutils_priv.h b/drivers/net/wireless/bcm4319/siutils_priv.h
deleted file mode 100644 (file)
index e8ad7e5..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Include file private to the SOC Interconnect support files.
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: siutils_priv.h,v 1.3.10.5.4.2 2009/09/22 13:28:16 Exp $
- */
-
-#ifndef        _siutils_priv_h_
-#define        _siutils_priv_h_
-
-/* debug/trace */
-#define        SI_ERROR(args)
-
-#define        SI_MSG(args)
-
-#define        IS_SIM(chippkg) ((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))
-
-typedef uint32 (*si_intrsoff_t)(void *intr_arg);
-typedef void (*si_intrsrestore_t)(void *intr_arg, uint32 arg);
-typedef bool (*si_intrsenabled_t)(void *intr_arg);
-
-typedef struct gpioh_item {
-       void                    *arg;
-       bool                    level;
-       gpio_handler_t          handler;
-       uint32                  event;
-       struct gpioh_item       *next;
-} gpioh_item_t;
-
-/* misc si info needed by some of the routines */
-typedef struct si_common_info {
-       void    *regs[SI_MAXCORES];     /* other regs va */
-       void    *regs2[SI_MAXCORES];    /* va of each core second register set (usbh20) */
-       uint    coreid[SI_MAXCORES];    /* id of each core */
-       uint32  cia[SI_MAXCORES];       /* erom cia entry for each core */
-       uint32  cib[SI_MAXCORES];       /* erom cia entry for each core */
-       uint32  coresba_size[SI_MAXCORES]; /* backplane address space size */
-       uint32  coresba2_size[SI_MAXCORES]; /* second address space size */
-       uint32  coresba[SI_MAXCORES];   /* backplane address of each core */
-       uint32  coresba2[SI_MAXCORES];  /* address of each core second register set (usbh20) */
-       void    *wrappers[SI_MAXCORES]; /* other cores wrapper va */
-       uint32  wrapba[SI_MAXCORES];    /* address of controlling wrapper */
-       uint32  oob_router;             /* oob router registers for axi */
-       uint8   attach_count;
-} si_common_info_t;
-
-typedef struct si_info {
-       struct si_pub pub;              /* back plane public state (must be first field) */
-
-       void    *osh;                   /* osl os handle */
-       void    *sdh;                   /* bcmsdh handle */
-       void *pch;                      /* PCI/E core handle */
-       uint    dev_coreid;             /* the core provides driver functions */
-       void    *intr_arg;              /* interrupt callback function arg */
-       si_intrsoff_t intrsoff_fn;      /* turns chip interrupts off */
-       si_intrsrestore_t intrsrestore_fn; /* restore chip interrupts */
-       si_intrsenabled_t intrsenabled_fn; /* check if interrupts are enabled */
-
-
-       gpioh_item_t *gpioh_head;       /* GPIO event handlers list */
-
-       bool    memseg;                 /* flag to toggle MEM_SEG register */
-
-       char *vars;
-       uint varsz;
-
-       void    *curmap;                /* current regs va */
-
-       uint    curidx;                 /* current core index */
-       uint    numcores;               /* # discovered cores */
-       void    *curwrap;               /* current wrapper va */
-       si_common_info_t        *common_info;   /* Common information for all the cores in a chip */
-} si_info_t;
-
-#define        SI_INFO(sih)    (si_info_t *)(uintptr)sih
-
-#define        GOODCOREADDR(x, b) (((x) >= (b)) && ((x) < ((b) + SI_MAXCORES * SI_CORE_SIZE)) && \
-               ISALIGNED((x), SI_CORE_SIZE))
-#define        GOODREGS(regs)  ((regs) != NULL && ISALIGNED((uintptr)(regs), SI_CORE_SIZE))
-#define BADCOREADDR    0
-#define        GOODIDX(idx)    (((uint)idx) < SI_MAXCORES)
-#define        BADIDX          (SI_MAXCORES + 1)
-#define        NOREV           -1              /* Invalid rev */
-
-#define PCI(si)                ((BUSTYPE((si)->pub.bustype) == PCI_BUS) &&     \
-                        ((si)->pub.buscoretype == PCI_CORE_ID))
-#define PCIE(si)       ((BUSTYPE((si)->pub.bustype) == PCI_BUS) &&     \
-                        ((si)->pub.buscoretype == PCIE_CORE_ID))
-#define PCMCIA(si)     ((BUSTYPE((si)->pub.bustype) == PCMCIA_BUS) && ((si)->memseg == TRUE))
-
-/* Newer chips can access PCI/PCIE and CC core without requiring to change
- * PCI BAR0 WIN
- */
-#define SI_FAST(si) (((si)->pub.buscoretype == PCIE_CORE_ID) ||        \
-                    (((si)->pub.buscoretype == PCI_CORE_ID) && (si)->pub.buscorerev >= 13))
-
-#define PCIEREGS(si) (((char *)((si)->curmap) + PCI_16KB0_PCIREGS_OFFSET))
-#define CCREGS_FAST(si) (((char *)((si)->curmap) + PCI_16KB0_CCREGS_OFFSET))
-
-/*
- * Macros to disable/restore function core(D11, ENET, ILINE20, etc) interrupts before/
- * after core switching to avoid invalid register accesss inside ISR.
- */
-#define INTR_OFF(si, intr_val) \
-       if ((si)->intrsoff_fn && (si)->common_info->coreid[(si)->curidx] == (si)->dev_coreid) { \
-               intr_val = (*(si)->intrsoff_fn)((si)->intr_arg); }
-#define INTR_RESTORE(si, intr_val) \
-       if ((si)->intrsrestore_fn && (si)->common_info->coreid[(si)->curidx] == (si)->dev_coreid) {\
-               (*(si)->intrsrestore_fn)((si)->intr_arg, intr_val); }
-
-/* dynamic clock control defines */
-#define        LPOMINFREQ              25000           /* low power oscillator min */
-#define        LPOMAXFREQ              43000           /* low power oscillator max */
-#define        XTALMINFREQ             19800000        /* 20 MHz - 1% */
-#define        XTALMAXFREQ             20200000        /* 20 MHz + 1% */
-#define        PCIMINFREQ              25000000        /* 25 MHz */
-#define        PCIMAXFREQ              34000000        /* 33 MHz + fudge */
-
-#define        ILP_DIV_5MHZ            0               /* ILP = 5 MHz */
-#define        ILP_DIV_1MHZ            4               /* ILP = 1 MHz */
-
-#define PCI_FORCEHT(si)        \
-       (((PCIE(si)) && (si->pub.chip == BCM4311_CHIP_ID) && ((si->pub.chiprev <= 1))) || \
-       ((PCI(si) || PCIE(si)) && (si->pub.chip == BCM4321_CHIP_ID)))
-
-/* GPIO Based LED powersave defines */
-#define DEFAULT_GPIO_ONTIME    10              /* Default: 10% on */
-#define DEFAULT_GPIO_OFFTIME   90              /* Default: 10% on */
-
-#ifndef DEFAULT_GPIOTIMERVAL
-#define DEFAULT_GPIOTIMERVAL  ((DEFAULT_GPIO_ONTIME << GPIO_ONTIME_SHIFT) | DEFAULT_GPIO_OFFTIME)
-#endif
-
-/* Silicon Backplane externs */
-extern void sb_scan(si_t *sih, void *regs, uint devid);
-extern uint sb_coreid(si_t *sih);
-extern uint sb_flag(si_t *sih);
-extern void sb_setint(si_t *sih, int siflag);
-extern uint sb_corevendor(si_t *sih);
-extern uint sb_corerev(si_t *sih);
-extern uint sb_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val);
-extern bool sb_iscoreup(si_t *sih);
-extern void *sb_setcoreidx(si_t *sih, uint coreidx);
-extern uint32 sb_core_cflags(si_t *sih, uint32 mask, uint32 val);
-extern void sb_core_cflags_wo(si_t *sih, uint32 mask, uint32 val);
-extern uint32 sb_core_sflags(si_t *sih, uint32 mask, uint32 val);
-extern void sb_commit(si_t *sih);
-extern uint32 sb_base(uint32 admatch);
-extern uint32 sb_size(uint32 admatch);
-extern void sb_core_reset(si_t *sih, uint32 bits, uint32 resetbits);
-extern void sb_core_tofixup(si_t *sih);
-extern void sb_core_disable(si_t *sih, uint32 bits);
-extern uint32 sb_addrspace(si_t *sih, uint asidx);
-extern uint32 sb_addrspacesize(si_t *sih, uint asidx);
-extern int sb_numaddrspaces(si_t *sih);
-
-extern uint32 sb_set_initiator_to(si_t *sih, uint32 to, uint idx);
-
-
-
-/* Wake-on-wireless-LAN (WOWL) */
-extern bool sb_pci_pmecap(si_t *sih);
-struct osl_info;
-extern bool sb_pci_fastpmecap(struct osl_info *osh);
-extern bool sb_pci_pmeclr(si_t *sih);
-extern void sb_pci_pmeen(si_t *sih);
-extern uint sb_pcie_readreg(void *sih, uint addrtype, uint offset);
-
-/* AMBA Interconnect exported externs */
-extern si_t *ai_attach(uint pcidev, osl_t *osh, void *regs, uint bustype,
-                       void *sdh, char **vars, uint *varsz);
-extern si_t *ai_kattach(osl_t *osh);
-extern void ai_scan(si_t *sih, void *regs, uint devid);
-
-extern uint ai_flag(si_t *sih);
-extern void ai_setint(si_t *sih, int siflag);
-extern uint ai_coreidx(si_t *sih);
-extern uint ai_corevendor(si_t *sih);
-extern uint ai_corerev(si_t *sih);
-extern bool ai_iscoreup(si_t *sih);
-extern void *ai_setcoreidx(si_t *sih, uint coreidx);
-extern uint32 ai_core_cflags(si_t *sih, uint32 mask, uint32 val);
-extern void ai_core_cflags_wo(si_t *sih, uint32 mask, uint32 val);
-extern uint32 ai_core_sflags(si_t *sih, uint32 mask, uint32 val);
-extern uint ai_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val);
-extern void ai_core_reset(si_t *sih, uint32 bits, uint32 resetbits);
-extern void ai_core_disable(si_t *sih, uint32 bits);
-extern int ai_numaddrspaces(si_t *sih);
-extern uint32 ai_addrspace(si_t *sih, uint asidx);
-extern uint32 ai_addrspacesize(si_t *sih, uint asidx);
-extern void ai_write_wrap_reg(si_t *sih, uint32 offset, uint32 val);
-
-
-#endif /* _siutils_priv_h_ */
diff --git a/drivers/net/wireless/bcm4319/wl_cfg80211.c b/drivers/net/wireless/bcm4319/wl_cfg80211.c
deleted file mode 100644 (file)
index 0343971..0000000
+++ /dev/null
@@ -1,4491 +0,0 @@
-/*
- * Linux Cfg80211 support
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: wl_cfg80211.c,v 1.1.2.28 2010/05/04 21:43:38 Exp $
- */
-
-#include <typedefs.h>
-#include <linuxver.h>
-#include <osl.h>
-
-#include <bcmutils.h>
-#include <bcmendian.h>
-#include <proto/ethernet.h>
-
-#include <linux/if_arp.h>
-#include <asm/uaccess.h>
-
-#include <dngl_stats.h>
-#include <dhd.h>
-#include <dhdioctl.h>
-#include <wlioctl.h>
-
-#include <proto/ethernet.h>
-#include <dngl_stats.h>
-#include <dhd.h>
-
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/sched.h>
-#include <linux/etherdevice.h>
-#include <linux/wireless.h>
-#include <linux/ieee80211.h>
-#include <net/cfg80211.h>
-
-#include <net/rtnetlink.h>
-#include <linux/mmc/sdio_func.h>
-#include <linux/firmware.h>
-#include <wl_cfg80211.h>
-
-static struct sdio_func *cfg80211_sdio_func = NULL;
-static struct wl_dev *wl_cfg80211_dev = NULL;
-
-#ifdef WL_CFG80211_BACKTRACE
-uint32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO | WL_DBG_DBG;
-#else
-uint32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
-#endif
-
-#define WL_4329_FW_FILE "brcm/fw_4329.bin"
-#define WL_4329_NVRAM_FILE "brcm/nvram_4329.txt"
-
-/*
-** cfg80211_ops api/callback list
-*/
-static int32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
-       enum nl80211_iftype type, uint32 *flags, struct vif_params *params);
-static int32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-       struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
-static int32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-       struct cfg80211_scan_request *request);
-static int32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, uint32 changed);
-static int32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
-       struct cfg80211_ibss_params *params);
-static int32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev);
-static int32 wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
-       uint8 *mac, struct station_info *sinfo);
-static int32 wl_cfg80211_set_power_mgmt(struct wiphy *wiphy,
-      struct net_device *dev, bool enabled, int32 timeout);
-static int32 wl_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
-      struct net_device *dev, const uint8 *addr,
-      const struct cfg80211_bitrate_mask *mask);
-static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
-       struct cfg80211_connect_params *sme);
-static int32 wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
-       uint16 reason_code);
-static int32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type, int32 dbm);
-static int32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, int32 *dbm);
-static int32 wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev,
-       uint8 key_idx);
-static int32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
-     uint8 key_idx, const uint8 *mac_addr, struct key_params *params);
-static int32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
-     uint8 key_idx, const uint8 *mac_addr);
-static int32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
-     uint8 key_idx, const uint8 *mac_addr, void *cookie,
-     void (*callback)(void *cookie, struct key_params *params));
-static int32 wl_cfg80211_config_default_mgmt_key(struct wiphy *wiphy,
-       struct net_device *dev, uint8 key_idx);
-static int32 wl_cfg80211_resume(struct wiphy *wiphy);
-static int32 wl_cfg80211_suspend(struct wiphy *wiphy);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) || \
-       defined(CHROMIUMOS_COMPAT_WIRELESS)
-static int32 wl_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev,
-       struct cfg80211_pmksa *pmksa);
-static int32 wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev,
-       struct cfg80211_pmksa *pmksa);
-static int32 wl_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev);
-#endif
-/*
-** event & event Q handlers for cfg80211 interfaces
-*/
-static int32 wl_create_event_handler(struct wl_priv *wl);
-static void wl_destroy_event_handler(struct wl_priv *wl);
-static int32 wl_event_handler(void *data);
-static void wl_init_eq(struct wl_priv *wl);
-static void wl_flush_eq(struct wl_priv *wl);
-static void wl_lock_eq(struct wl_priv *wl);
-static void wl_unlock_eq(struct wl_priv *wl);
-static void wl_init_eq_lock(struct wl_priv *wl);
-static void wl_init_eloop_handler(struct wl_event_loop *el);
-static struct wl_event_q *wl_deq_event(struct wl_priv *wl);
-static int32 wl_enq_event(struct wl_priv *wl, uint32 type, const wl_event_msg_t *msg, void *data);
-static void wl_put_event(struct wl_event_q *e);
-static void wl_wakeup_event(struct wl_priv *wl);
-static int32 wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data);
-static int32 wl_notify_roaming_status(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data);
-static int32 wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data);
-static int32 wl_bss_connect_done(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data);
-static int32 wl_bss_roaming_done(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data);
-static int32 wl_notify_mic_status(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data);
-
-/*
-** register/deregister sdio function 
-*/
-static struct sdio_func *wl_sdio_func(void);
-static void wl_clear_sdio_func(void);
-
-/*
-** ioctl utilites 
-*/
-static int32 wl_dev_bufvar_get(struct net_device *dev, int8 *name, int8 *buf, int32 buf_len);
-static __used int32 wl_dev_bufvar_set(struct net_device *dev, int8 *name, int8 *buf, int32 len);
-static int32 wl_dev_intvar_set(struct net_device *dev, int8 *name, int32 val);
-static int32 wl_dev_intvar_get(struct net_device *dev, int8 *name, int32 *retval);
-static int32 wl_dev_ioctl(struct net_device *dev, uint32 cmd, void *arg, uint32 len);
-
-
-/*
-** cfg80211 set_wiphy_params utilities 
-*/
-static int32 wl_set_frag(struct net_device *dev, uint32 frag_threshold);
-static int32 wl_set_rts(struct net_device *dev, uint32 frag_threshold);
-static int32 wl_set_retry(struct net_device *dev, uint32 retry, bool l);
-
-/*
-** wl profile utilities
-*/
-static int32 wl_update_prof(struct wl_priv *wl, const wl_event_msg_t *e, void *data, int32 item);
-static void * wl_read_prof(struct wl_priv *wl, int32 item);
-static void wl_init_prof(struct wl_profile *prof);
-
-
-/*
-** cfg80211 connect utilites 
-*/
-static int32 wl_set_wpa_version(struct net_device *dev, struct cfg80211_connect_params *sme);
-static int32 wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme);
-static int32 wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme);
-static int32 wl_set_key_mgmt(struct net_device *dev, struct cfg80211_connect_params *sme);
-static int32 wl_set_set_sharedkey(struct net_device *dev, struct cfg80211_connect_params *sme);
-static int32 wl_get_assoc_ies(struct wl_priv *wl);
-
-
-/* 
-** information element utilities 
-*/
-static void wl_rst_ie(struct wl_priv *wl);
-static int32 wl_add_ie(struct wl_priv *wl, uint8 t, uint8 l, uint8 *v);
-static int32 wl_mrg_ie(struct wl_priv *wl, uint8 *ie_stream, uint16 ie_size);
-static int32 wl_cp_ie(struct wl_priv *wl, uint8 *dst, uint16 dst_size);
-static uint32 wl_get_ielen(struct wl_priv *wl);
-
-
-static int32 wl_mode_to_nl80211_iftype(int32 mode);
-
-static struct wireless_dev *wl_alloc_wdev(int32 sizeof_iface, struct device *dev);
-static void wl_free_wdev(struct wl_priv *wl);
-
-static int32 wl_inform_bss(struct wl_priv *wl);
-static int32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi);
-static int32 wl_update_bss_info(struct wl_priv *wl);
-
-static int32 wl_add_keyext(struct wiphy *wiphy, struct net_device *dev,
-     uint8 key_idx, const uint8 *mac_addr, struct key_params *params);
-
-
-/*
-** key indianess swap utilities 
-*/
-static void swap_key_from_BE(struct wl_wsec_key *key);
-static void swap_key_to_BE(struct wl_wsec_key *key);
-
-
-/*
-** wl_priv memory init/deinit utilities
-*/
-static int32 wl_init_priv_mem(struct wl_priv *wl);
-static void wl_deinit_priv_mem(struct wl_priv *wl);
-
-static void wl_delay(uint32 ms);
-
-/* 
-** store/restore cfg80211 instance data
-*/
-static void wl_set_drvdata(struct wl_dev *dev, void *data);
-static void *wl_get_drvdata(struct wl_dev *dev);
-
-/*
-** ibss mode utilities
-*/
-static bool wl_is_ibssmode(struct wl_priv *wl);
-static bool wl_is_ibssstarter(struct wl_priv *wl);
-
-/* 
-** dongle up/down , default configuration utilities 
-*/
-static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e);
-static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e);
-static void wl_link_up(struct wl_priv *wl);
-static void wl_link_down(struct wl_priv *wl);
-static int32 wl_dongle_mode(struct net_device *ndev, int32 iftype);
-static int32 __wl_cfg80211_up(struct wl_priv *wl);
-static int32 __wl_cfg80211_down(struct wl_priv *wl);
-static int32 wl_dongle_probecap(struct wl_priv *wl);
-static void wl_init_conf(struct wl_conf *conf);
-
-/*
-** dongle configuration utilities
-*/
-#ifndef EMBEDDED_PLATFORM
-static int32 wl_dongle_mode(struct net_device *ndev, int32 iftype);
-static int32 wl_dongle_country(struct net_device *ndev, uint8 ccode);
-static int32 wl_dongle_up(struct net_device *ndev, uint32 up);
-static int32 wl_dongle_power(struct net_device *ndev, uint32 power_mode);
-static int32 wl_dongle_glom(struct net_device *ndev, uint32 glom, uint32 dongle_align);
-static int32 wl_dongle_roam(struct net_device *ndev, uint32 roamvar, uint32 bcn_timeout);
-static int32 wl_dongle_eventmsg(struct net_device *ndev);
-static int32 wl_dongle_scantime(struct net_device *ndev, int32 scan_assoc_time,
-       int32 scan_unassoc_time);
-static int32 wl_dongle_offload(struct net_device *ndev, int32 arpoe, int32 arp_ol);
-static int32 wl_pattern_atoh(int8 *src, int8 *dst);
-static int32 wl_dongle_filter(struct net_device *ndev, uint32 filter_mode);
-static int32 wl_update_wiphybands(struct wl_priv *wl);
-#endif /* !EMBEDDED_PLATFORM */
-static int32 wl_config_dongle(struct wl_priv *wl, bool need_lock);
-
-/*
-** iscan handler 
-*/
-static void wl_iscan_timer(ulong data);
-static void wl_term_iscan(struct wl_priv *wl);
-static int32 wl_init_iscan(struct wl_priv *wl);
-static int32 wl_iscan_thread(void *data);
-static int32 wl_dev_iovar_setbuf(struct net_device *dev, int8 *iovar, void *param,
-       int32 paramlen, void *bufptr, int32 buflen);
-static int32 wl_dev_iovar_getbuf(struct net_device *dev, int8 *iovar, void *param,
-       int32 paramlen, void *bufptr, int32 buflen);
-static int32 wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, uint16 action);
-static int32 wl_do_iscan(struct wl_priv *wl);
-static int32 wl_wakeup_iscan(struct wl_iscan_ctrl *iscan);
-static int32 wl_invoke_iscan(struct wl_priv *wl);
-static int32 wl_get_iscan_results(struct wl_iscan_ctrl *iscan, uint32 *status,
-       struct wl_scan_results **bss_list);
-static void wl_notify_iscan_complete(struct wl_iscan_ctrl *iscan, bool aborted);
-static void wl_init_iscan_eloop(struct wl_iscan_eloop *el);
-static int32 wl_iscan_done(struct wl_priv *wl);
-static int32 wl_iscan_pending(struct wl_priv *wl);
-static int32 wl_iscan_inprogress(struct wl_priv *wl);
-static int32 wl_iscan_aborted(struct wl_priv *wl);
-
-/*
-** fw/nvram downloading handler
-*/
-static void wl_init_fw(struct wl_fw_ctrl *fw);
-
-/*
-* find most significant bit set 
-*/
-static __used uint32 wl_find_msb(uint16 bit16);
-
-/*
-* update pmklist to dongle
-*/
-static __used int32 wl_update_pmklist(struct net_device *dev, struct wl_pmk_list *pmk_list,
-       int32 err);
-
-
-#define WL_PRIV_GET()                                                                          \
-       ({                                                                                      \
-               struct wl_iface *ci;                                                            \
-               if (unlikely(!(wl_cfg80211_dev && (ci = wl_get_drvdata(wl_cfg80211_dev))))) {   \
-                       WL_ERR(("wl_cfg80211_dev is unavailable\n"));                           \
-                       BUG();                                                                  \
-               }                                                                       \
-               ci_to_wl(ci);                                                   \
-       })
-
-#define CHECK_SYS_UP()                                                 \
-       do {                                                                            \
-               struct wl_priv *wl = wiphy_to_wl(wiphy);        \
-               if (unlikely(!test_bit(WL_STATUS_READY, &wl->status))) {        \
-                       WL_INFO(("device is not ready : status (%d)\n", (int)wl->status));      \
-                       return -EIO;    \
-               }       \
-       } while (0)
-
-
-extern int dhd_wait_pend8021x(struct net_device *dev);
-
-#if (WL_DBG_LEVEL > 0)
-#define WL_DBG_ESTR_MAX        32
-static int8 wl_dbg_estr[][WL_DBG_ESTR_MAX] = {
-"SET_SSID", "JOIN", "START", "AUTH", "AUTH_IND",
-"DEAUTH", "DEAUTH_IND", "ASSOC", "ASSOC_IND", "REASSOC",
-"REASSOC_IND", "DISASSOC", "DISASSOC_IND", "QUIET_START", "QUIET_END",
-"BEACON_RX", "LINK", "MIC_ERROR", "NDIS_LINK", "ROAM",
-"TXFAIL", "PMKID_CACHE", "RETROGRADE_TSF", "PRUNE", "AUTOAUTH",
-"EAPOL_MSG", "SCAN_COMPLETE", "ADDTS_IND", "DELTS_IND", "BCNSENT_IND",
-"BCNRX_MSG", "BCNLOST_MSG", "ROAM_PREP", "PFN_NET_FOUND", "PFN_NET_LOST",
-"RESET_COMPLETE", "JOIN_START", "ROAM_START", "ASSOC_START", "IBSS_ASSOC",
-"RADIO", "PSM_WATCHDOG",
-"PROBREQ_MSG",
-"SCAN_CONFIRM_IND", "PSK_SUP", "COUNTRY_CODE_CHANGED", "EXCEEDED_MEDIUM_TIME", "ICV_ERROR",
-"UNICAST_DECODE_ERROR", "MULTICAST_DECODE_ERROR", "TRACE",
-"IF",
-"RSSI", "PFN_SCAN_COMPLETE", "ACTION_FRAME", "ACTION_FRAME_COMPLETE",
-};
-#endif /* WL_DBG_LEVEL */
-
-#define CHAN2G(_channel, _freq, _flags) {                      \
-       .band                   = IEEE80211_BAND_2GHZ,          \
-       .center_freq            = (_freq),                      \
-       .hw_value               = (_channel),                   \
-       .flags                  = (_flags),                     \
-       .max_antenna_gain       = 0,                            \
-       .max_power              = 30,                           \
-}
-
-#define CHAN5G(_channel, _flags) {                             \
-       .band                   = IEEE80211_BAND_5GHZ,          \
-       .center_freq            = 5000 + (5 * (_channel)),      \
-       .hw_value               = (_channel),                   \
-       .flags                  = (_flags),                     \
-       .max_antenna_gain       = 0,                            \
-       .max_power              = 30,                           \
-}
-
-#define RATE_TO_BASE100KBPS(rate)   (((rate) * 10) / 2)
-#define RATETAB_ENT(_rateid, _flags) \
-       {                                                               \
-               .bitrate        = RATE_TO_BASE100KBPS(_rateid),     \
-               .hw_value       = (_rateid),                            \
-               .flags          = (_flags),                             \
-       }
-
-static struct ieee80211_rate __wl_rates[] = {
-       RATETAB_ENT(WLC_RATE_1M, 0),
-       RATETAB_ENT(WLC_RATE_2M, IEEE80211_RATE_SHORT_PREAMBLE),
-       RATETAB_ENT(WLC_RATE_5M5, IEEE80211_RATE_SHORT_PREAMBLE),
-       RATETAB_ENT(WLC_RATE_11M, IEEE80211_RATE_SHORT_PREAMBLE),
-       RATETAB_ENT(WLC_RATE_6M, 0),
-       RATETAB_ENT(WLC_RATE_9M, 0),
-       RATETAB_ENT(WLC_RATE_12M, 0),
-       RATETAB_ENT(WLC_RATE_18M, 0),
-       RATETAB_ENT(WLC_RATE_24M, 0),
-       RATETAB_ENT(WLC_RATE_36M, 0),
-       RATETAB_ENT(WLC_RATE_48M, 0),
-       RATETAB_ENT(WLC_RATE_54M, 0),
-};
-
-#define wl_a_rates             (__wl_rates + 4)
-#define wl_a_rates_size        8
-#define wl_g_rates             (__wl_rates + 0)
-#define wl_g_rates_size        12
-
-static struct ieee80211_channel __wl_2ghz_channels[] = {
-       CHAN2G(1, 2412, 0),
-       CHAN2G(2, 2417, 0),
-       CHAN2G(3, 2422, 0),
-       CHAN2G(4, 2427, 0),
-       CHAN2G(5, 2432, 0),
-       CHAN2G(6, 2437, 0),
-       CHAN2G(7, 2442, 0),
-       CHAN2G(8, 2447, 0),
-       CHAN2G(9, 2452, 0),
-       CHAN2G(10, 2457, 0),
-       CHAN2G(11, 2462, 0),
-       CHAN2G(12, 2467, 0),
-       CHAN2G(13, 2472, 0),
-       CHAN2G(14, 2484, 0),
-};
-
-static struct ieee80211_channel __wl_5ghz_a_channels[] = {
-       CHAN5G(34, 0),          CHAN5G(36, 0),
-       CHAN5G(38, 0),          CHAN5G(40, 0),
-       CHAN5G(42, 0),          CHAN5G(44, 0),
-       CHAN5G(46, 0),          CHAN5G(48, 0),
-       CHAN5G(52, 0),          CHAN5G(56, 0),
-       CHAN5G(60, 0),          CHAN5G(64, 0),
-       CHAN5G(100, 0),         CHAN5G(104, 0),
-       CHAN5G(108, 0),         CHAN5G(112, 0),
-       CHAN5G(116, 0),         CHAN5G(120, 0),
-       CHAN5G(124, 0),         CHAN5G(128, 0),
-       CHAN5G(132, 0),         CHAN5G(136, 0),
-       CHAN5G(140, 0),         CHAN5G(149, 0),
-       CHAN5G(153, 0),         CHAN5G(157, 0),
-       CHAN5G(161, 0),         CHAN5G(165, 0),
-       CHAN5G(184, 0),         CHAN5G(188, 0),
-       CHAN5G(192, 0),         CHAN5G(196, 0),
-       CHAN5G(200, 0),         CHAN5G(204, 0),
-       CHAN5G(208, 0),         CHAN5G(212, 0),
-       CHAN5G(216, 0),
-};
-
-static struct ieee80211_channel __wl_5ghz_n_channels[] = {
-       CHAN5G(32, 0),          CHAN5G(34, 0),
-       CHAN5G(36, 0),          CHAN5G(38, 0),
-       CHAN5G(40, 0),          CHAN5G(42, 0),
-       CHAN5G(44, 0),          CHAN5G(46, 0),
-       CHAN5G(48, 0),          CHAN5G(50, 0),
-       CHAN5G(52, 0),          CHAN5G(54, 0),
-       CHAN5G(56, 0),          CHAN5G(58, 0),
-       CHAN5G(60, 0),          CHAN5G(62, 0),
-       CHAN5G(64, 0),          CHAN5G(66, 0),
-       CHAN5G(68, 0),          CHAN5G(70, 0),
-       CHAN5G(72, 0),          CHAN5G(74, 0),
-       CHAN5G(76, 0),          CHAN5G(78, 0),
-       CHAN5G(80, 0),          CHAN5G(82, 0),
-       CHAN5G(84, 0),          CHAN5G(86, 0),
-       CHAN5G(88, 0),          CHAN5G(90, 0),
-       CHAN5G(92, 0),          CHAN5G(94, 0),
-       CHAN5G(96, 0),          CHAN5G(98, 0),
-       CHAN5G(100, 0),         CHAN5G(102, 0),
-       CHAN5G(104, 0),         CHAN5G(106, 0),
-       CHAN5G(108, 0),         CHAN5G(110, 0),
-       CHAN5G(112, 0),         CHAN5G(114, 0),
-       CHAN5G(116, 0),         CHAN5G(118, 0),
-       CHAN5G(120, 0),         CHAN5G(122, 0),
-       CHAN5G(124, 0),         CHAN5G(126, 0),
-       CHAN5G(128, 0),         CHAN5G(130, 0),
-       CHAN5G(132, 0),         CHAN5G(134, 0),
-       CHAN5G(136, 0),         CHAN5G(138, 0),
-       CHAN5G(140, 0),         CHAN5G(142, 0),
-       CHAN5G(144, 0),         CHAN5G(145, 0),
-       CHAN5G(146, 0),         CHAN5G(147, 0),
-       CHAN5G(148, 0),         CHAN5G(149, 0),
-       CHAN5G(150, 0),         CHAN5G(151, 0),
-       CHAN5G(152, 0),         CHAN5G(153, 0),
-       CHAN5G(154, 0),         CHAN5G(155, 0),
-       CHAN5G(156, 0),         CHAN5G(157, 0),
-       CHAN5G(158, 0),         CHAN5G(159, 0),
-       CHAN5G(160, 0),         CHAN5G(161, 0),
-       CHAN5G(162, 0),         CHAN5G(163, 0),
-       CHAN5G(164, 0),         CHAN5G(165, 0),
-       CHAN5G(166, 0),         CHAN5G(168, 0),
-       CHAN5G(170, 0),         CHAN5G(172, 0),
-       CHAN5G(174, 0),         CHAN5G(176, 0),
-       CHAN5G(178, 0),         CHAN5G(180, 0),
-       CHAN5G(182, 0),         CHAN5G(184, 0),
-       CHAN5G(186, 0),         CHAN5G(188, 0),
-       CHAN5G(190, 0),         CHAN5G(192, 0),
-       CHAN5G(194, 0),         CHAN5G(196, 0),
-       CHAN5G(198, 0),         CHAN5G(200, 0),
-       CHAN5G(202, 0),         CHAN5G(204, 0),
-       CHAN5G(206, 0),         CHAN5G(208, 0),
-       CHAN5G(210, 0),         CHAN5G(212, 0),
-       CHAN5G(214, 0),         CHAN5G(216, 0),
-       CHAN5G(218, 0),         CHAN5G(220, 0),
-       CHAN5G(222, 0),         CHAN5G(224, 0),
-       CHAN5G(226, 0),         CHAN5G(228, 0),
-};
-
-static struct ieee80211_supported_band __wl_band_2ghz = {
-       .band           = IEEE80211_BAND_2GHZ,
-       .channels       = __wl_2ghz_channels,
-       .n_channels = ARRAY_SIZE(__wl_2ghz_channels),
-       .bitrates       = wl_g_rates,
-       .n_bitrates = wl_g_rates_size,
-};
-
-static struct ieee80211_supported_band __wl_band_5ghz_a = {
-       .band           = IEEE80211_BAND_5GHZ,
-       .channels       = __wl_5ghz_a_channels,
-       .n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
-       .bitrates       = wl_a_rates,
-       .n_bitrates = wl_a_rates_size,
-};
-
-static struct ieee80211_supported_band __wl_band_5ghz_n = {
-       .band           = IEEE80211_BAND_5GHZ,
-       .channels       = __wl_5ghz_n_channels,
-       .n_channels     = ARRAY_SIZE(__wl_5ghz_n_channels),
-       .bitrates       = wl_a_rates,
-       .n_bitrates = wl_a_rates_size,
-};
-
-static const uint32 __wl_cipher_suites[] = {
-       WLAN_CIPHER_SUITE_WEP40,
-       WLAN_CIPHER_SUITE_WEP104,
-       WLAN_CIPHER_SUITE_TKIP,
-       WLAN_CIPHER_SUITE_CCMP,
-       WLAN_CIPHER_SUITE_AES_CMAC,
-};
-
-static void
-swap_key_from_BE(struct wl_wsec_key *key)
-{
-       key->index = htod32(key->index);
-       key->len = htod32(key->len);
-       key->algo = htod32(key->algo);
-       key->flags = htod32(key->flags);
-       key->rxiv.hi = htod32(key->rxiv.hi);
-       key->rxiv.lo = htod16(key->rxiv.lo);
-       key->iv_initialized = htod32(key->iv_initialized);
-}
-
-static void
-swap_key_to_BE(struct wl_wsec_key *key)
-{
-       key->index = dtoh32(key->index);
-       key->len = dtoh32(key->len);
-       key->algo = dtoh32(key->algo);
-       key->flags = dtoh32(key->flags);
-       key->rxiv.hi = dtoh32(key->rxiv.hi);
-       key->rxiv.lo = dtoh16(key->rxiv.lo);
-       key->iv_initialized = dtoh32(key->iv_initialized);
-}
-
-static int32
-wl_dev_ioctl(struct net_device *dev, uint32 cmd, void *arg, uint32 len)
-{
-       struct ifreq ifr;
-       struct wl_ioctl ioc;
-       mm_segment_t fs;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In : cmd (%d)\n", cmd));
-#endif
-       memset(&ioc, 0, sizeof(ioc));
-       ioc.cmd = cmd;
-       ioc.buf = arg;
-       ioc.len = len;
-       strcpy(ifr.ifr_name, dev->name);
-       ifr.ifr_data = (caddr_t) &ioc;
-
-
-       fs = get_fs();
-       set_fs(get_ds());
-       err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
-       set_fs(fs);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
-       enum nl80211_iftype type, uint32 *flags, struct vif_params *params)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       struct wireless_dev *wdev;
-       int32 infra = 0;
-       int32 ap = 0;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       switch (type) {
-       case NL80211_IFTYPE_MONITOR:
-       case NL80211_IFTYPE_WDS:
-               WL_ERR(("type (%d) : currently we do not support this type\n", type));
-               return -EOPNOTSUPP;
-       case NL80211_IFTYPE_ADHOC:
-               wl->conf->mode = WL_MODE_IBSS;
-               break;
-       case NL80211_IFTYPE_STATION:
-               wl->conf->mode = WL_MODE_BSS;
-               infra = 1;
-               break;
-       default:
-               return -EINVAL;
-       }
-       infra = htod32(infra);
-       ap = htod32(ap);
-       wdev = ndev->ieee80211_ptr;
-       wdev->iftype = type;
-       WL_DBG(("%s : ap (%d), infra (%d)\n", ndev->name, ap, infra));
-       if (unlikely((err = wl_dev_ioctl(ndev, WLC_SET_INFRA, &infra, sizeof(infra)))) ||
-               unlikely((err = wl_dev_ioctl(ndev, WLC_SET_AP, &ap, sizeof(ap))))) {
-               WL_ERR(("Error (%d)\n", err));
-               return err;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       /* -EINPROGRESS: Call commit handler */
-       return -EINPROGRESS;
-}
-
-static void
-wl_iscan_prep(struct wl_scan_params *params, struct wlc_ssid *ssid)
-{
-       memcpy(&params->bssid, &ether_bcast, ETHER_ADDR_LEN);
-       params->bss_type = DOT11_BSSTYPE_ANY;
-       params->scan_type = 0;
-       params->nprobes = -1;
-       params->active_time = -1;
-       params->passive_time = -1;
-       params->home_time = -1;
-       params->channel_num = 0;
-
-       params->nprobes = htod32(params->nprobes);
-       params->active_time = htod32(params->active_time);
-       params->passive_time = htod32(params->passive_time);
-       params->home_time = htod32(params->home_time);
-       if (ssid && ssid->SSID_len)
-               memcpy(&params->ssid, ssid, sizeof(wlc_ssid_t));
-
-}
-
-static int32
-wl_dev_iovar_setbuf(struct net_device *dev, int8 *iovar, void *param,
-       int32 paramlen, void *bufptr, int32 buflen)
-{
-       int32 iolen;
-
-       iolen = bcm_mkiovar(iovar, param, paramlen, bufptr, buflen);
-       BUG_ON(unlikely(!iolen));
-
-       return wl_dev_ioctl(dev, WLC_SET_VAR, bufptr, iolen);
-}
-
-static int32
-wl_dev_iovar_getbuf(struct net_device *dev, int8 *iovar, void *param,
-       int32 paramlen, void *bufptr, int32 buflen)
-{
-       int32 iolen;
-
-       iolen = bcm_mkiovar(iovar, param, paramlen, bufptr, buflen);
-       BUG_ON(unlikely(!iolen));
-
-       return wl_dev_ioctl(dev, WLC_GET_VAR, bufptr, buflen);
-}
-
-static int32
-wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, uint16 action)
-{
-       int32 params_size = (WL_SCAN_PARAMS_FIXED_SIZE + OFFSETOF(wl_iscan_params_t, params));
-       struct wl_iscan_params *params;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (ssid && ssid->SSID_len)
-               params_size += sizeof(struct wlc_ssid);
-       params = (struct wl_iscan_params *)kzalloc(params_size, GFP_KERNEL);
-       if (unlikely(!params))
-               return -ENOMEM;
-       memset(params, 0, params_size);
-       BUG_ON(unlikely(params_size >= WLC_IOCTL_SMLEN));
-
-       wl_iscan_prep(&params->params, ssid);
-
-       params->version = htod32(ISCAN_REQ_VERSION);
-       params->action = htod16(action);
-       params->scan_duration = htod16(0);
-
-       /* params_size += OFFSETOF(wl_iscan_params_t, params); */
-       if (unlikely((err = wl_dev_iovar_setbuf(iscan->dev, "iscan", params, params_size,
-               iscan->ioctl_buf, WLC_IOCTL_SMLEN)))) {
-               if (err == -EBUSY) {
-                       WL_INFO(("system busy : iscan canceled\n"));
-               } else {
-                       WL_ERR(("error (%d)\n", err));
-               }
-       }
-       kfree(params);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-
-static int32
-wl_do_iscan(struct wl_priv *wl)
-{
-       struct wl_iscan_ctrl *iscan = wl_to_iscan(wl);
-       struct wlc_ssid ssid;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       /* Broadcast scan by default */
-       memset(&ssid, 0, sizeof(ssid));
-
-       iscan->state = WL_ISCAN_STATE_SCANING;
-
-       if (wl->active_scan) {
-               int32 passive_scan = 0;
-               /* make it active scan */
-               if (unlikely((err = wl_dev_ioctl(wl_to_ndev(wl), WLC_SET_PASSIVE_SCAN,
-                       &passive_scan, sizeof(passive_scan))))) {
-                       WL_DBG(("error (%d)\n", err));
-                       return err;
-               }
-       }
-       wl->iscan_kickstart = TRUE;
-       wl_run_iscan(iscan, &ssid, WL_SCAN_ACTION_START);
-       mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-       iscan->timer_on = 1;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-
-static int32
-__wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-       struct cfg80211_scan_request *request,  struct cfg80211_ssid *this_ssid)
-{
-       struct wl_priv *wl = ndev_to_wl(ndev);
-       struct cfg80211_ssid *ssids;
-       struct wl_scan_req *sr = wl_to_sr(wl);
-       uint32 n_ssids;
-       bool iscan_req;
-       bool spec_scan;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (unlikely(test_bit(WL_STATUS_SCANNING, &wl->status))) {
-               WL_ERR(("Scanning already : status (%d)\n", (int)wl->status));
-               return -EAGAIN;
-       }
-       if (unlikely(test_bit(WL_STATUS_SCAN_ABORTING, &wl->status))) {
-               WL_ERR(("Scanning being aborted : status (%d)\n", (int)wl->status));
-               return -EAGAIN;
-       }
-
-       iscan_req = FALSE;
-       spec_scan = FALSE;
-       if (request) {  /* scan bss */
-               ssids = request->ssids;
-               n_ssids = min(request->n_ssids, WL_NUM_SCAN_MAX);
-               if (wl->iscan_on && n_ssids && !ssids->ssid_len) { /* for specific scan,
-                                                               * ssids->ssid_len has 
-                                                               * non-zero(ssid string) length.  
-                                                               * Otherwise this is 0.
-                                                               * we do not iscan for
-                                                               * specific scan request
-                                                               */
-                       iscan_req = TRUE;
-               }
-       } else {        /* scan in ibss */
-               /* we don't do iscan in ibss */
-               ssids = this_ssid;
-               n_ssids = 1;
-       }
-       wl->scan_request = request;
-       set_bit(WL_STATUS_SCANNING, &wl->status);
-       if (iscan_req) {
-               if (likely(!(err = wl_do_iscan(wl))))
-                       return err;
-               else
-                       goto scan_out;
-       } else {
-               WL_DBG(("n_ssid (%d), ssid \"%s\", ssid_len (%d)\n",
-               n_ssids, ssids->ssid, ssids->ssid_len));
-               memset(&sr->ssid, 0, sizeof(sr->ssid));
-               if (n_ssids) {
-                       sr->ssid.SSID_len = MIN(sizeof(sr->ssid.SSID), ssids->ssid_len);
-                       if (sr->ssid.SSID_len) {
-                               memcpy(sr->ssid.SSID, ssids->ssid, sr->ssid.SSID_len);
-                               sr->ssid.SSID_len = htod32(sr->ssid.SSID_len);
-                               WL_DBG(("Specific scan ssid=\"%s\" len=%d\n", sr->ssid.SSID,
-                               sr->ssid.SSID_len));
-                               spec_scan = TRUE;
-                       } else {
-                               WL_DBG(("Broadcast scan\n"));
-                       }
-               } else {
-                       /* broadcast scan */
-                       WL_DBG(("Broadcast scan\n"));
-               }
-               WL_DBG(("sr->ssid.SSID_len (%d)\n", sr->ssid.SSID_len));
-               if (wl->active_scan) {
-                       int32 pssive_scan = 0;
-                       /* make it active scan */
-                       if (unlikely((err = wl_dev_ioctl(ndev, WLC_SET_PASSIVE_SCAN,
-                               &pssive_scan, sizeof(pssive_scan))))) {
-                               WL_ERR(("WLC_SET_PASSIVE_SCAN error (%d)\n", err));
-                               goto scan_out;
-                       }
-               }
-               if ((err = wl_dev_ioctl(ndev, WLC_SCAN, &sr->ssid, sizeof(sr->ssid)))) {
-                       if (err == -EBUSY) {
-                               WL_INFO(("system busy : scan for \"%s\" canceled\n",
-                               sr->ssid.SSID));
-                       } else {
-                               WL_ERR(("WLC_SCAN error (%d)\n", err));
-                       }
-                       goto scan_out;
-               }
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return 0;
-
-scan_out:
-       clear_bit(WL_STATUS_SCANNING, &wl->status);
-       wl->scan_request = NULL;
-       return err;
-}
-
-
-static int32
-wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-       struct cfg80211_scan_request *request)
-{
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       if (unlikely((err = __wl_cfg80211_scan(wiphy, ndev, request, NULL)))) {
-               WL_DBG(("scan error (%d)\n", err));
-               return err;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_dev_intvar_set(struct net_device *dev, int8 *name, int32 val)
-{
-       int8 buf[WLC_IOCTL_SMLEN];
-       uint32 len;
-       int32 err = 0;
-
-       val = htod32(val);
-       len = bcm_mkiovar(name, (char *)(&val), sizeof(val), buf, sizeof(buf));
-       BUG_ON(unlikely(!len));
-
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_VAR, buf, len)))) {
-               WL_ERR(("error (%d)\n", err));
-       }
-
-       return err;
-}
-
-static int32
-wl_dev_intvar_get(struct net_device *dev, int8 *name, int32 *retval)
-{
-       union {
-               int8 buf[WLC_IOCTL_SMLEN];
-               int32 val;
-       } var;
-       uint32 len;
-       uint32 data_null;
-       int32 err = 0;
-
-       len = bcm_mkiovar(name, (char *)(&data_null), 0, (char *)(&var), sizeof(var.buf));
-       BUG_ON(unlikely(!len));
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_GET_VAR, &var, len)))) {
-               WL_ERR(("error (%d)\n", err));
-       }
-       *retval = dtoh32(var.val);
-
-       return err;
-}
-
-static int32
-wl_set_rts(struct net_device *dev, uint32 rts_threshold)
-{
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (unlikely((err = wl_dev_intvar_set(dev, "rtsthresh", rts_threshold)))) {
-               WL_ERR(("Error (%d)\n", err));
-               return err;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_set_frag(struct net_device *dev, uint32 frag_threshold)
-{
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (unlikely((err = wl_dev_intvar_set(dev, "fragthresh", frag_threshold)))) {
-               WL_ERR(("Error (%d)\n", err));
-               return err;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_set_retry(struct net_device *dev, uint32 retry, bool l)
-{
-       int32 err = 0;
-       uint32 cmd = (l ? WLC_SET_LRL : WLC_SET_SRL);
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       retry = htod32(retry);
-       if (unlikely((err = wl_dev_ioctl(dev, cmd, &retry, sizeof(retry))))) {
-               WL_ERR(("cmd (%d) , error (%d)\n", cmd, err));
-               return err;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, uint32 changed)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       struct net_device *ndev = wl_to_ndev(wl);
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       if (changed & WIPHY_PARAM_RTS_THRESHOLD &&
-               (wl->conf->rts_threshold != wiphy->rts_threshold)) {
-               wl->conf->rts_threshold = wiphy->rts_threshold;
-               if (!(err = wl_set_rts(ndev, wl->conf->rts_threshold))) {
-                       return err;
-               }
-       }
-       if (changed & WIPHY_PARAM_FRAG_THRESHOLD &&
-               (wl->conf->frag_threshold != wiphy->frag_threshold)) {
-               wl->conf->frag_threshold = wiphy->frag_threshold;
-               if (!(err = wl_set_frag(ndev, wl->conf->frag_threshold))) {
-                       return err;
-               }
-       }
-       if (changed & WIPHY_PARAM_RETRY_LONG && (wl->conf->retry_long != wiphy->retry_long)) {
-               wl->conf->retry_long = wiphy->retry_long;
-               if (!(err = wl_set_retry(ndev, wl->conf->retry_long, TRUE))) {
-                       return err;
-               }
-       }
-       if (changed & WIPHY_PARAM_RETRY_SHORT && (wl->conf->retry_short != wiphy->retry_short)) {
-               wl->conf->retry_short = wiphy->retry_short;
-               if (!(err = wl_set_retry(ndev, wl->conf->retry_short, FALSE))) {
-                       return err;
-               }
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
-       struct cfg80211_ibss_params *params)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       struct cfg80211_bss *bss;
-       struct ieee80211_channel *chan;
-       struct wl_join_params join_params;
-       struct cfg80211_ssid ssid;
-       int32 scan_retry = 0;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In \n"));
-#endif
-       CHECK_SYS_UP();
-       if (params->bssid) {
-               WL_ERR(("Invalid bssid\n"));
-               return -EOPNOTSUPP;
-       }
-       bss = cfg80211_get_ibss(wiphy, NULL, params->ssid, params->ssid_len);
-       if (!bss) {
-               memcpy(ssid.ssid, params->ssid, params->ssid_len);
-               ssid.ssid_len = params->ssid_len;
-               do {
-                       if (unlikely(__wl_cfg80211_scan(wiphy, dev, NULL, &ssid) == -EBUSY)) {
-                               wl_delay(150);
-                       } else {
-                               break;
-                       }
-               } while (++scan_retry < WL_SCAN_RETRY_MAX);
-               rtnl_unlock();  /* to allow scan_inform to paropagate to cfg80211 plane */
-               schedule_timeout_interruptible(4 * HZ); /* wait 4 secons till scan done.... */
-               rtnl_lock();
-               bss = cfg80211_get_ibss(wiphy, NULL,
-                       params->ssid, params->ssid_len);
-       }
-       if (bss) {
-               wl->ibss_starter = FALSE;
-               WL_DBG(("Found IBSS\n"));
-       } else {
-               wl->ibss_starter = TRUE;
-       }
-       if ((chan = params->channel)) {
-               wl->channel = ieee80211_frequency_to_channel(chan->center_freq);
-       }
-       /* 
-       ** Join with specific BSSID and cached SSID
-       ** If SSID is zero join based on BSSID only
-       */
-       memset(&join_params, 0, sizeof(join_params));
-       memcpy((void *)join_params.ssid.SSID, (void *)params->ssid, params->ssid_len);
-       join_params.ssid.SSID_len = htod32(params->ssid_len);
-       if (params->bssid)
-               memcpy(&join_params.params.bssid, params->bssid, ETHER_ADDR_LEN);
-       else
-               memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN);
-
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, sizeof(join_params))))) {
-               WL_ERR(("Error (%d)\n", err));
-               return err;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       wl_link_down(wl);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_set_wpa_version(struct net_device *dev, struct cfg80211_connect_params *sme)
-{
-       struct wl_priv *wl = ndev_to_wl(dev);
-       struct wl_security *sec;
-       int32 val = 0;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_1)
-               val = WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED;
-       else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2)
-               val = WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED;
-       else
-               val = WPA_AUTH_DISABLED;
-       WL_DBG(("setting wpa_auth to 0x%0x\n", val));
-       if (unlikely((err = wl_dev_intvar_set(dev, "wpa_auth", val)))) {
-               WL_ERR(("set wpa_auth failed (%d)\n", err));
-               return err;
-       }
-       sec = wl_read_prof(wl, WL_PROF_SEC);
-       sec->wpa_versions = sme->crypto.wpa_versions;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme)
-{
-       struct wl_priv *wl = ndev_to_wl(dev);
-       struct wl_security *sec;
-       int32 val = 0;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       switch (sme->auth_type) {
-       case NL80211_AUTHTYPE_OPEN_SYSTEM:
-               val = 0;
-               WL_DBG(("open system\n"));
-               break;
-       case NL80211_AUTHTYPE_SHARED_KEY:
-               val = 1;
-               WL_DBG(("shared key\n"));
-               break;
-       case NL80211_AUTHTYPE_AUTOMATIC:
-               val = 2;
-               WL_DBG(("automatic\n"));
-               break;
-       case NL80211_AUTHTYPE_NETWORK_EAP:
-               WL_DBG(("network eap\n"));
-       default :
-               val = 2;
-               WL_ERR(("invalid auth type (%d)\n", sme->auth_type));
-               break;
-       }
-
-       if (unlikely((err = wl_dev_intvar_set(dev, "auth", val)))) {
-               WL_ERR(("set auth failed (%d)\n", err));
-               return err;
-       }
-       sec = wl_read_prof(wl, WL_PROF_SEC);
-       sec->auth_type = sme->auth_type;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-
-static int32
-wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme)
-{
-       struct wl_priv *wl = ndev_to_wl(dev);
-       struct wl_security *sec;
-       int32 pval = 0;
-       int32 gval = 0;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (sme->crypto.n_ciphers_pairwise) {
-               switch (sme->crypto.ciphers_pairwise[0]) {
-               case WLAN_CIPHER_SUITE_WEP40:
-               case WLAN_CIPHER_SUITE_WEP104:
-                       pval =  WEP_ENABLED;
-                       break;
-               case WLAN_CIPHER_SUITE_TKIP:
-                       pval = TKIP_ENABLED;
-                       break;
-               case WLAN_CIPHER_SUITE_CCMP:
-                       pval = AES_ENABLED;
-                       break;
-               case WLAN_CIPHER_SUITE_AES_CMAC:
-                       pval = AES_ENABLED;
-                       break;
-               default:
-                       WL_ERR(("invalid cipher pairwise (%d)\n",
-                       sme->crypto.ciphers_pairwise[0]));
-                       return -EINVAL;
-               }
-       }
-       if (sme->crypto.cipher_group) {
-               switch (sme->crypto.cipher_group) {
-               case WLAN_CIPHER_SUITE_WEP40:
-               case WLAN_CIPHER_SUITE_WEP104:
-                       gval =  WEP_ENABLED;
-                       break;
-               case WLAN_CIPHER_SUITE_TKIP:
-                       gval = TKIP_ENABLED;
-                       break;
-               case WLAN_CIPHER_SUITE_CCMP:
-                       gval = AES_ENABLED;
-                       break;
-               case WLAN_CIPHER_SUITE_AES_CMAC:
-                       gval = AES_ENABLED;
-                       break;
-               default:
-                       WL_ERR(("invalid cipher group (%d)\n", sme->crypto.cipher_group));
-                       return -EINVAL;
-               }
-       }
-
-       WL_DBG(("pval (%d) gval (%d)\n", pval, gval));
-       if (unlikely((err = wl_dev_intvar_set(dev, "wsec", pval|gval)))) {
-               WL_ERR(("error (%d)\n", err));
-               return err;
-       }
-
-       sec = wl_read_prof(wl, WL_PROF_SEC);
-       sec->cipher_pairwise = sme->crypto.ciphers_pairwise[0];
-       sec->cipher_group = sme->crypto.cipher_group;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_set_key_mgmt(struct net_device *dev, struct cfg80211_connect_params *sme)
-{
-       struct wl_priv *wl = ndev_to_wl(dev);
-       struct wl_security *sec;
-       int32 val = 0;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-
-       if (sme->crypto.n_akm_suites) {
-               if (unlikely((err = wl_dev_intvar_get(dev, "wpa_auth", &val)))) {
-                       WL_ERR(("could not get wpa_auth (%d)\n", err));
-                       return err;
-               }
-               if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED)) {
-                       switch (sme->crypto.akm_suites[0]) {
-                       case WLAN_AKM_SUITE_8021X:
-                               val = WPA_AUTH_UNSPECIFIED;
-                               break;
-                       case WLAN_AKM_SUITE_PSK:
-                               val = WPA_AUTH_PSK;
-                               break;
-                       default :
-                               WL_ERR(("invalid cipher group (%d)\n",
-                               sme->crypto.cipher_group));
-                               return -EINVAL;
-                       }
-               } else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED)) {
-                       switch (sme->crypto.akm_suites[0]) {
-                       case WLAN_AKM_SUITE_8021X:
-                               val = WPA2_AUTH_UNSPECIFIED;
-                               break;
-                       case WLAN_AKM_SUITE_PSK:
-                               val = WPA2_AUTH_PSK;
-                               break;
-                       default :
-                               WL_ERR(("invalid cipher group (%d)\n",
-                               sme->crypto.cipher_group));
-                               return -EINVAL;
-                       }
-               }
-
-               WL_DBG(("setting wpa_auth to %d\n", val));
-               if (unlikely((err = wl_dev_intvar_set(dev, "wpa_auth", val)))) {
-                       WL_ERR(("could not set wpa_auth (%d)\n", err));
-                       return err;
-               }
-       }
-       sec = wl_read_prof(wl, WL_PROF_SEC);
-       sec->wpa_auth = sme->crypto.akm_suites[0];
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_set_set_sharedkey(struct net_device *dev, struct cfg80211_connect_params *sme)
-{
-       struct wl_priv *wl = ndev_to_wl(dev);
-       struct wl_security *sec;
-       struct wl_wsec_key key;
-       int32 val;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       WL_DBG(("key len (%d)\n", sme->key_len));
-       if (sme->key_len) {
-               sec = wl_read_prof(wl, WL_PROF_SEC);
-               WL_DBG(("wpa_versions 0x%x cipher_pairwise 0x%x\n", sec->wpa_versions,
-                       sec->cipher_pairwise));
-               if (!(sec->wpa_versions & (NL80211_WPA_VERSION_1 | NL80211_WPA_VERSION_2)) &&
-                       (sec->cipher_pairwise & (WLAN_CIPHER_SUITE_WEP40 |
-                       WLAN_CIPHER_SUITE_WEP104))) {
-                       memset(&key, 0, sizeof(key));
-                       key.len = (uint32)sme->key_len;
-                       key.index = (uint32)sme->key_idx;
-                       if (unlikely(key.len > sizeof(key.data))) {
-                               WL_ERR(("Too long key length (%u)\n", key.len));
-                               return -EINVAL;
-                       }
-                       memcpy(key.data, sme->key, key.len);
-                       key.flags = WL_PRIMARY_KEY;
-                       switch (sec->cipher_pairwise) {
-                       case WLAN_CIPHER_SUITE_WEP40:
-                               key.algo = CRYPTO_ALGO_WEP1;
-                               break;
-                       case WLAN_CIPHER_SUITE_WEP104:
-                               key.algo = CRYPTO_ALGO_WEP128;
-                               break;
-                       default :
-                               WL_ERR(("Invalid algorithm (%d)\n",
-                               sme->crypto.ciphers_pairwise[0]));
-                               return -EINVAL;
-                       }
-                       /* Set the new key/index */
-                       WL_DBG(("key length (%d) key index (%d) algo (%d)\n", key.len,
-                               key.index, key.algo));
-                       WL_DBG(("key \"%s\"\n", key.data));
-                       swap_key_from_BE(&key);
-                       if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_KEY, &key, sizeof(key))))) {
-                               WL_ERR(("WLC_SET_KEY error (%d)\n", err));
-                               return err;
-                       }
-                       if (sec->auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM) {
-                               WL_DBG(("set auth_type to shared key\n"));
-                               val = 1;        /* shared key */
-                               if (unlikely((err = wl_dev_intvar_set(dev, "auth", val)))) {
-                                       WL_ERR(("set auth failed (%d)\n", err));
-                                       return err;
-                               }
-                       }
-               }
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
-       struct cfg80211_connect_params *sme)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       struct ieee80211_channel *chan = sme->channel;
-       struct wlc_ssid ssid;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In \n"));
-#endif
-       CHECK_SYS_UP();
-       if (unlikely(!sme->ssid)) {
-               WL_ERR(("Invalid ssid\n"));
-               return -EOPNOTSUPP;
-       }
-       if (chan) {
-               wl->channel = ieee80211_frequency_to_channel(chan->center_freq);
-               WL_DBG(("channel (%d), center_req (%d) \n", wl->channel, chan->center_freq));
-       }
-       WL_DBG(("ie (%p), ie_len (%d)\n", sme->ie, sme->ie_len));
-       if (unlikely((err = wl_set_wpa_version(dev, sme)))) {
-               return err;
-       }
-       if (unlikely((err = wl_set_auth_type(dev, sme)))) {
-               return err;
-       }
-       if (unlikely((err = wl_set_set_cipher(dev, sme)))) {
-               return err;
-       }
-       if (unlikely((err = wl_set_key_mgmt(dev, sme)))) {
-               return err;
-       }
-       if (unlikely((err = wl_set_set_sharedkey(dev, sme)))) {
-               return err;
-       }
-       wl_update_prof(wl, NULL, sme->bssid, WL_PROF_BSSID);
-       /* 
-       **  Join with specific BSSID and cached SSID
-       **  If SSID is zero join based on BSSID only
-        */
-       memset(&ssid, 0, sizeof(ssid));
-       ssid.SSID_len = MIN(sizeof(ssid.SSID), sme->ssid_len);
-       memcpy(ssid.SSID, sme->ssid, ssid.SSID_len);
-       ssid.SSID_len = htod32(ssid.SSID_len);
-       wl_update_prof(wl, NULL, &ssid, WL_PROF_SSID);
-       if (ssid.SSID_len < IEEE80211_MAX_SSID_LEN) {
-               WL_DBG(("ssid \"%s\", len (%d)\n", ssid.SSID, ssid.SSID_len));
-       }
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_SSID, &ssid, sizeof(ssid))))) {
-               WL_ERR(("error (%d)\n", err));
-               return err;
-       }
-       set_bit(WL_STATUS_CONNECTING, &wl->status);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
-       uint16 reason_code)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       scb_val_t scbval;
-       bool act = FALSE;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       WL_DBG(("Reason %d\n", reason_code));
-       CHECK_SYS_UP();
-       if (likely((act = *(bool *)wl_read_prof(wl, WL_PROF_ACT)))) {
-               scbval.val = reason_code;
-               memcpy(&scbval.ea, &wl->bssid, ETHER_ADDR_LEN);
-               scbval.val = htod32(scbval.val);
-               if (unlikely((err = wl_dev_ioctl(dev, WLC_DISASSOC, &scbval,
-                       sizeof(scb_val_t))))) {
-                       WL_ERR(("error (%d)\n", err));
-                       return err;
-               }
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type, int32 dbm)
-{
-
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       struct net_device *ndev = wl_to_ndev(wl);
-       uint16 txpwrmw;
-       int32 err  = 0;
-       int32 disable = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       switch (type) {
-       case TX_POWER_AUTOMATIC:
-               break;
-       case TX_POWER_LIMITED:
-               if (dbm < 0) {
-                       WL_ERR(("TX_POWER_LIMITTED - dbm is negative\n"));
-                       return -EINVAL;
-               }
-               break;
-       case TX_POWER_FIXED:
-               if (dbm < 0) {
-                       WL_ERR(("TX_POWER_FIXED - dbm is negative..\n"));
-                       return -EINVAL;
-               }
-                       break;
-       }
-       /* Make sure radio is off or on as far as software is concerned */
-       disable = WL_RADIO_SW_DISABLE << 16;
-       disable = htod32(disable);
-       if (unlikely((err = wl_dev_ioctl(ndev, WLC_SET_RADIO, &disable, sizeof(disable))))) {
-               WL_ERR(("WLC_SET_RADIO error (%d)\n", err));
-               return err;
-       }
-
-       if (dbm > 0xffff)
-               txpwrmw = 0xffff;
-       else
-               txpwrmw = (uint16)dbm;
-       if (unlikely((err = wl_dev_intvar_set(ndev, "qtxpower",
-               (int32)(bcm_mw_to_qdbm(txpwrmw)))))) {
-               WL_ERR(("qtxpower error (%d)\n", err));
-               return err;
-       }
-       wl->conf->tx_power = dbm;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_cfg80211_get_tx_power(struct wiphy *wiphy, int32 *dbm)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       struct net_device *ndev = wl_to_ndev(wl);
-       int32 txpwrdbm;
-       uint8 result;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       if (unlikely((err = wl_dev_intvar_get(ndev, "qtxpower", &txpwrdbm)))) {
-               WL_ERR(("error (%d)\n", err));
-               return err;
-       }
-       result = (uint8)(txpwrdbm & ~WL_TXPWR_OVERRIDE);
-       *dbm = (int32)bcm_qdbm_to_mw(result);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev, uint8 key_idx)
-{
-       uint32 index;
-       int32 wsec;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       WL_DBG(("key index (%d)\n", key_idx));
-       CHECK_SYS_UP();
-
-       if (unlikely(err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec)))) {
-               WL_ERR(("WLC_GET_WSEC error (%d)\n", err));
-               return err;
-       }
-       wsec = dtoh32(wsec);
-       if (wsec & WEP_ENABLED) {
-               /* Just select a new current key */
-               index = (uint32)key_idx;
-               index = htod32(index);
-               if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_KEY_PRIMARY,
-                       &index, sizeof(index))))) {
-                       WL_ERR(("error (%d)\n", err));
-               }
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_add_keyext(struct wiphy *wiphy, struct net_device *dev,
-     uint8 key_idx, const uint8 *mac_addr, struct key_params *params)
-{
-       struct wl_wsec_key key;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       memset(&key, 0, sizeof(key));
-       key.index = (uint32)key_idx;
-       /* Instead of bcast for ea address for default wep keys, driver needs it to be Null */
-       if (!ETHER_ISMULTI(mac_addr))
-               memcpy((char *)&key.ea, (void *)mac_addr, ETHER_ADDR_LEN);
-       key.len = (uint32)params->key_len;
-       /* check for key index change */
-       if (key.len == 0) {
-               /* key delete */
-               swap_key_from_BE(&key);
-               if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_KEY, &key, sizeof(key))))) {
-                       WL_ERR(("key delete error (%d)\n", err));
-                       return err;
-               }
-       } else {
-               if (key.len > sizeof(key.data)) {
-                       WL_ERR(("Invalid key length (%d)\n", key.len));
-                       return -EINVAL;
-               }
-
-               WL_DBG(("Setting the key index %d\n", key.index));
-               memcpy(key.data, params->key, key.len);
-
-               if (params->cipher == WLAN_CIPHER_SUITE_TKIP) {
-                       uint8 keybuf[8];
-                       memcpy(keybuf, &key.data[24], sizeof(keybuf));
-                       memcpy(&key.data[24], &key.data[16], sizeof(keybuf));
-                       memcpy(&key.data[16], keybuf, sizeof(keybuf));
-               }
-
-               /* if IW_ENCODE_EXT_RX_SEQ_VALID set */
-               if (params->seq && params->seq_len == 6) {
-                       /* rx iv */
-                       uint8 *ivptr;
-                       ivptr = (uint8 *)params->seq;
-                       key.rxiv.hi = (ivptr[5] << 24) | (ivptr[4] << 16) |
-                               (ivptr[3] << 8) | ivptr[2];
-                       key.rxiv.lo = (ivptr[1] << 8) | ivptr[0];
-                       key.iv_initialized = TRUE;
-               }
-
-               switch (params->cipher) {
-               case WLAN_CIPHER_SUITE_WEP40:
-                       key.algo = CRYPTO_ALGO_WEP1;
-                       WL_DBG(("WLAN_CIPHER_SUITE_WEP40\n"));
-                       break;
-               case WLAN_CIPHER_SUITE_WEP104:
-                       key.algo = CRYPTO_ALGO_WEP128;
-                       WL_DBG(("WLAN_CIPHER_SUITE_WEP104\n"));
-                       break;
-               case WLAN_CIPHER_SUITE_TKIP:
-                       key.algo = CRYPTO_ALGO_TKIP;
-                       WL_DBG(("WLAN_CIPHER_SUITE_TKIP\n"));
-                       break;
-               case WLAN_CIPHER_SUITE_AES_CMAC:
-                       key.algo = CRYPTO_ALGO_AES_CCM;
-                       WL_DBG(("WLAN_CIPHER_SUITE_AES_CMAC\n"));
-                       break;
-               case WLAN_CIPHER_SUITE_CCMP:
-                       key.algo = CRYPTO_ALGO_AES_CCM;
-                       WL_DBG(("WLAN_CIPHER_SUITE_CCMP\n"));
-                       break;
-               default:
-                       WL_ERR(("Invalid cipher (0x%x)\n", params->cipher));
-                       return -EINVAL;
-               }
-               swap_key_from_BE(&key);
-
-               dhd_wait_pend8021x(dev);
-               if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_KEY, &key, sizeof(key))))) {
-                       WL_ERR(("WLC_SET_KEY error (%d)\n", err));
-                       return err;
-               }
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
-     uint8 key_idx, const uint8 *mac_addr, struct key_params *params)
-{
-       struct wl_wsec_key key;
-       int32 val;
-       int32 wsec;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       WL_DBG(("key index (%d)\n", key_idx));
-       CHECK_SYS_UP();
-
-       if (mac_addr)
-               return wl_add_keyext(wiphy, dev, key_idx, mac_addr, params);
-       memset(&key, 0, sizeof(key));
-
-       key.len = (uint32)params->key_len;
-       key.index = (uint32)key_idx;
-
-       if (unlikely(key.len > sizeof(key.data))) {
-               WL_ERR(("Too long key length (%u)\n", key.len));
-               return -EINVAL;
-       }
-       memcpy(key.data, params->key, key.len);
-
-       key.flags = WL_PRIMARY_KEY;
-       switch (params->cipher) {
-       case WLAN_CIPHER_SUITE_WEP40:
-               key.algo = CRYPTO_ALGO_WEP1;
-               WL_DBG(("WLAN_CIPHER_SUITE_WEP40\n"));
-               break;
-       case WLAN_CIPHER_SUITE_WEP104:
-               key.algo = CRYPTO_ALGO_WEP128;
-               WL_DBG(("WLAN_CIPHER_SUITE_WEP104\n"));
-               break;
-       case WLAN_CIPHER_SUITE_TKIP:
-               key.algo = CRYPTO_ALGO_TKIP;
-               WL_DBG(("WLAN_CIPHER_SUITE_TKIP\n"));
-               break;
-       case WLAN_CIPHER_SUITE_AES_CMAC:
-               key.algo = CRYPTO_ALGO_AES_CCM;
-               WL_DBG(("WLAN_CIPHER_SUITE_AES_CMAC\n"));
-               break;
-       case WLAN_CIPHER_SUITE_CCMP:
-               key.algo = CRYPTO_ALGO_AES_CCM;
-               WL_DBG(("WLAN_CIPHER_SUITE_CCMP\n"));
-               break;
-       default:
-               WL_ERR(("Invalid cipher (0x%x)\n", params->cipher));
-               return -EINVAL;
-       }
-
-       /* Set the new key/index */
-       swap_key_from_BE(&key);
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_KEY, &key, sizeof(key))))) {
-               WL_ERR(("WLC_SET_KEY error (%d)\n", err));
-               return err;
-       }
-
-       val = WEP_ENABLED;
-       if (unlikely((err = wl_dev_intvar_get(dev, "wsec", &wsec)))) {
-               WL_ERR(("get wsec error (%d)\n", err));
-                       return err;
-       }
-       wsec  &= ~(WEP_ENABLED);
-       wsec |= val;
-       if (unlikely((err = wl_dev_intvar_set(dev, "wsec", wsec)))) {
-               WL_ERR(("set wsec error (%d)\n", err));
-               return err;
-       }
-
-       val = 1;        /* assume shared key. otherwise 0 */
-       val = htod32(val);
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val))))) {
-               WL_ERR(("WLC_SET_AUTH error (%d)\n", err));
-               return err;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
-     uint8 key_idx, const uint8 *mac_addr)
-{
-       struct wl_wsec_key key;
-       int32 err = 0;
-       int32 val;
-       int32 wsec;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       memset(&key, 0, sizeof(key));
-
-       key.index = (uint32)key_idx;
-       key.flags = WL_PRIMARY_KEY;
-       key.algo = CRYPTO_ALGO_OFF; 
-
-       WL_DBG(("key index (%d)\n", key_idx));
-       /* Set the new key/index */
-       swap_key_from_BE(&key);
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_KEY, &key, sizeof(key))))) {
-               if (err == -EINVAL) {
-                       if (key.index >= DOT11_MAX_DEFAULT_KEYS) {
-                               /* we ignore this key index in this case */
-                               WL_DBG(("invalid key index (%d)\n", key_idx));
-                       }
-               } else {
-                       WL_ERR(("WLC_SET_KEY error (%d)\n", err));
-               }
-               return err;
-       }
-
-       val = 0;
-       if (unlikely((err = wl_dev_intvar_get(dev, "wsec", &wsec)))) {
-               WL_ERR(("get wsec error (%d)\n", err));
-                       return err;
-       }
-       wsec  &= ~(WEP_ENABLED);
-       wsec |= val;
-       if (unlikely((err = wl_dev_intvar_set(dev, "wsec", wsec)))) {
-               WL_ERR(("set wsec error (%d)\n", err));
-               return err;
-       }
-
-       val = 0;        /* assume open key. otherwise 1 */
-       val = htod32(val);
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val))))) {
-               WL_ERR(("WLC_SET_AUTH error (%d)\n", err));
-               return err;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
-     uint8 key_idx, const uint8 *mac_addr, void *cookie,
-     void (*callback)(void *cookie, struct key_params *params))
-{
-       struct key_params params;
-       struct wl_wsec_key key;
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       struct wl_security *sec;
-       int32 wsec;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       WL_DBG(("key index (%d)\n", key_idx));
-       CHECK_SYS_UP();
-
-       memset(&key, 0, sizeof(key));
-       key.index = key_idx;
-       swap_key_to_BE(&key);
-       memset(&params, 0, sizeof(params));
-       params.key_len = (uint8)MIN(DOT11_MAX_KEY_SIZE, key.len);
-       memcpy(params.key, key.data, params.key_len);
-
-       if (unlikely(err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec)))) {
-               WL_ERR(("WLC_GET_WSEC error (%d)\n", err));
-               return err;
-       }
-       wsec = dtoh32(wsec);
-       switch (wsec) {
-       case WEP_ENABLED:
-               sec = wl_read_prof(wl, WL_PROF_SEC);
-               if (sec->cipher_pairwise & WLAN_CIPHER_SUITE_WEP40) {
-                       params.cipher = WLAN_CIPHER_SUITE_WEP40;
-                       WL_DBG(("WLAN_CIPHER_SUITE_WEP40\n"));
-               } else if (sec->cipher_pairwise & WLAN_CIPHER_SUITE_WEP104) {
-                       params.cipher = WLAN_CIPHER_SUITE_WEP104;
-                       WL_DBG(("WLAN_CIPHER_SUITE_WEP104\n"));
-               }
-               break;
-       case TKIP_ENABLED:
-               params.cipher = WLAN_CIPHER_SUITE_TKIP;
-               WL_DBG(("WLAN_CIPHER_SUITE_TKIP\n"));
-               break;
-       case AES_ENABLED:
-               params.cipher = WLAN_CIPHER_SUITE_AES_CMAC;
-               WL_DBG(("WLAN_CIPHER_SUITE_AES_CMAC\n"));
-               break;
-       default:
-               WL_ERR(("Invalid algo (0x%x)\n", wsec));
-               return -EINVAL;
-       }
-
-       callback(cookie, &params);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_cfg80211_config_default_mgmt_key(struct wiphy *wiphy,
-     struct net_device *dev, uint8 key_idx)
-{
-       WL_INFO(("Not supported\n"));
-       CHECK_SYS_UP();
-       return -EOPNOTSUPP;
-}
-
-static int32
-wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
-       uint8 *mac, struct station_info *sinfo)
-
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       scb_val_t scb_val;
-       int rssi;
-       int32 rate;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       if (unlikely(memcmp(mac, wl_read_prof(wl, WL_PROF_BSSID), ETHER_ADDR_LEN))) {
-               WL_ERR(("Wrong Mac address\n"));
-               return -ENOENT;
-       }
-
-       /* Report the current tx rate */
-       if ((err = wl_dev_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate)))) {
-               WL_ERR(("Could not get rate (%d)\n", err));
-       } else {
-               rate = dtoh32(rate);
-               sinfo->filled |= STATION_INFO_TX_BITRATE;
-               sinfo->txrate.legacy = rate * 5;
-               WL_DBG(("Rate %d Mbps\n", (rate/2)));
-       }
-
-       if (test_bit(WL_STATUS_CONNECTED, &wl->status)) {
-               scb_val.val = 0;
-               if (unlikely(err = wl_dev_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t)))) {
-                       WL_ERR(("Could not get rssi (%d)\n", err));
-                       return err;
-               }
-               rssi = dtoh32(scb_val.val);
-               sinfo->filled |= STATION_INFO_SIGNAL;
-               sinfo->signal = rssi;
-               WL_DBG(("RSSI %d dBm\n", rssi));
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
-       bool enabled, int32 timeout)
-{
-       int32 pm;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       pm = enabled ? PM_FAST : PM_OFF;
-       pm = htod32(pm);
-       WL_DBG(("power save %s\n", (pm ? "enabled" : "disabled")));
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm))))) {
-               if (err == -ENODEV) {
-                       WL_DBG(("net_device is not ready yet\n"));
-               } else {
-                       WL_ERR(("error (%d)\n", err));
-               }
-               return err;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static __used uint32
-wl_find_msb(uint16 bit16)
-{
-       uint32 ret = 0;
-
-       if (bit16 & 0xff00) {
-               ret += 8;
-               bit16 >>= 8;
-       }
-
-       if (bit16 & 0xf0) {
-               ret += 4;
-               bit16 >>= 4;
-       }
-
-       if (bit16 & 0xc) {
-               ret += 2;
-               bit16 >>= 2;
-       }
-
-       if (bit16 & 2)
-               ret += bit16 & 2;
-       else if (bit16)
-               ret += bit16;
-
-       return ret;
-}
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) || \
-       defined(CHROMIUMOS_COMPAT_WIRELESS)
-static int32
-wl_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
-       const uint8 *addr, const struct cfg80211_bitrate_mask *mask)
-{
-       struct wl_rateset rateset;
-       int32 rate;
-       int32 val;
-       int32 err_bg;
-       int32 err_a;
-       uint32 legacy;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       /* addr param is always NULL. ignore it */
-       /* Get current rateset */
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_GET_CURR_RATESET, &rateset,
-               sizeof(rateset))))) {
-               WL_ERR(("could not get current rateset (%d)\n", err));
-               return err;
-       }
-
-       rateset.count = dtoh32(rateset.count);
-
-       if (!(legacy = wl_find_msb(mask->control[IEEE80211_BAND_2GHZ].legacy)))
-               legacy = wl_find_msb(mask->control[IEEE80211_BAND_5GHZ].legacy);
-
-       val = wl_g_rates[legacy-1].bitrate * 100000;
-
-       if (val < rateset.count) {
-               /* Select rate by rateset index */
-               rate = rateset.rates[val] & 0x7f;
-       } else {
-               /* Specified rate in bps */
-               rate = val / 500000;
-       }
-
-       WL_DBG(("rate %d mbps\n", (rate/2)));
-
-       /*
-       *
-       *       Set rate override,
-       *       Since the is a/b/g-blind, both a/bg_rate are enforced.
-       */
-       err_bg = wl_dev_intvar_set(dev, "bg_rate", rate);
-       err_a = wl_dev_intvar_set(dev, "a_rate", rate);
-       if (unlikely(err_bg && err_a)) {
-               WL_ERR(("could not set fixed rate (%d) (%d)\n", err_bg, err_a));
-               return (err_bg | err_a);
-       }
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-#else
-static int32
-wl_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
-       const uint8 *addr, const struct cfg80211_bitrate_mask *mask)
-{
-       struct wl_rateset rateset;
-       int32 rate;
-       int32 val;
-       int32 err_bg;
-       int32 err_a;
-       int32 err = 0;
-       int i;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       /* addr param is always NULL. ignore it */
-       /* Get current rateset */
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_GET_CURR_RATESET, &rateset,
-               sizeof(rateset))))) {
-               WL_ERR(("could not get current rateset (%d)\n", err));
-               return err;
-       }
-
-       rateset.count = dtoh32(rateset.count);
-
-       if (mask->fixed || mask->maxrate) {
-               val = mask->fixed ? (mask->fixed * 1000) : (mask->maxrate * 1000);
-               if (val < rateset.count) {
-                       /* Select rate by rateset index */
-                       rate = rateset.rates[val] & 0x7f;
-               } else {
-                       /* Specified rate in bps */
-                       rate = val / 500000;
-               }
-       } else {
-               /* Select maximum rate */
-               rate = rateset.rates[rateset.count - 1] & 0x7f;
-       }
-
-       if (mask->fixed) {
-               /*
-                       Set rate override,
-                       Since the is a/b/g-blind, both a/bg_rate are enforced.
-               */
-               err_bg = wl_dev_intvar_set(dev, "bg_rate", rate);
-               err_a = wl_dev_intvar_set(dev, "a_rate", rate);
-               if (unlikely(err_bg && err_a)) {
-                       WL_ERR(("could not set fixed rate (%d) (%d)\n", err_bg, err_a));
-                       return (err_bg | err_a);
-               }
-       } else {
-               /*
-                       clear rate override
-                       Since the is a/b/g-blind, both a/bg_rate are enforced.
-               */
-               /* 0 is for clearing rate override */
-               err_bg = wl_dev_intvar_set(dev, "bg_rate", 0);
-               /* 0 is for clearing rate override */
-               err_a = wl_dev_intvar_set(dev, "a_rate", 0);
-
-               if (unlikely(err_bg && err_a)) {
-                       WL_ERR(("could not set max rate (%d) (%d)\n", err_bg, err_a));
-                       return (err_bg | err_a);
-               }
-
-               /* Remove rates above selected rate */
-               for (i = 0; i < rateset.count; i++)
-                       if ((rateset.rates[i] & 0x7f) > rate)
-                               break;
-               rateset.count = htod32(i);
-
-               /* Set current rateset */
-               if (unlikely((err = wl_dev_ioctl(dev, WLC_SET_RATESET, &rateset,
-                       sizeof(rateset))))) {
-                       WL_ERR(("error (%d)\n", err));
-                       return err;
-               }
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) */
-
-static int32
-wl_cfg80211_resume(struct wiphy *wiphy)
-{
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       wl_invoke_iscan(wiphy_to_wl(wiphy));
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_cfg80211_suspend(struct wiphy *wiphy)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-
-       set_bit(WL_STATUS_SCAN_ABORTING, &wl->status);
-       wl_term_iscan(wl);
-       if (wl->scan_request) {
-               cfg80211_scan_done(wl->scan_request, TRUE); /* TRUE means abort */
-               wl->scan_request = NULL;
-       }
-       clear_bit(WL_STATUS_SCANNING, &wl->status);
-       clear_bit(WL_STATUS_SCAN_ABORTING, &wl->status);
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static __used int32
-wl_update_pmklist(struct net_device *dev, struct wl_pmk_list *pmk_list, int32 err)
-{
-       int8 eabuf[ETHER_ADDR_STR_LEN];
-       int i, j;
-
-       memset(eabuf, 0, ETHER_ADDR_STR_LEN);
-
-       WL_DBG(("No of elements %d\n", pmk_list->pmkids.npmkid));
-       for (i = 0; i < pmk_list->pmkids.npmkid; i++) {
-               WL_DBG(("PMKID[%d]: %s =\n", i,
-                       bcm_ether_ntoa(&pmk_list->pmkids.pmkid[i].BSSID,
-                       eabuf)));
-               for (j = 0; j < WPA2_PMKID_LEN; j++) {
-                       WL_DBG(("%02x\n", pmk_list->pmkids.pmkid[i].PMKID[j]));
-               }
-       }
-       if (likely(!err)) {
-               err = wl_dev_bufvar_set(dev, "pmkid_info", (char *)pmk_list,
-                       sizeof(*pmk_list));
-       }
-
-       return err;
-}
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) || \
-       defined(CHROMIUMOS_COMPAT_WIRELESS)
-static int32
-wl_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev,
-       struct cfg80211_pmksa *pmksa)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       int8 eabuf[ETHER_ADDR_STR_LEN];
-       int32 err = 0;
-       int i;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-
-       CHECK_SYS_UP();
-       memset(eabuf, 0, ETHER_ADDR_STR_LEN);
-       for (i = 0; i < wl->pmk_list->pmkids.npmkid; i++)
-               if (!memcmp(pmksa->bssid, &wl->pmk_list->pmkids.pmkid[i].BSSID,
-                       ETHER_ADDR_LEN))
-                               break;
-       if (i < WL_NUM_PMKIDS_MAX) {
-               memcpy(&wl->pmk_list->pmkids.pmkid[i].BSSID, pmksa->bssid, ETHER_ADDR_LEN);
-               memcpy(&wl->pmk_list->pmkids.pmkid[i].PMKID, pmksa->pmkid, WPA2_PMKID_LEN);
-               if (i == wl->pmk_list->pmkids.npmkid)
-                       wl->pmk_list->pmkids.npmkid++;
-       } else {
-               err = -EINVAL;
-       }
-       WL_DBG(("set_pmksa,IW_PMKSA_ADD - PMKID: %s =\n",
-               bcm_ether_ntoa(&wl->pmk_list->pmkids.pmkid[wl->pmk_list->pmkids.npmkid].BSSID,
-               eabuf)));
-       for (i = 0; i < WPA2_PMKID_LEN; i++) {
-               WL_DBG(("%02x\n",
-               wl->pmk_list->pmkids.pmkid[wl->pmk_list->pmkids.npmkid].PMKID[i]));
-       }
-
-       err = wl_update_pmklist(dev, wl->pmk_list, err);
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev,
-       struct cfg80211_pmksa *pmksa)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       int8 eabuf[ETHER_ADDR_STR_LEN];
-       struct _pmkid_list pmkid;
-       int32 err = 0;
-       int i;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-
-       CHECK_SYS_UP();
-       memset(eabuf, 0, ETHER_ADDR_STR_LEN);
-       memcpy(&pmkid.pmkid[0].BSSID, pmksa->bssid, ETHER_ADDR_LEN);
-       memcpy(&pmkid.pmkid[0].PMKID, pmksa->pmkid, WPA2_PMKID_LEN);
-
-       WL_DBG(("del_pmksa,IW_PMKSA_REMOVE - PMKID: %s =\n",
-               bcm_ether_ntoa(&pmkid.pmkid[0].BSSID, eabuf)));
-       for (i = 0; i < WPA2_PMKID_LEN; i++) {
-               WL_DBG(("%02x\n", pmkid.pmkid[0].PMKID[i]));
-       }
-
-       for (i = 0; i < wl->pmk_list->pmkids.npmkid; i++)
-               if (!memcmp(pmksa->bssid, &wl->pmk_list->pmkids.pmkid[i].BSSID, ETHER_ADDR_LEN))
-                       break;
-
-       if ((wl->pmk_list->pmkids.npmkid > 0) && (i < wl->pmk_list->pmkids.npmkid)) {
-               memset(&wl->pmk_list->pmkids.pmkid[i], 0, sizeof(pmkid_t));
-               for (; i < (wl->pmk_list->pmkids.npmkid - 1); i++) {
-                       memcpy(&wl->pmk_list->pmkids.pmkid[i].BSSID,
-                               &wl->pmk_list->pmkids.pmkid[i+1].BSSID, ETHER_ADDR_LEN);
-                       memcpy(&wl->pmk_list->pmkids.pmkid[i].PMKID,
-                               &wl->pmk_list->pmkids.pmkid[i+1].PMKID, WPA2_PMKID_LEN);
-               }
-               wl->pmk_list->pmkids.npmkid--;
-       }
-       else {
-               err = -EINVAL;
-       }
-
-       err = wl_update_pmklist(dev, wl->pmk_list, err);
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-
-}
-
-static int32
-wl_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev)
-{
-       struct wl_priv *wl = wiphy_to_wl(wiphy);
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       CHECK_SYS_UP();
-       memset(wl->pmk_list, 0, sizeof(*wl->pmk_list));
-       err = wl_update_pmklist(dev, wl->pmk_list, err);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-
-}
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) */
-
-static struct cfg80211_ops wl_cfg80211_ops = {
-       .change_virtual_intf = wl_cfg80211_change_iface,
-       .scan = wl_cfg80211_scan,
-       .set_wiphy_params = wl_cfg80211_set_wiphy_params,
-       .join_ibss = wl_cfg80211_join_ibss,
-       .leave_ibss = wl_cfg80211_leave_ibss,
-       .get_station = wl_cfg80211_get_station,
-       .set_tx_power = wl_cfg80211_set_tx_power,
-       .get_tx_power = wl_cfg80211_get_tx_power,
-       .add_key = wl_cfg80211_add_key,
-       .del_key = wl_cfg80211_del_key,
-       .get_key = wl_cfg80211_get_key,
-       .set_default_key = wl_cfg80211_config_default_key,
-       .set_default_mgmt_key = wl_cfg80211_config_default_mgmt_key,
-       .set_power_mgmt = wl_cfg80211_set_power_mgmt,
-       .set_bitrate_mask = wl_cfg80211_set_bitrate_mask,
-       .connect = wl_cfg80211_connect,
-       .disconnect = wl_cfg80211_disconnect,
-       .suspend = wl_cfg80211_suspend,
-       .resume = wl_cfg80211_resume,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) || \
-       defined(CHROMIUMOS_COMPAT_WIRELESS)
-       .set_pmksa = wl_cfg80211_set_pmksa,
-       .del_pmksa = wl_cfg80211_del_pmksa,
-       .flush_pmksa = wl_cfg80211_flush_pmksa
-#endif
-};
-
-static int32
-wl_mode_to_nl80211_iftype(int32 mode)
-{
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       switch (mode) {
-       case WL_MODE_BSS:
-               return NL80211_IFTYPE_STATION;
-       case WL_MODE_IBSS:
-               return NL80211_IFTYPE_ADHOC;
-       default:
-               return NL80211_IFTYPE_UNSPECIFIED;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static struct wireless_dev *
-wl_alloc_wdev(int32 sizeof_iface, struct device *dev)
-{
-       struct wireless_dev *wdev;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wdev = kzalloc(sizeof(*wdev), GFP_KERNEL);
-       if (unlikely(!wdev)) {
-               WL_ERR(("Could not allocate wireless device\n"));
-               return ERR_PTR(-ENOMEM);
-       }
-       wdev->wiphy = wiphy_new(&wl_cfg80211_ops, sizeof(struct wl_priv) + sizeof_iface);
-       if (unlikely(!wdev->wiphy)) {
-               WL_ERR(("Couldn not allocate wiphy device\n"));
-               err = -ENOMEM;
-               goto wiphy_new_out;
-       }
-       set_wiphy_dev(wdev->wiphy, dev);
-       wdev->wiphy->max_scan_ssids = WL_NUM_SCAN_MAX;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) || \
-       defined(CHROMIUMOS_COMPAT_WIRELESS)
-       wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
-#endif
-       wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION)| BIT(NL80211_IFTYPE_ADHOC);
-       wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
-       wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a;    /* Set it as 11a by default.
-                                                               ** This will be updated with 
-                                                               ** 11n phy tables in "ifconfig up"
-                                                               ** if phy has 11n capability
-                                                               */
-       wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
-       wdev->wiphy->cipher_suites = __wl_cipher_suites;
-       wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
-#ifndef WL_POWERSAVE_DISABLED
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) || \
-       defined(CHROMIUMOS_COMPAT_WIRELESS)
-       wdev->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT; /* enable power 
-                                                       * save mode by default 
-                                                       */
-#else
-       wdev->wiphy->ps_default = TRUE; /* enable power save mode by default */
-#endif
-#else
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) || \
-       defined(CHROMIUMOS_COMPAT_WIRELESS)
-       wdev->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
-#else
-       wdev->wiphy->ps_default = FALSE;
-#endif
-#endif /* !WL_POWERSAVE_DISABLED */
-       if (unlikely(((err = wiphy_register(wdev->wiphy)) < 0))) {
-               WL_ERR(("Couldn not register wiphy device (%d)\n", err));
-               goto wiphy_register_out;
-       }
-       return wdev;
-
-wiphy_register_out:
-       wiphy_free(wdev->wiphy);
-
-wiphy_new_out:
-       kfree(wdev);
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return ERR_PTR(err);
-}
-
-static void
-wl_free_wdev(struct wl_priv *wl)
-{
-       struct wireless_dev *wdev = wl_to_wdev(wl);
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (unlikely(!wdev)) {
-               WL_ERR(("wdev is invalid\n"));
-               return;
-       }
-       wiphy_unregister(wdev->wiphy);
-       wiphy_free(wdev->wiphy);
-       kfree(wdev);
-       wl_to_wdev(wl) = NULL;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-}
-
-static int32
-wl_inform_bss(struct wl_priv *wl)
-{
-       struct wl_scan_results *bss_list;
-       struct wl_bss_info *bi = NULL;  /* must be initialized */
-       int32 err = 0;
-       int i;
-
-
-       bss_list = wl->bss_list;
-       if (unlikely(bss_list->version != WL_BSS_INFO_VERSION)) {
-                       WL_ERR(("Version %d != WL_BSS_INFO_VERSION\n", bss_list->version));
-                       return -EOPNOTSUPP;
-       }
-       WL_DBG(("scanned AP count (%d)\n", bss_list->count));
-       bi = next_bss(bss_list, bi);
-       for_each_bss(bss_list, bi, i) {
-               if (unlikely(err = wl_inform_single_bss(wl, bi)))
-                       break;
-       }
-       return err;
-}
-
-static int32
-wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi)
-{
-       struct wiphy *wiphy = wl_to_wiphy(wl);
-       struct ieee80211_mgmt *mgmt;
-       struct ieee80211_channel *channel;
-       struct ieee80211_supported_band *band;
-       struct wl_cfg80211_bss_info *notif_bss_info;
-       struct wl_scan_req *sr = wl_to_sr(wl);
-       uint32 signal;
-       uint32 freq;
-       int32 err = 0;
-
-       if (unlikely(dtoh32(bi->length) > WL_BSS_INFO_MAX)) {
-               WL_DBG(("Beacon size is larger than allocated buffer. Discard it!!\n"));
-               return err;
-       }
-       notif_bss_info = kzalloc(sizeof(*notif_bss_info) + sizeof(*mgmt) - sizeof(uint8) +
-               WL_BSS_INFO_MAX, GFP_KERNEL);
-       if (unlikely(!notif_bss_info)) {
-               WL_ERR(("notif_bss_info alloc failed\n"));
-               return -ENOMEM;
-       }
-       mgmt = (struct ieee80211_mgmt *)notif_bss_info->frame_buf;
-       notif_bss_info->channel = CHSPEC_CHANNEL(bi->chanspec);
-       if (notif_bss_info->channel <= CH_MAX_2G_CHANNEL)
-               band = wiphy->bands[IEEE80211_BAND_2GHZ];
-       else
-               band = wiphy->bands[IEEE80211_BAND_5GHZ];
-       notif_bss_info->rssi = bi->RSSI;
-       memcpy(mgmt->bssid, &bi->BSSID,  ETHER_ADDR_LEN);
-       if (!memcmp(bi->SSID, sr->ssid.SSID, bi->SSID_len)) {
-               mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                       IEEE80211_STYPE_PROBE_RESP);
-       }
-       mgmt->u.probe_resp.timestamp = 0;
-       mgmt->u.probe_resp.beacon_int = cpu_to_le16(bi->beacon_period);
-       mgmt->u.probe_resp.capab_info = cpu_to_le16(bi->capability);
-       wl_rst_ie(wl);
-       wl_add_ie(wl, WLAN_EID_SSID, bi->SSID_len, bi->SSID);
-       wl_add_ie(wl, WLAN_EID_SUPP_RATES, bi->rateset.count, bi->rateset.rates);
-       wl_mrg_ie(wl, ((uint8 *)bi) + bi->ie_offset, bi->ie_length);
-       wl_cp_ie(wl, mgmt->u.probe_resp.variable, WL_BSS_INFO_MAX -
-               offsetof(struct wl_cfg80211_bss_info, frame_buf));
-       notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.probe_resp.variable) +
-               wl_get_ielen(wl);
-       freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
-       channel = ieee80211_get_channel(wiphy, freq);
-
-       WL_DBG(("SSID : \"%s\", rssi (%d), capability : 0x04%x\n", bi->SSID, notif_bss_info->rssi,
-               mgmt->u.probe_resp.capab_info));
-
-       signal = notif_bss_info->rssi * 100;
-       if (unlikely(!cfg80211_inform_bss_frame(wiphy, channel, mgmt,
-               le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL))) {
-               WL_ERR(("cfg80211_inform_bss_frame error\n"));
-               kfree(notif_bss_info);
-               return -EINVAL;
-       }
-       kfree(notif_bss_info);
-
-       return err;
-}
-
-static bool
-wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e)
-{
-       uint32 event = ntoh32(e->event_type);
-       uint16 flags =  ntoh16(e->flags);
-
-       if (event == WLC_E_JOIN || event == WLC_E_ASSOC_IND || event == WLC_E_REASSOC_IND) {
-               return TRUE;
-       } else if (event == WLC_E_LINK) {
-               if (flags & WLC_EVENT_MSG_LINK) {
-                       if (wl_is_ibssmode(wl)) {
-                               if (wl_is_ibssstarter(wl)) {
-                               }
-                       } else {
-
-                       }
-               }
-       }
-
-       return FALSE;
-}
-
-static bool
-wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e)
-{
-       uint32 event = ntoh32(e->event_type);
-       uint16 flags =  ntoh16(e->flags);
-
-       if (event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) {
-               return TRUE;
-       } else if (event == WLC_E_LINK) {
-               if (!(flags & WLC_EVENT_MSG_LINK)) {
-                       return TRUE;
-               }
-       }
-
-       return FALSE;
-}
-
-static int32
-wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data)
-{
-       bool act;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (wl_is_linkup(wl, e)) {
-               wl_link_up(wl);
-               if (wl_is_ibssmode(wl)) {
-                       cfg80211_ibss_joined(ndev, (int8 *)&e->addr, GFP_KERNEL);
-                       WL_DBG(("joined in IBSS network\n"));
-               } else {
-                       wl_bss_connect_done(wl, ndev, e, data);
-                       WL_DBG(("joined in BSS network \"%s\"\n",
-                       ((struct wlc_ssid *)wl_read_prof(wl, WL_PROF_SSID))->SSID));
-               }
-               act = TRUE;
-               wl_update_prof(wl, e, &act, WL_PROF_ACT);
-       } else if (wl_is_linkdown(wl, e)) {
-               cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL);
-               clear_bit(WL_STATUS_CONNECTED, &wl->status);
-               wl_link_down(wl);
-               wl_init_prof(wl->profile);
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_notify_roaming_status(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data)
-{
-       bool act;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl_bss_roaming_done(wl, ndev, e, data);
-       act = TRUE;
-       wl_update_prof(wl, e, &act, WL_PROF_ACT);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static __used int32
-wl_dev_bufvar_set(struct net_device *dev, int8 *name, int8 *buf, int32 len)
-{
-       struct wl_priv *wl = ndev_to_wl(dev);
-       uint32 buflen;
-
-       buflen = bcm_mkiovar(name, buf, len, wl->ioctl_buf, WL_IOCTL_LEN_MAX);
-       BUG_ON(unlikely(!buflen));
-
-       return (wl_dev_ioctl(dev, WLC_SET_VAR, wl->ioctl_buf, buflen));
-}
-
-static int32
-wl_dev_bufvar_get(struct net_device *dev, int8 *name, int8 *buf, int32 buf_len)
-{
-       struct wl_priv *wl = ndev_to_wl(dev);
-       uint32 len;
-       int32 err = 0;
-
-       len = bcm_mkiovar(name, NULL, 0, wl->ioctl_buf, WL_IOCTL_LEN_MAX);
-       BUG_ON(unlikely(!len));
-       if (unlikely((err = wl_dev_ioctl(dev, WLC_GET_VAR, (void *)wl->ioctl_buf,
-               WL_IOCTL_LEN_MAX)))) {
-               WL_ERR(("error (%d)\n", err));
-               return err;
-       }
-       memcpy(buf, wl->ioctl_buf, buf_len);
-
-       return err;
-}
-
-static int32
-wl_get_assoc_ies(struct wl_priv *wl)
-{
-       struct net_device *ndev = wl_to_ndev(wl);
-       struct wl_assoc_ielen *assoc_info;
-       struct wl_connect_info *conn_info = wl_to_conn(wl);
-       uint32 req_len;
-       uint32 resp_len;
-       int32 err = 0;
-
-       if (unlikely(err = wl_dev_bufvar_get(ndev, "assoc_info", wl->extra_buf,
-               WL_ASSOC_INFO_MAX))) {
-               WL_ERR(("could not get assoc info (%d)\n", err));
-               return err;
-       }
-       assoc_info = (struct wl_assoc_ielen *)wl->extra_buf;
-       req_len = assoc_info->req_len;
-       resp_len = assoc_info->resp_len;
-       if (req_len) {
-               if (unlikely(err = wl_dev_bufvar_get(ndev, "assoc_req_ies", wl->extra_buf,
-                       WL_ASSOC_INFO_MAX))) {
-                       WL_ERR(("could not get assoc req (%d)\n", err));
-                       return err;
-               }
-               conn_info->req_ie_len = req_len;
-               conn_info->req_ie = kmemdup(wl->extra_buf, conn_info->req_ie_len, GFP_KERNEL);
-       } else {
-               conn_info->req_ie_len = 0;
-               conn_info->req_ie = NULL;
-       }
-       if (resp_len) {
-               if (unlikely(err = wl_dev_bufvar_get(ndev, "assoc_resp_ies", wl->extra_buf,
-                       WL_ASSOC_INFO_MAX))) {
-                       WL_ERR(("could not get assoc resp (%d)\n", err));
-                       return err;
-               }
-               conn_info->resp_ie_len = resp_len;
-               conn_info->resp_ie = kmemdup(wl->extra_buf, conn_info->resp_ie_len, GFP_KERNEL);
-       } else {
-               conn_info->resp_ie_len = 0;
-               conn_info->resp_ie = NULL;
-       }
-       WL_DBG(("req len (%d) resp len (%d)\n", conn_info->req_ie_len, conn_info->resp_ie_len));
-
-       return err;
-}
-
-static int32
-wl_update_bss_info(struct wl_priv *wl)
-{
-       struct cfg80211_bss *bss;
-       struct wl_bss_info *bi;
-       struct wlc_ssid *ssid;
-       int32 err = 0;
-
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (wl_is_ibssmode(wl))
-               return err;
-
-       ssid = (struct wlc_ssid *)wl_read_prof(wl, WL_PROF_SSID);
-       bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (int8 *)&wl->bssid, ssid->SSID,
-               ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
-
-       rtnl_lock();
-       if (unlikely(!bss)) {
-               WL_DBG(("Could not find the AP\n"));
-               *(uint32*)wl->extra_buf = htod32(WL_EXTRA_BUF_MAX);
-               if (unlikely(err = wl_dev_ioctl(wl_to_ndev(wl), WLC_GET_BSS_INFO, wl->extra_buf,
-                       WL_EXTRA_BUF_MAX))) {
-                       WL_ERR(("Could not get bss info %d\n", err));
-                       goto update_bss_info_out;
-               }
-               bi = (struct wl_bss_info *)(wl->extra_buf + 4);
-               if (unlikely(memcmp(&bi->BSSID, &wl->bssid, ETHER_ADDR_LEN))) {
-                       err = -EIO;
-                       goto update_bss_info_out;
-               }
-               if (unlikely((err = wl_inform_single_bss(wl, bi))))
-                       goto update_bss_info_out;
-       } else {
-               WL_DBG(("Found the AP in the list - BSSID %02x:%02x:%02x:%02x:%02x:%02x\n",
-                       bss->bssid[0], bss->bssid[1], bss->bssid[2], bss->bssid[3],
-                       bss->bssid[4], bss->bssid[5]));
-               cfg80211_put_bss(bss);
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-update_bss_info_out:
-       rtnl_unlock();
-       return err;
-}
-
-static int32
-wl_bss_roaming_done(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data)
-{
-       struct wl_connect_info *conn_info = wl_to_conn(wl);
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl_get_assoc_ies(wl);
-       memcpy(&wl->bssid, &e->addr,  ETHER_ADDR_LEN);
-       wl_update_bss_info(wl);
-       cfg80211_roamed(ndev,
-               (uint8 *)&wl->bssid,
-               conn_info->req_ie, conn_info->req_ie_len,
-               conn_info->resp_ie, conn_info->resp_ie_len,
-               GFP_KERNEL);
-               WL_DBG(("Report roaming result\n"));
-
-       set_bit(WL_STATUS_CONNECTED, &wl->status);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_bss_connect_done(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data)
-{
-       struct wl_connect_info *conn_info = wl_to_conn(wl);
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl_get_assoc_ies(wl);
-       memcpy(&wl->bssid, &e->addr,  ETHER_ADDR_LEN);
-       wl_update_bss_info(wl);
-       if (test_and_clear_bit(WL_STATUS_CONNECTING, &wl->status)) {
-               cfg80211_connect_result(ndev,
-                       (uint8 *)&wl->bssid,
-                       conn_info->req_ie, conn_info->req_ie_len,
-                       conn_info->resp_ie, conn_info->resp_ie_len,
-                       WLAN_STATUS_SUCCESS,
-                       GFP_KERNEL);
-               WL_DBG(("Report connect result\n"));
-       } else {
-               cfg80211_roamed(ndev,
-                       (uint8 *)&wl->bssid,
-                       conn_info->req_ie, conn_info->req_ie_len,
-                       conn_info->resp_ie, conn_info->resp_ie_len,
-                       GFP_KERNEL);
-                WL_DBG(("Report roaming result\n"));
-       }
-       set_bit(WL_STATUS_CONNECTED, &wl->status);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_notify_mic_status(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data)
-{
-       uint16 flags =  ntoh16(e->flags);
-       enum nl80211_key_type key_type;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-
-       rtnl_lock();
-       if (flags & WLC_EVENT_MSG_GROUP)
-               key_type = NL80211_KEYTYPE_GROUP;
-       else
-               key_type = NL80211_KEYTYPE_PAIRWISE;
-
-       cfg80211_michael_mic_failure(ndev, (uint8 *)&e->addr, key_type, -1, NULL, GFP_KERNEL);
-       rtnl_unlock();
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return 0;
-}
-
-static int32
-wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev,
-       const wl_event_msg_t *e, void* data)
-{
-       struct channel_info channel_inform;
-       struct wl_scan_results *bss_list;
-       uint32 len = WL_SCAN_BUF_MAX;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-
-       if (wl->iscan_on && wl->iscan_kickstart)
-               return wl_wakeup_iscan(wl_to_iscan(wl));
-
-       if (unlikely(!test_and_clear_bit(WL_STATUS_SCANNING, &wl->status))) {
-               WL_ERR(("Scan complete while device not scanning\n"));
-               return -EINVAL;
-       }
-       if (unlikely(!wl->scan_request)) {
-       }
-       rtnl_lock();
-       if (unlikely((err = wl_dev_ioctl(ndev, WLC_GET_CHANNEL, &channel_inform,
-               sizeof(channel_inform))))) {
-               WL_ERR(("scan busy (%d)\n", err));
-               goto scan_done_out;
-       }
-       channel_inform.scan_channel = dtoh32(channel_inform.scan_channel);
-       if (unlikely(channel_inform.scan_channel)) {
-
-               WL_DBG(("channel_inform.scan_channel (%d)\n", channel_inform.scan_channel));
-       }
-       wl->bss_list = wl->scan_results;
-       bss_list = wl->bss_list;
-       memset(bss_list, 0, len);
-       bss_list->buflen = htod32(len);
-       if (unlikely((err = wl_dev_ioctl(ndev, WLC_SCAN_RESULTS, bss_list, len)))) {
-               WL_ERR(("%s Scan_results error (%d)\n", ndev->name, err));
-               err = -EINVAL;
-               goto scan_done_out;
-       }
-       bss_list->buflen = dtoh32(bss_list->buflen);
-       bss_list->version = dtoh32(bss_list->version);
-       bss_list->count = dtoh32(bss_list->count);
-
-       if ((err = wl_inform_bss(wl))) {
-               goto scan_done_out;
-       }
-
-scan_done_out :
-       if (wl->scan_request) {
-               cfg80211_scan_done(wl->scan_request, FALSE);
-               wl->scan_request = NULL;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       rtnl_unlock();
-       return err;
-}
-
-static void
-wl_init_conf(struct wl_conf *conf)
-{
-       conf->mode = (uint32)-1;
-       conf->frag_threshold = (uint32)-1;
-       conf->rts_threshold = (uint32)-1;
-       conf->retry_short = (uint32)-1;
-       conf->retry_long = (uint32)-1;
-       conf->tx_power = -1;
-}
-
-static void
-wl_init_prof(struct wl_profile *prof)
-{
-       memset(prof, 0, sizeof(*prof));
-}
-
-static void
-wl_init_eloop_handler(struct wl_event_loop *el)
-{
-       memset(el, 0, sizeof(*el));
-       el->handler[WLC_E_SCAN_COMPLETE] = wl_notify_scan_status;
-       el->handler[WLC_E_JOIN] = wl_notify_connect_status;
-       el->handler[WLC_E_LINK] = wl_notify_connect_status;
-       el->handler[WLC_E_DEAUTH_IND] = wl_notify_connect_status;
-       el->handler[WLC_E_DISASSOC_IND] = wl_notify_connect_status;
-       el->handler[WLC_E_ASSOC_IND] = wl_notify_connect_status;
-       el->handler[WLC_E_REASSOC_IND] = wl_notify_connect_status;
-       el->handler[WLC_E_ROAM] = wl_notify_roaming_status;
-       el->handler[WLC_E_MIC_ERROR] = wl_notify_mic_status;
-}
-
-static int32
-wl_init_priv_mem(struct wl_priv *wl)
-{
-       wl->scan_results = (void *)kzalloc(WL_SCAN_BUF_MAX, GFP_KERNEL);
-       if (unlikely(!wl->scan_results)) {
-               WL_ERR(("Scan results alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-       wl->conf = (void *)kzalloc(sizeof(*wl->conf), GFP_KERNEL);
-       if (unlikely(!wl->conf)) {
-               WL_ERR(("wl_conf alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-       wl->profile = (void *)kzalloc(sizeof(*wl->profile), GFP_KERNEL);
-       if (unlikely(!wl->profile)) {
-               WL_ERR(("wl_profile alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-       wl->bss_info = (void *)kzalloc(WL_BSS_INFO_MAX, GFP_KERNEL);
-       if (unlikely(!wl->bss_info)) {
-               WL_ERR(("Bss information alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-       wl->scan_req_int = (void *)kzalloc(sizeof(*wl->scan_req_int), GFP_KERNEL);
-       if (unlikely(!wl->scan_req_int)) {
-               WL_ERR(("Scan req alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-       wl->ioctl_buf = (void *)kzalloc(WL_IOCTL_LEN_MAX, GFP_KERNEL);
-       if (unlikely(!wl->ioctl_buf)) {
-               WL_ERR(("Ioctl buf alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-       wl->extra_buf = (void *)kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL);
-       if (unlikely(!wl->extra_buf)) {
-               WL_ERR(("Extra buf alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-       wl->iscan = (void *)kzalloc(sizeof(*wl->iscan), GFP_KERNEL);
-       if (unlikely(!wl->iscan)) {
-               WL_ERR(("Iscan buf alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-       wl->fw = (void *)kzalloc(sizeof(*wl->fw), GFP_KERNEL);
-       if (unlikely(!wl->fw)) {
-               WL_ERR(("fw object alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-       wl->pmk_list = (void *)kzalloc(sizeof(*wl->pmk_list), GFP_KERNEL);
-       if (unlikely(!wl->pmk_list)) {
-               WL_ERR(("pmk list alloc failed\n"));
-               goto init_priv_mem_out;
-       }
-
-       return 0;
-
-init_priv_mem_out:
-       wl_deinit_priv_mem(wl);
-
-       return -ENOMEM;
-}
-
-static void
-wl_deinit_priv_mem(struct wl_priv *wl)
-{
-       if (wl->scan_results) {
-               kfree(wl->scan_results);
-               wl->scan_results = NULL;
-       }
-       if (wl->bss_info) {
-               kfree(wl->bss_info);
-               wl->bss_info = NULL;
-       }
-       if (wl->conf) {
-               kfree(wl->conf);
-               wl->conf = NULL;
-       }
-       if (wl->profile) {
-               kfree(wl->profile);
-               wl->profile = NULL;
-       }
-       if (wl->scan_req_int) {
-               kfree(wl->scan_req_int);
-               wl->scan_req_int = NULL;
-       }
-       if (wl->ioctl_buf) {
-               kfree(wl->ioctl_buf);
-               wl->ioctl_buf = NULL;
-       }
-       if (wl->extra_buf) {
-               kfree(wl->extra_buf);
-               wl->extra_buf = NULL;
-       }
-       if (wl->iscan) {
-               kfree(wl->iscan);
-               wl->iscan = NULL;
-       }
-       if (wl->fw) {
-               kfree(wl->fw);
-               wl->fw = NULL;
-       }
-       if (wl->pmk_list) {
-               kfree(wl->pmk_list);
-               wl->pmk_list = NULL;
-       }
-}
-
-
-static int32
-wl_create_event_handler(struct wl_priv *wl)
-{
-       sema_init(&wl->event_sync, 0);
-       init_completion(&wl->event_exit);
-       if (unlikely(((wl->event_pid = kernel_thread(wl_event_handler, wl, 0)) < 0))) {
-               WL_ERR(("failed to create event thread\n"));
-               return -ENOMEM;
-       }
-       WL_DBG(("pid %d\n", wl->event_pid));
-       return 0;
-}
-
-static void
-wl_destroy_event_handler(struct wl_priv *wl)
-{
-       if (wl->event_pid >= 0) {
-               KILL_PROC(wl->event_pid, SIGTERM);
-               wait_for_completion(&wl->event_exit);
-       }
-}
-
-static void
-wl_term_iscan(struct wl_priv *wl)
-{
-       struct wl_iscan_ctrl *iscan = wl_to_iscan(wl);
-
-       if (wl->iscan_on && iscan->pid >= 0) {
-               iscan->state = WL_ISCAN_STATE_IDLE;
-               KILL_PROC(iscan->pid, SIGTERM);
-               wait_for_completion(&iscan->exited);
-               iscan->pid = -1;
-       }
-}
-
-static void
-wl_notify_iscan_complete(struct wl_iscan_ctrl *iscan, bool aborted)
-{
-       struct wl_priv *wl = iscan_to_wl(iscan);
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (unlikely(!test_and_clear_bit(WL_STATUS_SCANNING, &wl->status))) {
-               WL_ERR(("Scan complete while device not scanning\n"));
-               return;
-       }
-       if (likely(wl->scan_request)) {
-               cfg80211_scan_done(wl->scan_request, aborted);
-               wl->scan_request = NULL;
-       }
-       wl->iscan_kickstart = FALSE;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-}
-
-static int32
-wl_wakeup_iscan(struct wl_iscan_ctrl *iscan)
-{
-       if (likely(iscan->state != WL_ISCAN_STATE_IDLE)) {
-               WL_DBG(("wake up iscan\n"));
-               up(&iscan->sync);
-               return 0;
-       }
-
-       return -EIO;
-}
-
-static int32
-wl_get_iscan_results(struct wl_iscan_ctrl *iscan, uint32 *status, struct wl_scan_results **bss_list)
-{
-       struct wl_iscan_results list;
-       struct wl_scan_results *results;
-       struct wl_iscan_results *list_buf;
-       int32 err = 0;
-
-       memset(iscan->scan_buf, 0, WL_ISCAN_BUF_MAX);
-       list_buf = (struct wl_iscan_results *)iscan->scan_buf;
-       results = &list_buf->results;
-       results->buflen = WL_ISCAN_RESULTS_FIXED_SIZE;
-       results->version = 0;
-       results->count = 0;
-
-       memset(&list, 0, sizeof(list));
-       list.results.buflen = htod32(WL_ISCAN_BUF_MAX);
-       if (unlikely((err = wl_dev_iovar_getbuf(
-               iscan->dev,
-               "iscanresults",
-               &list,
-               WL_ISCAN_RESULTS_FIXED_SIZE,
-               iscan->scan_buf,
-               WL_ISCAN_BUF_MAX)))) {
-               WL_ERR(("error (%d)\n", err));
-               return err;
-       }
-       results->buflen = dtoh32(results->buflen);
-       results->version = dtoh32(results->version);
-       results->count = dtoh32(results->count);
-       //WL_DBG(("results->count = %d\n", results->count));
-       //WL_DBG(("results->buflen = %d\n", results->buflen));
-       *status = dtoh32(list_buf->status);
-       *bss_list = results;
-
-       return err;
-}
-
-static int32
-wl_iscan_done(struct wl_priv *wl)
-{
-       struct wl_iscan_ctrl *iscan = wl->iscan;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       iscan->state = WL_ISCAN_STATE_IDLE;
-       rtnl_lock();
-       wl_inform_bss(wl);
-       wl_notify_iscan_complete(iscan, FALSE);
-       rtnl_unlock();
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_iscan_pending(struct wl_priv *wl)
-{
-       struct wl_iscan_ctrl *iscan = wl->iscan;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       /* Reschedule the timer */
-       mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-       iscan->timer_on = 1;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_iscan_inprogress(struct wl_priv *wl)
-{
-       struct wl_iscan_ctrl *iscan = wl->iscan;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       rtnl_lock();
-       wl_inform_bss(wl);
-       wl_run_iscan(iscan, NULL, WL_SCAN_ACTION_CONTINUE);
-       rtnl_unlock();
-       /* Reschedule the timer */
-       mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-       iscan->timer_on = 1;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_iscan_aborted(struct wl_priv *wl)
-{
-       struct wl_iscan_ctrl *iscan = wl->iscan;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       iscan->state = WL_ISCAN_STATE_IDLE;
-       rtnl_lock();
-       wl_notify_iscan_complete(iscan, TRUE);
-       rtnl_unlock();
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_iscan_thread(void *data)
-{
-       struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
-       struct wl_iscan_ctrl *iscan = (struct wl_iscan_ctrl *)data;
-       struct wl_priv *wl = iscan_to_wl(iscan);
-       struct wl_iscan_eloop *el = &iscan->el;
-       uint32 status;
-       int err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       sched_setscheduler(current, SCHED_FIFO, &param);
-       status = WL_SCAN_RESULTS_PARTIAL;
-       while (likely(!down_interruptible(&iscan->sync))) {
-               if (iscan->timer_on) {
-                       del_timer_sync(&iscan->timer);
-                       iscan->timer_on = 0;
-               }
-               rtnl_lock();
-               if (unlikely((err = wl_get_iscan_results(iscan, &status, &wl->bss_list)))) {
-                       status = WL_SCAN_RESULTS_ABORTED;
-                       WL_ERR(("Abort iscan\n"));
-               }
-               rtnl_unlock();
-               el->handler[status](wl);
-       }
-       if (iscan->timer_on) {
-               del_timer_sync(&iscan->timer);
-               iscan->timer_on = 0;
-       }
-       complete_and_exit(&iscan->exited, 0);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return 0;
-}
-
-static void
-wl_iscan_timer(ulong data)
-{
-       struct wl_iscan_ctrl *iscan = (struct wl_iscan_ctrl *)data;
-
-       if (iscan) {
-               iscan->timer_on = 0;
-               WL_DBG(("timer expired\n"));
-               wl_wakeup_iscan(iscan);
-       }
-}
-
-static int32
-wl_invoke_iscan(struct wl_priv *wl)
-{
-       struct wl_iscan_ctrl *iscan = wl_to_iscan(wl);
-       int err = 0;
-
-       if (wl->iscan_on && iscan->pid < 0) {
-               iscan->state = WL_ISCAN_STATE_IDLE;
-               sema_init(&iscan->sync, 0);
-               init_completion(&iscan->exited);
-               iscan->pid = kernel_thread(wl_iscan_thread, iscan, 0);
-               if (unlikely(iscan->pid < 0)) {
-                       WL_ERR(("Could not create iscan thread\n"));
-                       return -ENOMEM;
-               }
-       }
-
-       return err;
-}
-
-static void
-wl_init_iscan_eloop(struct wl_iscan_eloop *el)
-{
-       memset(el, 0, sizeof(*el));
-       el->handler[WL_SCAN_RESULTS_SUCCESS] = wl_iscan_done;
-       el->handler[WL_SCAN_RESULTS_PARTIAL] = wl_iscan_inprogress;
-       el->handler[WL_SCAN_RESULTS_PENDING] = wl_iscan_pending;
-       el->handler[WL_SCAN_RESULTS_ABORTED] = wl_iscan_aborted;
-       el->handler[WL_SCAN_RESULTS_NO_MEM] = wl_iscan_aborted;
-}
-
-static int32
-wl_init_iscan(struct wl_priv *wl)
-{
-       struct wl_iscan_ctrl *iscan = wl_to_iscan(wl);
-       int err = 0;
-
-       if (wl->iscan_on) {
-               iscan->dev = wl_to_ndev(wl);
-               iscan->state = WL_ISCAN_STATE_IDLE;
-               wl_init_iscan_eloop(&iscan->el);
-               iscan->timer_ms = WL_ISCAN_TIMER_INTERVAL_MS;
-               init_timer(&iscan->timer);
-               iscan->timer.data = (ulong)iscan;
-               iscan->timer.function = wl_iscan_timer;
-               sema_init(&iscan->sync, 0);
-               init_completion(&iscan->exited);
-               iscan->pid = kernel_thread(wl_iscan_thread, iscan, 0);
-               if (unlikely(iscan->pid < 0)) {
-                       WL_ERR(("Could not create iscan thread\n"));
-                       return -ENOMEM;
-               }
-               iscan->data = wl;
-       }
-
-       return err;
-}
-
-static void
-wl_init_fw(struct wl_fw_ctrl *fw)
-{
-       fw->status = 0; /* init fw loading status. 0 means nothing was loaded yet */
-}
-
-static int32
-wl_init_priv(struct wl_priv *wl)
-{
-       struct wiphy *wiphy = wl_to_wiphy(wl);
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl->scan_request = NULL;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) || \
-       defined(CHROMIUMOS_COMPAT_WIRELESS)
-       wl->pwr_save = !!(wiphy->flags & WIPHY_FLAG_PS_ON_BY_DEFAULT);
-#else
-       wl->pwr_save = wiphy->ps_default;
-#endif
-#ifndef WL_ISCAN_DISABLED
-       wl->iscan_on = TRUE;    /* iscan on & off switch. we enable iscan per default */
-#else
-       wl->iscan_on = FALSE;
-#endif /* WL_ISCAN_DISABLED */
-#ifndef WL_ROAM_DISABLED
-       wl->roam_on = TRUE;     /* roam on & off switch. we enable roam per default */
-#else
-       wl->roam_on = FALSE;
-#endif /* WL_ROAM_DISABLED */
-
-       wl->iscan_kickstart = FALSE;
-       wl->active_scan = TRUE; /* we do active scan for specific scan per default */
-       wl->dongle_up = FALSE;  /* dongle is not up yet */
-       wl_init_eq(wl);
-       if (unlikely((err = wl_init_priv_mem(wl))))
-               return err;
-       if (unlikely(wl_create_event_handler(wl)))
-               return -ENOMEM;
-       wl_init_eloop_handler(&wl->el);
-       mutex_init(&wl->usr_sync);
-       if (unlikely((err = wl_init_iscan(wl))))
-               return err;
-       wl_init_fw(wl->fw);
-       wl_init_conf(wl->conf);
-       wl_init_prof(wl->profile);
-       wl_link_down(wl);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static void
-wl_deinit_priv(struct wl_priv *wl)
-{
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl_destroy_event_handler(wl);
-       wl->dongle_up = FALSE;  /* dongle down */
-       wl_flush_eq(wl);
-       wl_link_down(wl);
-       wl_term_iscan(wl);
-       wl_deinit_priv_mem(wl);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-}
-
-int32
-wl_cfg80211_attach(struct net_device *ndev, void *data)
-{
-       struct wireless_dev *wdev;
-       struct wl_priv *wl;
-       struct wl_iface *ci;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (unlikely(!ndev)) {
-               WL_ERR(("ndev is invaild\n"));
-               return -ENODEV;
-       }
-       wl_cfg80211_dev = kzalloc(sizeof(struct wl_dev), GFP_KERNEL);
-       if (unlikely(!wl_cfg80211_dev)) {
-               WL_ERR(("wl_cfg80211_dev is invalid\n"));
-               return -ENOMEM;
-       }
-       WL_DBG(("func %p\n", wl_sdio_func()));
-#ifndef WL_CFG80211_LOCALTEST
-       wdev = wl_alloc_wdev(sizeof(struct wl_iface), &wl_sdio_func()->dev);
-#else
-       wdev = wl_alloc_wdev(sizeof(struct wl_iface), NULL);
-#endif
-       if (unlikely(IS_ERR(wdev)))
-               return -ENOMEM;
-
-       wdev->iftype = wl_mode_to_nl80211_iftype(WL_MODE_BSS);
-       wl = wdev_to_wl(wdev);
-       wl->wdev = wdev;
-       wl->pub = data;
-       ci = (struct wl_iface *)wl_to_ci(wl);
-       ci->wl = wl;
-       ndev->ieee80211_ptr = wdev;
-       SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));
-       wdev->netdev = ndev;
-       if (unlikely((err = wl_init_priv(wl)))) {
-               WL_ERR(("Failed to init iwm_priv (%d)\n", err));
-               goto cfg80211_attach_out;
-       }
-       wl_set_drvdata(wl_cfg80211_dev, ci);
-       set_bit(WL_STATUS_READY, &wl->status);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-
-cfg80211_attach_out:
-       wl_free_wdev(wl);
-       return err;
-}
-
-void
-wl_cfg80211_detach(void)
-{
-       struct wl_priv *wl;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl = WL_PRIV_GET();
-
-       wl_deinit_priv(wl);
-       wl_free_wdev(wl);
-       wl_set_drvdata(wl_cfg80211_dev, NULL);
-       kfree(wl_cfg80211_dev);
-       wl_cfg80211_dev = NULL;
-       wl_clear_sdio_func();
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-}
-
-static void
-wl_wakeup_event(struct wl_priv *wl)
-{
-       up(&wl->event_sync);
-}
-
-static int32
-wl_event_handler(void *data)
-{
-       struct wl_priv *wl = (struct wl_priv *)data;
-       struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
-       struct wl_event_q *e;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       sched_setscheduler(current, SCHED_FIFO, &param);
-       while (likely(!down_interruptible(&wl->event_sync))) {
-               if (unlikely(!(e = wl_deq_event(wl)))) {
-                       WL_ERR(("eqeue empty..\n"));
-                       BUG();
-               }
-               WL_DBG(("event type (%d)\n", e->etype));
-               if (wl->el.handler[e->etype]) {
-                       wl->el.handler[e->etype](wl, wl_to_ndev(wl), &e->emsg, e->edata);
-               }       else {
-                       WL_DBG(("Unknown Event (%d): ignoring\n", e->etype));
-               }
-               wl_put_event(e);
-       }
-       complete_and_exit(&wl->event_exit, 0);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-}
-
-void
-wl_cfg80211_event(struct net_device *ndev, const wl_event_msg_t *e, void* data)
-{
-       uint32 event_type = ntoh32(e->event_type);
-       struct wl_priv *wl = ndev_to_wl(ndev);
-#if (WL_DBG_LEVEL > 0)
-       int8 *estr = (event_type <= sizeof(wl_dbg_estr)/WL_DBG_ESTR_MAX-1) ?
-               wl_dbg_estr[event_type] : (int8 *)"Unknown";
-#endif /* (WL_DBG_LEVEL > 0) */
-       WL_DBG(("event_type (%d):""WLC_E_""%s\n", event_type, estr));
-       if (likely(!wl_enq_event(wl, event_type, e, data)))
-               wl_wakeup_event(wl);
-}
-
-static void
-wl_init_eq(struct wl_priv *wl)
-{
-       wl_init_eq_lock(wl);
-       INIT_LIST_HEAD(&wl->eq_list);
-}
-
-static void
-wl_flush_eq(struct wl_priv *wl)
-{
-       struct wl_event_q *e;
-
-       wl_lock_eq(wl);
-       while (!list_empty(&wl->eq_list)) {
-               e = list_first_entry(&wl->eq_list, struct wl_event_q, eq_list);
-               list_del(&e->eq_list);
-               kfree(e);
-       }
-       wl_unlock_eq(wl);
-}
-
-/* 
-* retrieve first queued event from head
-*/
-
-static struct wl_event_q *
-wl_deq_event(struct wl_priv *wl)
-{
-       struct wl_event_q *e = NULL;
-
-       wl_lock_eq(wl);
-       if (likely(!list_empty(&wl->eq_list))) {
-               e = list_first_entry(&wl->eq_list, struct wl_event_q, eq_list);
-               list_del(&e->eq_list);
-       }
-       wl_unlock_eq(wl);
-
-       return e;
-}
-
-/*
-** push event to tail of the queue
-*/
-
-static int32
-wl_enq_event(struct wl_priv *wl, uint32 event, const wl_event_msg_t *msg, void *data)
-{
-       struct wl_event_q *e;
-       int32 err = 0;
-
-       if (unlikely(!(e = kzalloc(sizeof(struct wl_event_q), GFP_KERNEL)))) {
-               WL_ERR(("event alloc failed\n"));
-               return -ENOMEM;
-       }
-
-       e->etype = event;
-       memcpy(&e->emsg, msg, sizeof(wl_event_msg_t));
-       if (data) {
-       }
-       wl_lock_eq(wl);
-       list_add_tail(&e->eq_list, &wl->eq_list);
-       wl_unlock_eq(wl);
-
-       return err;
-}
-
-static void
-wl_put_event(struct wl_event_q *e)
-{
-       kfree(e);
-}
-
-void
-wl_cfg80211_sdio_func(void *func)
-{
-       cfg80211_sdio_func = (struct sdio_func *)func;
-}
-
-static void
-wl_clear_sdio_func(void)
-{
-       cfg80211_sdio_func = NULL;
-}
-
-
-static struct sdio_func  *
-wl_sdio_func(void)
-{
-       return cfg80211_sdio_func;
-}
-
-static int32
-wl_dongle_mode(struct net_device *ndev, int32 iftype)
-{
-       int32 infra = 0;
-       int32 ap = 0;
-       int32 err = 0;
-
-       switch (iftype) {
-       case NL80211_IFTYPE_MONITOR:
-       case NL80211_IFTYPE_WDS:
-               WL_ERR(("type (%d) : currently we do not support this mode\n", iftype));
-               err = -EINVAL;
-               return err;
-       case NL80211_IFTYPE_ADHOC:
-               break;
-       case NL80211_IFTYPE_STATION:
-               infra = 1;
-               break;
-       default:
-               err = -EINVAL;
-               WL_ERR(("invalid type (%d)\n", iftype));
-               return err;
-       }
-       infra = htod32(infra);
-       ap = htod32(ap);
-       WL_DBG(("%s ap (%d), infra (%d)\n", ndev->name, ap, infra));
-       if (unlikely(err = wl_dev_ioctl(ndev, WLC_SET_INFRA, &infra, sizeof(infra))) ||
-               unlikely(err = wl_dev_ioctl(ndev, WLC_SET_AP, &ap, sizeof(ap)))) {
-               WL_ERR(("WLC_SET_INFRA error (%d)\n", err));
-               return err;
-       }
-
-       return -EINPROGRESS;
-}
-
-#ifndef EMBEDDED_PLATFORM
-static int32
-wl_dongle_country(struct net_device *ndev, uint8 ccode)
-{
-
-       int32 err = 0;
-
-
-       return err;
-}
-
-static int32
-wl_dongle_up(struct net_device *ndev, uint32 up)
-{
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (unlikely(err =  wl_dev_ioctl(ndev, WLC_UP, &up, sizeof(up)))) {
-               WL_ERR(("WLC_UP error (%d)\n", err));
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return err;
-}
-
-static int32
-wl_dongle_power(struct net_device *ndev, uint32 power_mode)
-{
-       int32 err = 0;
-
-       if (unlikely(err =  wl_dev_ioctl(ndev, WLC_SET_PM, &power_mode, sizeof(power_mode)))) {
-               WL_ERR(("WLC_SET_PM error (%d)\n", err));
-       }
-       return err;
-}
-
-static int32
-wl_dongle_glom(struct net_device *ndev, uint32 glom, uint32 dongle_align)
-{
-       int8 iovbuf[WL_EVENTING_MASK_LEN + 12]; /*  Room for "event_msgs" + '\0' + bitvec  */
-       int32 err = 0;
-
-       /* Match Host and Dongle rx alignment */
-       bcm_mkiovar("bus:txglomalign", (char *)&dongle_align, 4, iovbuf, sizeof(iovbuf));
-       if (unlikely(err =  wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf)))) {
-               WL_ERR(("txglomalign error (%d)\n", err));
-               goto dongle_glom_out;
-       }
-       /* disable glom option per default */
-       bcm_mkiovar("bus:txglom", (char *)&glom, 4, iovbuf, sizeof(iovbuf));
-       if (unlikely(err =  wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf)))) {
-               WL_ERR(("txglom error (%d)\n", err));
-               goto dongle_glom_out;
-       }
-dongle_glom_out :
-       return err;
-}
-
-static int32
-wl_dongle_roam(struct net_device *ndev, uint32 roamvar, uint32 bcn_timeout)
-{
-       int8 iovbuf[WL_EVENTING_MASK_LEN + 12]; /*  Room for "event_msgs" + '\0' + bitvec  */
-       int32 err = 0;
-
-       /* Setup timeout if Beacons are lost and roam is off to report link down */
-       if (roamvar) {
-               bcm_mkiovar("bcn_timeout", (char *)&bcn_timeout, 4, iovbuf, sizeof(iovbuf));
-               if (unlikely(err =  wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf)))) {
-                       WL_ERR(("bcn_timeout error (%d)\n", err));
-                       goto dongle_rom_out;
-               }
-       }
-       /* Enable/Disable built-in roaming to allow supplicant to take care of roaming */
-       bcm_mkiovar("roam_off", (char *)&roamvar, 4, iovbuf, sizeof(iovbuf));
-       if (unlikely(err =  wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf)))) {
-               WL_ERR(("roam_off error (%d)\n", err));
-               goto dongle_rom_out;
-       }
-dongle_rom_out :
-       return err;
-}
-
-static int32
-wl_dongle_eventmsg(struct net_device *ndev)
-{
-
-       int8 iovbuf[WL_EVENTING_MASK_LEN + 12]; /*  Room for "event_msgs" + '\0' + bitvec  */
-       int8 eventmask[WL_EVENTING_MASK_LEN];
-       int32 err = 0;
-
-       /* Setup event_msgs */
-       bcm_mkiovar("event_msgs", eventmask, WL_EVENTING_MASK_LEN, iovbuf, sizeof(iovbuf));
-       if (unlikely(err =  wl_dev_ioctl(ndev, WLC_GET_VAR, iovbuf, sizeof(iovbuf)))) {
-               WL_ERR(("Get event_msgs error (%d)\n", err));
-               goto dongle_eventmsg_out;
-       }
-       memcpy(eventmask, iovbuf, WL_EVENTING_MASK_LEN);
-
-       setbit(eventmask, WLC_E_SET_SSID);
-       setbit(eventmask, WLC_E_PRUNE);
-       setbit(eventmask, WLC_E_AUTH);
-       setbit(eventmask, WLC_E_REASSOC);
-       setbit(eventmask, WLC_E_REASSOC_IND);
-       setbit(eventmask, WLC_E_DEAUTH_IND);
-       setbit(eventmask, WLC_E_DISASSOC_IND);
-       setbit(eventmask, WLC_E_DISASSOC);
-       setbit(eventmask, WLC_E_JOIN);
-       setbit(eventmask, WLC_E_ASSOC_IND);
-       setbit(eventmask, WLC_E_PSK_SUP);
-       setbit(eventmask, WLC_E_LINK);
-       setbit(eventmask, WLC_E_NDIS_LINK);
-       setbit(eventmask, WLC_E_MIC_ERROR);
-       setbit(eventmask, WLC_E_PMKID_CACHE);
-       setbit(eventmask, WLC_E_TXFAIL);
-       setbit(eventmask, WLC_E_JOIN_START);
-       setbit(eventmask, WLC_E_SCAN_COMPLETE);
-
-       bcm_mkiovar("event_msgs", eventmask, WL_EVENTING_MASK_LEN, iovbuf, sizeof(iovbuf));
-       if (unlikely(err =  wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf)))) {
-               WL_ERR(("Set event_msgs error (%d)\n", err));
-               goto dongle_eventmsg_out;
-       }
-
-dongle_eventmsg_out :
-       return err;
-}
-
-static int32
-wl_dongle_scantime(struct net_device *ndev, int32 scan_assoc_time, int32 scan_unassoc_time)
-{
-       int32 err = 0;
-
-       if ((err =  wl_dev_ioctl(ndev, WLC_SET_SCAN_CHANNEL_TIME, &scan_assoc_time,
-               sizeof(scan_assoc_time)))) {
-               if (err == -EOPNOTSUPP) {
-                       WL_INFO(("Scan assoc time is not supported\n"));
-               } else {
-                       WL_ERR(("Scan assoc time error (%d)\n", err));
-               }
-               goto dongle_scantime_out;
-       }
-       if ((err =  wl_dev_ioctl(ndev, WLC_SET_SCAN_UNASSOC_TIME, &scan_unassoc_time,
-               sizeof(scan_unassoc_time)))) {
-               if (err == -EOPNOTSUPP) {
-                       WL_INFO(("Scan unassoc time is not supported\n"));
-               } else {
-                       WL_ERR(("Scan unassoc time error (%d)\n", err));
-               }
-               goto dongle_scantime_out;
-       }
-
-dongle_scantime_out :
-       return err;
-}
-
-static int32
-wl_dongle_offload(struct net_device *ndev, int32 arpoe, int32 arp_ol)
-{
-       int8 iovbuf[WL_EVENTING_MASK_LEN + 12]; /*  Room for "event_msgs" + '\0' + bitvec  */
-       int32 err = 0;
-
-       /* Set ARP offload */
-       bcm_mkiovar("arpoe", (char *)&arpoe, 4, iovbuf, sizeof(iovbuf));
-       if ((err =  wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf)))) {
-               if (err == -EOPNOTSUPP) {
-                       WL_INFO(("arpoe is not supported\n"));
-               } else {
-                       WL_ERR(("arpoe error (%d)\n", err));
-               }
-               goto dongle_offload_out;
-       }
-       bcm_mkiovar("arp_ol", (char *)&arp_ol, 4, iovbuf, sizeof(iovbuf));
-       if ((err =  wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf)))) {
-               if (err == -EOPNOTSUPP) {
-                       WL_INFO(("arp_ol is not supported\n"));
-               } else {
-                       WL_ERR(("arp_ol error (%d)\n", err));
-               }
-               goto dongle_offload_out;
-       }
-
-dongle_offload_out :
-       return err;
-}
-
-static int32
-wl_pattern_atoh(int8 *src, int8 *dst)
-{
-#define strtoul(nptr, endptr, base) bcm_strtoul((nptr), (endptr), (base))
-       int i;
-       if (strncmp(src, "0x", 2) != 0 &&
-           strncmp(src, "0X", 2) != 0) {
-               WL_ERR(("Mask invalid format. Needs to start with 0x\n"));
-               return -1;
-       }
-       src = src + 2; /* Skip past 0x */
-       if (strlen(src) % 2 != 0) {
-               WL_ERR(("Mask invalid format. Needs to be of even length\n"));
-               return -1;
-       }
-       for (i = 0; *src != '\0'; i++) {
-               char num[3];
-               strncpy(num, src, 2);
-               num[2] = '\0';
-               dst[i] = (uint8)strtoul(num, NULL, 16);
-               src += 2;
-       }
-       return i;
-}
-
-static int32
-wl_dongle_filter(struct net_device *ndev, uint32 filter_mode)
-{
-       int8 iovbuf[WL_EVENTING_MASK_LEN + 12]; /*  Room for "event_msgs" + '\0' + bitvec  */
-       const int8                              *str;
-       struct wl_pkt_filter            pkt_filter;
-       struct wl_pkt_filter            *pkt_filterp;
-       int32                                           buf_len;
-       int32                                           str_len;
-       uint32                                  mask_size;
-       uint32                                  pattern_size;
-       int8 buf[256];
-       int32 err = 0;
-
-/* add a default packet filter pattern */
-       str = "pkt_filter_add";
-       str_len = strlen(str);
-       strncpy(buf, str, str_len);
-       buf[ str_len ] = '\0';
-       buf_len = str_len + 1;
-
-       pkt_filterp = (struct wl_pkt_filter *) (buf + str_len + 1);
-
-       /* Parse packet filter id. */
-       pkt_filter.id = htod32(100);
-
-       /* Parse filter polarity. */
-       pkt_filter.negate_match = htod32(0);
-
-       /* Parse filter type. */
-       pkt_filter.type = htod32(0);
-
-       /* Parse pattern filter offset. */
-       pkt_filter.u.pattern.offset = htod32(0);
-
-       /* Parse pattern filter mask. */
-       mask_size =     htod32(wl_pattern_atoh("0xff",
-               (char *) pkt_filterp->u.pattern.mask_and_pattern));
-
-       /* Parse pattern filter pattern. */
-       pattern_size = htod32(wl_pattern_atoh("0x00",
-               (char *) &pkt_filterp->u.pattern.mask_and_pattern[mask_size]));
-
-       if (mask_size != pattern_size) {
-               WL_ERR(("Mask and pattern not the same size\n"));
-               err = -EINVAL;
-               goto dongle_filter_out;
-       }
-
-       pkt_filter.u.pattern.size_bytes = mask_size;
-       buf_len += WL_PKT_FILTER_FIXED_LEN;
-       buf_len += (WL_PKT_FILTER_PATTERN_FIXED_LEN + 2 * mask_size);
-
-       /* Keep-alive attributes are set in local       variable (keep_alive_pkt), and
-       ** then memcpy'ed into buffer (keep_alive_pktp) since there is no
-       ** guarantee that the buffer is properly aligned.
-       */
-       memcpy((char *)pkt_filterp, &pkt_filter,
-               WL_PKT_FILTER_FIXED_LEN + WL_PKT_FILTER_PATTERN_FIXED_LEN);
-
-       if ((err =  wl_dev_ioctl(ndev, WLC_SET_VAR, buf, buf_len))) {
-               if (err == -EOPNOTSUPP) {
-                       WL_INFO(("filter not supported\n"));
-               } else {
-                       WL_ERR(("filter (%d)\n", err));
-               }
-               goto dongle_filter_out;
-       }
-
-       /* set mode to allow pattern */
-       bcm_mkiovar("pkt_filter_mode", (char *)&filter_mode, 4, iovbuf, sizeof(iovbuf));
-       if ((err =  wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf)))) {
-               if (err == -EOPNOTSUPP) {
-                       WL_INFO(("filter_mode not supported\n"));
-               } else {
-                       WL_ERR(("filter_mode (%d)\n", err));
-               }
-               goto dongle_filter_out;
-       }
-
-dongle_filter_out :
-       return err;
-}
-#endif /* !EMBEDDED_PLATFORM */
-
-int32
-wl_config_dongle(struct wl_priv *wl, bool need_lock)
-{
-#ifndef DHD_SDALIGN
-#define DHD_SDALIGN    32
-#endif
-       struct net_device *ndev;
-       struct wireless_dev *wdev;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (wl->dongle_up)
-               return err;
-
-
-       ndev = wl_to_ndev(wl);
-       wdev = ndev->ieee80211_ptr;
-       if (need_lock)
-               rtnl_lock();
-
-#ifndef EMBEDDED_PLATFORM
-       if (unlikely((err = wl_dongle_up(ndev, 0))))
-               goto default_conf_out;
-       if (unlikely((err = wl_dongle_country(ndev, 0))))
-               goto default_conf_out;
-       if (unlikely((err = wl_dongle_power(ndev, PM_FAST))))
-               goto default_conf_out;
-       if (unlikely((err = wl_dongle_glom(ndev, 0, DHD_SDALIGN))))
-               goto default_conf_out;
-       if (unlikely((err = wl_dongle_roam(ndev, (wl->roam_on ? 0 : 1), 3))))
-               goto default_conf_out;
-       if (unlikely((err = wl_dongle_eventmsg(ndev))))
-               goto default_conf_out;
-
-       wl_dongle_scantime(ndev, 40, 80);
-       wl_dongle_offload(ndev, 1, 0xf);
-       wl_dongle_filter(ndev, 1);
-#endif /* !EMBEDDED_PLATFORM */
-
-       err = wl_dongle_mode(ndev, wdev->iftype);
-       if (unlikely(err && err != -EINPROGRESS))
-               goto default_conf_out;
-       if (unlikely((err = wl_dongle_probecap(wl))))
-               goto default_conf_out;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       /* -EINPROGRESS: Call commit handler */
-
-default_conf_out :
-       if (need_lock)
-               rtnl_unlock();
-
-       wl->dongle_up = TRUE;
-
-       return err;
-
-}
-
-static int32
-wl_update_wiphybands(struct wl_priv *wl)
-{
-       struct wiphy *wiphy;
-       int32 phy_list;
-       int8 phy;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       if (unlikely(err =  wl_dev_ioctl(wl_to_ndev(wl), WLC_GET_PHYLIST, &phy_list,
-               sizeof(phy_list)))) {
-               WL_ERR(("error (%d)\n", err));
-               return err;
-       }
-
-       phy = ((char *)&phy_list)[1];
-       WL_DBG(("%c phy\n", phy));
-       if (phy == 'n' || phy == 'a') {
-               wiphy = wl_to_wiphy(wl);
-               wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-__wl_cfg80211_up(struct wl_priv *wl)
-{
-       int32 err = 0;
-
-       if (unlikely(err = wl_config_dongle(wl, FALSE)))
-               return err;
-
-       wl_invoke_iscan(wl);
-       set_bit(WL_STATUS_READY, &wl->status);
-       return err;
-}
-
-static int32
-__wl_cfg80211_down(struct wl_priv *wl)
-{
-       int32 err = 0;
-
-       /* Check if cfg80211 interface is already down */
-       if (!test_bit(WL_STATUS_READY, &wl->status))
-               return err;        /* it is even not ready */
-
-       set_bit(WL_STATUS_SCAN_ABORTING, &wl->status);
-       wl_term_iscan(wl);
-       if (wl->scan_request) {
-               cfg80211_scan_done(wl->scan_request, TRUE); /* TRUE means abort */
-               wl->scan_request = NULL;
-       }
-       clear_bit(WL_STATUS_READY, &wl->status);
-       clear_bit(WL_STATUS_SCANNING, &wl->status);
-       clear_bit(WL_STATUS_SCAN_ABORTING, &wl->status);
-       clear_bit(WL_STATUS_CONNECTED, &wl->status);
-
-       return err;
-}
-
-int32
-wl_cfg80211_up(void)
-{
-       struct wl_priv *wl;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl = WL_PRIV_GET();
-       mutex_lock(&wl->usr_sync);
-       err = __wl_cfg80211_up(wl);
-       mutex_unlock(&wl->usr_sync);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-int32
-wl_cfg80211_down(void)
-{
-       struct wl_priv *wl;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl = WL_PRIV_GET();
-       mutex_lock(&wl->usr_sync);
-       err = __wl_cfg80211_down(wl);
-       mutex_unlock(&wl->usr_sync);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-       return err;
-}
-
-static int32
-wl_dongle_probecap(struct wl_priv *wl)
-{
-       int32 err = 0;
-
-       if (unlikely((err = wl_update_wiphybands(wl))))
-               return err;
-
-       return err;
-}
-
-static void *
-wl_read_prof(struct wl_priv *wl, int32 item)
-{
-       switch (item) {
-       case WL_PROF_SEC:
-               return &wl->profile->sec;
-       case WL_PROF_ACT:
-               return &wl->profile->active;
-       case WL_PROF_BSSID:
-               return &wl->profile->bssid;
-       case WL_PROF_SSID:
-               return &wl->profile->ssid;
-       }
-       WL_ERR(("invalid item (%d)\n", item));
-       return NULL;
-}
-
-static int32
-wl_update_prof(struct wl_priv *wl, const wl_event_msg_t *e, void *data, int32 item)
-{
-       int32 err = 0;
-       struct wlc_ssid *ssid;
-
-       switch (item) {
-       case WL_PROF_SSID:
-               ssid = (wlc_ssid_t *)data;
-               memset(wl->profile->ssid.SSID, 0, sizeof(wl->profile->ssid.SSID));
-               memcpy(wl->profile->ssid.SSID, ssid->SSID, ssid->SSID_len);
-               wl->profile->ssid.SSID_len = ssid->SSID_len;
-               break;
-       case WL_PROF_BSSID:
-               if (data)
-                       memcpy(wl->profile->bssid, data, ETHER_ADDR_LEN);
-               else
-                       memset(wl->profile->bssid, 0, ETHER_ADDR_LEN);
-               break;
-       case WL_PROF_SEC:
-               memcpy(&wl->profile->sec, data, sizeof(wl->profile->sec));
-               break;
-       case WL_PROF_ACT:
-               wl->profile->active = *(bool *)data;
-               break;
-       default :
-               WL_ERR(("unsupported item (%d)\n", item));
-               err = -EOPNOTSUPP;
-               break;
-       }
-
-       return err;
-}
-
-void
-wl_cfg80211_dbg_level(uint32 level)
-{
-       wl_dbg_level = level;
-}
-
-static bool
-wl_is_ibssmode(struct wl_priv *wl)
-{
-       return (wl->conf->mode == WL_MODE_IBSS);
-}
-
-static bool
-wl_is_ibssstarter(struct wl_priv *wl)
-{
-       return wl->ibss_starter;
-}
-
-static void
-wl_rst_ie(struct wl_priv *wl)
-{
-       struct wl_ie *ie = wl_to_ie(wl);
-
-       ie->offset = 0;
-}
-
-static int32
-wl_add_ie(struct wl_priv *wl, uint8 t, uint8 l, uint8 *v)
-{
-       struct wl_ie *ie = wl_to_ie(wl);
-       int32 err = 0;
-
-       if (unlikely(ie->offset + l + 2 > WL_TLV_INFO_MAX)) {
-               WL_ERR(("ei crosses buffer boundary\n"));
-               return -ENOSPC;
-       }
-       ie->buf[ie->offset] = t;
-       ie->buf[ie->offset+1] = l;
-       memcpy(&ie->buf[ie->offset+2], v, l);
-       ie->offset += l+2;
-
-       return err;
-}
-
-static int32
-wl_mrg_ie(struct wl_priv *wl, uint8 *ie_stream, uint16 ie_size)
-{
-       struct wl_ie *ie = wl_to_ie(wl);
-       int32 err = 0;
-
-       if (unlikely(ie->offset + ie_size > WL_TLV_INFO_MAX)) {
-               WL_ERR(("ei_stream crosses buffer boundary\n"));
-               return -ENOSPC;
-       }
-       memcpy(&ie->buf[ie->offset], ie_stream,  ie_size);
-       ie->offset += ie_size;
-
-       return err;
-}
-
-static int32
-wl_cp_ie(struct wl_priv *wl, uint8 *dst, uint16 dst_size)
-{
-       struct wl_ie *ie = wl_to_ie(wl);
-       int32 err = 0;
-
-       if (unlikely(ie->offset > dst_size)) {
-               WL_ERR(("dst_size is not enough\n"));
-               return -ENOSPC;
-       }
-       memcpy(dst, &ie->buf[0], ie->offset);
-
-       return err;
-}
-
-static uint32
-wl_get_ielen(struct wl_priv *wl)
-{
-       struct wl_ie *ie = wl_to_ie(wl);
-
-       return ie->offset;
-}
-
-static void
-wl_link_up(struct wl_priv *wl)
-{
-       wl->link_up = TRUE;
-}
-
-static void
-wl_link_down(struct wl_priv *wl)
-{
-       struct wl_connect_info *conn_info = wl_to_conn(wl);
-
-       wl->link_up = FALSE;
-       if (conn_info->req_ie) {
-               kfree(conn_info->req_ie);
-               conn_info->req_ie = NULL;
-       }
-       conn_info->req_ie_len = 0;
-       if (conn_info->resp_ie) {
-               kfree(conn_info->resp_ie);
-               conn_info->resp_ie = NULL;
-       }
-       conn_info->resp_ie_len = 0;
-}
-
-static void
-wl_lock_eq(struct wl_priv *wl)
-{
-       spin_lock_irq(&wl->eq_lock);
-}
-
-static void
-wl_unlock_eq(struct wl_priv *wl)
-{
-       spin_unlock_irq(&wl->eq_lock);
-}
-
-static void
-wl_init_eq_lock(struct wl_priv *wl)
-{
-       spin_lock_init(&wl->eq_lock);
-}
-
-static void
-wl_delay(uint32 ms)
-{
-       if (ms < 1000 / HZ) {
-               cond_resched();
-               mdelay(ms);
-       } else {
-               msleep(ms);
-       }
-}
-
-static void
-wl_set_drvdata(struct wl_dev *dev, void *data)
-{
-       dev->driver_data = data;
-}
-
-static void *
-wl_get_drvdata(struct wl_dev *dev)
-{
-       return dev->driver_data;
-}
-
-int32
-wl_cfg80211_read_fw(int8 *buf, uint32 size)
-{
-       const struct firmware *fw_entry;
-       struct wl_priv *wl;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In : size (%d)\n", size));
-#endif
-       wl = WL_PRIV_GET();
-
-       fw_entry = wl->fw->fw_entry;
-
-       if (fw_entry->size < wl->fw->ptr + size) {
-               size = fw_entry->size - wl->fw->ptr;
-       }
-       memcpy(buf, &fw_entry->data[wl->fw->ptr], size);
-       wl->fw->ptr += size;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out : size (%d)\n", size));
-#endif
-       return size;
-}
-
-void
-wl_cfg80211_release_fw(void)
-{
-       struct wl_priv *wl;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl = WL_PRIV_GET();
-       release_firmware(wl->fw->fw_entry);
-       wl->fw->ptr = 0;
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-}
-
-void *
-wl_cfg80211_request_fw(int8 *file_name)
-{
-       struct wl_priv *wl;
-       const struct firmware *fw_entry = NULL;
-       int32 err = 0;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       WL_DBG(("file name : \"%s\"\n", file_name));
-       wl = WL_PRIV_GET();
-
-       if (!test_bit(WL_FW_LOADING_DONE, &wl->fw->status)) {
-               if (unlikely(err = request_firmware(&wl->fw->fw_entry, file_name,
-                       &wl_sdio_func()->dev))) {
-                       WL_ERR(("Could not download fw (%d)\n", err));
-                       goto req_fw_out;
-               }
-               set_bit(WL_FW_LOADING_DONE, &wl->fw->status);
-               fw_entry = wl->fw->fw_entry;
-               if (fw_entry) {
-                       WL_DBG(("fw size (%d), data (%p)\n", fw_entry->size, fw_entry->data));
-               }
-       } else if (!test_bit(WL_NVRAM_LOADING_DONE, &wl->fw->status)) {
-               if (unlikely(err = request_firmware(&wl->fw->fw_entry, file_name,
-                       &wl_sdio_func()->dev))) {
-                       WL_ERR(("Could not download nvram (%d)\n", err));
-                       goto req_fw_out;
-               }
-               set_bit(WL_NVRAM_LOADING_DONE, &wl->fw->status);
-               fw_entry = wl->fw->fw_entry;
-               if (fw_entry) {
-                       WL_DBG(("nvram size (%d), data (%p)\n", fw_entry->size, fw_entry->data));
-               }
-       } else {
-               WL_DBG(("Downloading already done. Nothing to do more\n"));
-               err = -EPERM;
-       }
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-
-req_fw_out:
-       if (unlikely(err)) {
-               return NULL;
-       }
-       wl->fw->ptr = 0;
-       return (void *)fw_entry->data;
-}
-
-int8 *
-wl_cfg80211_get_fwname(void)
-{
-       struct wl_priv *wl;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl = WL_PRIV_GET();
-       strcpy(wl->fw->fw_name, WL_4329_FW_FILE);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return wl->fw->fw_name;
-}
-
-int8 *
-wl_cfg80211_get_nvramname(void)
-{
-       struct wl_priv *wl;
-
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("In\n"));
-#endif
-       wl = WL_PRIV_GET();
-       strcpy(wl->fw->nvram_name, WL_4329_NVRAM_FILE);
-#ifdef WL_CFG80211_BACKTRACE
-       WL_DBG(("Out\n"));
-#endif
-       return wl->fw->nvram_name;
-}
diff --git a/drivers/net/wireless/bcm4319/wl_cfg80211.h b/drivers/net/wireless/bcm4319/wl_cfg80211.h
deleted file mode 100644 (file)
index 2722699..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Linux Cfg80211 support
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: wl_cfg80211.h,v 1.1.2.19 2010/05/04 21:21:00 Exp $
- */
-
-#ifndef _wl_cfg80211_h_
-#define _wl_cfg80211_h_
-
-#include <linux/wireless.h>
-#include <typedefs.h>
-#include <proto/ethernet.h>
-#include <wlioctl.h>
-#include <linux/wireless.h>
-#include <net/cfg80211.h>
-
-struct wl_conf;
-struct wl_iface;
-struct wl_priv;
-struct wl_security;
-struct wl_ibss;
-
-#if defined(IL_BIGENDIAN)
-#include <bcmendian.h>
-#define htod32(i) (bcmswap32(i))
-#define htod16(i) (bcmswap16(i))
-#define dtoh32(i) (bcmswap32(i))
-#define dtoh16(i) (bcmswap16(i))
-#define htodchanspec(i) htod16(i)
-#define dtohchanspec(i) dtoh16(i)
-#else
-#define htod32(i) i
-#define htod16(i) i
-#define dtoh32(i) i
-#define dtoh16(i) i
-#define htodchanspec(i) i
-#define dtohchanspec(i) i
-#endif
-
-#define WL_DBG_NONE    0
-#define WL_DBG_DBG     (1 << 2)
-#define WL_DBG_INFO    (1 << 1)
-#define WL_DBG_ERR     (1 << 0)
-#define WL_DBG_MASK ((WL_DBG_DBG | WL_DBG_INFO | WL_DBG_ERR) << 1)
-
-#define WL_DBG_LEVEL 1 /* 0 invalidates all debug messages. default is 1 */
-#define        WL_ERR(args)                                                                    \
-       do {                                                                            \
-               if (wl_dbg_level & WL_DBG_ERR) {                                \
-                       if (net_ratelimit()) {                                          \
-                               printk("ERROR @%s : ", __FUNCTION__);   \
-                               printk args;                                            \
-                       }                                                               \
-               }                                                                       \
-       } while (0)
-#define        WL_INFO(args)                                                                   \
-       do {                                                                            \
-               if (wl_dbg_level & WL_DBG_INFO) {                               \
-                       if (net_ratelimit()) {                                          \
-                               printk("INFO @%s : ", __FUNCTION__);    \
-                               printk args;                                            \
-                       }                                                               \
-               }                                                                       \
-       } while (0)
-#if (WL_DBG_LEVEL > 0)
-#define        WL_DBG(args)                                                            \
-       do {                                                                    \
-               if (wl_dbg_level & WL_DBG_DBG) {                        \
-                       printk("DEBUG @%s :", __FUNCTION__);    \
-                       printk args;                                                    \
-               }                                                                       \
-       } while (0)
-#else /* !(WL_DBG_LEVEL > 0) */
-#define        WL_DBG(args)
-#endif /* (WL_DBG_LEVEL > 0) */
-
-#define WL_SCAN_RETRY_MAX              3       /* used for ibss scan */
-#define WL_NUM_SCAN_MAX                1
-#define WL_NUM_PMKIDS_MAX              MAXPMKID        /* will be used for 2.6.33 kernel
-                                                       * or later 
-                                                       */
-#define WL_SCAN_BUF_MAX                (1024 * 8)
-#define WL_TLV_INFO_MAX                1024
-#define WL_BSS_INFO_MAX                        2048
-#define WL_ASSOC_INFO_MAX              512     /* 
-                                               * needs to grab assoc info from dongle to 
-                                               * report it to cfg80211 through "connect"
-                                               * event 
-                                               */
-#define WL_IOCTL_LEN_MAX               1024
-#define WL_EXTRA_BUF_MAX               2048
-#define WL_ISCAN_BUF_MAX               2048    /* the buf lengh can be WLC_IOCTL_MAXLEN (8K)
-                                               * to reduce iteration 
-                                               */
-#define WL_ISCAN_TIMER_INTERVAL_MS     3000
-#define WL_SCAN_ERSULTS_LAST   (WL_SCAN_RESULTS_NO_MEM+1)
-#define WL_AP_MAX                              256     /* virtually unlimitted as long
-                                                       * as kernel memory allows
-                                                       */
-#define WL_FILE_NAME_MAX               256
-
-/* dongle status */
-enum wl_status {
-       WL_STATUS_READY,
-       WL_STATUS_SCANNING,
-       WL_STATUS_SCAN_ABORTING,
-       WL_STATUS_CONNECTING,
-       WL_STATUS_CONNECTED
-};
-
-/* wi-fi mode */
-enum wl_mode {
-       WL_MODE_BSS,
-       WL_MODE_IBSS,
-       WL_MODE_AP
-};
-
-/* dongle profile list */
-enum wl_prof_list {
-       WL_PROF_MODE,
-       WL_PROF_SSID,
-       WL_PROF_SEC,
-       WL_PROF_IBSS,
-       WL_PROF_BAND,
-       WL_PROF_BSSID,
-       WL_PROF_ACT
-};
-
-/* dongle iscan state */
-enum wl_iscan_state {
-       WL_ISCAN_STATE_IDLE,
-       WL_ISCAN_STATE_SCANING
-};
-
-/* fw downloading status */
-enum wl_fw_status {
-       WL_FW_LOADING_DONE,
-       WL_NVRAM_LOADING_DONE
-};
-
-/* dongle configuration */
-struct wl_conf {
-       uint32 mode;    /* adhoc , infrastructure or ap */
-       uint32 frag_threshold;
-       uint32 rts_threshold;
-       uint32 retry_short;
-       uint32 retry_long;
-       int32 tx_power;
-       struct ieee80211_channel channel;
-};
-
-/* cfg80211 main event loop */
-struct wl_event_loop {
-       int32 (*handler[WLC_E_LAST])(struct wl_priv *wl, struct net_device *ndev,
-               const wl_event_msg_t *e, void *data);
-};
-
-/* representing interface of cfg80211 plane */
-struct wl_iface {
-       struct wl_priv *wl;
-};
-
-struct wl_dev {
-       void *driver_data;      /* to store cfg80211 object information */
-};
-
-/* bss inform structure for cfg80211 interface */
-struct wl_cfg80211_bss_info {
-       uint16 band;
-       uint16 channel;
-       int16 rssi;
-       uint16 frame_len;
-       uint8 frame_buf[1];
-};
-
-/* basic structure of scan request */
-struct wl_scan_req {
-       struct wlc_ssid ssid;
-};
-
-/* basic structure of information element */
-struct wl_ie {
-       uint16 offset;
-       uint8 buf[WL_TLV_INFO_MAX];
-};
-
-/* event queue for cfg80211 main event */
-struct wl_event_q {
-       struct list_head eq_list;
-       uint32 etype;
-       wl_event_msg_t emsg;
-       int8 edata[1];
-};
-
-/* security information with currently associated ap */
-struct wl_security {
-       uint32 wpa_versions;
-       uint32 auth_type;
-       uint32 cipher_pairwise;
-       uint32 cipher_group;
-       uint32 wpa_auth;
-};
-
-/* ibss information for currently joined ibss network */
-struct wl_ibss {
-       uint8 beacon_interval;  /* in millisecond */
-       uint8 atim;             /* in millisecond */
-       int8 join_only;
-       uint8 band;
-       uint8 channel;
-};
-
-/* dongle profile */
-struct wl_profile {
-       uint32 mode;
-       struct wlc_ssid ssid;
-       uint8 bssid[ETHER_ADDR_LEN];
-       struct wl_security sec;
-       struct wl_ibss ibss;
-       int32 band;
-       bool active;
-};
-
-/* dongle iscan event loop */
-struct wl_iscan_eloop {
-       int32 (*handler[WL_SCAN_ERSULTS_LAST])(struct wl_priv *wl);
-};
-
-/* dongle iscan controller */
-struct wl_iscan_ctrl {
-       struct net_device *dev;
-       struct timer_list timer;
-       uint32 timer_ms;
-       uint32 timer_on;
-       int32 state;
-       int32 pid;
-       struct semaphore sync;
-       struct completion exited;
-       struct wl_iscan_eloop el;
-       void *data;
-       int8 ioctl_buf[WLC_IOCTL_SMLEN];
-       int8 scan_buf[WL_ISCAN_BUF_MAX];
-};
-
-/* association inform */
-struct wl_connect_info {
-       uint8 *req_ie;
-       int32 req_ie_len;
-       uint8 *resp_ie;
-       int32 resp_ie_len;
-};
-
-/* firmware /nvram downloading controller */
-struct wl_fw_ctrl {
-       const struct firmware *fw_entry;
-       ulong status;
-       uint32 ptr;
-       int8 fw_name[WL_FILE_NAME_MAX];
-       int8 nvram_name[WL_FILE_NAME_MAX];
-};
-
-/* assoc ie length */
-struct wl_assoc_ielen {
-       uint32  req_len;
-       uint32  resp_len;
-};
-
-/* wpa2 pmk list */
-struct wl_pmk_list {
-       pmkid_list_t pmkids;
-       pmkid_t foo[MAXPMKID-1];
-};
-
-
-/* dongle private data of cfg80211 interface */
-struct wl_priv {
-       struct wireless_dev *wdev;      /* representing wl cfg80211 device */
-       struct wl_conf *conf;   /* dongle configuration */
-       struct cfg80211_scan_request *scan_request;     /* scan request object */
-       struct wl_event_loop el;        /* main event loop */
-       struct list_head        eq_list;        /* used for event queue */
-       spinlock_t eq_lock;     /* for event queue synchronization */
-       struct mutex usr_sync;  /* maily for dongle up/down synchronization */
-       struct wl_scan_results *bss_list;       /* bss_list holding scanned ap information */
-       struct wl_scan_results *scan_results;
-       struct wl_scan_req *scan_req_int;       /* scan request object for internal purpose */
-       struct wl_cfg80211_bss_info *bss_info;  /* bss information for cfg80211 layer */
-       struct wl_ie ie;        /* information element object for internal purpose */
-       struct ether_addr bssid;        /* bssid of currently engaged network */
-       struct semaphore event_sync;    /* for synchronization of main event thread */
-       struct completion event_exit;
-       struct wl_profile *profile;             /* holding dongle profile */
-       struct wl_iscan_ctrl *iscan;    /* iscan controller */
-       struct wl_connect_info conn_info;       /* association information container */
-       struct wl_fw_ctrl *fw;  /* control firwmare / nvram paramter downloading */
-       struct wl_pmk_list *pmk_list;   /* wpa2 pmk list */
-       int32 event_pid;        /* pid of main event handler thread */
-       ulong status;   /* current dongle status */
-       void * pub;
-       uint32 channel; /* current channel */
-       bool iscan_on;  /* iscan on/off switch */
-       bool iscan_kickstart;   /* indicate iscan already started */
-       bool active_scan;       /* current scan mode */
-       bool ibss_starter;      /* indicates this sta is ibss starter */
-       bool link_up;   /* link/connection up flag */
-       bool pwr_save;  /* indicate whether dongle to support power save mode */
-       bool dongle_up; /* indicate whether dongle up or not */
-       bool roam_on;   /* on/off switch for dongle self-roaming */
-       bool scan_tried;        /* indicates if first scan attempted */
-       uint8 *ioctl_buf;       /* ioctl buffer */
-       uint8 *extra_buf;       /* maily to grab assoc information */
-       uint8 ci[0] __attribute__((__aligned__(NETDEV_ALIGN)));
-};
-
-#define wl_to_dev(w) (wiphy_dev(wl->wdev->wiphy))
-#define wl_to_wiphy(w) (w->wdev->wiphy)
-#define wiphy_to_wl(w) ((struct wl_priv *)(wiphy_priv(w)))
-#define wl_to_wdev(w) (w->wdev)
-#define wdev_to_wl(w) ((struct wl_priv *)(wdev_priv(w)))
-#define wl_to_ndev(w) (w->wdev->netdev)
-#define ndev_to_wl(n) (wdev_to_wl(n->ieee80211_ptr))
-#define ci_to_wl(c) (ci->wl)
-#define wl_to_ci(w) (&w->ci)
-#define wl_to_sr(w) (w->scan_req_int)
-#define wl_to_ie(w) (&w->ie)
-#define iscan_to_wl(i) ((struct wl_priv *)(i->data))
-#define wl_to_iscan(w) (w->iscan)
-#define wl_to_conn(w) (&w->conn_info)
-
-inline static struct wl_bss_info * next_bss(struct wl_scan_results *list,
-       struct wl_bss_info *bss) {
-       return (bss = bss ?
-        (struct wl_bss_info *)((uintptr)bss + dtoh32(bss->length)) : list->bss_info);
-}
-#define for_each_bss(list, bss, __i)   \
-       for (__i = 0; __i < list->count && __i < WL_AP_MAX; __i++, bss = next_bss(list, bss))
-
-extern int32 wl_cfg80211_attach(struct net_device *ndev, void *data);
-extern void wl_cfg80211_detach(void);
-/* event handler from dongle */
-extern void wl_cfg80211_event(struct net_device *ndev, const wl_event_msg_t *e, void* data);
-extern void wl_cfg80211_sdio_func(void *func); /* set sdio function info */
-extern int32 wl_cfg80211_up(void);     /* dongle up */
-extern int32 wl_cfg80211_down(void);   /* dongle down */
-extern void wl_cfg80211_dbg_level(uint32 level);       /* set dongle debugging level */
-extern void * wl_cfg80211_request_fw(int8 *file_name); /* request fw /nvram downloading */
-extern int32 wl_cfg80211_read_fw(int8 *buf, uint32 size);      /* read fw image */
-extern void wl_cfg80211_release_fw(void);      /* release fw */
-extern int8 * wl_cfg80211_get_fwname(void); /* get firmware name for the dongle */
-extern int8 * wl_cfg80211_get_nvramname(void); /* get nvram name for the dongle */
-
-#endif /* _wl_cfg80211_h_ */
diff --git a/drivers/net/wireless/bcm4319/wl_iw.c b/drivers/net/wireless/bcm4319/wl_iw.c
deleted file mode 100644 (file)
index c25cf2c..0000000
+++ /dev/null
@@ -1,7591 +0,0 @@
-/*
- * Linux Wireless Extensions support
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: wl_iw.c,v 1.51.4.9.2.6.4.124 2010/07/27 20:46:02 Exp $
- */
-
-#include <wlioctl.h>
-
-#include <typedefs.h>
-#include <linuxver.h>
-#include <osl.h>
-
-#include <bcmutils.h>
-#include <bcmendian.h>
-#include <proto/ethernet.h>
-
-#include <linux/if_arp.h>
-#include <asm/uaccess.h>
-
-#include <dngl_stats.h>
-#include <dhd.h>
-#include <dhdioctl.h>
-
-typedef void wlc_info_t;
-typedef void wl_info_t;
-typedef const struct si_pub  si_t;
-#include <wlioctl.h>
-
-#include <proto/ethernet.h>
-#include <dngl_stats.h>
-#include <dhd.h>
-#include <dhd_dbg.h>
-#define WL_ERROR(x) DHD_ERROR(x)
-#define WL_TRACE(x) DHD_TRACE(x)
-#define WL_ASSOC(x)
-#define WL_INFORM(x)
-#define WL_WSEC(x)
-#define WL_SCAN(x)
-
-#include <wl_iw.h>
-
-#ifndef IW_ENCODE_ALG_SM4
-#define IW_ENCODE_ALG_SM4 0x20
-#endif
-
-#ifndef IW_AUTH_WAPI_ENABLED
-#define IW_AUTH_WAPI_ENABLED 0x20
-#endif
-
-#ifndef IW_AUTH_WAPI_VERSION_1
-#define IW_AUTH_WAPI_VERSION_1 0x00000008
-#endif
-
-#ifndef IW_AUTH_CIPHER_SMS4
-#define IW_AUTH_CIPHER_SMS4    0x00000020
-#endif
-
-#ifndef IW_AUTH_KEY_MGMT_WAPI_PSK
-#define IW_AUTH_KEY_MGMT_WAPI_PSK 4
-#endif
-
-#ifndef IW_AUTH_KEY_MGMT_WAPI_CERT
-#define IW_AUTH_KEY_MGMT_WAPI_CERT 8
-#endif
-
-
-#define IW_WSEC_ENABLED(wsec)  ((wsec) & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED | SMS4_ENABLED))
-
-#include <linux/rtnetlink.h>
-
-#define WL_IW_USE_ISCAN  1
-#define ENABLE_ACTIVE_PASSIVE_SCAN_SUPPRESS  1
-
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       struct mutex  g_wl_ss_scan_lock; 
-#endif 
-
-#if defined(SOFTAP)
-#define WL_SOFTAP(x) DHD_TRACE(x)
-static struct net_device *priv_dev;
-static bool    ap_cfg_running = FALSE;
-static bool    ap_fw_loaded = FALSE;
-struct net_device *ap_net_dev = NULL;
-struct semaphore  ap_eth_sema;
-static int wl_iw_set_ap_security(struct net_device *dev, struct ap_profile *ap);
-static int wl_iw_softap_deassoc_stations(struct net_device *dev);
-#endif 
-
-#define WL_IW_IOCTL_CALL(func_call) \
-       do {                            \
-               func_call;              \
-       } while (0)
-
-static int             g_onoff = G_WLAN_SET_ON;
-
-extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
-       uint32 reason, char* stringBuf, uint buflen);
-#include <bcmsdbus.h>
-extern void dhd_customer_gpio_wlan_ctrl(int onoff);
-extern uint dhd_dev_reset(struct net_device *dev, uint8 flag);
-extern void dhd_dev_init_ioctl(struct net_device *dev);
-int dev_iw_write_cfg1_bss_var(struct net_device *dev, int val);
-
-uint wl_msg_level = WL_ERROR_VAL;
-
-#define MAX_WLIW_IOCTL_LEN 1024
-
-#if defined(IL_BIGENDIAN)
-#include <bcmendian.h>
-#define htod32(i) (bcmswap32(i))
-#define htod16(i) (bcmswap16(i))
-#define dtoh32(i) (bcmswap32(i))
-#define dtoh16(i) (bcmswap16(i))
-#define htodchanspec(i) htod16(i)
-#define dtohchanspec(i) dtoh16(i)
-#else
-#define htod32(i) i
-#define htod16(i) i
-#define dtoh32(i) i
-#define dtoh16(i) i
-#define htodchanspec(i) i
-#define dtohchanspec(i) i
-#endif
-
-#ifdef CONFIG_WIRELESS_EXT
-
-extern struct iw_statistics *dhd_get_wireless_stats(struct net_device *dev);
-extern int dhd_wait_pend8021x(struct net_device *dev);
-#endif 
-
-#if WIRELESS_EXT < 19
-#define IW_IOCTL_IDX(cmd)      ((cmd) - SIOCIWFIRST)
-#define IW_EVENT_IDX(cmd)      ((cmd) - IWEVFIRST)
-#endif 
-
-static void *g_scan = NULL;
-static volatile uint g_scan_specified_ssid;    
-static wlc_ssid_t g_specific_ssid;             
-
-static wlc_ssid_t g_ssid;
-
-static wl_iw_ss_cache_ctrl_t g_ss_cache_ctrl;  
-static volatile uint g_first_broadcast_scan;   
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-#define DAEMONIZE(a) daemonize(a); \
-       allow_signal(SIGKILL); \
-       allow_signal(SIGTERM);
-#else 
-#define RAISE_RX_SOFTIRQ() \
-       cpu_raise_softirq(smp_processor_id(), NET_RX_SOFTIRQ)
-#define DAEMONIZE(a) daemonize(); \
-       do { if (a) \
-               strncpy(current->comm, a, MIN(sizeof(current->comm), (strlen(a) + 1))); \
-       } while (0);
-#endif 
-
-#if defined(WL_IW_USE_ISCAN)
-#if  !defined(CSCAN)
-static void wl_iw_free_ss_cache(void);
-static int   wl_iw_run_ss_cache_timer(int kick_off);
-#endif 
-int  wl_iw_iscan_set_scan_broadcast_prep(struct net_device *dev, uint flag);
-static int dev_wlc_bufvar_set(struct net_device *dev, char *name, char *buf, int len);
-#define ISCAN_STATE_IDLE   0
-#define ISCAN_STATE_SCANING 1
-
-#define WLC_IW_ISCAN_MAXLEN   2048
-typedef struct iscan_buf {
-       struct iscan_buf * next;
-       char   iscan_buf[WLC_IW_ISCAN_MAXLEN];
-} iscan_buf_t;
-
-typedef struct iscan_info {
-       struct net_device *dev;
-       struct timer_list timer;
-       uint32 timer_ms;
-       uint32 timer_on;
-       int    iscan_state;
-       iscan_buf_t * list_hdr;
-       iscan_buf_t * list_cur;
-       
-       long sysioc_pid;
-       struct semaphore sysioc_sem;
-       struct completion sysioc_exited;
-
-       uint32 scan_flag;       
-#if defined CSCAN
-       char ioctlbuf[WLC_IOCTL_MEDLEN];
-#else
-       char ioctlbuf[WLC_IOCTL_SMLEN];
-#endif 
-       
-       wl_iscan_params_t *iscan_ex_params_p;
-       int iscan_ex_param_size;
-} iscan_info_t;
-#define  COEX_DHCP 1 
-static void wl_iw_bt_flag_set(struct net_device *dev, bool set);
-static void wl_iw_bt_release(void);
-
-typedef enum bt_coex_status {
-       BT_DHCP_IDLE = 0,
-       BT_DHCP_START,
-       BT_DHCP_OPPORTUNITY_WINDOW,
-       BT_DHCP_FLAG_FORCE_TIMEOUT
-} coex_status_t;
-#define BT_DHCP_OPPORTUNITY_WINDOW_TIEM        2500    
-#define BT_DHCP_FLAG_FORCE_TIME                                5500    
-
-typedef struct bt_info {
-       struct net_device *dev;
-       struct timer_list timer;
-       uint32 timer_ms;
-       uint32 timer_on;
-       int     bt_state;
-
-       
-       long bt_pid;
-       struct semaphore bt_sem;
-       struct completion bt_exited;
-} bt_info_t;
-
-bt_info_t *g_bt = NULL;
-static void wl_iw_bt_timerfunc(ulong data);
-iscan_info_t *g_iscan = NULL;
-static void wl_iw_timerfunc(ulong data);
-static void wl_iw_set_event_mask(struct net_device *dev);
-static int
-wl_iw_iscan(iscan_info_t *iscan, wlc_ssid_t *ssid, uint16 action);
-#endif 
-static int
-wl_iw_set_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-);
-static int
-wl_iw_get_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-);
-
-static uint
-wl_iw_get_scan_prep(
-       wl_scan_results_t *list,
-       struct iw_request_info *info,
-       char *extra,
-       short max_size
-);
-
-
-static void swap_key_from_BE(
-               wl_wsec_key_t *key
-)
-{
-       key->index = htod32(key->index);
-       key->len = htod32(key->len);
-       key->algo = htod32(key->algo);
-       key->flags = htod32(key->flags);
-       key->rxiv.hi = htod32(key->rxiv.hi);
-       key->rxiv.lo = htod16(key->rxiv.lo);
-       key->iv_initialized = htod32(key->iv_initialized);
-}
-
-static void swap_key_to_BE(
-               wl_wsec_key_t *key
-)
-{
-       key->index = dtoh32(key->index);
-       key->len = dtoh32(key->len);
-       key->algo = dtoh32(key->algo);
-       key->flags = dtoh32(key->flags);
-       key->rxiv.hi = dtoh32(key->rxiv.hi);
-       key->rxiv.lo = dtoh16(key->rxiv.lo);
-       key->iv_initialized = dtoh32(key->iv_initialized);
-}
-
-static int dev_wlc_ioctl(      struct net_device *dev,
-       int cmd,
-       void *arg,
-       int len
-)
-{
-       struct ifreq ifr;
-       wl_ioctl_t ioc;
-       mm_segment_t fs;
-       int ret = -EINVAL;
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return ret;
-       }
-
-       WL_INFORM(("\n%s, PID:%x: send Local IOCTL -> dhd: cmd:0x%x, buf:%p, len:%d ,\n",
-               __FUNCTION__, current->pid, cmd, arg, len));
-
-       if (g_onoff == G_WLAN_SET_ON) 
-       {
-               memset(&ioc, 0, sizeof(ioc));
-               ioc.cmd = cmd;
-               ioc.buf = arg;
-               ioc.len = len;
-
-               strcpy(ifr.ifr_name, dev->name);
-               ifr.ifr_data = (caddr_t) &ioc;
-
-               
-               ret = dev_open(dev);
-               if (ret) {
-                       WL_ERROR(("%s: Error dev_open: %d\n", __func__, ret));
-                       return ret;
-               }
-
-               fs = get_fs();
-               set_fs(get_ds());
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
-               //printk("Calling dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE)\n");
-               ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
-#else
-               ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
-#endif 
-               set_fs(fs);
-       }
-       else {
-               WL_TRACE(("%s: call after driver stop : ignored\n", __FUNCTION__));
-       }
-       return ret;
-}
-
-static int
-dev_wlc_intvar_get_reg(
-       struct net_device *dev,
-       char *name,
-       uint  reg,
-       int *retval)
-{
-       union {
-               char buf[WLC_IOCTL_SMLEN];
-               int val;
-       } var;
-       int error;
-
-       uint len;
-       len = bcm_mkiovar(name, (char *)(&reg), sizeof(reg), (char *)(&var), sizeof(var.buf));
-       ASSERT(len);
-       error = dev_wlc_ioctl(dev, WLC_GET_VAR, (void *)&var, len);
-
-       *retval = dtoh32(var.val);
-       return (error);
-}
-
-
-static int
-dev_wlc_intvar_set_reg(
-       struct net_device *dev,
-       char *name,
-       char *addr,
-       char * val)
-{
-       char reg_addr[8];
-
-       memset(reg_addr, 0, sizeof(reg_addr));
-       memcpy((char *)&reg_addr[0], (char *)addr, 4);
-       memcpy((char *)&reg_addr[4], (char *)val, 4);
-
-       return (dev_wlc_bufvar_set(dev, name,  (char *)&reg_addr[0], sizeof(reg_addr)));
-}
-
-
-
-
-static int
-dev_wlc_intvar_set(
-       struct net_device *dev,
-       char *name,
-       int val)
-{
-       char buf[WLC_IOCTL_SMLEN];
-       uint len;
-
-       val = htod32(val);
-       len = bcm_mkiovar(name, (char *)(&val), sizeof(val), buf, sizeof(buf));
-       ASSERT(len);
-
-       return (dev_wlc_ioctl(dev, WLC_SET_VAR, buf, len));
-}
-
-#if defined(WL_IW_USE_ISCAN)
-static int
-dev_iw_iovar_setbuf(
-       struct net_device *dev,
-       char *iovar,
-       void *param,
-       int paramlen,
-       void *bufptr,
-       int buflen)
-{
-       int iolen;
-
-       iolen = bcm_mkiovar(iovar, param, paramlen, bufptr, buflen);
-       ASSERT(iolen);
-
-       if (iolen == 0)
-               return 0;
-
-       return (dev_wlc_ioctl(dev, WLC_SET_VAR, bufptr, iolen));
-}
-
-static int
-dev_iw_iovar_getbuf(
-       struct net_device *dev,
-       char *iovar,
-       void *param,
-       int paramlen,
-       void *bufptr,
-       int buflen)
-{
-       int iolen;
-
-       iolen = bcm_mkiovar(iovar, param, paramlen, bufptr, buflen);
-       ASSERT(iolen);
-
-       return (dev_wlc_ioctl(dev, WLC_GET_VAR, bufptr, buflen));
-}
-#endif 
-
-
-#if WIRELESS_EXT > 17
-static int
-dev_wlc_bufvar_set(
-       struct net_device *dev,
-       char *name,
-       char *buf, int len)
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
-       char ioctlbuf[MAX_WLIW_IOCTL_LEN];
-#else
-       static char ioctlbuf[MAX_WLIW_IOCTL_LEN];
-#endif 
-       uint buflen;
-
-       buflen = bcm_mkiovar(name, buf, len, ioctlbuf, sizeof(ioctlbuf));
-       ASSERT(buflen);
-
-       return (dev_wlc_ioctl(dev, WLC_SET_VAR, ioctlbuf, buflen));
-}
-#endif 
-
-
-static int
-dev_wlc_bufvar_get(
-       struct net_device *dev,
-       char *name,
-       char *buf, int buflen)
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
-       char ioctlbuf[MAX_WLIW_IOCTL_LEN];
-#else
-       static char ioctlbuf[MAX_WLIW_IOCTL_LEN];
-#endif 
-       int error;
-       uint len;
-
-       len = bcm_mkiovar(name, NULL, 0, ioctlbuf, sizeof(ioctlbuf));
-       ASSERT(len);
-       error = dev_wlc_ioctl(dev, WLC_GET_VAR, (void *)ioctlbuf, MAX_WLIW_IOCTL_LEN);
-       if (!error)
-               bcopy(ioctlbuf, buf, buflen);
-
-       return (error);
-}
-
-
-
-static int
-dev_wlc_intvar_get(
-       struct net_device *dev,
-       char *name,
-       int *retval)
-{
-       union {
-               char buf[WLC_IOCTL_SMLEN];
-               int val;
-       } var;
-       int error;
-
-       uint len;
-       uint data_null;
-
-       len = bcm_mkiovar(name, (char *)(&data_null), 0, (char *)(&var), sizeof(var.buf));
-       ASSERT(len);
-       error = dev_wlc_ioctl(dev, WLC_GET_VAR, (void *)&var, len);
-
-       *retval = dtoh32(var.val);
-
-       return (error);
-}
-
-
-#if WIRELESS_EXT > 12
-static int
-wl_iw_set_active_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int as = 0;
-       int error = 0;
-       char *p = extra;
-
-#if defined(WL_IW_USE_ISCAN)
-       if (g_iscan->iscan_state == ISCAN_STATE_IDLE)
-#endif 
-               error = dev_wlc_ioctl(dev, WLC_SET_PASSIVE_SCAN, &as, sizeof(as));
-#if defined(WL_IW_USE_ISCAN)
-       else
-               g_iscan->scan_flag = as;
-#endif 
-       p += snprintf(p, MAX_WX_STRING, "OK");
-
-       wrqu->data.length = p - extra + 1;
-       return error;
-}
-
-static int
-wl_iw_set_passive_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int ps = 1;
-       int error = 0;
-       char *p = extra;
-
-#if defined(WL_IW_USE_ISCAN)
-       if (g_iscan->iscan_state == ISCAN_STATE_IDLE) {
-#endif 
-
-                
-               if (g_scan_specified_ssid == 0) {
-                       error = dev_wlc_ioctl(dev, WLC_SET_PASSIVE_SCAN, &ps, sizeof(ps));
-               }
-#if defined(WL_IW_USE_ISCAN)
-       }
-       else
-               g_iscan->scan_flag = ps;
-#endif 
-
-       p += snprintf(p, MAX_WX_STRING, "OK");
-
-       wrqu->data.length = p - extra + 1;
-       return error;
-}
-
-static int
-wl_iw_get_macaddr(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error;
-       char buf[128];
-       struct ether_addr *id;
-       char *p = extra;
-
-       
-       strcpy(buf, "cur_etheraddr");
-       error = dev_wlc_ioctl(dev, WLC_GET_VAR, buf, sizeof(buf));
-       id = (struct ether_addr *) buf;
-       p += snprintf(p, MAX_WX_STRING, "Macaddr = %02X:%02X:%02X:%02X:%02X:%02X\n",
-               id->octet[0], id->octet[1], id->octet[2],
-               id->octet[3], id->octet[4], id->octet[5]);
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-
-
-
-static int
-wl_iw_set_country(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       char country_code[WLC_CNTRY_BUF_SZ];
-       int error = 0;
-       char *p = extra;
-       int country_offset;
-       int country_code_size;
-
-       memset(country_code, 0, sizeof(country_code));
-
-       
-       country_offset = strcspn(extra, " ");
-       country_code_size = strlen(extra) - country_offset;
-
-       
-       if (country_offset != 0) {
-               strncpy(country_code, extra + country_offset +1,
-                       MIN(country_code_size, sizeof(country_code)));
-
-               
-               if ((error = dev_wlc_ioctl(dev, WLC_SET_COUNTRY,
-                       &country_code, sizeof(country_code))) >= 0) {
-                       p += snprintf(p, MAX_WX_STRING, "OK");
-                       WL_TRACE(("%s: set country %s OK\n", __FUNCTION__, country_code));
-                       goto exit;
-               }
-       }
-
-       WL_ERROR(("%s: set country %s failed code %d\n", __FUNCTION__, country_code, error));
-       p += snprintf(p, MAX_WX_STRING, "FAIL");
-
-exit:
-       wrqu->data.length = p - extra + 1;
-       return error;
-}
-
-#ifdef CUSTOMER_HW2
-static int
-wl_iw_set_power_mode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = 0;
-       char *p = extra;
-       static int  pm = PM_FAST;
-       int  pm_local = PM_OFF;
-       char powermode_val = 0;
-
-       strncpy((char *)&powermode_val, extra + strlen("POWERMODE") +1, 1);
-
-       if (strnicmp((char *)&powermode_val, "1", strlen("1")) == 0) {
-
-               WL_TRACE(("%s: DHCP session starts\n", __FUNCTION__));
-
-               dev_wlc_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm));
-               dev_wlc_ioctl(dev, WLC_SET_PM, &pm_local, sizeof(pm_local));
-       }
-       else if (strnicmp((char *)&powermode_val, "0", strlen("0")) == 0) {
-
-               WL_TRACE(("%s: DHCP session done\n", __FUNCTION__));
-
-
-               dev_wlc_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm));
-       }
-       else {
-               WL_ERROR(("Unkwown yet power setting, ignored\n"));
-       }
-
-       p += snprintf(p, MAX_WX_STRING, "OK");
-
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-#endif 
-static int
-wl_iw_set_btcoex_dhcp(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = 0;
-       char *p = extra;
-#ifndef CUSTOMER_HW2
-       static int  pm = PM_FAST;
-       int  pm_local = PM_OFF;
-#endif
-       char powermode_val = 0;
-       char buf_reg66va_dhcp_on[8] = { 66, 00, 00, 00, 0x10, 0x27, 0x00, 0x00 };
-       char buf_reg41va_dhcp_on[8] = { 41, 00, 00, 00, 0x33, 0x00, 0x00, 0x00 };
-       char buf_reg68va_dhcp_on[8] = { 68, 00, 00, 00, 0x90, 0x01, 0x00, 0x00 };
-
-       uint32 regaddr;
-       static uint32 saved_reg66;
-       static uint32 saved_reg41;
-       static uint32 saved_reg68;
-       static bool saved_status = FALSE;
-
-       char buf_flag7_default[8] =   { 7, 00, 00, 00, 0x0, 0x00, 0x00, 0x00};
-#ifndef CUSTOMER_HW2
-       uint32 temp1, temp2;
-#endif 
-
-       
-#ifdef  CUSTOMER_HW2
-       strncpy((char *)&powermode_val, extra + strlen("BTCOEXMODE") +1, 1);
-#else
-       strncpy((char *)&powermode_val, extra + strlen("POWERMODE") +1, 1);
-#endif
-
-       if (strnicmp((char *)&powermode_val, "1", strlen("1")) == 0) {
-
-               WL_TRACE(("%s: DHCP session starts\n", __FUNCTION__));
-
-               
-               if ((saved_status == FALSE) &&
-#ifndef CUSTOMER_HW2
-                       (!dev_wlc_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm))) &&
-#endif
-                       (!dev_wlc_intvar_get_reg(dev, "btc_params", 66,  &saved_reg66)) &&
-                       (!dev_wlc_intvar_get_reg(dev, "btc_params", 41,  &saved_reg41)) &&
-                       (!dev_wlc_intvar_get_reg(dev, "btc_params", 68,  &saved_reg68)))   {
-                               saved_status = TRUE;
-                               WL_TRACE(("Saved 0x%x 0x%x 0x%x\n", \
-                                       saved_reg66, saved_reg41, saved_reg68));
-
-                               
-#ifndef CUSTOMER_HW2
-                               dev_wlc_ioctl(dev, WLC_SET_PM, &pm_local, sizeof(pm_local));
-#endif
-
-                               
-                               dev_wlc_bufvar_set(dev, "btc_params", \
-                                       (char *)&buf_reg66va_dhcp_on[0], \
-                                                sizeof(buf_reg66va_dhcp_on));
-                               
-                               dev_wlc_bufvar_set(dev, "btc_params", \
-                                       (char *)&buf_reg41va_dhcp_on[0], \
-                                                sizeof(buf_reg41va_dhcp_on));
-                               
-                               dev_wlc_bufvar_set(dev, "btc_params", \
-                                       (char *)&buf_reg68va_dhcp_on[0], \
-                                                sizeof(buf_reg68va_dhcp_on));
-                               
-#ifndef CUSTOMER_HW2
-                               if ((!dev_wlc_intvar_get_reg(dev, "btc_params", 12, &temp1)) &&
-                                       (!dev_wlc_intvar_get_reg(dev, "btc_params", 13, &temp2)))
-                               {
-                                       if ((temp1 != 0) && (temp2 != 0)) {
-#endif
-                                               g_bt->bt_state = BT_DHCP_START;
-                                               g_bt->timer_on = 1;
-                                               mod_timer(&g_bt->timer, g_bt->timer.expires);
-                                               WL_TRACE(("%s enable BT DHCP Timer\n", \
-                                                       __FUNCTION__));
-#ifndef CUSTOMER_HW2
-                                       }
-                               }
-#endif
-               }
-               else if (saved_status == TRUE) {
-                       WL_ERROR(("%s was called w/o DHCP OFF. Continue\n", __FUNCTION__));
-               }
-       }
-#ifdef  CUSTOMER_HW2
-       else if (strnicmp((char *)&powermode_val, "2", strlen("2")) == 0) {
-#else
-       else if (strnicmp((char *)&powermode_val, "0", strlen("0")) == 0) {
-#endif
-
-               WL_TRACE(("%s: DHCP session done\n", __FUNCTION__));
-
-               
-#ifndef CUSTOMER_HW2
-               dev_wlc_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm));
-#endif
-
-               
-               WL_TRACE(("%s disable BT DHCP Timer\n", __FUNCTION__));
-               if (g_bt->timer_on) {
-                       g_bt->timer_on = 0;
-                       del_timer_sync(&g_bt->timer);
-               }
-
-               
-               dev_wlc_bufvar_set(dev, "btc_flags", \
-                               (char *)&buf_flag7_default[0], sizeof(buf_flag7_default));
-
-               
-               if (saved_status) {
-                       regaddr = 66;
-                       dev_wlc_intvar_set_reg(dev, "btc_params", \
-                               (char *)&regaddr, (char *)&saved_reg66);
-                       regaddr = 41;
-                       dev_wlc_intvar_set_reg(dev, "btc_params", \
-                               (char *)&regaddr, (char *)&saved_reg41);
-                       regaddr = 68;
-                       dev_wlc_intvar_set_reg(dev, "btc_params", \
-                               (char *)&regaddr, (char *)&saved_reg68);
-               }
-               saved_status = FALSE;
-
-       }
-       else {
-               WL_ERROR(("Unkwown yet power setting, ignored\n"));
-       }
-
-       p += snprintf(p, MAX_WX_STRING, "OK");
-
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-
-int
-wl_format_ssid(char* ssid_buf, uint8* ssid, int ssid_len)
-{
-       int i, c;
-       char *p = ssid_buf;
-
-       if (ssid_len > 32) ssid_len = 32;
-
-       for (i = 0; i < ssid_len; i++) {
-               c = (int)ssid[i];
-               if (c == '\\') {
-                       *p++ = '\\';
-                       *p++ = '\\';
-               } else if (isprint((uchar)c)) {
-                       *p++ = (char)c;
-               } else {
-                       p += sprintf(p, "\\x%02X", c);
-               }
-       }
-       *p = '\0';
-
-       return p - ssid_buf;
-}
-
-static int
-wl_iw_get_link_speed(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = 0;
-       char *p = extra;
-       static int link_speed;
-
-       
-       if (g_onoff == G_WLAN_SET_ON) {
-               error = dev_wlc_ioctl(dev, WLC_GET_RATE, &link_speed, sizeof(link_speed));
-               link_speed *= 500000;
-       }
-
-       p += snprintf(p, MAX_WX_STRING, "LinkSpeed %d", link_speed/1000000);
-
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-
-
-static int
-wl_iw_get_band(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = -1;
-       char *p = extra;
-       static int band;
-
-       if (g_onoff == G_WLAN_SET_ON) {
-               error = dev_wlc_ioctl(dev, WLC_GET_BAND, &band, sizeof(band));
-
-               p += snprintf(p, MAX_WX_STRING, "Band %d", band);
-
-               wrqu->data.length = p - extra + 1;
-       }
-       return error;
-}
-
-
-static int
-wl_iw_set_band(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = -1;
-       char *p = extra;
-       char band;
-
-       if (g_onoff == G_WLAN_SET_ON) {
-
-               band = *(extra + strlen(BAND_SET_CMD) + 1) - '0';
-
-               if ((band == WLC_BAND_AUTO) || (band == WLC_BAND_5G) || (band == WLC_BAND_2G)) {
-
-                       
-                       if ((error = dev_wlc_ioctl(dev, WLC_SET_BAND,
-                               &band, sizeof(band))) >= 0) {
-                               p += snprintf(p, MAX_WX_STRING, "OK");
-                               WL_TRACE(("%s: set band %d OK\n", __FUNCTION__, band));
-                               goto exit;
-                       }
-                       else  WL_ERROR(("%s: set band %d failed code %d\n", __FUNCTION__, \
-                                       band, error));
-               }
-               else  WL_ERROR(("%s Incorrect band setting, ignored\n", __FUNCTION__));
-       }
-
-       p += snprintf(p, MAX_WX_STRING, "FAIL");
-
-exit:
-       wrqu->data.length = p - extra + 1;
-       return error;
-}
-
-
-static int
-wl_iw_get_rssi(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       static int rssi = 0;
-       static wlc_ssid_t ssid = {0};
-       int error = 0;
-       char *p = extra;
-       static char ssidbuf[SSID_FMT_BUF_LEN];
-       scb_val_t scb_val;
-
-       bzero(&scb_val, sizeof(scb_val_t));
-
-       if (g_onoff == G_WLAN_SET_ON) {
-               error = dev_wlc_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
-               rssi = dtoh32(scb_val.val);
-
-               error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid));
-
-               ssid.SSID_len = dtoh32(ssid.SSID_len);
-       }
-
-       wl_format_ssid(ssidbuf, ssid.SSID, dtoh32(ssid.SSID_len));
-       p += snprintf(p, MAX_WX_STRING, "%s rssi %d ", ssidbuf, rssi);
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-
-int
-wl_iw_send_priv_event(
-       struct net_device *dev,
-       char *flag
-)
-{
-       union iwreq_data wrqu;
-       char extra[IW_CUSTOM_MAX + 1];
-       int cmd;
-
-       cmd = IWEVCUSTOM;
-       memset(&wrqu, 0, sizeof(wrqu));
-       if (strlen(flag) > sizeof(extra))
-               return -1;
-
-       strcpy(extra, flag);
-       wrqu.data.length = strlen(extra);
-       wireless_send_event(dev, cmd, &wrqu, extra);
-       WL_TRACE(("Send IWEVCUSTOM Event as %s\n", extra));
-
-       return 0;
-}
-
-
-int
-wl_control_wl_start(struct net_device *dev)
-{
-       int ret = 0;
-       wl_iw_t *iw;
-
-       WL_TRACE(("Enter %s \n", __FUNCTION__));
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return -1;
-       }
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK(iw->pub);
-
-       if (g_onoff == G_WLAN_SET_OFF) {
-               dhd_customer_gpio_wlan_ctrl(WLAN_RESET_ON);
-#if 0
-#if defined(BCMLXSDMMC)
-               sdioh_start(NULL, 0);
-#endif
-
-               dhd_dev_reset(dev, 0);
-
-#if defined(BCMLXSDMMC)
-               sdioh_start(NULL, 1);
-#endif
-
-               dhd_dev_init_ioctl(dev);
-#endif
-               g_onoff = G_WLAN_SET_ON;
-       }
-       WL_TRACE(("Exited %s \n", __FUNCTION__));
-
-       MUTEX_UNLOCK(iw->pub);
-       return ret;
-}
-static int
-wl_iw_control_wl_off(
-       struct net_device *dev,
-       struct iw_request_info *info
-)
-{
-       int ret = 0;
-       wl_iw_t *iw;
-
-       WL_TRACE(("Enter %s\n", __FUNCTION__));
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return -1;
-       }
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK(iw->pub);
-
-#ifdef SOFTAP
-       ap_cfg_running = FALSE;
-#endif 
-
-       if (g_onoff == G_WLAN_SET_ON) {
-               g_onoff = G_WLAN_SET_OFF;
-
-#if defined(WL_IW_USE_ISCAN)
-               g_iscan->iscan_state = ISCAN_STATE_IDLE;
-#endif 
-#if 0
-               dhd_dev_reset(dev, 1);
-#endif
-#if defined(WL_IW_USE_ISCAN)
-#if !defined(CSCAN)
-               
-               wl_iw_free_ss_cache();
-               wl_iw_run_ss_cache_timer(0);
-               
-               g_ss_cache_ctrl.m_link_down = 1;
-#endif 
-               memset(g_scan, 0, G_SCAN_RESULTS);
-               g_scan_specified_ssid = 0;
-               
-               g_first_broadcast_scan = BROADCAST_SCAN_FIRST_IDLE;
-#endif 
-#if 0
-#if defined(BCMLXSDMMC)
-               sdioh_stop(NULL);
-#endif
-#endif
-               dhd_customer_gpio_wlan_ctrl(WLAN_RESET_OFF);
-
-               wl_iw_send_priv_event(dev, "STOP");
-
-       }
-
-       MUTEX_UNLOCK(iw->pub);
-
-       WL_TRACE(("Exited %s\n", __FUNCTION__));
-
-       return ret;
-}
-
-static int
-wl_iw_control_wl_on(
-       struct net_device *dev,
-       struct iw_request_info *info
-)
-{
-       int ret = 0;
-
-       WL_TRACE(("Enter %s \n", __FUNCTION__));
-
-       ret = wl_control_wl_start(dev);
-
-       wl_iw_send_priv_event(dev, "START");
-
-#if !defined(CSCAN)
-#ifdef SOFTAP
-       if (!ap_fw_loaded) {
-               wl_iw_iscan_set_scan_broadcast_prep(dev, 0);
-       }
-#else
-       wl_iw_iscan_set_scan_broadcast_prep(dev, 0);
-#endif
-#endif 
-
-       WL_TRACE(("Exited %s \n", __FUNCTION__));
-
-       return ret;
-}
-
-#ifdef SOFTAP
-static struct ap_profile my_ap;
-static int set_ap_cfg(struct net_device *dev, struct ap_profile *ap); 
-static int get_assoc_sta_list(struct net_device *dev, char *buf, int len);
-static int set_ap_mac_list(struct net_device *dev, char *buf);
-#endif /* SOFTAP */
-
-int hex2num(char c)
-{
-       if (c >= '0' && c <= '9')
-               return c - '0';
-       if (c >= 'a' && c <= 'f')
-               return c - 'a' + 10;
-       if (c >= 'A' && c <= 'F')
-               return c - 'A' + 10;
-       return -1;
-}
-
-int hex2byte(const char *hex)
-{
-       int a, b;
-       a = hex2num(*hex++);
-       if (a < 0)
-               return -1;
-       b = hex2num(*hex++);
-       if (b < 0)
-               return -1;
-       return (a << 4) | b;
-}
-
-
-
-int hstr_2_buf(const char *txt, u8 *buf, int len)
-{
-       int i;
-
-       for (i = 0; i < len; i++) {
-               int a, b;
-
-               a = hex2num(*txt++);
-               if (a < 0)
-                       return -1;
-               b = hex2num(*txt++);
-               if (b < 0)
-                       return -1;
-               *buf++ = (a << 4) | b;
-       }
-
-       return 0;
-}
-
-
-
-#if defined(SOFTAP) || defined(CSCAN)
-
-/* parameter type */
-#define PTYPE_STRING   0
-#define PTYPE_INTDEC   1   
-#define PTYPE_INTHEX   2
-#define PTYPE_STR_HEX  3  
-
-int get_parmeter_from_string(
-                       char **str_ptr, const char *token,
-                       int param_type, void  *dst, int param_max_len)
-{
-       char int_str[7] = "0";
-       int parm_str_len;
-       char  *param_str_begin;
-       char  *param_str_end;
-       char  *orig_str = *str_ptr;
-
-       if ((*str_ptr) && !strncmp(*str_ptr, token, strlen(token))) {
-
-               strsep(str_ptr, "=,"); 
-               param_str_begin = *str_ptr;
-               strsep(str_ptr, "=,"); 
-
-               if (*str_ptr == NULL) {
-                       
-                       parm_str_len = strlen(param_str_begin);
-               } else {
-                       param_str_end = *str_ptr-1;  
-                       parm_str_len = param_str_end - param_str_begin;
-               }
-
-               WL_TRACE((" 'token:%s', len:%d, ", token, parm_str_len));
-
-               if (parm_str_len > param_max_len) {
-                       WL_ERROR((" WARNING: extracted param len:%d is > MAX:%d\n",
-                               parm_str_len, param_max_len));
-
-                       parm_str_len = param_max_len;
-               }
-
-               switch (param_type) {
-
-                       case PTYPE_INTDEC: {
-                       
-                               int *pdst_int = dst;
-                               char *eptr;
-                               if (parm_str_len > sizeof(int_str))
-                                        parm_str_len = sizeof(int_str);
-
-                               memcpy(int_str, param_str_begin, parm_str_len);
-
-                               *pdst_int = simple_strtoul(int_str, &eptr, 10);
-
-                               WL_TRACE((" written as integer:%d\n",  *pdst_int));
-                       }
-                       break;
-                       case PTYPE_STR_HEX: {
-                               u8 *buf = dst;
-                               
-                               param_max_len = param_max_len >> 1;  
-                               hstr_2_buf(param_str_begin, buf, param_max_len);
-                               print_buf(buf, param_max_len, 0);
-                       }
-                       break;
-                       default:
-                               
-                               memcpy(dst, param_str_begin, parm_str_len);
-                               *((char *)dst + parm_str_len) = 0; 
-                               WL_ERROR((" written as a string:%s\n", (char *)dst));
-                       break;
-
-               }
-
-               return 0;
-       } else {
-               WL_ERROR(("\n %s: ERROR: can't find token:%s in str:%s \n",
-                       __FUNCTION__, token, orig_str));
-
-        return -1;
-       }
-}
-
-#endif 
-
-
-#ifdef SOFTAP
-int init_ap_profile_from_string(char *param_str, struct ap_profile *ap_cfg)
-{
-       char *str_ptr = param_str;
-       char sub_cmd[16];
-       int ret = 0;
-
-       memset(sub_cmd, 0, sizeof(sub_cmd));
-       memset(ap_cfg, 0, sizeof(struct ap_profile));
-
-       
-       if (get_parmeter_from_string(&str_ptr, "ASCII_CMD=",
-               PTYPE_STRING, sub_cmd, SSID_LEN) != 0) {
-        return -1;
-       }
-       if (strncmp(sub_cmd, "AP_CFG", 6)) {
-          WL_ERROR(("ERROR: sub_cmd:%s != 'AP_CFG'!\n", sub_cmd));
-               return -1;
-       }
-
-       
-       
-       ret = get_parmeter_from_string(&str_ptr, "SSID=", PTYPE_STRING, ap_cfg->ssid, SSID_LEN);
-
-       ret |= get_parmeter_from_string(&str_ptr, "SEC=", PTYPE_STRING,  ap_cfg->sec, SEC_LEN);
-
-       ret |= get_parmeter_from_string(&str_ptr, "KEY=", PTYPE_STRING,  ap_cfg->key, KEY_LEN);
-
-       ret |= get_parmeter_from_string(&str_ptr, "CHANNEL=", PTYPE_INTDEC, &ap_cfg->channel, 5);
-
-       ret |= get_parmeter_from_string(&str_ptr, "PREAMBLE=", PTYPE_INTDEC, &ap_cfg->preamble, 5);
-
-       ret |= get_parmeter_from_string(&str_ptr, "MAX_SCB=", PTYPE_INTDEC,  &ap_cfg->max_scb, 5);
-
-       return ret;
-}
-#endif 
-
-
-
-#ifdef SOFTAP
-static int iwpriv_set_ap_config(struct net_device *dev,
-            struct iw_request_info *info,
-            union iwreq_data *wrqu,
-            char *ext)
-{
-       int res = 0;
-       char  *extra = NULL;
-       struct ap_profile *ap_cfg = &my_ap;
-
-       WL_TRACE(("> Got IWPRIV SET_AP IOCTL: info->cmd:%x, info->flags:%x, u.data:%p, u.len:%d\n",
-               info->cmd, info->flags,
-               wrqu->data.pointer, wrqu->data.length));
-
-
-       if (wrqu->data.length != 0) {
-
-               char *str_ptr;
-
-               if (!(extra = kmalloc(wrqu->data.length+1, GFP_KERNEL)))
-                       return -ENOMEM;
-
-               if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-
-               extra[wrqu->data.length] = 0;
-               WL_SOFTAP((" Got str param in iw_point:\n %s\n", extra));
-
-               memset(ap_cfg, 0, sizeof(struct ap_profile));
-
-               
-
-               str_ptr = extra;
-
-               if ((res = init_ap_profile_from_string(extra, ap_cfg)) < 0) {
-                       WL_ERROR(("%s failed to parse %d\n", __FUNCTION__, res));
-                       kfree(extra);
-                       return -1;
-               }
-
-       } else {
-        
-         WL_ERROR(("IWPRIV argument len = 0 \n"));
-         return -1;
-       }
-
-       if ((res = set_ap_cfg(dev, ap_cfg)) < 0)
-               WL_ERROR(("%s failed to set_ap_cfg %d\n", __FUNCTION__, res));
-
-       kfree(extra);
-
-       return res;
-}
-#endif 
-
-
-
-#ifdef SOFTAP
-static int iwpriv_get_assoc_list(struct net_device *dev,
-        struct iw_request_info *info,
-        union iwreq_data *p_iwrq,
-        char *extra)
-{
-       int i, ret = 0;
-       char mac_buf[256];
-       struct maclist *sta_maclist = (struct maclist *)mac_buf;
-
-       char mac_lst[256];
-       char *p_mac_str;
-
-       WL_TRACE(("\n %s: IWPRIV IOCTL: cmd:%hx, flags:%hx, extra:%p, iwp.len:%d, \
-               iwp.len:%p, iwp.flags:%x  \n", __FUNCTION__, info->cmd, info->flags, \
-               extra, p_iwrq->data.length, p_iwrq->data.pointer, p_iwrq->data.flags));
-
-       WL_SOFTAP(("extra:%s\n", extra));
-       print_buf((u8 *)p_iwrq, 16, 0);
-
-       memset(sta_maclist, 0, sizeof(mac_buf));
-
-       sta_maclist->count = 8;
-
-       WL_TRACE((" net device:%s, buf_sz:%d\n", dev->name, sizeof(mac_buf)));
-       get_assoc_sta_list(dev, mac_buf, 256);
-       WL_TRACE((" got %d stations\n", sta_maclist->count));
-
-       
-       memset(mac_lst, 0, sizeof(mac_lst));
-       p_mac_str = mac_lst;
-
-       for (i = 0; i < 8; i++) {
-               struct ether_addr * id = &sta_maclist->ea[i];
-
-               WL_SOFTAP(("dhd_drv>> sta_mac[%d] :", i));
-               print_buf((unsigned char *)&sta_maclist->ea[i], 6, 0);
-
-               
-               p_mac_str += snprintf(p_mac_str, MAX_WX_STRING,
-                       "Mac[%d]=%02X:%02X:%02X:%02X:%02X:%02X\n", i,
-                       id->octet[0], id->octet[1], id->octet[2],
-                       id->octet[3], id->octet[4], id->octet[5]);
-
-       }
-
-       p_iwrq->data.length = strlen(mac_lst);
-
-       WL_TRACE(("u.pointer:%p\n", p_iwrq->data.pointer));
-       WL_TRACE(("resulting str:\n%s \n len:%d\n\n", mac_lst, p_iwrq->data.length));
-
-       if (p_iwrq->data.length) {
-               if (copy_to_user(p_iwrq->data.pointer, mac_lst, p_iwrq->data.length)) {
-                       WL_ERROR(("%s: Can't copy to user\n", __FUNCTION__));
-                       return -EFAULT;
-               }
-       }
-
-       WL_ERROR(("Exited %s \n", __FUNCTION__));
-       return ret;
-}
-#endif 
-
-
-#ifdef SOFTAP
-static int iwpriv_set_mac_filters(struct net_device *dev,
-        struct iw_request_info *info,
-        union iwreq_data *wrqu,
-        char *ext)
-{
-
-       int i, ret = -1;
-       char  * extra = NULL;
-       u8  macfilt[8][6];
-       int mac_cnt = 0; 
-       char sub_cmd[16];
-
-       WL_TRACE((">>> Got IWPRIV SET_MAC_FILTER IOCTL:  info->cmd:%x, \
-                       info->flags:%x, u.data:%p, u.len:%d\n",
-                       info->cmd, info->flags,
-                       wrqu->data.pointer, wrqu->data.length));
-
-       if (wrqu->data.length != 0) {
-
-               char *str_ptr;
-
-               if (!(extra = kmalloc(wrqu->data.length+1, GFP_KERNEL)))
-                       return -ENOMEM;
-
-               if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-
-               extra[wrqu->data.length] = 0;
-               WL_SOFTAP((" Got parameter string in iw_point:\n %s \n", extra));
-
-               memset(macfilt, 0, sizeof(macfilt));
-               memset(sub_cmd, 0, sizeof(sub_cmd));
-
-               
-               str_ptr = extra;
-
-               
-          if (get_parmeter_from_string(&str_ptr, "ASCII_CMD=", PTYPE_STRING, sub_cmd, 15) != 0) {
-                goto exit_proc;
-          }
-
-#define MAC_FILT_MAX 8
-          
-               if (strncmp(sub_cmd, "MAC_FLT_W", strlen("MAC_FLT_W"))) {
-                  WL_ERROR(("ERROR: sub_cmd:%s != 'MAC_FLT_W'!\n", sub_cmd));
-                       goto exit_proc;
-               }
-
-               if (get_parmeter_from_string(&str_ptr, "MAC_CNT=",
-                       PTYPE_INTDEC, &mac_cnt, 4) != 0) {
-                       WL_ERROR(("ERROR: MAC_CNT param is missing \n"));
-                       goto exit_proc;
-               }
-
-               if (mac_cnt > MAC_FILT_MAX) {
-                       WL_ERROR(("ERROR: number of MAC filters > MAX\n"));
-                       goto exit_proc;
-               }
-
-               for (i=0; i< mac_cnt; i++)      
-               if (get_parmeter_from_string(&str_ptr, "MAC=",
-                       PTYPE_STR_HEX, macfilt[i], 12) != 0) {
-                       WL_ERROR(("ERROR: MAC_filter[%d] is missing !\n", i));
-                       goto exit_proc;
-               }
-
-               for (i = 0; i < mac_cnt; i++) {
-                  WL_SOFTAP(("mac_filt[%d]:", i));
-                  print_buf(macfilt[i], 6, 0);
-               }
-
-               
-               wrqu->data.pointer = NULL;
-               wrqu->data.length = 0;
-               ret = 0;
-
-       } else {
-        
-         WL_ERROR(("IWPRIV argument len is 0\n"));
-         return -1;
-       }
-
-       exit_proc:
-       kfree(extra);
-       return ret;
-}
-#endif 
-
-#endif 
-
-#if WIRELESS_EXT < 13
-struct iw_request_info
-{
-       __u16           cmd;            
-       __u16           flags;          
-};
-
-typedef int (*iw_handler)(struct net_device *dev,
-                struct iw_request_info *info,
-                void *wrqu,
-                char *extra);
-#endif 
-
-static int
-wl_iw_config_commit(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       void *zwrq,
-       char *extra
-)
-{      
-       wlc_ssid_t ssid;
-       int error;
-       struct sockaddr bssid;
-
-       WL_TRACE(("%s: SIOCSIWCOMMIT\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid))))
-               return error;
-
-       ssid.SSID_len = dtoh32(ssid.SSID_len);
-
-       if (!ssid.SSID_len)
-               return 0;
-
-       bzero(&bssid, sizeof(struct sockaddr));
-       if ((error = dev_wlc_ioctl(dev, WLC_REASSOC, &bssid, ETHER_ADDR_LEN))) {
-               WL_ERROR(("%s: WLC_REASSOC to %s failed \n", __FUNCTION__, ssid.SSID));
-               return error;
-       }
-
-       return 0;
-}
-
-static int
-wl_iw_get_name(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       char *cwrq,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCGIWNAME\n", dev->name));
-
-       strcpy(cwrq, "IEEE 802.11-DS");
-
-       return 0;
-}
-
-static int
-wl_iw_set_freq(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_freq *fwrq,
-       char *extra
-)
-{
-       int error, chan;
-       uint sf = 0;
-
-       WL_TRACE(("%s %s: SIOCSIWFREQ : e=%d m=%d\n", __func__, dev->name, fwrq->e, fwrq->m));
-
-#if defined(SOFTAP)
-       if (ap_cfg_running) {
-               WL_TRACE(("%s:>> not executed, 'SOFT_AP is active' \n", __FUNCTION__));
-               return 0;
-       }
-#endif
-
-       
-       if (fwrq->e == 0 && fwrq->m < MAXCHANNEL) 
-       {
-               chan = fwrq->m;
-       }
-       else 
-       {
-               if (fwrq->e >= 6) 
-               {
-                       fwrq->e -= 6;
-                       while (fwrq->e--)
-                               fwrq->m *= 10;
-               } 
-               else if (fwrq->e < 6) 
-               {
-                       while (fwrq->e++ < 6)
-                               fwrq->m /= 10;
-               }
-       
-               if (fwrq->m > 4000 && fwrq->m < 5000)
-                       sf = WF_CHAN_FACTOR_4_G; 
-
-               chan = wf_mhz2channel(fwrq->m, sf);
-       }
-       chan = htod32(chan);    
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_CHANNEL, &chan, sizeof(chan))))
-               return error;
-
-       
-       return -EINPROGRESS;
-}
-
-static int
-wl_iw_get_freq(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_freq *fwrq,
-       char *extra
-)
-{
-       channel_info_t ci;
-       int error;
-
-       WL_TRACE(("%s: SIOCGIWFREQ\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_CHANNEL, &ci, sizeof(ci))))
-               return error;
-
-       
-       fwrq->m = dtoh32(ci.hw_channel);
-       fwrq->e = dtoh32(0);
-       return 0;
-}
-
-static int
-wl_iw_set_mode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       __u32 *uwrq,
-       char *extra
-)
-{
-       int infra = 0, ap = 0, error = 0;
-
-       WL_TRACE(("%s: SIOCSIWMODE\n", dev->name));
-
-       switch (*uwrq) {
-       case IW_MODE_MASTER:
-               infra = ap = 1;
-               break;
-       case IW_MODE_ADHOC:
-       case IW_MODE_AUTO:
-               break;
-       case IW_MODE_INFRA:
-               infra = 1;
-               break;
-       default:
-               return -EINVAL;
-       }
-       infra = htod32(infra);
-       ap = htod32(ap);
-
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra))) ||
-           (error = dev_wlc_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap))))
-               return error;
-
-       
-       return -EINPROGRESS;
-}
-
-static int
-wl_iw_get_mode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       __u32 *uwrq,
-       char *extra
-)
-{
-       int error, infra = 0, ap = 0;
-
-       WL_TRACE(("%s: SIOCGIWMODE\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_INFRA, &infra, sizeof(infra))) ||
-           (error = dev_wlc_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap))))
-               return error;
-
-       infra = dtoh32(infra);
-       ap = dtoh32(ap);
-       *uwrq = infra ? ap ? IW_MODE_MASTER : IW_MODE_INFRA : IW_MODE_ADHOC;
-
-       return 0;
-}
-
-static int
-wl_iw_set_sens(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       __u32 *uwrq,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCSIWSENS\n", dev->name));
-       return 0;
-}
-
-static int
-wl_iw_get_sens(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       static int rssi = 0;
-       static wlc_ssid_t ssid = {0};
-       int error = 0;
-       static char ssidbuf[SSID_FMT_BUF_LEN];
-       scb_val_t scb_val;
-
-       WL_TRACE(("%s: SIOCGIWSENS\n", dev->name));
-       
-       bzero(&scb_val, sizeof(scb_val_t));
-       
-       if (g_onoff == G_WLAN_SET_ON) {
-               error = dev_wlc_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
-               if (error) {
-                       WL_ERROR(("%s: Fails %d\n", __FUNCTION__, error));
-                       return error;
-               }
-               rssi = dtoh32(scb_val.val);
-               
-               error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid));
-               if (!error) {
-                       ssid.SSID_len = dtoh32(ssid.SSID_len);
-                       wl_format_ssid(ssidbuf, ssid.SSID, dtoh32(ssid.SSID_len));
-               }
-       }
-       
-       wrqu->sens.value = -rssi;
-    
-       return error;
-}
-
-static int
-wl_iw_get_range(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       struct iw_range *range = (struct iw_range *) extra;
-       wl_uint32_list_t *list;
-       wl_rateset_t rateset;
-       int8 *channels;
-       int error, i, k;
-       uint sf, ch;
-
-       int phytype;
-       int bw_cap = 0, sgi_tx = 0, nmode = 0;
-       channel_info_t ci;
-       uint8 nrate_list2copy = 0;
-       uint16 nrate_list[4][8] = { {13, 26, 39, 52, 78, 104, 117, 130},
-               {14, 29, 43, 58, 87, 116, 130, 144},
-               {27, 54, 81, 108, 162, 216, 243, 270},
-               {30, 60, 90, 120, 180, 240, 270, 300}};
-
-       WL_TRACE(("%s: SIOCGIWRANGE\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       channels = kmalloc((MAXCHANNEL+1)*4, GFP_KERNEL);
-       if (!channels) {
-               WL_ERROR(("Could not alloc channels\n"));
-               return -ENOMEM;
-       }
-       list = (wl_uint32_list_t *)channels;
-
-       dwrq->length = sizeof(struct iw_range);
-       memset(range, 0, sizeof(range));
-
-       
-       range->min_nwid = range->max_nwid = 0;
-
-       
-       list->count = htod32(MAXCHANNEL);
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_VALID_CHANNELS, channels, (MAXCHANNEL+1)*4))) {
-               kfree(channels);
-               return error;
-       }
-       for (i = 0; i < dtoh32(list->count) && i < IW_MAX_FREQUENCIES; i++) {
-               range->freq[i].i = dtoh32(list->element[i]);
-
-               ch = dtoh32(list->element[i]);
-               if (ch <= CH_MAX_2G_CHANNEL)
-                       sf = WF_CHAN_FACTOR_2_4_G;
-               else
-                       sf = WF_CHAN_FACTOR_5_G;
-
-               range->freq[i].m = wf_channel2mhz(ch, sf);
-               range->freq[i].e = 6;
-       }
-       range->num_frequency = range->num_channels = i;
-
-       
-       range->max_qual.qual = 5;
-       
-       range->max_qual.level = 0x100 - 200;    
-       
-       range->max_qual.noise = 0x100 - 200;    
-       
-       range->sensitivity = 65535;
-
-#if WIRELESS_EXT > 11
-       
-       range->avg_qual.qual = 3;
-       
-       range->avg_qual.level = 0x100 + WL_IW_RSSI_GOOD;
-       
-       range->avg_qual.noise = 0x100 - 75;     
-#endif 
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_CURR_RATESET, &rateset, sizeof(rateset)))) {
-               kfree(channels);
-               return error;
-       }
-       rateset.count = dtoh32(rateset.count);
-       range->num_bitrates = rateset.count;
-       for (i = 0; i < rateset.count && i < IW_MAX_BITRATES; i++)
-               range->bitrate[i] = (rateset.rates[i]& 0x7f) * 500000; 
-       dev_wlc_intvar_get(dev, "nmode", &nmode);
-       dev_wlc_ioctl(dev, WLC_GET_PHYTYPE, &phytype, sizeof(phytype));
-
-       if (nmode == 1 && phytype == WLC_PHY_TYPE_SSN) {
-               dev_wlc_intvar_get(dev, "mimo_bw_cap", &bw_cap);
-               dev_wlc_intvar_get(dev, "sgi_tx", &sgi_tx);
-               dev_wlc_ioctl(dev, WLC_GET_CHANNEL, &ci, sizeof(channel_info_t));
-               ci.hw_channel = dtoh32(ci.hw_channel);
-
-               if (bw_cap == 0 ||
-                       (bw_cap == 2 && ci.hw_channel <= 14)) {
-                       if (sgi_tx == 0)
-                               nrate_list2copy = 0;
-                       else
-                               nrate_list2copy = 1;
-               }
-               if (bw_cap == 1 ||
-                       (bw_cap == 2 && ci.hw_channel >= 36)) {
-                       if (sgi_tx == 0)
-                               nrate_list2copy = 2;
-                       else
-                               nrate_list2copy = 3;
-               }
-               range->num_bitrates += 8;
-               for (k = 0; i < range->num_bitrates; k++, i++) {
-                       
-                       range->bitrate[i] = (nrate_list[nrate_list2copy][k]) * 500000;
-               }
-       }
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_PHYTYPE, &i, sizeof(i)))) {
-               kfree(channels);
-               return error;
-       }
-       i = dtoh32(i);
-       if (i == WLC_PHY_TYPE_A)
-               range->throughput = 24000000;   
-       else
-               range->throughput = 1500000;    
-
-       
-       range->min_rts = 0;
-       range->max_rts = 2347;
-       range->min_frag = 256;
-       range->max_frag = 2346;
-
-       range->max_encoding_tokens = DOT11_MAX_DEFAULT_KEYS;
-       range->num_encoding_sizes = 4;
-       range->encoding_size[0] = WEP1_KEY_SIZE;
-       range->encoding_size[1] = WEP128_KEY_SIZE;
-#if WIRELESS_EXT > 17
-       range->encoding_size[2] = TKIP_KEY_SIZE;
-#else
-       range->encoding_size[2] = 0;
-#endif
-       range->encoding_size[3] = AES_KEY_SIZE;
-
-       
-       range->min_pmp = 0;
-       range->max_pmp = 0;
-       range->min_pmt = 0;
-       range->max_pmt = 0;
-       range->pmp_flags = 0;
-       range->pm_capa = 0;
-
-       
-       range->num_txpower = 2;
-       range->txpower[0] = 1;
-       range->txpower[1] = 255;
-       range->txpower_capa = IW_TXPOW_MWATT;
-
-#if WIRELESS_EXT > 10
-       range->we_version_compiled = WIRELESS_EXT;
-       range->we_version_source = 19;
-
-       
-       range->retry_capa = IW_RETRY_LIMIT;
-       range->retry_flags = IW_RETRY_LIMIT;
-       range->r_time_flags = 0;
-       
-       range->min_retry = 1;
-       range->max_retry = 255;
-       
-       range->min_r_time = 0;
-       range->max_r_time = 0;
-#endif 
-
-#if WIRELESS_EXT > 17
-       range->enc_capa = IW_ENC_CAPA_WPA;
-       range->enc_capa |= IW_ENC_CAPA_CIPHER_TKIP;
-       range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP;
-#ifdef BCMWPA2
-       range->enc_capa |= IW_ENC_CAPA_WPA2;
-#endif
-
-       
-       IW_EVENT_CAPA_SET_KERNEL(range->event_capa);
-       
-       IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP);
-       IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN);
-       IW_EVENT_CAPA_SET(range->event_capa, IWEVTXDROP);
-       IW_EVENT_CAPA_SET(range->event_capa, IWEVMICHAELMICFAILURE);
-#ifdef BCMWPA2
-       IW_EVENT_CAPA_SET(range->event_capa, IWEVPMKIDCAND);
-#endif
-#endif 
-
-       kfree(channels);
-
-       return 0;
-}
-
-static int
-rssi_to_qual(int rssi)
-{
-       if (rssi <= WL_IW_RSSI_NO_SIGNAL)
-               return 0;
-       else if (rssi <= WL_IW_RSSI_VERY_LOW)
-               return 1;
-       else if (rssi <= WL_IW_RSSI_LOW)
-               return 2;
-       else if (rssi <= WL_IW_RSSI_GOOD)
-               return 3;
-       else if (rssi <= WL_IW_RSSI_VERY_GOOD)
-               return 4;
-       else
-               return 5;
-}
-
-static int
-wl_iw_set_spy(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-       struct sockaddr *addr = (struct sockaddr *) extra;
-       int i;
-
-       WL_TRACE(("%s: SIOCSIWSPY\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       iw->spy_num = MIN(ARRAYSIZE(iw->spy_addr), dwrq->length);
-       for (i = 0; i < iw->spy_num; i++)
-               memcpy(&iw->spy_addr[i], addr[i].sa_data, ETHER_ADDR_LEN);
-       memset(iw->spy_qual, 0, sizeof(iw->spy_qual));
-
-       return 0;
-}
-
-static int
-wl_iw_get_spy(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-       struct sockaddr *addr = (struct sockaddr *) extra;
-       struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
-       int i;
-
-       WL_TRACE(("%s: SIOCGIWSPY\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       dwrq->length = iw->spy_num;
-       for (i = 0; i < iw->spy_num; i++) {
-               memcpy(addr[i].sa_data, &iw->spy_addr[i], ETHER_ADDR_LEN);
-               addr[i].sa_family = AF_UNIX;
-               memcpy(&qual[i], &iw->spy_qual[i], sizeof(struct iw_quality));
-               iw->spy_qual[i].updated = 0;
-       }
-
-       return 0;
-}
-
-static int
-wl_iw_set_wap(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct sockaddr *awrq,
-       char *extra
-)
-{
-       int error = -EINVAL;
-       wl_join_params_t join_params;
-
-       WL_TRACE(("%s: SIOCSIWAP\n", dev->name));
-
-       if (awrq->sa_family != ARPHRD_ETHER) {
-               WL_ERROR(("Invalid Header...sa_family\n"));
-               return -EINVAL;
-       }
-
-       
-       if (ETHER_ISBCAST(awrq->sa_data) || ETHER_ISNULLADDR(awrq->sa_data)) {
-               scb_val_t scbval;
-               
-               bzero(&scbval, sizeof(scb_val_t));
-               
-               (void) dev_wlc_ioctl(dev, WLC_DISASSOC, &scbval, sizeof(scb_val_t));
-               return 0;
-       }
-
-
-       
-       memset(&join_params, 0, sizeof(join_params));
-
-       memcpy(join_params.ssid.SSID, g_ssid.SSID, g_ssid.SSID_len);
-       join_params.ssid.SSID_len = htod32(g_ssid.SSID_len);
-       memcpy(&join_params.params.bssid, awrq->sa_data, ETHER_ADDR_LEN);
-
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_SSID, &join_params, sizeof(join_params)))) {
-               WL_ERROR(("Invalid ioctl data.\n"));
-               return error;
-       }
-
-       
-       memset(&g_ssid, 0, sizeof(g_ssid));
-       return 0;
-}
-
-static int
-wl_iw_get_wap(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct sockaddr *awrq,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCGIWAP\n", dev->name));
-
-       awrq->sa_family = ARPHRD_ETHER;
-       memset(awrq->sa_data, 0, ETHER_ADDR_LEN);
-
-       
-       (void) dev_wlc_ioctl(dev, WLC_GET_BSSID, awrq->sa_data, ETHER_ADDR_LEN);
-
-       return 0;
-}
-
-#if WIRELESS_EXT > 17
-static int
-wl_iw_mlme(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct sockaddr *awrq,
-       char *extra
-)
-{
-       struct iw_mlme *mlme;
-       scb_val_t scbval;
-       int error  = -EINVAL;
-
-       WL_TRACE(("%s: SIOCSIWMLME DISASSOC/DEAUTH\n", dev->name));
-
-       mlme = (struct iw_mlme *)extra;
-       if (mlme == NULL) {
-               WL_ERROR(("Invalid ioctl data.\n"));
-               return error;
-       }
-
-       scbval.val = mlme->reason_code;
-       bcopy(&mlme->addr.sa_data, &scbval.ea, ETHER_ADDR_LEN);
-
-       if (mlme->cmd == IW_MLME_DISASSOC) {
-               scbval.val = htod32(scbval.val);
-               error = dev_wlc_ioctl(dev, WLC_DISASSOC, &scbval, sizeof(scb_val_t));
-       }
-       else if (mlme->cmd == IW_MLME_DEAUTH) {
-               scbval.val = htod32(scbval.val);
-               error = dev_wlc_ioctl(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON, &scbval,
-                       sizeof(scb_val_t));
-       }
-       else {
-               WL_ERROR(("Invalid ioctl data.\n"));
-               return error;
-       }
-
-       return error;
-}
-#endif 
-
-static int
-wl_iw_get_aplist(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_scan_results_t *list;
-       struct sockaddr *addr = (struct sockaddr *) extra;
-       struct iw_quality qual[IW_MAX_AP];
-       wl_bss_info_t *bi = NULL;
-       int error, i;
-       uint buflen = dwrq->length;
-
-       WL_TRACE(("%s: SIOCGIWAPLIST\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       
-       list = kmalloc(buflen, GFP_KERNEL);
-       if (!list)
-               return -ENOMEM;
-       memset(list, 0, buflen);
-       list->buflen = htod32(buflen);
-       if ((error = dev_wlc_ioctl(dev, WLC_SCAN_RESULTS, list, buflen))) {
-               WL_ERROR(("%d: Scan results error %d\n", __LINE__, error));
-               kfree(list);
-               return error;
-       }
-       list->buflen = dtoh32(list->buflen);
-       list->version = dtoh32(list->version);
-       list->count = dtoh32(list->count);
-       if (list->version != WL_BSS_INFO_VERSION) {
-               WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                        __FUNCTION__, list->version));
-               kfree(list);
-               return -EINVAL;
-       }
-
-       for (i = 0, dwrq->length = 0; i < list->count && dwrq->length < IW_MAX_AP; i++) {
-               bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length)) : list->bss_info;
-               ASSERT(((uintptr)bi + dtoh32(bi->length)) <= ((uintptr)list +
-                       buflen));
-
-               
-               if (!(dtoh16(bi->capability) & DOT11_CAP_ESS))
-                       continue;
-
-               
-               memcpy(addr[dwrq->length].sa_data, &bi->BSSID, ETHER_ADDR_LEN);
-               addr[dwrq->length].sa_family = ARPHRD_ETHER;
-               qual[dwrq->length].qual = rssi_to_qual(dtoh16(bi->RSSI));
-               qual[dwrq->length].level = 0x100 + dtoh16(bi->RSSI);
-               qual[dwrq->length].noise = 0x100 + bi->phy_noise;
-
-               
-#if WIRELESS_EXT > 18
-               qual[dwrq->length].updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
-#else
-               qual[dwrq->length].updated = 7;
-#endif 
-
-               dwrq->length++;
-       }
-
-       kfree(list);
-
-       if (dwrq->length) {
-               memcpy(&addr[dwrq->length], qual, sizeof(struct iw_quality) * dwrq->length);
-               
-               dwrq->flags = 1;
-       }
-
-       return 0;
-}
-
-#ifdef WL_IW_USE_ISCAN
-static int
-wl_iw_iscan_get_aplist(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_scan_results_t *list;
-       iscan_buf_t * buf;
-       iscan_info_t *iscan = g_iscan;
-
-       struct sockaddr *addr = (struct sockaddr *) extra;
-       struct iw_quality qual[IW_MAX_AP];
-       wl_bss_info_t *bi = NULL;
-       int i;
-
-       WL_TRACE(("%s: SIOCGIWAPLIST\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       if ((!iscan) || (iscan->sysioc_pid < 0)) {
-               return wl_iw_get_aplist(dev, info, dwrq, extra);
-       }
-
-       buf = iscan->list_hdr;
-       
-       while (buf) {
-               list = &((wl_iscan_results_t*)buf->iscan_buf)->results;
-               if (list->version != WL_BSS_INFO_VERSION) {
-                       WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                               __FUNCTION__, list->version));
-                       return -EINVAL;
-               }
-
-               bi = NULL;
-               for (i = 0, dwrq->length = 0; i < list->count && dwrq->length < IW_MAX_AP; i++) {
-                       bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length))
-                                 : list->bss_info;
-                       ASSERT(((uintptr)bi + dtoh32(bi->length)) <= ((uintptr)list +
-                               WLC_IW_ISCAN_MAXLEN));
-
-                       
-                       if (!(dtoh16(bi->capability) & DOT11_CAP_ESS))
-                               continue;
-
-                       
-                       memcpy(addr[dwrq->length].sa_data, &bi->BSSID, ETHER_ADDR_LEN);
-                       addr[dwrq->length].sa_family = ARPHRD_ETHER;
-                       qual[dwrq->length].qual = rssi_to_qual(dtoh16(bi->RSSI));
-                       qual[dwrq->length].level = 0x100 + dtoh16(bi->RSSI);
-                       qual[dwrq->length].noise = 0x100 + bi->phy_noise;
-
-                       
-#if WIRELESS_EXT > 18
-                       qual[dwrq->length].updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
-#else
-                       qual[dwrq->length].updated = 7;
-#endif 
-
-                       dwrq->length++;
-               }
-               buf = buf->next;
-       }
-       if (dwrq->length) {
-               memcpy(&addr[dwrq->length], qual, sizeof(struct iw_quality) * dwrq->length);
-               
-               dwrq->flags = 1;
-       }
-
-       return 0;
-}
-
-static int
-wl_iw_iscan_prep(wl_scan_params_t *params, wlc_ssid_t *ssid)
-{
-       int err = 0;
-
-       memcpy(&params->bssid, &ether_bcast, ETHER_ADDR_LEN);
-       params->bss_type = DOT11_BSSTYPE_ANY;
-       params->scan_type = 0;
-       params->nprobes = -1;
-       params->active_time = -1;
-       params->passive_time = -1;
-       params->home_time = -1;
-       params->channel_num = 0;
-
-       params->nprobes = htod32(params->nprobes);
-       params->active_time = htod32(params->active_time);
-       params->passive_time = htod32(params->passive_time);
-       params->home_time = htod32(params->home_time);
-       if (ssid && ssid->SSID_len)
-               memcpy(&params->ssid, ssid, sizeof(wlc_ssid_t));
-
-       return err;
-}
-
-static int
-wl_iw_iscan(iscan_info_t *iscan, wlc_ssid_t *ssid, uint16 action)
-{
-       int err = 0;
-
-       iscan->iscan_ex_params_p->version = htod32(ISCAN_REQ_VERSION);
-       iscan->iscan_ex_params_p->action = htod16(action);
-       iscan->iscan_ex_params_p->scan_duration = htod16(0);
-
-       WL_SCAN(("%s : nprobes=%d\n", __FUNCTION__, iscan->iscan_ex_params_p->params.nprobes));
-       WL_SCAN(("active_time=%d\n", iscan->iscan_ex_params_p->params.active_time));
-       WL_SCAN(("passive_time=%d\n", iscan->iscan_ex_params_p->params.passive_time));
-       WL_SCAN(("home_time=%d\n", iscan->iscan_ex_params_p->params.home_time));
-       WL_SCAN(("scan_type=%d\n", iscan->iscan_ex_params_p->params.scan_type));
-       WL_SCAN(("bss_type=%d\n", iscan->iscan_ex_params_p->params.bss_type));
-
-       
-       (void) dev_iw_iovar_setbuf(iscan->dev, "iscan", iscan->iscan_ex_params_p, \
-               iscan->iscan_ex_param_size, iscan->ioctlbuf, sizeof(iscan->ioctlbuf));
-
-       return err;
-}
-
-static void
-wl_iw_timerfunc(ulong data)
-{
-       iscan_info_t *iscan = (iscan_info_t *)data;
-       if (iscan) {
-               iscan->timer_on = 0;
-               if (iscan->iscan_state != ISCAN_STATE_IDLE) {
-                       WL_TRACE(("timer trigger\n"));
-                       up(&iscan->sysioc_sem);
-               }
-       }
-}
-static void wl_iw_set_event_mask(struct net_device *dev)
-{
-       char eventmask[WL_EVENTING_MASK_LEN];
-       char iovbuf[WL_EVENTING_MASK_LEN + 12]; 
-
-       dev_iw_iovar_getbuf(dev, "event_msgs", "", 0, iovbuf, sizeof(iovbuf));
-       bcopy(iovbuf, eventmask, WL_EVENTING_MASK_LEN);
-       setbit(eventmask, WLC_E_SCAN_COMPLETE);
-       dev_iw_iovar_setbuf(dev, "event_msgs", eventmask, WL_EVENTING_MASK_LEN,
-               iovbuf, sizeof(iovbuf));
-}
-
-static uint32
-wl_iw_iscan_get(iscan_info_t *iscan)
-{
-       iscan_buf_t * buf;
-       iscan_buf_t * ptr;
-       wl_iscan_results_t * list_buf;
-       wl_iscan_results_t list;
-       wl_scan_results_t *results;
-       uint32 status;
-
-       
-       MUTEX_LOCK_WL_SCAN_SET();
-       if (iscan->list_cur) {
-               buf = iscan->list_cur;
-               iscan->list_cur = buf->next;
-       }
-       else {
-               buf = kmalloc(sizeof(iscan_buf_t), GFP_KERNEL);
-               if (!buf) {
-                       WL_ERROR(("%s can't alloc iscan_buf_t : going to abort currect iscan\n", \
-                                               __FUNCTION__));
-                       MUTEX_UNLOCK_WL_SCAN_SET();
-                       return WL_SCAN_RESULTS_NO_MEM;
-               }
-               buf->next = NULL;
-               if (!iscan->list_hdr)
-                       iscan->list_hdr = buf;
-               else {
-                       ptr = iscan->list_hdr;
-                       while (ptr->next) {
-                               ptr = ptr->next;
-                       }
-                       ptr->next = buf;
-               }
-       }
-       memset(buf->iscan_buf, 0, WLC_IW_ISCAN_MAXLEN);
-       list_buf = (wl_iscan_results_t*)buf->iscan_buf;
-       results = &list_buf->results;
-       results->buflen = WL_ISCAN_RESULTS_FIXED_SIZE;
-       results->version = 0;
-       results->count = 0;
-
-       memset(&list, 0, sizeof(list));
-       list.results.buflen = htod32(WLC_IW_ISCAN_MAXLEN);
-       (void) dev_iw_iovar_getbuf(
-               iscan->dev,
-               "iscanresults",
-               &list,
-               WL_ISCAN_RESULTS_FIXED_SIZE,
-               buf->iscan_buf,
-               WLC_IW_ISCAN_MAXLEN);
-       results->buflen = dtoh32(results->buflen);
-       results->version = dtoh32(results->version);
-       results->count = dtoh32(results->count);
-       WL_TRACE(("%s: results->count = %d\n", __func__, results->count));
-
-       //WL_TRACE(("results->buflen = %d\n", results->buflen));
-       status = dtoh32(list_buf->status);
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       return status;
-}
-
-static void wl_iw_force_specific_scan(iscan_info_t *iscan)
-{
-       WL_TRACE(("%s force Specific SCAN for %s\n", __FUNCTION__, g_specific_ssid.SSID));
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       rtnl_lock();
-#endif
-
-       (void) dev_wlc_ioctl(iscan->dev, WLC_SCAN, &g_specific_ssid, sizeof(g_specific_ssid));
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       rtnl_unlock();
-#endif
-}
-static void wl_iw_send_scan_complete(iscan_info_t *iscan)
-{
-#ifndef SANDGATE2G
-       union iwreq_data wrqu;
-
-#if !defined(CSCAN)
-       if (g_first_broadcast_scan == BROADCAST_SCAN_FIRST_STARTED)
-               g_first_broadcast_scan = BROADCAST_SCAN_FIRST_RESULT_READY;
-#endif 
-       memset(&wrqu, 0, sizeof(wrqu));
-       wireless_send_event(iscan->dev, SIOCGIWSCAN, &wrqu, NULL);
-       WL_TRACE(("Send Event ISCAN complete\n"));
-#endif 
-}
-static int
-_iscan_sysioc_thread(void *data)
-{
-       uint32 status;
-       iscan_info_t *iscan = (iscan_info_t *)data;
-       static bool iscan_pass_abort = FALSE;
-       DAEMONIZE("iscan_sysioc");
-
-       status = WL_SCAN_RESULTS_PARTIAL;
-       while (down_interruptible(&iscan->sysioc_sem) == 0) {
-
-#if defined(SOFTAP)
-               if (ap_cfg_running) {
-                WL_TRACE(("%s skipping SCAN ops in AP mode !!!\n", __FUNCTION__));
-                continue;
-               }
-#endif 
-               if (iscan->timer_on) {
-                       del_timer(&iscan->timer);
-                       iscan->timer_on = 0;
-               }
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-               rtnl_lock();
-#endif
-               status = wl_iw_iscan_get(iscan);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-               rtnl_unlock();
-#endif
-       if  (g_scan_specified_ssid && (iscan_pass_abort == TRUE)) {
-               WL_TRACE(("%s Get results from specific scan status=%d\n", __FUNCTION__, status));
-                       wl_iw_send_scan_complete(iscan);
-                       iscan_pass_abort = FALSE;
-                       status  = -1;
-               }
-
-               switch (status) {
-                       case WL_SCAN_RESULTS_PARTIAL:
-                               WL_TRACE(("iscanresults incomplete\n"));
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-                               rtnl_lock();
-#endif
-                               
-                               wl_iw_iscan(iscan, NULL, WL_SCAN_ACTION_CONTINUE);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-                               rtnl_unlock();
-#endif
-                               
-                               mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-                               iscan->timer_on = 1;
-                               break;
-                       case WL_SCAN_RESULTS_SUCCESS:
-                               WL_TRACE(("iscanresults complete\n"));
-                               iscan->iscan_state = ISCAN_STATE_IDLE;
-                               wl_iw_send_scan_complete(iscan);
-                               break;
-                       case WL_SCAN_RESULTS_PENDING:
-                               WL_TRACE(("iscanresults pending\n"));
-                               
-                               mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-                               iscan->timer_on = 1;
-                               break;
-                       case WL_SCAN_RESULTS_ABORTED:
-                               WL_TRACE(("iscanresults aborted\n"));
-                               iscan->iscan_state = ISCAN_STATE_IDLE;
-                               if (g_scan_specified_ssid == 0)
-                                       wl_iw_send_scan_complete(iscan);
-                               else {
-                                       iscan_pass_abort = TRUE;
-                                       wl_iw_force_specific_scan(iscan);
-                               }
-                               break;
-                       case WL_SCAN_RESULTS_NO_MEM:
-                               WL_TRACE(("iscanresults can't alloc memory: skip\n"));
-                               iscan->iscan_state = ISCAN_STATE_IDLE;
-                               break;
-                       default:
-                               WL_TRACE(("iscanresults returned unknown status %d\n", status));
-                               break;
-                }
-       }
-
-       if (iscan->timer_on) {
-               del_timer(&iscan->timer);
-               iscan->timer_on = 0;
-       }
-       complete_and_exit(&iscan->sysioc_exited, 0);
-}
-#endif 
-
-#if !defined(CSCAN)
-
-static void
-wl_iw_set_ss_cache_timer_flag(void)
-{
-       g_ss_cache_ctrl.m_timer_expired = 1;
-       //WL_TRACE(("%s called\n", __FUNCTION__));
-}
-
-static int
-wl_iw_init_ss_cache_ctrl(void)
-{
-       WL_TRACE(("%s :\n", __FUNCTION__));
-       g_ss_cache_ctrl.m_prev_scan_mode = 0;
-       g_ss_cache_ctrl.m_cons_br_scan_cnt = 0;
-       g_ss_cache_ctrl.m_cache_head = NULL;
-       g_ss_cache_ctrl.m_link_down = 0;
-       g_ss_cache_ctrl.m_timer_expired = 0;
-       memset(g_ss_cache_ctrl.m_active_bssid, 0, ETHER_ADDR_LEN);
-
-       g_ss_cache_ctrl.m_timer = kmalloc(sizeof(struct timer_list), GFP_KERNEL);
-       if (!g_ss_cache_ctrl.m_timer) {
-               return -ENOMEM;
-       }
-       g_ss_cache_ctrl.m_timer->function = (void *)wl_iw_set_ss_cache_timer_flag;
-       init_timer(g_ss_cache_ctrl.m_timer);
-
-       return 0;
-}
-
-
-
-static void
-wl_iw_free_ss_cache(void)
-{
-       wl_iw_ss_cache_t *node, *cur;
-       wl_iw_ss_cache_t **spec_scan_head;
-
-       WL_TRACE(("%s called\n", __FUNCTION__));
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       spec_scan_head = &g_ss_cache_ctrl.m_cache_head;
-       node = *spec_scan_head;
-
-       for (;node;) {
-               WL_TRACE(("%s : SSID - %s\n", __FUNCTION__, node->bss_info->SSID));
-               cur = node;
-               node = cur->next;
-               kfree(cur);
-       }
-       *spec_scan_head = NULL;
-       MUTEX_UNLOCK_WL_SCAN_SET();
-}
-
-
-
-static int
-wl_iw_run_ss_cache_timer(int kick_off)
-{
-       struct timer_list **timer;
-
-       timer = &g_ss_cache_ctrl.m_timer;
-
-       if (*timer) {
-               if (kick_off) {
-                       (*timer)->expires = jiffies + 30000 * HZ / 1000;        
-                       add_timer(*timer);
-                       //WL_TRACE(("%s : timer starts \n", __FUNCTION__));
-               } else {
-                       del_timer_sync(*timer);
-                       //WL_TRACE(("%s : timer stops \n", __FUNCTION__));
-               }
-       }
-
-       return 0;
-}
-
-
-void
-wl_iw_release_ss_cache_ctrl(void)
-{
-       WL_TRACE(("%s :\n", __FUNCTION__));
-       wl_iw_free_ss_cache();
-       wl_iw_run_ss_cache_timer(0);
-       if (g_ss_cache_ctrl.m_timer) {
-               kfree(g_ss_cache_ctrl.m_timer);
-       }
-}
-
-
-
-static void
-wl_iw_reset_ss_cache(void)
-{
-       wl_iw_ss_cache_t *node, *prev, *cur;
-       wl_iw_ss_cache_t **spec_scan_head;
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       spec_scan_head = &g_ss_cache_ctrl.m_cache_head;
-       node = *spec_scan_head;
-       prev = node;
-
-       for (;node;) {
-               WL_TRACE(("%s : node SSID %s \n", __FUNCTION__, node->bss_info->SSID));
-               if (!node->dirty) {
-                       cur = node;
-                       if (cur == *spec_scan_head) {
-                               *spec_scan_head = cur->next;
-                               prev = *spec_scan_head;
-                       }
-                       else {
-                               prev->next = cur->next;
-                       }
-                       node = cur->next;
-
-                       WL_TRACE(("%s : Del node : SSID %s\n", __FUNCTION__, cur->bss_info->SSID));
-                       kfree(cur);
-                       continue;
-               }
-
-               node->dirty = 0;
-               prev = node;
-               node = node->next;
-       }
-       MUTEX_UNLOCK_WL_SCAN_SET();
-}
-
-
-static int
-wl_iw_add_bss_to_ss_cache(wl_scan_results_t *ss_list)
-{
-
-       wl_iw_ss_cache_t *node, *prev, *leaf;
-       wl_iw_ss_cache_t **spec_scan_head;
-       wl_bss_info_t *bi = NULL;
-       int i;
-
-       
-       if (!ss_list->count) {
-               return 0;
-       }
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       spec_scan_head = &g_ss_cache_ctrl.m_cache_head;
-       for (i = 0; i < ss_list->count; i++) {
-
-               node = *spec_scan_head;
-               prev = node;
-
-               bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length)) : ss_list->bss_info;
-
-               WL_TRACE(("%s : find %d with specific SSID %s\n", __FUNCTION__, i, bi->SSID));
-               for (;node;) {
-                       if (!memcmp(&node->bss_info->BSSID, &bi->BSSID, ETHER_ADDR_LEN)) {
-                               
-                               WL_TRACE(("dirty marked : SSID %s\n", bi->SSID));
-                               node->dirty = 1;
-                               break;
-                       }
-                       prev = node;
-                       node = node->next;
-               }
-
-               if (node) {
-                       continue;
-               }
-               leaf = kmalloc(bi->length + WLC_IW_SS_CACHE_CTRL_FIELD_MAXLEN, GFP_KERNEL);
-               if (!leaf) {
-                       MUTEX_UNLOCK_WL_SCAN_SET();
-                       return -ENOMEM;
-               }
-
-               memcpy(leaf->bss_info, bi, bi->length);
-               leaf->next = NULL;
-               leaf->dirty = 1;
-               leaf->count = 1;
-               leaf->version = ss_list->version;
-
-               if (!prev) {
-                       *spec_scan_head = leaf;
-               }
-               else {
-                       prev->next = leaf;
-               }
-       }
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       return 0;
-
-}
-
-
-static int
-wl_iw_merge_scan_cache(struct iw_request_info *info, char *extra, uint buflen_from_user,
-__u16 *merged_len)
-{
-       wl_iw_ss_cache_t *node;
-       wl_scan_results_t *list_merge;
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       node = g_ss_cache_ctrl.m_cache_head;
-       for (;node;) {
-               list_merge = (wl_scan_results_t *)node;
-               WL_TRACE(("%s: Cached Specific APs list=%d\n", __FUNCTION__, list_merge->count));
-               if (buflen_from_user - *merged_len > 0) {
-                       *merged_len += (__u16) wl_iw_get_scan_prep(list_merge, info,
-                               extra + *merged_len, buflen_from_user - *merged_len);
-               }
-               else {
-                       WL_TRACE(("%s: exit with break\n", __FUNCTION__));
-                       break;
-               }
-               node = node->next;
-       }
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       return 0;
-}
-
-
-static int
-wl_iw_delete_bss_from_ss_cache(void *addr)
-{
-
-       wl_iw_ss_cache_t *node, *prev;
-       wl_iw_ss_cache_t **spec_scan_head;
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       spec_scan_head = &g_ss_cache_ctrl.m_cache_head;
-       node = *spec_scan_head;
-       prev = node;
-       for (;node;) {
-               if (!memcmp(&node->bss_info->BSSID, addr, ETHER_ADDR_LEN)) {
-                       if (node == *spec_scan_head) {
-                               *spec_scan_head = node->next;
-                       }
-                       else {
-                               prev->next = node->next;
-                       }
-
-                       WL_TRACE(("%s : Del node : %s\n", __FUNCTION__, node->bss_info->SSID));
-                       kfree(node);
-                       break;
-               }
-
-               prev = node;
-               node = node->next;
-       }
-
-       memset(addr, 0, ETHER_ADDR_LEN);
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       return 0;
-
-}
-
-#endif 
-
-
-static int
-wl_iw_set_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error;
-       WL_TRACE(("\n:%s dev:%s: SIOCSIWSCAN : SCAN\n", __FUNCTION__, dev->name));
-
-
-#if defined(CSCAN)
-               WL_ERROR(("%s: Scan from SIOCGIWSCAN not supported\n", __FUNCTION__));
-               return -EINVAL;
-#endif 
-
-#if defined(SOFTAP)
-       
-       if (ap_cfg_running) {
-               WL_TRACE(("\n>%s: Not executed, reason -'SOFTAP is active'\n", __FUNCTION__));
-               return 0;
-       }
-#endif 
-
-       
-       if (g_onoff == G_WLAN_SET_OFF)
-               return 0;
-
-       
-       memset(&g_specific_ssid, 0, sizeof(g_specific_ssid));
-#ifndef WL_IW_USE_ISCAN
-       
-       g_scan_specified_ssid = 0;
-#endif 
-
-#if WIRELESS_EXT > 17
-       
-       if (wrqu->data.length == sizeof(struct iw_scan_req)) {
-               if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
-                       struct iw_scan_req *req = (struct iw_scan_req *)extra;
-                       if (g_first_broadcast_scan != BROADCAST_SCAN_FIRST_RESULT_CONSUMED) {
-                               
-                               WL_TRACE(("%s Ignoring SC %s first BC is not done = %d\n", \
-                                               __FUNCTION__, req->essid, \
-                                               g_first_broadcast_scan));
-                               return -EBUSY;
-                       }
-                       if (g_scan_specified_ssid) {
-                               WL_TRACE(("%s Specific SCAN is not done ignore scan for = %s \n", \
-                                       __FUNCTION__, req->essid));
-                               
-                               return -EBUSY;
-                       }
-                       else {
-                               g_specific_ssid.SSID_len = MIN(sizeof(g_specific_ssid.SSID), \
-                                                                               req->essid_len);
-                               memcpy(g_specific_ssid.SSID, req->essid, g_specific_ssid.SSID_len);
-                               g_specific_ssid.SSID_len = htod32(g_specific_ssid.SSID_len);
-                               g_scan_specified_ssid = 1;
-                               WL_TRACE(("### Specific scan ssid=%s len=%d\n", \
-                                               g_specific_ssid.SSID, g_specific_ssid.SSID_len));
-                       }
-               }
-       }
-#endif 
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_SCAN, &g_specific_ssid, sizeof(g_specific_ssid)))) {
-               WL_TRACE(("#### Set SCAN for %s failed with %d\n", g_specific_ssid.SSID, error));
-               
-               g_scan_specified_ssid = 0;
-               return -EBUSY;
-       }
-
-       return 0;
-}
-
-#ifdef WL_IW_USE_ISCAN
-int
-wl_iw_iscan_set_scan_broadcast_prep(struct net_device *dev, uint flag)
-{
-       wlc_ssid_t ssid;
-       iscan_info_t *iscan = g_iscan;
-
-#if !defined(CSCAN)
-       
-       if (g_first_broadcast_scan == BROADCAST_SCAN_FIRST_IDLE) {
-               g_first_broadcast_scan = BROADCAST_SCAN_FIRST_STARTED;
-               WL_TRACE(("%s: First Brodcast scan was forced\n", __FUNCTION__));
-       }
-       else if (g_first_broadcast_scan == BROADCAST_SCAN_FIRST_STARTED) {
-               WL_TRACE(("%s: ignore ISCAN request first BS is not done yet\n", __FUNCTION__));
-               return 0;
-       }
-#endif 
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       if (flag)
-               rtnl_lock();
-#endif
-
-       dev_wlc_ioctl(dev, WLC_SET_PASSIVE_SCAN, &iscan->scan_flag, sizeof(iscan->scan_flag));
-       wl_iw_set_event_mask(dev);
-
-       WL_TRACE(("+++: Set Broadcast ISCAN\n"));
-       
-       memset(&ssid, 0, sizeof(ssid));
-
-       iscan->list_cur = iscan->list_hdr;
-       iscan->iscan_state = ISCAN_STATE_SCANING;
-
-       memset(&iscan->iscan_ex_params_p->params, 0, iscan->iscan_ex_param_size);
-       wl_iw_iscan_prep(&iscan->iscan_ex_params_p->params, &ssid);
-       wl_iw_iscan(iscan, &ssid, WL_SCAN_ACTION_START);
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       if (flag)
-               rtnl_unlock();
-#endif
-
-       mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-
-       iscan->timer_on = 1;
-
-       return 0;
-}
-static int
-wl_iw_iscan_set_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       wlc_ssid_t ssid;
-       iscan_info_t *iscan = g_iscan;
-
-       WL_TRACE(("%s: SIOCSIWSCAN : ISCAN\n", dev->name));
-
-#if defined(CSCAN)
-               WL_ERROR(("%s: Scan from SIOCGIWSCAN not supported\n", __FUNCTION__));
-               return -EINVAL;
-#endif 
-
-       
-#if defined(SOFTAP)
-       if (ap_cfg_running) {
-               WL_TRACE(("\n>%s: Not executed, reason -'SOFTAP is active'\n", __FUNCTION__));
-               return 0;
-       }
-#endif
-       
-       if (g_onoff == G_WLAN_SET_OFF) {
-               WL_TRACE(("%s: driver is not up yet after START\n", __FUNCTION__));
-               return 0;
-       }
-
-       
-       if ((!iscan) || (iscan->sysioc_pid < 0)) {
-               WL_TRACE(("%s use backup if iscan thread is not successful\n", \
-                        __FUNCTION__));
-               return wl_iw_set_scan(dev, info, wrqu, extra);
-       }
-
-       if (g_scan_specified_ssid) {
-               WL_TRACE(("%s Specific SCAN already running ignoring BC scan\n", \
-                               __FUNCTION__));
-               return EBUSY;
-       }
-
-       
-       memset(&ssid, 0, sizeof(ssid));
-
-#if WIRELESS_EXT > 17
-       
-       if (wrqu->data.length == sizeof(struct iw_scan_req)) {
-               if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
-                       int as = 0;
-                       struct iw_scan_req *req = (struct iw_scan_req *)extra;
-#if !defined(CSCAN)
-                       if (g_first_broadcast_scan < BROADCAST_SCAN_FIRST_RESULT_CONSUMED) {
-                               
-                               WL_TRACE(("%s First ISCAN in progress : ignoring SC = %s\n", \
-                                        __FUNCTION__, req->essid));
-                               return -EBUSY;
-                       }
-#endif 
-                       ssid.SSID_len = MIN(sizeof(ssid.SSID), req->essid_len);
-                       memcpy(ssid.SSID, req->essid, ssid.SSID_len);
-                       ssid.SSID_len = htod32(ssid.SSID_len);
-                       dev_wlc_ioctl(dev, WLC_SET_PASSIVE_SCAN, &as, sizeof(as));
-                       wl_iw_set_event_mask(dev);
-                       return wl_iw_set_scan(dev, info, wrqu, extra);
-               }
-               else {
-                       g_scan_specified_ssid = 0;
-
-                       if (iscan->iscan_state == ISCAN_STATE_SCANING) {
-                               WL_TRACE(("%s ISCAN already in progress \n", __FUNCTION__));
-                               return 0;
-                       }
-               }
-       }
-#endif 
-
-       wl_iw_iscan_set_scan_broadcast_prep(dev, 0);
-
-       return 0;
-}
-#endif 
-
-#if WIRELESS_EXT > 17
-static bool
-ie_is_wpa_ie(uint8 **wpaie, uint8 **tlvs, int *tlvs_len)
-{
-
-
-       uint8 *ie = *wpaie;
-
-       
-       if ((ie[1] >= 6) &&
-               !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x01"), 4)) {
-               return TRUE;
-       }
-
-       
-       ie += ie[1] + 2;
-       
-       *tlvs_len -= (int)(ie - *tlvs);
-       
-       *tlvs = ie;
-       return FALSE;
-}
-
-static bool
-ie_is_wps_ie(uint8 **wpsie, uint8 **tlvs, int *tlvs_len)
-{
-
-
-       uint8 *ie = *wpsie;
-
-       
-       if ((ie[1] >= 4) &&
-               !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x04"), 4)) {
-               return TRUE;
-       }
-
-       
-       ie += ie[1] + 2;
-       
-       *tlvs_len -= (int)(ie - *tlvs);
-       
-       *tlvs = ie;
-       return FALSE;
-}
-#endif 
-
-static inline int _wpa_snprintf_hex(char *buf, size_t buf_size, const u8 *data,
-       size_t len, int uppercase)
-{
-       size_t i;
-       char *pos = buf, *end = buf + buf_size;
-       int ret;
-       if (buf_size == 0)
-               return 0;
-       for (i = 0; i < len; i++) {
-               ret = snprintf(pos, end - pos, uppercase ? "%02X" : "%02x",
-                       data[i]);
-               if (ret < 0 || ret >= end - pos) {
-                       end[-1] = '\0';
-                       return pos - buf;
-               }
-               pos += ret;
-       }
-       end[-1] = '\0';
-       return pos - buf;
-}
-
-
-int wpa_snprintf_hex(char *buf, size_t buf_size, const u8 *data, size_t len)
-{
-       return _wpa_snprintf_hex(buf, buf_size, data, len, 0);
-}
-
-static int
-wl_iw_handle_scanresults_ies(char **event_p, char *end,
-       struct iw_request_info *info, wl_bss_info_t *bi)
-{
-#if WIRELESS_EXT > 17
-       struct iw_event iwe;
-       char *event;
-       char *buf;
-       int custom_event_len;
-
-       event = *event_p;
-       if (bi->ie_length) {
-               
-               bcm_tlv_t *ie;
-               uint8 *ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
-               int ptr_len = bi->ie_length;
-
-#ifdef BCMWPA2
-               if ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_RSN_ID))) {
-                       iwe.cmd = IWEVGENIE;
-                       iwe.u.data.length = ie->len + 2;
-                       event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)ie);
-               }
-               ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
-#endif 
-
-               while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) {
-                       
-                       if (ie_is_wps_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
-                               iwe.cmd = IWEVGENIE;
-                               iwe.u.data.length = ie->len + 2;
-                               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)ie);
-                               break;
-                       }
-               }
-
-               ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
-               ptr_len = bi->ie_length;
-               while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) {
-                       if (ie_is_wpa_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
-                               iwe.cmd = IWEVGENIE;
-                               iwe.u.data.length = ie->len + 2;
-                               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)ie);
-                               break;
-                       }
-               }
-
-               ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
-               ptr_len = bi->ie_length;
-
-               while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WAPI_ID))) {
-                       WL_TRACE(("%s: found a WAPI IE...\n", __FUNCTION__));
-#ifdef WAPI_IE_USE_GENIE
-                       iwe.cmd = IWEVGENIE;
-                       iwe.u.data.length = ie->len + 2;
-                       event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)ie);
-#else 
-                       iwe.cmd = IWEVCUSTOM;
-                       custom_event_len = strlen("wapi_ie=") + 2*(ie->len + 2);
-                       iwe.u.data.length = custom_event_len;
-
-                       buf = kmalloc(custom_event_len+1, GFP_KERNEL);
-                       if (buf == NULL)
-                       {
-                               WL_ERROR(("malloc(%d) returned NULL...\n", custom_event_len));
-                               break;
-                       }
-
-                       memcpy(buf, "wapi_ie=", 8);
-                       wpa_snprintf_hex(buf + 8, 2+1, &(ie->id), 1);
-                       wpa_snprintf_hex(buf + 10, 2+1, &(ie->len), 1);
-                       wpa_snprintf_hex(buf + 12, 2*ie->len+1, ie->data, ie->len);
-                       event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, buf);
-#endif 
-                       break;
-               }
-       *event_p = event;
-       }
-#endif 
-
-       return 0;
-}
-
-static uint
-wl_iw_get_scan_prep(
-       wl_scan_results_t *list,
-       struct iw_request_info *info,
-       char *extra,
-       short max_size)
-{
-       int  i, j;
-       struct iw_event  iwe;
-       wl_bss_info_t *bi = NULL;
-       char *event = extra, *end = extra + max_size - WE_ADD_EVENT_FIX, *value;
-       int     ret = 0;
-
-       ASSERT(list);
-
-       
-
-       for (i = 0; i < list->count && i < IW_MAX_AP; i++)
-       {
-               if (list->version != WL_BSS_INFO_VERSION) {
-                       WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                               __FUNCTION__, list->version));
-                       return ret;
-                }
-
-               bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length)) : list->bss_info;
-
-               WL_TRACE(("%s : %s\n", __FUNCTION__, bi->SSID));
-
-               
-               iwe.cmd = SIOCGIWAP;
-               iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-               memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_ADDR_LEN);
-               
-               iwe.u.data.length = dtoh32(bi->SSID_len);
-               iwe.cmd = SIOCGIWESSID;
-               iwe.u.data.flags = 1;
-               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, bi->SSID);
-
-               
-               if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
-                       iwe.cmd = SIOCGIWMODE;
-                       if (dtoh16(bi->capability) & DOT11_CAP_ESS)
-                               iwe.u.mode = IW_MODE_INFRA;
-                       else
-                               iwe.u.mode = IW_MODE_ADHOC;
-                       event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_UINT_LEN);
-               }
-
-               
-               iwe.cmd = SIOCGIWFREQ;
-               iwe.u.freq.m = wf_channel2mhz(CHSPEC_CHANNEL(bi->chanspec),
-                       CHSPEC_CHANNEL(bi->chanspec) <= CH_MAX_2G_CHANNEL ?
-                       WF_CHAN_FACTOR_2_4_G : WF_CHAN_FACTOR_5_G);
-               iwe.u.freq.e = 6;
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_FREQ_LEN);
-
-               
-               iwe.cmd = IWEVQUAL;
-               iwe.u.qual.qual = rssi_to_qual(dtoh16(bi->RSSI));
-               iwe.u.qual.level = 0x100 + dtoh16(bi->RSSI);
-               iwe.u.qual.noise = 0x100 + bi->phy_noise;
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_QUAL_LEN);
-
-               
-                wl_iw_handle_scanresults_ies(&event, end, info, bi);
-
-               
-               iwe.cmd = SIOCGIWENCODE;
-               if (dtoh16(bi->capability) & DOT11_CAP_PRIVACY)
-                       iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-               else
-                       iwe.u.data.flags = IW_ENCODE_DISABLED;
-               iwe.u.data.length = 0;
-               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)event);
-
-               
-               if (bi->rateset.count) {
-                       if (((event -extra) + IW_EV_LCP_LEN) <= (uintptr)end) {
-                               value = event + IW_EV_LCP_LEN;
-                               iwe.cmd = SIOCGIWRATE;
-                               
-                               iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
-                               for (j = 0; j < bi->rateset.count && j < IW_MAX_BITRATES; j++) {
-                                       iwe.u.bitrate.value =
-                                               (bi->rateset.rates[j] & 0x7f) * 500000;
-                                       value = IWE_STREAM_ADD_VALUE(info, event, value, end, &iwe,
-                                               IW_EV_PARAM_LEN);
-                               }
-                               event = value;
-                       }
-               }
-       } 
-
-       if ((ret = (event - extra)) < 0) {
-               WL_ERROR(("==> Wrong size\n"));
-               ret = 0;
-       }
-       WL_TRACE(("%s: size=%d bytes prepared \n", __FUNCTION__, (unsigned int)(event - extra)));
-       return (uint)ret;
-}
-
-static int
-wl_iw_get_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       channel_info_t ci;
-       wl_scan_results_t *list_merge;
-       wl_scan_results_t *list = (wl_scan_results_t *) g_scan;
-       int error;
-       uint buflen_from_user = dwrq->length;
-       uint len =  G_SCAN_RESULTS;
-       __u16 len_ret = 0;
-#if  !defined(CSCAN)
-       __u16 merged_len = 0;
-#endif
-#if defined(WL_IW_USE_ISCAN)
-       iscan_info_t *iscan = g_iscan;
-       iscan_buf_t * p_buf;
-#if  !defined(CSCAN)
-       uint32 counter = 0;
-#endif 
-#endif 
-
-       WL_TRACE(("%s: buflen_from_user %d: \n", dev->name, buflen_from_user));
-
-       if (!extra) {
-               WL_TRACE(("%s: wl_iw_get_scan return -EINVAL\n", dev->name));
-               return -EINVAL;
-       }
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_CHANNEL, &ci, sizeof(ci))))
-               return error;
-       ci.scan_channel = dtoh32(ci.scan_channel);
-       if (ci.scan_channel)
-               return -EAGAIN;
-
-#if  !defined(CSCAN)
-       if (g_ss_cache_ctrl.m_timer_expired) {
-               wl_iw_free_ss_cache();
-               g_ss_cache_ctrl.m_timer_expired ^= 1;
-       }
-       if ((!g_scan_specified_ssid && g_ss_cache_ctrl.m_prev_scan_mode) ||
-               g_ss_cache_ctrl.m_cons_br_scan_cnt > 4) {
-               g_ss_cache_ctrl.m_cons_br_scan_cnt = 0;
-               
-               wl_iw_reset_ss_cache();
-       }
-       g_ss_cache_ctrl.m_prev_scan_mode = g_scan_specified_ssid;
-       if (g_scan_specified_ssid) {
-               g_ss_cache_ctrl.m_cons_br_scan_cnt = 0;
-       }
-       else {
-               g_ss_cache_ctrl.m_cons_br_scan_cnt++;
-       }
-#endif 
-
-
-       
-       if (g_scan_specified_ssid) {
-               
-               list = kmalloc(len, GFP_KERNEL);
-               if (!list) {
-                       WL_TRACE(("%s: wl_iw_get_scan return -ENOMEM\n", dev->name));
-                       g_scan_specified_ssid = 0;
-                       return -ENOMEM;
-               }
-       }
-
-       memset(list, 0, len);
-       list->buflen = htod32(len);
-       if ((error = dev_wlc_ioctl(dev, WLC_SCAN_RESULTS, list, len))) {
-               WL_TRACE(("%s: %s : Scan_results ERROR %d\n", dev->name, __FUNCTION__, len));
-               dwrq->length = len;
-               if (g_scan_specified_ssid)
-                       kfree(list);
-               return 0;
-       }
-       list->buflen = dtoh32(list->buflen);
-       list->version = dtoh32(list->version);
-       list->count = dtoh32(list->count);
-
-       
-       if (list->version != WL_BSS_INFO_VERSION) {
-               WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                        __FUNCTION__, list->version));
-               if (g_scan_specified_ssid) {
-                       g_scan_specified_ssid = 0;
-                       kfree(list);
-               }
-               return -EINVAL;
-       }
-
-#if  !defined(CSCAN)
-       if (g_scan_specified_ssid) {
-               
-               wl_iw_add_bss_to_ss_cache(list);
-               kfree(list);
-       }
-#endif
-
-#if  !defined(CSCAN)
-       MUTEX_LOCK_WL_SCAN_SET();
-#if defined(WL_IW_USE_ISCAN)
-       if (g_scan_specified_ssid)
-               WL_TRACE(("%s: Specified scan APs from scan=%d\n", __FUNCTION__, list->count));
-       p_buf = iscan->list_hdr;
-       
-       while (p_buf != iscan->list_cur) {
-               list_merge = &((wl_iscan_results_t*)p_buf->iscan_buf)->results;
-               WL_TRACE(("%s: Bcast APs list=%d\n", __FUNCTION__, list_merge->count));
-               counter += list_merge->count;
-               if (list_merge->count > 0)
-                       len_ret += (__u16) wl_iw_get_scan_prep(list_merge, info,
-                           extra+len_ret, buflen_from_user -len_ret);
-               p_buf = p_buf->next;
-       }
-       WL_TRACE(("%s merged with total Bcast APs=%d\n", __FUNCTION__, counter));
-#else
-       list_merge = (wl_scan_results_t *) g_scan;
-       len_ret = (__u16) wl_iw_get_scan_prep(list_merge, info, extra, buflen_from_user);
-#endif 
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       if (g_ss_cache_ctrl.m_link_down) {
-               
-               wl_iw_delete_bss_from_ss_cache(g_ss_cache_ctrl.m_active_bssid);
-       }
-       
-       wl_iw_merge_scan_cache(info, extra+len_ret, buflen_from_user-len_ret, &merged_len);
-       len_ret += merged_len;
-       wl_iw_run_ss_cache_timer(0);
-       wl_iw_run_ss_cache_timer(1);
-#else  
-
-       
-       if (g_scan_specified_ssid) {
-               WL_TRACE(("%s: Specified scan APs in the list =%d\n", __FUNCTION__, list->count));
-               len_ret = (__u16) wl_iw_get_scan_prep(list, info, extra, buflen_from_user);
-               kfree(list);
-
-#if defined(WL_IW_USE_ISCAN)
-               p_buf = iscan->list_hdr;
-               
-               while (p_buf != iscan->list_cur) {
-                       list_merge = &((wl_iscan_results_t*)p_buf->iscan_buf)->results;
-                       WL_TRACE(("%s: Bcast APs list=%d\n", __FUNCTION__, list_merge->count));
-                       if (list_merge->count > 0)
-                               len_ret += (__u16) wl_iw_get_scan_prep(list_merge, info,
-                                   extra+len_ret, buflen_from_user -len_ret);
-                       p_buf = p_buf->next;
-               }
-#else
-               list_merge = (wl_scan_results_t *) g_scan;
-               WL_TRACE(("%s: Bcast APs list=%d\n", __FUNCTION__, list_merge->count));
-               if (list_merge->count > 0)
-                       len_ret += (__u16) wl_iw_get_scan_prep(list_merge, info, extra+len_ret,
-                               buflen_from_user -len_ret);
-#endif 
-       }
-       else {
-               list = (wl_scan_results_t *) g_scan;
-               len_ret = (__u16) wl_iw_get_scan_prep(list, info, extra, buflen_from_user);
-       }
-#endif 
-
-#if defined(WL_IW_USE_ISCAN)
-       
-       g_scan_specified_ssid = 0;
-#endif 
-       
-       if ((len_ret + WE_ADD_EVENT_FIX) < buflen_from_user)
-               len = len_ret;
-
-       dwrq->length = len;
-       dwrq->flags = 0;        
-
-       WL_TRACE(("%s return to WE %d bytes APs=%d\n", __FUNCTION__, dwrq->length, list->count));
-       return 0;
-}
-
-#if defined(WL_IW_USE_ISCAN)
-static int
-wl_iw_iscan_get_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_scan_results_t *list;
-       struct iw_event iwe;
-       wl_bss_info_t *bi = NULL;
-       int ii, j;
-       int apcnt;
-       char *event = extra, *end = extra + dwrq->length, *value;
-       iscan_info_t *iscan = g_iscan;
-       iscan_buf_t * p_buf;
-       uint32  counter = 0;
-#if !defined(CSCAN)
-       __u16 merged_len = 0;
-       uint buflen_from_user = dwrq->length;
-#endif
-
-       WL_TRACE(("%s %s buflen_from_user %d:\n", dev->name, __FUNCTION__, dwrq->length));
-
-#if defined(SOFTAP)
-       if (ap_cfg_running) {
-               WL_TRACE(("%s: Not executed, reason -'SOFTAP is active'\n", __FUNCTION__));
-               return -EINVAL;
-       }
-#endif
-
-       if (!extra) {
-               WL_TRACE(("%s: INVALID SIOCGIWSCAN GET bad parameter\n", dev->name));
-               return -EINVAL;
-       }
-
-#if !defined(CSCAN)
-       if (g_first_broadcast_scan < BROADCAST_SCAN_FIRST_RESULT_READY) {
-               WL_TRACE(("%s %s: first ISCAN results are NOT ready yet \n", \
-                        dev->name, __FUNCTION__));
-               return -EAGAIN;
-       }
-#endif 
-       
-       if ((!iscan) || (iscan->sysioc_pid < 0)) {
-               WL_TRACE(("%ssysioc_pid\n", __FUNCTION__));
-               return wl_iw_get_scan(dev, info, dwrq, extra);
-       }
-
-#if !defined(CSCAN)
-       if (g_ss_cache_ctrl.m_timer_expired) {
-               wl_iw_free_ss_cache();
-               g_ss_cache_ctrl.m_timer_expired ^= 1;
-       }
-       if (g_scan_specified_ssid) {
-               return wl_iw_get_scan(dev, info, dwrq, extra);
-       }
-       else {
-               if (g_ss_cache_ctrl.m_link_down) {
-                       
-                       wl_iw_delete_bss_from_ss_cache(g_ss_cache_ctrl.m_active_bssid);
-               }
-               if (g_ss_cache_ctrl.m_prev_scan_mode || g_ss_cache_ctrl.m_cons_br_scan_cnt > 4) {
-                       g_ss_cache_ctrl.m_cons_br_scan_cnt = 0;
-                       
-                       wl_iw_reset_ss_cache();
-               }
-               g_ss_cache_ctrl.m_prev_scan_mode = g_scan_specified_ssid;
-               g_ss_cache_ctrl.m_cons_br_scan_cnt++;
-       }
-#endif 
-
-       WL_TRACE(("%s: SIOCGIWSCAN GET broadcast results\n", dev->name));
-       apcnt = 0;
-       p_buf = iscan->list_hdr;
-       
-       while (p_buf != iscan->list_cur) {
-           list = &((wl_iscan_results_t*)p_buf->iscan_buf)->results;
-
-       counter += list->count;
-
-           if (list->version != WL_BSS_INFO_VERSION) {
-               WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                        __FUNCTION__, list->version));
-               return -EINVAL;
-           }
-
-           bi = NULL;
-           for (ii = 0; ii < list->count && apcnt < IW_MAX_AP; apcnt++, ii++) {
-               bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length)) : list->bss_info;
-               ASSERT(((uintptr)bi + dtoh32(bi->length)) <= ((uintptr)list +
-                       WLC_IW_ISCAN_MAXLEN));
-
-               
-               if (event + ETHER_ADDR_LEN + bi->SSID_len + IW_EV_UINT_LEN + IW_EV_FREQ_LEN +
-                       IW_EV_QUAL_LEN >= end)
-                       return -E2BIG;
-               
-               iwe.cmd = SIOCGIWAP;
-               iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-               memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_ADDR_LEN);
-
-               
-               iwe.u.data.length = dtoh32(bi->SSID_len);
-               iwe.cmd = SIOCGIWESSID;
-               iwe.u.data.flags = 1;
-               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, bi->SSID);
-
-               
-               if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
-                       iwe.cmd = SIOCGIWMODE;
-                       if (dtoh16(bi->capability) & DOT11_CAP_ESS)
-                               iwe.u.mode = IW_MODE_INFRA;
-                       else
-                               iwe.u.mode = IW_MODE_ADHOC;
-                       event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_UINT_LEN);
-               }
-
-               
-               iwe.cmd = SIOCGIWFREQ;
-               iwe.u.freq.m = wf_channel2mhz(CHSPEC_CHANNEL(bi->chanspec),
-                       CHSPEC_CHANNEL(bi->chanspec) <= CH_MAX_2G_CHANNEL ?
-                       WF_CHAN_FACTOR_2_4_G : WF_CHAN_FACTOR_5_G);
-               iwe.u.freq.e = 6;
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_FREQ_LEN);
-
-               
-               iwe.cmd = IWEVQUAL;
-               iwe.u.qual.qual = rssi_to_qual(dtoh16(bi->RSSI));
-               iwe.u.qual.level = 0x100 + dtoh16(bi->RSSI);
-               iwe.u.qual.noise = 0x100 + bi->phy_noise;
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_QUAL_LEN);
-
-               
-               wl_iw_handle_scanresults_ies(&event, end, info, bi);
-
-               
-               iwe.cmd = SIOCGIWENCODE;
-               if (dtoh16(bi->capability) & DOT11_CAP_PRIVACY)
-                       iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-               else
-                       iwe.u.data.flags = IW_ENCODE_DISABLED;
-               iwe.u.data.length = 0;
-               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)event);
-
-               
-               if (bi->rateset.count) {
-                       if (event + IW_MAX_BITRATES*IW_EV_PARAM_LEN >= end)
-                               return -E2BIG;
-
-                       value = event + IW_EV_LCP_LEN;
-                       iwe.cmd = SIOCGIWRATE;
-                       
-                       iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
-                       for (j = 0; j < bi->rateset.count && j < IW_MAX_BITRATES; j++) {
-                               iwe.u.bitrate.value = (bi->rateset.rates[j] & 0x7f) * 500000;
-                               value = IWE_STREAM_ADD_VALUE(info, event, value, end, &iwe,
-                                       IW_EV_PARAM_LEN);
-                       }
-                       event = value;
-               }
-           }
-           p_buf = p_buf->next;
-       } 
-
-       dwrq->length = event - extra;
-       dwrq->flags = 0;        
-
-#if !defined(CSCAN)
-       
-       wl_iw_merge_scan_cache(info, event, buflen_from_user - dwrq->length, &merged_len);
-       dwrq->length += merged_len;
-       wl_iw_run_ss_cache_timer(0);
-       wl_iw_run_ss_cache_timer(1);
-       
-       g_first_broadcast_scan = BROADCAST_SCAN_FIRST_RESULT_CONSUMED;
-#endif
-
-       WL_TRACE(("%s return to WE %d bytes APs=%d\n", __FUNCTION__, dwrq->length, counter));
-
-       
-       if (!dwrq->length)
-               return -EAGAIN;
-
-       return 0;
-}
-#endif 
-
-static int
-wl_iw_set_essid(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       int error;
-
-       WL_TRACE(("%s: SIOCSIWESSID\n", dev->name));
-
-
-       
-       memset(&g_ssid, 0, sizeof(g_ssid));
-
-       CHECK_EXTRA_FOR_NULL(extra);
-
-       if (dwrq->length && extra) {
-#if WIRELESS_EXT > 20
-               g_ssid.SSID_len = MIN(sizeof(g_ssid.SSID), dwrq->length);
-#else
-               g_ssid.SSID_len = MIN(sizeof(g_ssid.SSID), dwrq->length-1);
-#endif
-               memcpy(g_ssid.SSID, extra, g_ssid.SSID_len);
-       } else {
-               
-               g_ssid.SSID_len = 0;
-       }
-       g_ssid.SSID_len = htod32(g_ssid.SSID_len);
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_SSID, &g_ssid, sizeof(g_ssid))))
-               return error;
-
-       if (g_ssid.SSID_len) {
-               WL_TRACE(("%s: join SSID=%s\n", __FUNCTION__,  g_ssid.SSID));
-       }
-       return 0;
-}
-
-static int
-wl_iw_get_essid(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wlc_ssid_t ssid;
-       int error;
-
-       WL_TRACE(("%s: SIOCGIWESSID\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid)))) {
-               WL_ERROR(("Error getting the SSID\n"));
-               return error;
-       }
-
-       ssid.SSID_len = dtoh32(ssid.SSID_len);
-
-       
-       memcpy(extra, ssid.SSID, ssid.SSID_len);
-
-       dwrq->length = ssid.SSID_len;
-
-       dwrq->flags = 1; 
-
-       return 0;
-}
-
-static int
-wl_iw_set_nick(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-
-       WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       
-       if (dwrq->length > sizeof(iw->nickname))
-               return -E2BIG;
-
-       memcpy(iw->nickname, extra, dwrq->length);
-       iw->nickname[dwrq->length - 1] = '\0';
-
-       return 0;
-}
-
-static int
-wl_iw_get_nick(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-
-       WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       strcpy(extra, iw->nickname);
-       dwrq->length = strlen(extra) + 1;
-
-       return 0;
-}
-
-static int wl_iw_set_rate(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       wl_rateset_t rateset;
-       int error, rate, i, error_bg, error_a;
-
-       WL_TRACE(("%s: SIOCSIWRATE\n", dev->name));
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_CURR_RATESET, &rateset, sizeof(rateset))))
-               return error;
-
-       rateset.count = dtoh32(rateset.count);
-
-       if (vwrq->value < 0) {
-               
-               rate = rateset.rates[rateset.count - 1] & 0x7f;
-       } else if (vwrq->value < rateset.count) {
-               
-               rate = rateset.rates[vwrq->value] & 0x7f;
-       } else {
-               
-               rate = vwrq->value / 500000;
-       }
-
-       if (vwrq->fixed) {
-               
-               error_bg = dev_wlc_intvar_set(dev, "bg_rate", rate);
-               error_a = dev_wlc_intvar_set(dev, "a_rate", rate);
-
-               if (error_bg && error_a)
-                       return (error_bg | error_a);
-       } else {
-               
-               
-               error_bg = dev_wlc_intvar_set(dev, "bg_rate", 0);
-               
-               error_a = dev_wlc_intvar_set(dev, "a_rate", 0);
-
-               if (error_bg && error_a)
-                       return (error_bg | error_a);
-
-               
-               for (i = 0; i < rateset.count; i++)
-                       if ((rateset.rates[i] & 0x7f) > rate)
-                               break;
-               rateset.count = htod32(i);
-
-               
-               if ((error = dev_wlc_ioctl(dev, WLC_SET_RATESET, &rateset, sizeof(rateset))))
-                       return error;
-       }
-
-       return 0;
-}
-
-static int wl_iw_get_rate(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, rate;
-
-       WL_TRACE(("%s: SIOCGIWRATE\n", dev->name));
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate))))
-               return error;
-       rate = dtoh32(rate);
-       vwrq->value = rate * 500000;
-
-       return 0;
-}
-
-static int
-wl_iw_set_rts(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, rts;
-
-       WL_TRACE(("%s: SIOCSIWRTS\n", dev->name));
-
-       if (vwrq->disabled)
-               rts = DOT11_DEFAULT_RTS_LEN;
-       else if (vwrq->value < 0 || vwrq->value > DOT11_DEFAULT_RTS_LEN)
-               return -EINVAL;
-       else
-               rts = vwrq->value;
-
-       if ((error = dev_wlc_intvar_set(dev, "rtsthresh", rts)))
-               return error;
-
-       return 0;
-}
-
-static int
-wl_iw_get_rts(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, rts;
-
-       WL_TRACE(("%s: SIOCGIWRTS\n", dev->name));
-
-       if ((error = dev_wlc_intvar_get(dev, "rtsthresh", &rts)))
-               return error;
-
-       vwrq->value = rts;
-       vwrq->disabled = (rts >= DOT11_DEFAULT_RTS_LEN);
-       vwrq->fixed = 1;
-
-       return 0;
-}
-
-static int
-wl_iw_set_frag(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, frag;
-
-       WL_TRACE(("%s: SIOCSIWFRAG\n", dev->name));
-
-       if (vwrq->disabled)
-               frag = DOT11_DEFAULT_FRAG_LEN;
-       else if (vwrq->value < 0 || vwrq->value > DOT11_DEFAULT_FRAG_LEN)
-               return -EINVAL;
-       else
-               frag = vwrq->value;
-
-       if ((error = dev_wlc_intvar_set(dev, "fragthresh", frag)))
-               return error;
-
-       return 0;
-}
-
-static int
-wl_iw_get_frag(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, fragthreshold;
-
-       WL_TRACE(("%s: SIOCGIWFRAG\n", dev->name));
-
-       if ((error = dev_wlc_intvar_get(dev, "fragthresh", &fragthreshold)))
-               return error;
-
-       vwrq->value = fragthreshold;
-       vwrq->disabled = (fragthreshold >= DOT11_DEFAULT_FRAG_LEN);
-       vwrq->fixed = 1;
-
-       return 0;
-}
-
-static int
-wl_iw_set_txpow(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, disable;
-       uint16 txpwrmw;
-       WL_TRACE(("%s: SIOCSIWTXPOW\n", dev->name));
-
-       
-       disable = vwrq->disabled ? WL_RADIO_SW_DISABLE : 0;
-       disable += WL_RADIO_SW_DISABLE << 16;
-
-       disable = htod32(disable);
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_RADIO, &disable, sizeof(disable))))
-               return error;
-
-       
-       if (disable & WL_RADIO_SW_DISABLE)
-               return 0;
-
-       
-       if (!(vwrq->flags & IW_TXPOW_MWATT))
-               return -EINVAL;
-
-       
-       if (vwrq->value < 0)
-               return 0;
-
-       if (vwrq->value > 0xffff) txpwrmw = 0xffff;
-       else txpwrmw = (uint16)vwrq->value;
-
-
-       error = dev_wlc_intvar_set(dev, "qtxpower", (int)(bcm_mw_to_qdbm(txpwrmw)));
-       return error;
-}
-
-static int
-wl_iw_get_txpow(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, disable, txpwrdbm;
-       uint8 result;
-
-       WL_TRACE(("%s: SIOCGIWTXPOW\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_RADIO, &disable, sizeof(disable))) ||
-           (error = dev_wlc_intvar_get(dev, "qtxpower", &txpwrdbm)))
-               return error;
-
-       disable = dtoh32(disable);
-       result = (uint8)(txpwrdbm & ~WL_TXPWR_OVERRIDE);
-       vwrq->value = (int32)bcm_qdbm_to_mw(result);
-       vwrq->fixed = 0;
-       vwrq->disabled = (disable & (WL_RADIO_SW_DISABLE | WL_RADIO_HW_DISABLE)) ? 1 : 0;
-       vwrq->flags = IW_TXPOW_MWATT;
-
-       return 0;
-}
-
-#if WIRELESS_EXT > 10
-static int
-wl_iw_set_retry(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, lrl, srl;
-
-       WL_TRACE(("%s: SIOCSIWRETRY\n", dev->name));
-
-       
-       if (vwrq->disabled || (vwrq->flags & IW_RETRY_LIFETIME))
-               return -EINVAL;
-
-       
-       if (vwrq->flags & IW_RETRY_LIMIT) {
-
-               
-#if WIRELESS_EXT > 20
-       if ((vwrq->flags & IW_RETRY_LONG) ||(vwrq->flags & IW_RETRY_MAX) ||
-               !((vwrq->flags & IW_RETRY_SHORT) || (vwrq->flags & IW_RETRY_MIN))) {
-#else
-       if ((vwrq->flags & IW_RETRY_MAX) || !(vwrq->flags & IW_RETRY_MIN)) {
-#endif 
-                       lrl = htod32(vwrq->value);
-                       if ((error = dev_wlc_ioctl(dev, WLC_SET_LRL, &lrl, sizeof(lrl))))
-                               return error;
-               }
-
-               
-#if WIRELESS_EXT > 20
-       if ((vwrq->flags & IW_RETRY_SHORT) ||(vwrq->flags & IW_RETRY_MIN) ||
-               !((vwrq->flags & IW_RETRY_LONG) || (vwrq->flags & IW_RETRY_MAX))) {
-#else
-               if ((vwrq->flags & IW_RETRY_MIN) || !(vwrq->flags & IW_RETRY_MAX)) {
-#endif 
-                       srl = htod32(vwrq->value);
-                       if ((error = dev_wlc_ioctl(dev, WLC_SET_SRL, &srl, sizeof(srl))))
-                               return error;
-               }
-       }
-       return 0;
-}
-
-static int
-wl_iw_get_retry(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, lrl, srl;
-
-       WL_TRACE(("%s: SIOCGIWRETRY\n", dev->name));
-
-       vwrq->disabled = 0;      
-
-       
-       if ((vwrq->flags & IW_RETRY_TYPE) == IW_RETRY_LIFETIME)
-               return -EINVAL;
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_LRL, &lrl, sizeof(lrl))) ||
-           (error = dev_wlc_ioctl(dev, WLC_GET_SRL, &srl, sizeof(srl))))
-               return error;
-
-       lrl = dtoh32(lrl);
-       srl = dtoh32(srl);
-
-       
-       if (vwrq->flags & IW_RETRY_MAX) {
-               vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
-               vwrq->value = lrl;
-       } else {
-               vwrq->flags = IW_RETRY_LIMIT;
-               vwrq->value = srl;
-               if (srl != lrl)
-                       vwrq->flags |= IW_RETRY_MIN;
-       }
-
-       return 0;
-}
-#endif 
-
-static int
-wl_iw_set_encode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_wsec_key_t key;
-       int error, val, wsec;
-
-       WL_TRACE(("%s: SIOCSIWENCODE\n", dev->name));
-
-       memset(&key, 0, sizeof(key));
-
-       if ((dwrq->flags & IW_ENCODE_INDEX) == 0) {
-               
-               for (key.index = 0; key.index < DOT11_MAX_DEFAULT_KEYS; key.index++) {
-                       val = htod32(key.index);
-                       if ((error = dev_wlc_ioctl(dev, WLC_GET_KEY_PRIMARY, &val, sizeof(val))))
-                               return error;
-                       val = dtoh32(val);
-                       if (val)
-                               break;
-               }
-               
-               if (key.index == DOT11_MAX_DEFAULT_KEYS)
-                       key.index = 0;
-       } else {
-               key.index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
-               if (key.index >= DOT11_MAX_DEFAULT_KEYS)
-                       return -EINVAL;
-       }
-
-       
-       if (!extra || !dwrq->length || (dwrq->flags & IW_ENCODE_NOKEY)) {
-               
-               val = htod32(key.index);
-               if ((error = dev_wlc_ioctl(dev, WLC_SET_KEY_PRIMARY, &val, sizeof(val))))
-                       return error;
-       } else {
-               key.len = dwrq->length;
-
-               if (dwrq->length > sizeof(key.data))
-                       return -EINVAL;
-
-               memcpy(key.data, extra, dwrq->length);
-
-               key.flags = WL_PRIMARY_KEY;
-               switch (key.len) {
-               case WEP1_KEY_SIZE:
-                       key.algo = CRYPTO_ALGO_WEP1;
-                       break;
-               case WEP128_KEY_SIZE:
-                       key.algo = CRYPTO_ALGO_WEP128;
-                       break;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-               case TKIP_KEY_SIZE:
-                       key.algo = CRYPTO_ALGO_TKIP;
-                       break;
-#endif
-               case AES_KEY_SIZE:
-                       key.algo = CRYPTO_ALGO_AES_CCM;
-                       break;
-               default:
-                       return -EINVAL;
-               }
-
-               
-               swap_key_from_BE(&key);
-               if ((error = dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key))))
-                       return error;
-       }
-
-       
-       val = (dwrq->flags & IW_ENCODE_DISABLED) ? 0 : WEP_ENABLED;
-
-       if ((error = dev_wlc_intvar_get(dev, "wsec", &wsec)))
-               return error;
-
-       wsec  &= ~(WEP_ENABLED);
-       wsec |= val;
-
-       if ((error = dev_wlc_intvar_set(dev, "wsec", wsec)))
-               return error;
-
-       
-       val = (dwrq->flags & IW_ENCODE_RESTRICTED) ? 1 : 0;
-       val = htod32(val);
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val))))
-               return error;
-
-       return 0;
-}
-
-static int
-wl_iw_get_encode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_wsec_key_t key;
-       int error, val, wsec, auth;
-
-       WL_TRACE(("%s: SIOCGIWENCODE\n", dev->name));
-
-       
-       bzero(&key, sizeof(wl_wsec_key_t));
-
-       if ((dwrq->flags & IW_ENCODE_INDEX) == 0) {
-               
-               for (key.index = 0; key.index < DOT11_MAX_DEFAULT_KEYS; key.index++) {
-                       val = key.index;
-                       if ((error = dev_wlc_ioctl(dev, WLC_GET_KEY_PRIMARY, &val, sizeof(val))))
-                               return error;
-                       val = dtoh32(val);
-                       if (val)
-                               break;
-               }
-       } else
-               key.index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
-
-       if (key.index >= DOT11_MAX_DEFAULT_KEYS)
-               key.index = 0;
-
-       
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec))) ||
-           (error = dev_wlc_ioctl(dev, WLC_GET_AUTH, &auth, sizeof(auth))))
-               return error;
-
-       swap_key_to_BE(&key);
-
-       wsec = dtoh32(wsec);
-       auth = dtoh32(auth);
-       
-       dwrq->length = MIN(DOT11_MAX_KEY_SIZE, key.len);
-
-       
-       dwrq->flags = key.index + 1;
-       if (!(wsec & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED))) {
-               
-               dwrq->flags |= IW_ENCODE_DISABLED;
-       }
-       if (auth) {
-               
-               dwrq->flags |= IW_ENCODE_RESTRICTED;
-       }
-
-       
-       if (dwrq->length && extra)
-               memcpy(extra, key.data, dwrq->length);
-
-       return 0;
-}
-
-static int
-wl_iw_set_power(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, pm;
-
-       WL_TRACE(("%s: SIOCSIWPOWER\n", dev->name));
-
-       pm = vwrq->disabled ? PM_OFF : PM_MAX;
-
-       pm = htod32(pm);
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm))))
-               return error;
-
-       return 0;
-}
-
-static int
-wl_iw_get_power(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, pm;
-
-       WL_TRACE(("%s: SIOCGIWPOWER\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm))))
-               return error;
-
-       pm = dtoh32(pm);
-       vwrq->disabled = pm ? 0 : 1;
-       vwrq->flags = IW_POWER_ALL_R;
-
-       return 0;
-}
-
-#if WIRELESS_EXT > 17
-static int
-wl_iw_set_wpaie(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *iwp,
-       char *extra
-)
-{
-       uchar buf[WLC_IOCTL_SMLEN] = {0};
-       uchar *p = buf;
-       int wapi_ie_size;
-
-       WL_TRACE(("%s: SIOCSIWGENIE\n", dev->name));
-
-       CHECK_EXTRA_FOR_NULL(extra);
-
-       if (extra[0] == DOT11_MNG_WAPI_ID)
-       {
-               wapi_ie_size = iwp->length;
-               memcpy(p, extra, iwp->length);
-               dev_wlc_bufvar_set(dev, "wapiie", buf, wapi_ie_size);
-       }
-       else
-               dev_wlc_bufvar_set(dev, "wpaie", extra, iwp->length);
-
-       return 0;
-}
-
-static int
-wl_iw_get_wpaie(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *iwp,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCGIWGENIE\n", dev->name));
-       iwp->length = 64;
-       dev_wlc_bufvar_get(dev, "wpaie", extra, iwp->length);
-       return 0;
-}
-
-static int
-wl_iw_set_encodeext(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_wsec_key_t key;
-       int error;
-       struct iw_encode_ext *iwe;
-
-       WL_TRACE(("%s: SIOCSIWENCODEEXT\n", dev->name));
-
-       CHECK_EXTRA_FOR_NULL(extra);
-
-       memset(&key, 0, sizeof(key));
-       iwe = (struct iw_encode_ext *)extra;
-
-       
-       if (dwrq->flags & IW_ENCODE_DISABLED) {
-
-       }
-
-       
-       key.index = 0;
-       if (dwrq->flags & IW_ENCODE_INDEX)
-               key.index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
-
-       key.len = iwe->key_len;
-
-       
-       if (!ETHER_ISMULTI(iwe->addr.sa_data))
-               bcopy((void *)&iwe->addr.sa_data, (char *)&key.ea, ETHER_ADDR_LEN);
-
-       
-       if (key.len == 0) {
-               if (iwe->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-                       WL_WSEC(("Changing the the primary Key to %d\n", key.index));
-                       
-                       key.index = htod32(key.index);
-                       error = dev_wlc_ioctl(dev, WLC_SET_KEY_PRIMARY,
-                               &key.index, sizeof(key.index));
-                       if (error)
-                               return error;
-               }
-               
-               else {
-                       swap_key_from_BE(&key);
-                       dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
-               }
-       }
-       else {
-               if (iwe->key_len > sizeof(key.data))
-                       return -EINVAL;
-
-               WL_WSEC(("Setting the key index %d\n", key.index));
-               if (iwe->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-                       WL_WSEC(("key is a Primary Key\n"));
-                       key.flags = WL_PRIMARY_KEY;
-               }
-
-               bcopy((void *)iwe->key, key.data, iwe->key_len);
-
-               if (iwe->alg == IW_ENCODE_ALG_TKIP) {
-                       uint8 keybuf[8];
-                       bcopy(&key.data[24], keybuf, sizeof(keybuf));
-                       bcopy(&key.data[16], &key.data[24], sizeof(keybuf));
-                       bcopy(keybuf, &key.data[16], sizeof(keybuf));
-               }
-
-               
-               if (iwe->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
-                       uchar *ivptr;
-                       ivptr = (uchar *)iwe->rx_seq;
-                       key.rxiv.hi = (ivptr[5] << 24) | (ivptr[4] << 16) |
-                               (ivptr[3] << 8) | ivptr[2];
-                       key.rxiv.lo = (ivptr[1] << 8) | ivptr[0];
-                       key.iv_initialized = TRUE;
-               }
-
-               switch (iwe->alg) {
-                       case IW_ENCODE_ALG_NONE:
-                               key.algo = CRYPTO_ALGO_OFF;
-                               break;
-                       case IW_ENCODE_ALG_WEP:
-                               if (iwe->key_len == WEP1_KEY_SIZE)
-                                       key.algo = CRYPTO_ALGO_WEP1;
-                               else
-                                       key.algo = CRYPTO_ALGO_WEP128;
-                               break;
-                       case IW_ENCODE_ALG_TKIP:
-                               key.algo = CRYPTO_ALGO_TKIP;
-                               break;
-                       case IW_ENCODE_ALG_CCMP:
-                               key.algo = CRYPTO_ALGO_AES_CCM;
-                               break;
-                       case IW_ENCODE_ALG_SM4:
-                               key.algo = CRYPTO_ALGO_SMS4;
-                               if (iwe->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
-                                       key.flags &= ~WL_PRIMARY_KEY;
-                               }
-                               break;
-                       default:
-                               break;
-               }
-               swap_key_from_BE(&key);
-
-               dhd_wait_pend8021x(dev);
-
-               error = dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
-               if (error)
-                       return error;
-       }
-       return 0;
-}
-
-#if WIRELESS_EXT > 17
-#ifdef BCMWPA2
-struct {
-       pmkid_list_t pmkids;
-       pmkid_t foo[MAXPMKID-1];
-} pmkid_list;
-
-static int
-wl_iw_set_pmksa(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       struct iw_pmksa *iwpmksa;
-       uint i;
-       int ret = 0;
-       char eabuf[ETHER_ADDR_STR_LEN];
-
-       WL_WSEC(("%s: SIOCSIWPMKSA\n", dev->name));
-
-       CHECK_EXTRA_FOR_NULL(extra);
-
-       iwpmksa = (struct iw_pmksa *)extra;
-       bzero((char *)eabuf, ETHER_ADDR_STR_LEN);
-
-       if (iwpmksa->cmd == IW_PMKSA_FLUSH) {
-               WL_WSEC(("wl_iw_set_pmksa - IW_PMKSA_FLUSH\n"));
-               bzero((char *)&pmkid_list, sizeof(pmkid_list));
-       }
-
-       else if (iwpmksa->cmd == IW_PMKSA_REMOVE) {
-               {
-                       pmkid_list_t pmkid, *pmkidptr;
-                       uint j;
-                       pmkidptr = &pmkid;
-
-                       bcopy(&iwpmksa->bssid.sa_data[0], &pmkidptr->pmkid[0].BSSID, \
-                               ETHER_ADDR_LEN);
-                       bcopy(&iwpmksa->pmkid[0], &pmkidptr->pmkid[0].PMKID, WPA2_PMKID_LEN);
-
-                       WL_WSEC(("wl_iw_set_pmksa,IW_PMKSA_REMOVE - PMKID: %s = ",
-                               bcm_ether_ntoa(&pmkidptr->pmkid[0].BSSID,
-                               eabuf)));
-                       for (j = 0; j < WPA2_PMKID_LEN; j++)
-                               WL_WSEC(("%02x ", pmkidptr->pmkid[0].PMKID[j]));
-                       WL_WSEC(("\n"));
-               }
-
-               for (i = 0; i < pmkid_list.pmkids.npmkid; i++)
-                       if (!bcmp(&iwpmksa->bssid.sa_data[0], &pmkid_list.pmkids.pmkid[i].BSSID,
-                               ETHER_ADDR_LEN))
-                               break;
-
-               if ((pmkid_list.pmkids.npmkid > 0) && (i < pmkid_list.pmkids.npmkid)) {
-                       bzero(&pmkid_list.pmkids.pmkid[i], sizeof(pmkid_t));
-                       for (; i < (pmkid_list.pmkids.npmkid - 1); i++) {
-                               bcopy(&pmkid_list.pmkids.pmkid[i+1].BSSID,
-                                       &pmkid_list.pmkids.pmkid[i].BSSID,
-                                       ETHER_ADDR_LEN);
-                               bcopy(&pmkid_list.pmkids.pmkid[i+1].PMKID,
-                                       &pmkid_list.pmkids.pmkid[i].PMKID,
-                                       WPA2_PMKID_LEN);
-                       }
-                       pmkid_list.pmkids.npmkid--;
-               }
-               else
-                       ret = -EINVAL;
-       }
-
-       else if (iwpmksa->cmd == IW_PMKSA_ADD) {
-               for (i = 0; i < pmkid_list.pmkids.npmkid; i++)
-                       if (!bcmp(&iwpmksa->bssid.sa_data[0], &pmkid_list.pmkids.pmkid[i].BSSID,
-                               ETHER_ADDR_LEN))
-                               break;
-               if (i < MAXPMKID) {
-                       bcopy(&iwpmksa->bssid.sa_data[0],
-                               &pmkid_list.pmkids.pmkid[i].BSSID,
-                               ETHER_ADDR_LEN);
-                       bcopy(&iwpmksa->pmkid[0], &pmkid_list.pmkids.pmkid[i].PMKID,
-                               WPA2_PMKID_LEN);
-                       if (i == pmkid_list.pmkids.npmkid)
-                               pmkid_list.pmkids.npmkid++;
-               }
-               else
-                       ret = -EINVAL;
-               {
-                       uint j;
-                       uint k;
-                       k = pmkid_list.pmkids.npmkid;
-                       WL_WSEC(("wl_iw_set_pmksa,IW_PMKSA_ADD - PMKID: %s = ",
-                               bcm_ether_ntoa(&pmkid_list.pmkids.pmkid[k].BSSID,
-                               eabuf)));
-                       for (j = 0; j < WPA2_PMKID_LEN; j++)
-                               WL_WSEC(("%02x ", pmkid_list.pmkids.pmkid[k].PMKID[j]));
-                       WL_WSEC(("\n"));
-               }
-       }
-       WL_WSEC(("PRINTING pmkid LIST - No of elements %d\n", pmkid_list.pmkids.npmkid));
-       for (i = 0; i < pmkid_list.pmkids.npmkid; i++) {
-               uint j;
-               WL_WSEC(("PMKID[%d]: %s = ", i,
-                       bcm_ether_ntoa(&pmkid_list.pmkids.pmkid[i].BSSID,
-                       eabuf)));
-               for (j = 0; j < WPA2_PMKID_LEN; j++)
-                       WL_WSEC(("%02x ", pmkid_list.pmkids.pmkid[i].PMKID[j]));
-               WL_WSEC(("\n"));
-       }
-       WL_WSEC(("\n"));
-
-       if (!ret)
-               ret = dev_wlc_bufvar_set(dev, "pmkid_info", (char *)&pmkid_list, \
-                       sizeof(pmkid_list));
-       return ret;
-}
-#endif 
-#endif 
-
-static int
-wl_iw_get_encodeext(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCGIWENCODEEXT\n", dev->name));
-       return 0;
-}
-
-static int
-wl_iw_set_wpaauth(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error = 0;
-       int paramid;
-       int paramval;
-       int val = 0;
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-
-       WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
-
-#if defined(SOFTAP)
-       if (ap_cfg_running) {
-               WL_TRACE(("%s: Not executed, reason -'SOFTAP is active'\n", __FUNCTION__));
-               return 0;
-       }
-#endif
-
-       paramid = vwrq->flags & IW_AUTH_INDEX;
-       paramval = vwrq->value;
-
-       WL_TRACE(("%s: SIOCSIWAUTH, paramid = 0x%0x, paramval = 0x%0x\n",
-               dev->name, paramid, paramval));
-
-       switch (paramid) {
-       case IW_AUTH_WPA_VERSION:
-               
-               if (paramval & IW_AUTH_WPA_VERSION_DISABLED)
-                       val = WPA_AUTH_DISABLED;
-               else if (paramval & (IW_AUTH_WPA_VERSION_WPA))
-                       val = WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED;
-#ifdef BCMWPA2
-               else if (paramval & IW_AUTH_WPA_VERSION_WPA2)
-                       val = WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED;
-#endif 
-               else if (paramval & IW_AUTH_WAPI_VERSION_1)
-                       val = WPA_AUTH_WAPI;
-               WL_INFORM(("%s: %d: setting wpa_auth to 0x%0x\n", __FUNCTION__, __LINE__, val));
-               if ((error = dev_wlc_intvar_set(dev, "wpa_auth", val)))
-                       return error;
-               break;
-       case IW_AUTH_CIPHER_PAIRWISE:
-       case IW_AUTH_CIPHER_GROUP:
-               
-               
-               if (paramval & (IW_AUTH_CIPHER_WEP40 | IW_AUTH_CIPHER_WEP104))
-                       val =   WEP_ENABLED;
-               if (paramval & IW_AUTH_CIPHER_TKIP)
-                       val = TKIP_ENABLED;
-               if (paramval & IW_AUTH_CIPHER_CCMP)
-                       val = AES_ENABLED;
-               if (paramval & IW_AUTH_CIPHER_SMS4)
-                       val = SMS4_ENABLED;
-
-               if (paramid == IW_AUTH_CIPHER_PAIRWISE) {
-                       iw->pwsec = val;
-                       val |= iw->gwsec;
-               }
-               else {
-                       iw->gwsec = val;
-                       val |= iw->pwsec;
-               }
-
-               if (iw->privacy_invoked && !val) {
-                       WL_WSEC(("%s: %s: 'Privacy invoked' TRUE but clearing wsec, assuming "
-                                "we're a WPS enrollee\n", dev->name, __FUNCTION__));
-                       if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", TRUE))) {
-                               WL_WSEC(("Failed to set iovar is_WPS_enrollee\n"));
-                               return error;
-                       }
-               } else if (val) {
-                       if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", FALSE))) {
-                               WL_WSEC(("Failed to clear iovar is_WPS_enrollee\n"));
-                               return error;
-                       }
-               }
-
-               if ((error = dev_wlc_intvar_set(dev, "wsec", val)))
-                       return error;
-
-               break;
-
-       case IW_AUTH_KEY_MGMT:
-               if ((error = dev_wlc_intvar_get(dev, "wpa_auth", &val)))
-                       return error;
-
-               if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED)) {
-                       if (paramval & IW_AUTH_KEY_MGMT_PSK)
-                               val = WPA_AUTH_PSK;
-                       else
-                               val = WPA_AUTH_UNSPECIFIED;
-               }
-#ifdef BCMWPA2
-               else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED)) {
-                       if (paramval & IW_AUTH_KEY_MGMT_PSK)
-                               val = WPA2_AUTH_PSK;
-                       else
-                               val = WPA2_AUTH_UNSPECIFIED;
-               }
-#endif 
-               if (paramval & (IW_AUTH_KEY_MGMT_WAPI_PSK | IW_AUTH_KEY_MGMT_WAPI_CERT))
-                       val = WPA_AUTH_WAPI;
-               WL_INFORM(("%s: %d: setting wpa_auth to %d\n", __FUNCTION__, __LINE__, val));
-               if ((error = dev_wlc_intvar_set(dev, "wpa_auth", val)))
-                       return error;
-
-               break;
-       case IW_AUTH_TKIP_COUNTERMEASURES:
-               dev_wlc_bufvar_set(dev, "tkip_countermeasures", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_80211_AUTH_ALG:
-               
-               WL_INFORM(("Setting the D11auth %d\n", paramval));
-               if (paramval == IW_AUTH_ALG_OPEN_SYSTEM)
-                       val = 0;
-               else if (paramval == IW_AUTH_ALG_SHARED_KEY)
-                       val = 1;
-               else if (paramval == (IW_AUTH_ALG_OPEN_SYSTEM | IW_AUTH_ALG_SHARED_KEY))
-                       val = 2;
-               else
-                       error = 1;
-               if (!error && (error = dev_wlc_intvar_set(dev, "auth", val)))
-                       return error;
-               break;
-
-       case IW_AUTH_WPA_ENABLED:
-               if (paramval == 0) {
-                       iw->pwsec = 0;
-                       iw->gwsec = 0;
-                       if ((error = dev_wlc_intvar_get(dev, "wsec", &val)))
-                               return error;
-                       if (val & (TKIP_ENABLED | AES_ENABLED)) {
-                               val &= ~(TKIP_ENABLED | AES_ENABLED);
-                               dev_wlc_intvar_set(dev, "wsec", val);
-                       }
-                       val = 0;
-               WL_INFORM(("%s: %d: setting wpa_auth to %d\n", __FUNCTION__, __LINE__, val));
-                       dev_wlc_intvar_set(dev, "wpa_auth", 0);
-                       return error;
-               }
-
-               
-               break;
-
-       case IW_AUTH_DROP_UNENCRYPTED:
-               dev_wlc_bufvar_set(dev, "wsec_restrict", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-               dev_wlc_bufvar_set(dev, "rx_unencrypted_eapol", (char *)&paramval, 1);
-               break;
-
-#if WIRELESS_EXT > 17
-       case IW_AUTH_ROAMING_CONTROL:
-               WL_INFORM(("%s: IW_AUTH_ROAMING_CONTROL\n", __FUNCTION__));
-               
-               break;
-       case IW_AUTH_PRIVACY_INVOKED: {
-               int wsec;
-
-               if (paramval == 0) {
-                       iw->privacy_invoked = FALSE;
-                       if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", FALSE))) {
-                               WL_WSEC(("Failed to clear iovar is_WPS_enrollee\n"));
-                               return error;
-                       }
-               } else {
-                       iw->privacy_invoked = TRUE;
-                       if ((error = dev_wlc_intvar_get(dev, "wsec", &wsec)))
-                               return error;
-
-                       if (!(IW_WSEC_ENABLED(wsec))) {
-                               
-
-                               if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", TRUE))) {
-                                       WL_WSEC(("Failed to set iovar is_WPS_enrollee\n"));
-                                       return error;
-                               }
-                       } else {
-                               if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", FALSE))) {
-                                       WL_WSEC(("Failed to clear iovar is_WPS_enrollee\n"));
-                                       return error;
-                               }
-                       }
-               }
-               break;
-       }
-#endif 
-       case IW_AUTH_WAPI_ENABLED:
-               if ((error = dev_wlc_intvar_get(dev, "wsec", &val)))
-                       return error;
-               if (paramval) {
-                       val |= SMS4_ENABLED;
-                       if ((error = dev_wlc_intvar_set(dev, "wsec", val))) {
-                               WL_ERROR(("%s: setting wsec to 0x%0x returned error %d\n",
-                                       __FUNCTION__, val, error));
-                               return error;
-                       }
-                       if ((error = dev_wlc_intvar_set(dev, "wpa_auth", WPA_AUTH_WAPI))) {
-                               WL_ERROR(("%s: setting wpa_auth(WPA_AUTH_WAPI) returned %d\n",
-                                       __FUNCTION__, error));
-                               return error;
-                       }
-               }
-
-               break;
-       default:
-               break;
-       }
-       return 0;
-}
-#ifdef BCMWPA2
-#define VAL_PSK(_val) (((_val) & WPA_AUTH_PSK) || ((_val) & WPA2_AUTH_PSK))
-#else
-#define VAL_PSK(_val) (((_val) & WPA_AUTH_PSK))
-#endif 
-
-static int
-wl_iw_get_wpaauth(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error;
-       int paramid;
-       int paramval = 0;
-       int val;
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-
-       WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
-
-       paramid = vwrq->flags & IW_AUTH_INDEX;
-
-       switch (paramid) {
-       case IW_AUTH_WPA_VERSION:
-               
-               if ((error = dev_wlc_intvar_get(dev, "wpa_auth", &val)))
-                       return error;
-               if (val & (WPA_AUTH_NONE | WPA_AUTH_DISABLED))
-                       paramval = IW_AUTH_WPA_VERSION_DISABLED;
-               else if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED))
-                       paramval = IW_AUTH_WPA_VERSION_WPA;
-#ifdef BCMWPA2
-               else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED))
-                       paramval = IW_AUTH_WPA_VERSION_WPA2;
-#endif 
-               break;
-       case IW_AUTH_CIPHER_PAIRWISE:
-       case IW_AUTH_CIPHER_GROUP:
-               if (paramid == IW_AUTH_CIPHER_PAIRWISE)
-                       val = iw->pwsec;
-               else
-                       val = iw->gwsec;
-
-               paramval = 0;
-               if (val) {
-                       if (val & WEP_ENABLED)
-                               paramval |= (IW_AUTH_CIPHER_WEP40 | IW_AUTH_CIPHER_WEP104);
-                       if (val & TKIP_ENABLED)
-                               paramval |= (IW_AUTH_CIPHER_TKIP);
-                       if (val & AES_ENABLED)
-                               paramval |= (IW_AUTH_CIPHER_CCMP);
-               }
-               else
-                       paramval = IW_AUTH_CIPHER_NONE;
-               break;
-       case IW_AUTH_KEY_MGMT:
-               
-               if ((error = dev_wlc_intvar_get(dev, "wpa_auth", &val)))
-                       return error;
-               if (VAL_PSK(val))
-                       paramval = IW_AUTH_KEY_MGMT_PSK;
-               else
-                       paramval = IW_AUTH_KEY_MGMT_802_1X;
-
-               break;
-       case IW_AUTH_TKIP_COUNTERMEASURES:
-               dev_wlc_bufvar_get(dev, "tkip_countermeasures", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_DROP_UNENCRYPTED:
-               dev_wlc_bufvar_get(dev, "wsec_restrict", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-               dev_wlc_bufvar_get(dev, "rx_unencrypted_eapol", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_80211_AUTH_ALG:
-               
-               if ((error = dev_wlc_intvar_get(dev, "auth", &val)))
-                       return error;
-               if (!val)
-                       paramval = IW_AUTH_ALG_OPEN_SYSTEM;
-               else
-                       paramval = IW_AUTH_ALG_SHARED_KEY;
-               break;
-       case IW_AUTH_WPA_ENABLED:
-               if ((error = dev_wlc_intvar_get(dev, "wpa_auth", &val)))
-                       return error;
-               if (val)
-                       paramval = TRUE;
-               else
-                       paramval = FALSE;
-               break;
-#if WIRELESS_EXT > 17
-       case IW_AUTH_ROAMING_CONTROL:
-               WL_ERROR(("%s: IW_AUTH_ROAMING_CONTROL\n", __FUNCTION__));
-               
-               break;
-       case IW_AUTH_PRIVACY_INVOKED:
-               paramval = iw->privacy_invoked;
-               break;
-
-#endif 
-       }
-       vwrq->value = paramval;
-       return 0;
-}
-#endif 
-
-
-#ifdef SOFTAP
-
-static int ap_macmode = MACLIST_MODE_DISABLED;
-static struct mflist ap_black_list;
-static int
-wl_iw_parse_wep(char *keystr, wl_wsec_key_t *key)
-{
-       char hex[] = "XX";
-       unsigned char *data = key->data;
-
-       switch (strlen(keystr)) {
-       case 5:
-       case 13:
-       case 16:
-               key->len = strlen(keystr);
-               memcpy(data, keystr, key->len + 1);
-               break;
-       case 12:
-       case 28:
-       case 34:
-       case 66:
-               
-               if (!strnicmp(keystr, "0x", 2))
-                       keystr += 2;
-               else
-                       return -1;
-               
-       case 10:
-       case 26:
-       case 32:
-       case 64:
-               key->len = strlen(keystr) / 2;
-               while (*keystr) {
-                       strncpy(hex, keystr, 2);
-                       *data++ = (char) bcm_strtoul(hex, NULL, 16);
-                       keystr += 2;
-               }
-               break;
-       default:
-               return -1;
-       }
-
-       switch (key->len) {
-       case 5:
-               key->algo = CRYPTO_ALGO_WEP1;
-               break;
-       case 13:
-               key->algo = CRYPTO_ALGO_WEP128;
-               break;
-       case 16:
-               
-               key->algo = CRYPTO_ALGO_AES_CCM;
-               break;
-       case 32:
-               key->algo = CRYPTO_ALGO_TKIP;
-               break;
-       default:
-               return -1;
-       }
-
-       
-       key->flags |= WL_PRIMARY_KEY;
-
-       return 0;
-}
-
-#ifdef EXT_WPA_CRYPTO
-#define SHA1HashSize 20
-extern void pbkdf2_sha1(const char *passphrase, const char *ssid, size_t ssid_len, \
-                                               int iterations, u8 *buf, size_t buflen);
-
-#else
-
-#define SHA1HashSize 20
-int pbkdf2_sha1(const char *passphrase, const char *ssid, size_t ssid_len, \
-                                               int iterations, u8 *buf, size_t buflen)
-{
-       WL_ERROR(("WARNING: %s is not implemented !!!\n", __FUNCTION__));
-       return -1;
-}
-
-#endif 
-
-
-int dev_iw_write_cfg1_bss_var(struct net_device *dev, int val)
-{
-       struct {
-               int cfg;
-               int val;
-       } bss_setbuf;
-
-       int bss_set_res;
-       char smbuf[WLC_IOCTL_SMLEN];
-       memset(smbuf, 0, sizeof(smbuf));
-
-       bss_setbuf.cfg = 1;
-       bss_setbuf.val = val;
-
-       bss_set_res = dev_iw_iovar_setbuf(dev, "bss",
-               &bss_setbuf, sizeof(bss_setbuf), smbuf, sizeof(smbuf));
-       WL_TRACE(("%s: bss_set_result:%d set with %d\n", __FUNCTION__, bss_set_res, val));
-
-       return bss_set_res;
-}
-
-
-int dev_iw_read_cfg1_bss_var(struct net_device *dev, int *val)
-{
-       int bsscfg_idx = 1;
-       int bss_set_res;
-       char smbuf[WLC_IOCTL_SMLEN];
-       memset(smbuf, 0, sizeof(smbuf));
-
-       bss_set_res = dev_iw_iovar_getbuf(dev, "bss", \
-                &bsscfg_idx, sizeof(bsscfg_idx), smbuf, sizeof(smbuf));
-       *val = *(int*)smbuf;
-       *val = dtoh32(*val);
-       WL_TRACE(("%s: status=%d bss_get_result=%d\n", __FUNCTION__, bss_set_res, *val));
-       return bss_set_res;
-}
-
-
-
-#ifndef AP_ONLY
-static int wl_bssiovar_mkbuf(
-                       const char *iovar,
-                       int bssidx,
-                       void *param,
-                       int paramlen,
-                       void *bufptr,
-                       int buflen,
-                       int *perr)
-{
-       const char *prefix = "bsscfg:";
-       int8* p;
-       uint prefixlen;
-       uint namelen;
-       uint iolen;
-
-       prefixlen = strlen(prefix);     
-       namelen = strlen(iovar) + 1;    
-       iolen = prefixlen + namelen + sizeof(int) + paramlen;
-
-       
-       if (buflen < 0 || iolen > (uint)buflen) {
-               *perr = BCME_BUFTOOSHORT;
-               return 0;
-       }
-
-       p = (int8*)bufptr;
-
-       
-       memcpy(p, prefix, prefixlen);
-       p += prefixlen;
-
-       
-       memcpy(p, iovar, namelen);
-       p += namelen;
-
-       
-       bssidx = htod32(bssidx);
-       memcpy(p, &bssidx, sizeof(int32));
-       p += sizeof(int32);
-
-       
-       if (paramlen)
-               memcpy(p, param, paramlen);
-
-       *perr = 0;
-       return iolen;
-}
-#endif 
-
-
-
-
-int get_user_params(char *user_params, struct iw_point *dwrq)
-{
-       int ret = 0;
-
-       if (copy_from_user(user_params, dwrq->pointer, dwrq->length)) {
-               WL_ERROR(("\n%s: no user params: uptr:%p, ulen:%d\n",
-                       __FUNCTION__, dwrq->pointer, dwrq->length));
-               return -EFAULT;
-       }
-
-       WL_TRACE(("\n%s: iwpriv user params:%s\n", __FUNCTION__, user_params));
-
-       return ret;
-}
-
-
-#define strtoul(nptr, endptr, base) bcm_strtoul((nptr), (endptr), (base))
-
-#endif /* SOFTAP */
-
-
-#if defined(CSCAN)
-
-static int
-wl_iw_combined_scan_set(struct net_device *dev, wlc_ssid_t* ssids_local, int nssid, int nchan)
-{
-       int params_size = WL_SCAN_PARAMS_FIXED_SIZE + WL_NUMCHANNELS * sizeof(uint16);
-       int err = 0;
-       char *p;
-       int i;
-       iscan_info_t *iscan = g_iscan;
-
-       WL_TRACE(("%s nssid=%d nchan=%d\n", __FUNCTION__, nssid, nchan));
-
-       if ((!dev) && (!g_iscan) && (!iscan->iscan_ex_params_p)) {
-               WL_ERROR(("%s error exit\n", __FUNCTION__));
-               err = -1;
-       }
-
-       params_size += WL_SCAN_PARAMS_SSID_MAX * sizeof(wlc_ssid_t);
-
-       
-       if (nssid > 0) {
-               i = OFFSETOF(wl_scan_params_t, channel_list) + nchan * sizeof(uint16);
-               i = ROUNDUP(i, sizeof(uint32));
-               if (i + nssid * sizeof(wlc_ssid_t) > params_size) {
-                       printf("additional ssids exceed params_size\n");
-                       err = -1;
-                       goto exit;
-               }
-
-               p = ((char*)&iscan->iscan_ex_params_p->params) + i;
-               memcpy(p, ssids_local, nssid * sizeof(wlc_ssid_t));
-               p += nssid * sizeof(wlc_ssid_t);
-       } else {
-               p = (char*)iscan->iscan_ex_params_p->params.channel_list + nchan * sizeof(uint16);
-       }
-
-       
-       iscan->iscan_ex_params_p->params.channel_num = \
-               htod32((nssid << WL_SCAN_PARAMS_NSSID_SHIFT) | \
-                                       (nchan & WL_SCAN_PARAMS_COUNT_MASK));
-
-       nssid = \
-       (uint)((iscan->iscan_ex_params_p->params.channel_num >> WL_SCAN_PARAMS_NSSID_SHIFT) & \
-                              WL_SCAN_PARAMS_COUNT_MASK);
-
-       
-       params_size = (int) (p - (char*)iscan->iscan_ex_params_p + nssid * sizeof(wlc_ssid_t));
-       iscan->iscan_ex_param_size = params_size;
-
-       iscan->list_cur = iscan->list_hdr;
-       iscan->iscan_state = ISCAN_STATE_SCANING;
-       wl_iw_set_event_mask(dev);
-       mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-
-       iscan->timer_on = 1;
-
-#ifdef SCAN_DUMP
-       {
-               int i;
-               WL_SCAN(("\n### List of SSIDs to scan ###\n"));
-               for (i = 0; i < nssid; i++) {
-                       if (!ssids_local[i].SSID_len)
-                               WL_SCAN(("%d: Broadcast scan\n", i));
-                       else
-                       WL_SCAN(("%d: scan  for  %s size =%d\n", i, \
-                               ssids_local[i].SSID, ssids_local[i].SSID_len));
-               }
-               WL_SCAN(("### List of channels to scan ###\n"));
-               for (i = 0; i < nchan; i++)
-               {
-                       WL_SCAN(("%d ", iscan->iscan_ex_params_p->params.channel_list[i]));
-               }
-               WL_SCAN(("\nnprobes=%d\n", iscan->iscan_ex_params_p->params.nprobes));
-               WL_SCAN(("active_time=%d\n", iscan->iscan_ex_params_p->params.active_time));
-               WL_SCAN(("passive_time=%d\n", iscan->iscan_ex_params_p->params.passive_time));
-               WL_SCAN(("home_time=%d\n", iscan->iscan_ex_params_p->params.home_time));
-               WL_SCAN(("scan_type=%d\n", iscan->iscan_ex_params_p->params.scan_type));
-               WL_SCAN(("\n###################\n"));
-       }
-#endif 
-
-       if (params_size > WLC_IOCTL_MEDLEN) {
-                       WL_ERROR(("Set ISCAN for %s due to params_size=%d  \n", \
-                               __FUNCTION__, params_size));
-                       err = -1;
-       }
-
-       if ((err = dev_iw_iovar_setbuf(dev, "iscan", iscan->iscan_ex_params_p, \
-                       iscan->iscan_ex_param_size, \
-                       iscan->ioctlbuf, sizeof(iscan->ioctlbuf)))) {
-                       WL_TRACE(("Set ISCAN for %s failed with %d\n", __FUNCTION__, err));
-                       err = -1;
-       }
-
-exit:
-
-       return err;
-}
-
-
-static int iwpriv_set_cscan(struct net_device *dev, struct iw_request_info *info, \
-                               union iwreq_data *wrqu, char *ext)
-{
-       int res = 0;
-       char  *extra = NULL;
-       iscan_info_t *iscan = g_iscan;
-       wlc_ssid_t ssids_local[WL_SCAN_PARAMS_SSID_MAX];
-       int nssid = 0;
-       int nchan = 0;
-
-       WL_TRACE(("\%s: info->cmd:%x, info->flags:%x, u.data=0x%p, u.len=%d\n",
-               __FUNCTION__, info->cmd, info->flags,
-               wrqu->data.pointer, wrqu->data.length));
-
-       if (g_onoff == G_WLAN_SET_OFF) {
-               WL_TRACE(("%s: driver is not up yet after START\n", __FUNCTION__));
-               return -1;
-       }
-
-       if (wrqu->data.length != 0) {
-
-               char *str_ptr;
-
-               if (!iscan->iscan_ex_params_p) {
-                       return -EFAULT;
-               }
-
-               if (!(extra = kmalloc(wrqu->data.length+1, GFP_KERNEL)))
-                       return -ENOMEM;
-
-               if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-
-               extra[wrqu->data.length] = 0;
-               WL_ERROR(("Got str param in iw_point:\n %s\n", extra));
-
-               str_ptr = extra;
-
-               
-               if (strncmp(str_ptr, GET_SSID, strlen(GET_SSID))) {
-                       WL_ERROR(("%s Error: extracting SSID='' string\n", __FUNCTION__));
-                       goto exit_proc;
-               }
-               str_ptr += strlen(GET_SSID);
-               nssid = wl_iw_parse_ssid_list(&str_ptr, ssids_local, nssid, \
-                                               WL_SCAN_PARAMS_SSID_MAX);
-               if (nssid == -1) {
-                       WL_ERROR(("%s wrong ssid list", __FUNCTION__));
-                       return -1;
-               }
-
-               memset(iscan->iscan_ex_params_p, 0, iscan->iscan_ex_param_size);
-               ASSERT(iscan->iscan_ex_param_size < WLC_IOCTL_MAXLEN);
-
-               
-               wl_iw_iscan_prep(&iscan->iscan_ex_params_p->params, NULL);
-               iscan->iscan_ex_params_p->version = htod32(ISCAN_REQ_VERSION);
-               iscan->iscan_ex_params_p->action = htod16(WL_SCAN_ACTION_START);
-               iscan->iscan_ex_params_p->scan_duration = htod16(0);
-
-               
-               if ((nchan = wl_iw_parse_channel_list(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.channel_list[0], \
-                                       WL_NUMCHANNELS)) == -1) {
-                       WL_ERROR(("%s missing channel list\n", __FUNCTION__));
-                       return -1;
-               }
-
-               
-               get_parmeter_from_string(&str_ptr, \
-                               GET_NPROBE, PTYPE_INTDEC, \
-                               &iscan->iscan_ex_params_p->params.nprobes, 2);
-
-               get_parmeter_from_string(&str_ptr, GET_ACTIVE_ASSOC_DWELL, PTYPE_INTDEC, \
-                                               &iscan->iscan_ex_params_p->params.active_time, 4);
-
-               get_parmeter_from_string(&str_ptr, GET_PASSIVE_ASSOC_DWELL, PTYPE_INTDEC, \
-                                               &iscan->iscan_ex_params_p->params.passive_time, 4);
-
-               get_parmeter_from_string(&str_ptr, GET_HOME_DWELL, PTYPE_INTDEC, \
-                                       &iscan->iscan_ex_params_p->params.home_time, 4);
-
-               get_parmeter_from_string(&str_ptr, GET_SCAN_TYPE, PTYPE_INTDEC, \
-                                       &iscan->iscan_ex_params_p->params.scan_type, 1);
-
-               
-               res = wl_iw_combined_scan_set(dev, ssids_local, nssid, nchan);
-
-       } else {
-                
-                 WL_ERROR(("IWPRIV argument len = 0 \n"));
-                 return -1;
-       }
-
-exit_proc:
-
-       kfree(extra);
-
-       return res;
-}
-
-
-static int
-wl_iw_set_cscan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int res = -1;
-       iscan_info_t *iscan = g_iscan;
-       wlc_ssid_t ssids_local[WL_SCAN_PARAMS_SSID_MAX];
-       int nssid = 0;
-       int nchan = 0;
-       cscan_tlv_t *cscan_tlv_temp;
-       char type;
-       char *str_ptr;
-       int tlv_size_left;
-#ifdef TLV_DEBUG
-       int i;
-       char tlv_in_example[] = {                       'C', 'S', 'C', 'A', 'N', ' ', \
-                                                       0x53, 0x01, 0x00, 0x00,
-                                                       'S',      
-                                                       0x00, 
-                                                       'S',    
-                                                       0x04, 
-                                                       'B', 'R', 'C', 'M',
-                                                       'C',
-                                                       0x06, 
-                                                       'P', 
-                                                       0x94,
-                                                       0x11,
-                                                       'T',     
-                                                       0x01  
-                                                       };
-#endif 
-
-       WL_TRACE(("\n### %s: info->cmd:%x, info->flags:%x, u.data=0x%p, u.len=%d\n",
-               __FUNCTION__, info->cmd, info->flags,
-               wrqu->data.pointer, wrqu->data.length));
-
-       if (g_onoff == G_WLAN_SET_OFF) {
-               WL_TRACE(("%s: driver is not up yet after START\n", __FUNCTION__));
-               return -1;
-       }
-
-       if (wrqu->data.length < (strlen(CSCAN_COMMAND) + sizeof(cscan_tlv_t))) {
-               WL_ERROR(("%s aggument=%d  less %d\n", __FUNCTION__, \
-                       wrqu->data.length, strlen(CSCAN_COMMAND) + sizeof(cscan_tlv_t)));
-               return -1;
-       }
-
-#ifdef TLV_DEBUG
-       memcpy(extra, tlv_in_example, sizeof(tlv_in_example));
-       wrqu->data.length = sizeof(tlv_in_example);
-       for (i = 0; i < wrqu->data.length; i++)
-               printf("%02X ", extra[i]);
-       printf("\n");
-#endif 
-
-       str_ptr = extra;
-       str_ptr +=  strlen(CSCAN_COMMAND);
-       tlv_size_left = wrqu->data.length - strlen(CSCAN_COMMAND);
-
-       cscan_tlv_temp = (cscan_tlv_t *)str_ptr;
-       memset(ssids_local, 0, sizeof(ssids_local));
-       
-       if ((cscan_tlv_temp->prefix == CSCAN_TLV_PREFIX) && \
-               (cscan_tlv_temp->version == CSCAN_TLV_VERSION) && \
-               (cscan_tlv_temp->subver == CSCAN_TLV_SUBVERSION))
-       {
-               str_ptr += sizeof(cscan_tlv_t);
-               tlv_size_left  -= sizeof(cscan_tlv_t);
-
-               
-               if ((nssid = wl_iw_parse_ssid_list_tlv(&str_ptr, ssids_local, \
-                               WL_SCAN_PARAMS_SSID_MAX, &tlv_size_left)) <= 0) {
-                       WL_ERROR(("SSID is not presented or corrupted ret=%d\n", nssid));
-                       goto exit_proc;
-               }
-               else {
-                       
-                       memset(iscan->iscan_ex_params_p, 0, iscan->iscan_ex_param_size);
-
-                       
-                       wl_iw_iscan_prep(&iscan->iscan_ex_params_p->params, NULL);
-                       iscan->iscan_ex_params_p->version = htod32(ISCAN_REQ_VERSION);
-                       iscan->iscan_ex_params_p->action = htod16(WL_SCAN_ACTION_START);
-                       iscan->iscan_ex_params_p->scan_duration = htod16(0);
-
-                       
-                       while (tlv_size_left > 0)
-                       {
-                       type = str_ptr[0];
-                       switch (type) {
-                               case CSCAN_TLV_TYPE_CHANNEL_IE:
-                                       
-                                       if ((nchan = wl_iw_parse_channel_list_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.channel_list[0], \
-                                       WL_NUMCHANNELS, &tlv_size_left)) == -1) {
-                                       WL_ERROR(("%s missing channel list\n", \
-                                                __FUNCTION__));
-                                               goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_NPROBE_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                               &iscan->iscan_ex_params_p->params.nprobes, \
-                                               sizeof(iscan->iscan_ex_params_p->params.nprobes), \
-                                               type, sizeof(char), &tlv_size_left)) == -1) {
-                                               WL_ERROR(("%s return %d\n", \
-                                                       __FUNCTION__, res));
-                                                       goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_ACTIVE_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.active_time, \
-                                       sizeof(iscan->iscan_ex_params_p->params.active_time), \
-                                       type, sizeof(short), &tlv_size_left)) == -1) {
-                                               WL_ERROR(("%s return %d\n", \
-                                               __FUNCTION__, res));
-                                               goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_PASSIVE_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.passive_time, \
-                                       sizeof(iscan->iscan_ex_params_p->params.passive_time), \
-                                       type, sizeof(short), &tlv_size_left)) == -1) {
-                                               WL_ERROR(("%s return %d\n", \
-                                               __FUNCTION__, res));
-                                               goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_HOME_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.home_time, \
-                                       sizeof(iscan->iscan_ex_params_p->params.home_time), \
-                                       type, sizeof(short), &tlv_size_left)) == -1) {
-                                               WL_ERROR(("%s return %d\n", \
-                                               __FUNCTION__, res));
-                                               goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_STYPE_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.scan_type, \
-                                       sizeof(iscan->iscan_ex_params_p->params.scan_type), \
-                                       type, sizeof(char), &tlv_size_left)) == -1) {
-                                       WL_ERROR(("%s return %d\n", \
-                                               __FUNCTION__, res));
-                                               goto exit_proc;
-                                       }
-                               break;
-
-                               default :
-                                       WL_ERROR(("%s get unkwown type %X\n", \
-                                               __FUNCTION__, type));
-                                       goto exit_proc;
-                               break;
-                               }
-                       } 
-                       }
-               }
-               else {
-                       WL_ERROR(("%s get wrong TLV command\n", __FUNCTION__));
-                       goto exit_proc;
-               }
-
-               
-               res = wl_iw_combined_scan_set(dev, ssids_local, nssid, nchan);
-
-exit_proc:
-       return res;
-}
-
-#endif 
-
-
-
-#ifdef SOFTAP
-
-#ifndef AP_ONLY
-static int thr_wait_for_2nd_eth_dev(void *data)
-{
-       int ret = 0;
-
-       printk("==========> WARNING!!! we are in thr_wait_for_2nd_eth_dev!!!\n");
-
-       DAEMONIZE("wl0_eth_wthread");
-
-       WL_TRACE(("\n>%s threda started:, PID:%x\n", __FUNCTION__, current->pid));
-
-/*     if (down_timeout(&ap_eth_sema,  msecs_to_jiffies(5000)) != 0) {
-               WL_ERROR(("\n%s: sap_eth_sema timeout \n", __FUNCTION__));
-               ret = -1;
-               goto fail;
-       }
-*/
-       if (!ap_net_dev) {
-               WL_ERROR((" ap_net_dev is null !!!"));
-               ret = -1;
-               goto fail;
-       }
-
-       WL_TRACE(("\n>%s: Thread:'softap ethdev IF:%s is detected !!!'\n\n",
-               __FUNCTION__, ap_net_dev->name));
-
-       ap_cfg_running = TRUE;
-
-       bcm_mdelay(500); 
-
-       
-       wl_iw_send_priv_event(priv_dev, "AP_SET_CFG_OK");
-
-fail:
-
-       WL_TRACE(("\n>%s, thread completed\n", __FUNCTION__));
-
-       return ret;
-}
-#endif
-
-#ifndef AP_ONLY
-static int last_auto_channel = 6;
-#endif
-static int get_softap_auto_channel(struct net_device *dev, struct ap_profile *ap)
-{
-       int chosen = 0;
-       wl_uint32_list_t request;
-       int rescan = 0;
-       int retry = 0;
-       int updown = 0;
-       int ret = 0;
-       wlc_ssid_t null_ssid;
-       int res = 0;
-#ifndef AP_ONLY
-       int iolen = 0;
-       int mkvar_err = 0;
-       int bsscfg_index = 1;
-       char buf[WLC_IOCTL_SMLEN];
-#endif
-       WL_SOFTAP(("Enter %s\n", __FUNCTION__));
-
-#ifndef AP_ONLY
-       if (ap_cfg_running) {
-               ap->channel = last_auto_channel;
-               return res;
-       }
-#endif
-       memset(&null_ssid, 0, sizeof(wlc_ssid_t));
-       res |= dev_wlc_ioctl(dev, WLC_UP, &updown, sizeof(updown));
-#ifdef AP_ONLY
-       res |= dev_wlc_ioctl(dev, WLC_SET_SSID, &null_ssid, sizeof(null_ssid));
-#else
-       iolen = wl_bssiovar_mkbuf("ssid", bsscfg_index, (char *)(&null_ssid), \
-               null_ssid.SSID_len+4, buf, sizeof(buf), &mkvar_err);
-       ASSERT(iolen);
-       res |= dev_wlc_ioctl(dev, WLC_SET_VAR, buf, iolen);
-#endif
-       auto_channel_retry:
-                       request.count = htod32(0);
-                       ret = dev_wlc_ioctl(dev, WLC_START_CHANNEL_SEL, &request, sizeof(request));
-                       if (ret < 0) {
-                               WL_ERROR(("can't start auto channel scan\n"));
-                               goto fail;
-                       }
-
-       get_channel_retry:
-                       bcm_mdelay(500);
-
-                       ret = dev_wlc_ioctl(dev, WLC_GET_CHANNEL_SEL, &chosen, sizeof(chosen));
-                       if (ret < 0 || dtoh32(chosen) == 0) {
-                               if (retry++ < 3)
-                                       goto get_channel_retry;
-                               else {
-                                       WL_ERROR(("can't get auto channel sel, err = %d, \
-                                               chosen = %d\n", ret, chosen));
-                                       goto fail;
-                               }
-                       }
-                       if ((chosen == 1) && (!rescan++))
-                               goto auto_channel_retry;
-                       WL_SOFTAP(("Set auto channel = %d\n", chosen));
-                       ap->channel = chosen;
-                       if ((res = dev_wlc_ioctl(dev, WLC_DOWN, &updown, sizeof(updown))) < 0) {
-                               WL_ERROR(("%s fail to set up err =%d\n", __FUNCTION__, res));
-                               goto fail;
-                       }
-#ifndef AP_ONLY
-       if (!res)
-               last_auto_channel = ap->channel;
-#endif
-
-fail :
-       return res;
-} 
-
-
-static int set_ap_cfg(struct net_device *dev, struct ap_profile *ap)
-{
-       int updown = 0;
-       int channel = 0;
-
-       wlc_ssid_t ap_ssid;
-       int max_assoc = 8;
-
-       int res = 0;
-       int apsta_var = 0;
-#ifndef AP_ONLY
-       int mpc = 0;
-       int iolen = 0;
-       int mkvar_err = 0;
-       int bsscfg_index = 1;
-       char buf[WLC_IOCTL_SMLEN];
-#endif
-       wl_iw_t *iw;
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return -1;
-       }
-
-       WL_SOFTAP(("wl_iw: set ap profile:\n"));
-       WL_SOFTAP(("    ssid = '%s'\n", ap->ssid));
-       WL_SOFTAP(("    security = '%s'\n", ap->sec));
-       if (ap->key[0] != '\0')
-               WL_SOFTAP(("    key = '%s'\n", ap->key));
-       WL_SOFTAP(("    channel = %d\n", ap->channel));
-       WL_SOFTAP(("    max scb = %d\n", ap->max_scb));
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK_SOFTAP_SET(iw->pub);
-       WAKE_LOCK_INIT(iw->pub, WAKE_LOCK_SOFTAP_SET, "SoftAP_SET");
-       WAKE_LOCK(iw->pub, WAKE_LOCK_SOFTAP_SET);
-
-#ifdef AP_ONLY
-       if (ap_cfg_running) {
-               wl_iw_softap_deassoc_stations(dev);
-               ap_cfg_running = FALSE;
-       }
-#endif 
-
-       
-       if (ap_cfg_running == FALSE) {
-
-#ifndef AP_ONLY
-
-               
-               sema_init(&ap_eth_sema, 0);
-
-               mpc = 0;
-               if ((res = dev_wlc_intvar_set(dev, "mpc", mpc))) {
-                       WL_ERROR(("%s fail to set mpc\n", __FUNCTION__));
-                       goto fail;
-               }
-#endif
-
-               updown = 0;
-               if ((res = dev_wlc_ioctl(dev, WLC_DOWN, &updown, sizeof(updown)))) {
-                       WL_ERROR(("%s fail to set updown\n", __FUNCTION__));
-                       goto fail;
-               }
-
-#ifdef AP_ONLY
-               
-               apsta_var = 0;
-               if ((res = dev_wlc_ioctl(dev, WLC_SET_AP, &apsta_var, sizeof(apsta_var)))) {
-                       WL_ERROR(("%s fail to set apsta_var 0\n", __FUNCTION__));
-                       goto fail;
-               }
-               apsta_var = 1;
-               if ((res = dev_wlc_ioctl(dev, WLC_SET_AP, &apsta_var, sizeof(apsta_var)))) {
-                       WL_ERROR(("%s fail to set apsta_var 1\n", __FUNCTION__));
-                       goto fail;
-               }
-               res = dev_wlc_ioctl(dev, WLC_GET_AP, &apsta_var, sizeof(apsta_var));
-#else
-               
-               apsta_var = 1;
-               iolen = wl_bssiovar_mkbuf("apsta",
-                       bsscfg_index,  &apsta_var, sizeof(apsta_var)+4,
-                       buf, sizeof(buf), &mkvar_err);
-               ASSERT(iolen);
-               if ((res = dev_wlc_ioctl(dev, WLC_SET_VAR, buf, iolen)) < 0) {
-                       WL_ERROR(("%s fail to set apsta \n", __FUNCTION__));
-                       goto fail;
-               }
-               WL_TRACE(("\n>in %s: apsta set result: %d \n", __FUNCTION__, res));
-#endif 
-
-               updown = 1;
-               if ((res = dev_wlc_ioctl(dev, WLC_UP, &updown, sizeof(updown))) < 0) {
-                       WL_ERROR(("%s fail to set apsta \n", __FUNCTION__));
-                       goto fail;
-               }
-
-       } else {
-               
-               if (!ap_net_dev) {
-                       WL_ERROR(("%s: ap_net_dev is null\n", __FUNCTION__));
-                       goto fail;
-               }
-
-               res = wl_iw_softap_deassoc_stations(ap_net_dev);
-
-               
-               if ((res = dev_iw_write_cfg1_bss_var(dev, 0)) < 0) {
-                       WL_ERROR(("%s fail to set bss down\n", __FUNCTION__));
-                       goto fail;
-               }
-       }
-
-       
-       if ((ap->channel == 0) && (get_softap_auto_channel(dev, ap) < 0)) {
-               ap->channel = 1;
-               WL_ERROR(("%s auto channel failed, pick up channel=%d\n", \
-                       __FUNCTION__, ap->channel));
-
-       }
-
-       channel = ap->channel;
-       if ((res = dev_wlc_ioctl(dev, WLC_SET_CHANNEL, &channel, sizeof(channel)))) {
-                       WL_ERROR(("%s fail to set channel\n", __FUNCTION__));
-                       goto fail;
-       }
-
-       if (ap_cfg_running == FALSE) {
-               updown = 0;
-               if ((res = dev_wlc_ioctl(dev, WLC_UP, &updown, sizeof(updown)))) {
-                       WL_ERROR(("%s fail to set up\n", __FUNCTION__));
-                       goto fail;
-               }
-       }
-
-       max_assoc = ap->max_scb;
-       if ((res = dev_wlc_intvar_set(dev, "maxassoc", max_assoc))) {
-                       WL_ERROR(("%s fail to set maxassoc\n", __FUNCTION__));
-                       goto fail;
-       }
-
-       ap_ssid.SSID_len = strlen(ap->ssid);
-       strncpy(ap_ssid.SSID, ap->ssid, ap_ssid.SSID_len);
-
-       
-#ifdef AP_ONLY
-       if ((res = wl_iw_set_ap_security(dev, &my_ap)) != 0) {
-               WL_ERROR(("ERROR:%d in:%s, wl_iw_set_ap_security is skipped\n", \
-               res, __FUNCTION__));
-               goto fail;
-       }
-       wl_iw_send_priv_event(dev, "ASCII_CMD=AP_BSS_START");
-       ap_cfg_running = TRUE;
-#else
-
-       iolen = wl_bssiovar_mkbuf("ssid", bsscfg_index, (char *)(&ap_ssid),
-               ap_ssid.SSID_len+4, buf, sizeof(buf), &mkvar_err);
-       ASSERT(iolen);
-       if ((res = dev_wlc_ioctl(dev, WLC_SET_VAR, buf, iolen)) != 0) {
-               WL_ERROR(("ERROR:%d in:%s, Security & BSS reconfiguration is skipped\n", \
-               res, __FUNCTION__));
-               goto fail;
-       }
-       if (ap_cfg_running == FALSE) {
-               
-               kernel_thread(thr_wait_for_2nd_eth_dev, 0, 0);
-       } else {
-
-               
-               if (ap_net_dev == NULL) {
-                       WL_ERROR(("%s ERROR: ap_net_dev is NULL !!!\n", __FUNCTION__));
-                       goto fail;
-               }
-
-               WL_ERROR(("%s: %s Configure security & restart AP bss \n", \
-                        __FUNCTION__, ap_net_dev->name));
-
-               
-               if ((res = wl_iw_set_ap_security(ap_net_dev, &my_ap)) < 0) {
-                       WL_ERROR(("%s fail to set security : %d\n", __FUNCTION__, res));
-                       goto fail;
-               }
-
-               
-               if ((res = dev_iw_write_cfg1_bss_var(dev, 1)) < 0) {
-                       WL_ERROR(("%s fail to set bss up\n", __FUNCTION__));
-                       goto fail;
-               }
-       }
-#endif 
-fail:
-       WAKE_UNLOCK(iw->pub, WAKE_LOCK_SOFTAP_SET);
-       WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_SOFTAP_SET);
-       MUTEX_UNLOCK_SOFTAP_SET(iw->pub);
-
-       WL_SOFTAP(("%s exit with %d\n", __FUNCTION__, res));
-       return res;
-}
-
-
-static int wl_iw_set_ap_security(struct net_device *dev, struct ap_profile *ap)
-{
-       int wsec = 0;
-       int wpa_auth = 0;
-       int res = 0;
-       int i;
-       char *ptr;
-#ifdef AP_ONLY
-       int mpc = 0;
-       wlc_ssid_t ap_ssid;
-#endif
-       wl_wsec_key_t key;
-
-       WL_SOFTAP(("\nsetting SOFTAP security mode:\n"));
-       WL_SOFTAP(("wl_iw: set ap profile:\n"));
-       WL_SOFTAP(("    ssid = '%s'\n", ap->ssid));
-       WL_SOFTAP(("    security = '%s'\n", ap->sec));
-       if (ap->key[0] != '\0')
-               WL_SOFTAP(("    key = '%s'\n", ap->key));
-       WL_SOFTAP(("    channel = %d\n", ap->channel));
-       WL_SOFTAP(("    max scb = %d\n", ap->max_scb));
-
-
-       if (strnicmp(ap->sec, "open", strlen("open")) == 0) {
-
-          
-               wsec = 0;
-               res = dev_wlc_intvar_set(dev, "wsec", wsec);
-               wpa_auth = WPA_AUTH_DISABLED;
-               res |= dev_wlc_intvar_set(dev, "wpa_auth", wpa_auth);
-
-               WL_SOFTAP(("=====================\n"));
-               WL_SOFTAP((" wsec & wpa_auth set 'OPEN', result:&d %d\n", res));
-               WL_SOFTAP(("=====================\n"));
-
-       } else if (strnicmp(ap->sec, "wep", strlen("wep")) == 0) {
-
-          
-               memset(&key, 0, sizeof(key));
-
-               wsec = WEP_ENABLED;
-               res = dev_wlc_intvar_set(dev, "wsec", wsec);
-
-               key.index = 0;
-               if (wl_iw_parse_wep(ap->key, &key)) {
-                       WL_SOFTAP(("wep key parse err!\n"));
-                       return -1;
-               }
-
-               key.index = htod32(key.index);
-               key.len = htod32(key.len);
-               key.algo = htod32(key.algo);
-               key.flags = htod32(key.flags);
-
-               res |= dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
-
-               wpa_auth = WPA_AUTH_DISABLED;
-               res |= dev_wlc_intvar_set(dev, "wpa_auth", wpa_auth);
-
-               WL_SOFTAP(("=====================\n"));
-               WL_SOFTAP((" wsec & auth set 'WEP', result:&d %d\n", res));
-               WL_SOFTAP(("=====================\n"));
-
-       } else if (strnicmp(ap->sec, "wpa2-psk", strlen("wpa2-psk")) == 0) {
-
-          
-
-               wsec_pmk_t psk;
-               size_t key_len;
-
-               wsec = AES_ENABLED;
-               dev_wlc_intvar_set(dev, "wsec", wsec);
-
-               key_len = strlen(ap->key);
-               if (key_len < WSEC_MIN_PSK_LEN || key_len > WSEC_MAX_PSK_LEN) {
-                       WL_SOFTAP(("passphrase must be between %d and %d characters long\n",
-                       WSEC_MIN_PSK_LEN, WSEC_MAX_PSK_LEN));
-                       return -1;
-               }
-
-               
-               if (key_len < WSEC_MAX_PSK_LEN) {
-                       unsigned char output[2*SHA1HashSize];
-                       char key_str_buf[WSEC_MAX_PSK_LEN+1];
-
-                       
-                       memset(output, 0, sizeof(output));
-                       pbkdf2_sha1(ap->key, ap->ssid, strlen(ap->ssid), 4096, output, 32);
-                       
-                       ptr = key_str_buf;
-                       for (i = 0; i < (WSEC_MAX_PSK_LEN/8); i++) {
-                               
-                               sprintf(ptr, "%02x%02x%02x%02x", (uint)output[i*4], \
-                                        (uint)output[i*4+1], (uint)output[i*4+2], \
-                                        (uint)output[i*4+3]);
-                               ptr += 8;
-                       }
-                       WL_SOFTAP(("%s: passphase = %s\n", __FUNCTION__, key_str_buf));
-
-                       psk.key_len = htod16((ushort)WSEC_MAX_PSK_LEN);
-                       memcpy(psk.key, key_str_buf, psk.key_len);
-               } else {
-                       psk.key_len = htod16((ushort) key_len);
-                       memcpy(psk.key, ap->key, key_len);
-               }
-               psk.flags = htod16(WSEC_PASSPHRASE);
-               dev_wlc_ioctl(dev, WLC_SET_WSEC_PMK, &psk, sizeof(psk));
-
-               wpa_auth = WPA2_AUTH_PSK;
-               dev_wlc_intvar_set(dev, "wpa_auth", wpa_auth);
-
-       } else if (strnicmp(ap->sec, "wpa-psk", strlen("wpa-psk")) == 0) {
-
-               
-               wsec_pmk_t psk;
-               size_t key_len;
-
-               wsec = TKIP_ENABLED;
-               res = dev_wlc_intvar_set(dev, "wsec", wsec);
-
-               key_len = strlen(ap->key);
-               if (key_len < WSEC_MIN_PSK_LEN || key_len > WSEC_MAX_PSK_LEN) {
-                       WL_SOFTAP(("passphrase must be between %d and %d characters long\n",
-                       WSEC_MIN_PSK_LEN, WSEC_MAX_PSK_LEN));
-                       return -1;
-               }
-
-               
-               if (key_len < WSEC_MAX_PSK_LEN) {
-                       unsigned char output[2*SHA1HashSize];
-                       char key_str_buf[WSEC_MAX_PSK_LEN+1];
-
-                       WL_SOFTAP(("%s: do passhash...\n", __FUNCTION__));
-                       
-                       pbkdf2_sha1(ap->key, ap->ssid, strlen(ap->ssid), 4096, output, 32);
-                       
-                       ptr = key_str_buf;
-                       for (i = 0; i < (WSEC_MAX_PSK_LEN/8); i++) {
-                               WL_SOFTAP(("[%02d]: %08x\n", i, *((unsigned int*)&output[i*4])));
-                               
-                               sprintf(ptr, "%02x%02x%02x%02x", (uint)output[i*4], \
-                                       (uint)output[i*4+1], (uint)output[i*4+2], \
-                                        (uint)output[i*4+3]);
-                               ptr += 8;
-                       }
-                       printk("%s: passphase = %s\n", __FUNCTION__, key_str_buf);
-
-                       psk.key_len = htod16((ushort)WSEC_MAX_PSK_LEN);
-                       memcpy(psk.key, key_str_buf, psk.key_len);
-               } else {
-                       psk.key_len = htod16((ushort) key_len);
-                       memcpy(psk.key, ap->key, key_len);
-               }
-
-               psk.flags = htod16(WSEC_PASSPHRASE);
-               res |= dev_wlc_ioctl(dev, WLC_SET_WSEC_PMK, &psk, sizeof(psk));
-
-               wpa_auth = WPA_AUTH_PSK;
-               res |= dev_wlc_intvar_set(dev, "wpa_auth", wpa_auth);
-
-               WL_SOFTAP((" wsec & auth set 'wpa-psk' (TKIP), result:&d %d\n", res));
-       }
-
-#ifdef AP_ONLY
-               ap_ssid.SSID_len = strlen(ap->ssid);
-               strncpy(ap_ssid.SSID, ap->ssid, ap_ssid.SSID_len);
-               res |= dev_wlc_ioctl(dev, WLC_SET_SSID, &ap_ssid, sizeof(ap_ssid));
-               mpc = 0;
-               res |= dev_wlc_intvar_set(dev, "mpc", mpc);
-               if (strnicmp(ap->sec, "wep", strlen("wep")) == 0) {
-                       res |= dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
-               }
-#endif
-       return res;
-}
-
-
-static int wl_iw_softap_deassoc_stations(struct net_device *dev)
-{
-       int i;
-       int res = 0;
-
-       char mac_buf[128] = {0};
-       struct maclist *assoc_maclist = (struct maclist *) mac_buf;
-
-       memset(assoc_maclist, 0, sizeof(mac_buf));
-       assoc_maclist->count = 8; 
-
-       res = dev_wlc_ioctl(dev, WLC_GET_ASSOCLIST, assoc_maclist, 128);
-       if (res != 0) {
-
-               WL_SOFTAP((" Error:%d in :%s, Couldn't get ASSOC List\n", res, __FUNCTION__));
-               return res;
-       }
-
-               if (assoc_maclist->count)
-                       for (i = 0; i < assoc_maclist->count; i++) {
-                       scb_val_t scbval;
-                       scbval.val = htod32(1);
-                       
-                       bcopy(&assoc_maclist->ea[i], &scbval.ea, ETHER_ADDR_LEN);
-
-                       WL_SOFTAP(("deauth STA:%d \n", i));
-                       res |= dev_wlc_ioctl(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON,
-                               &scbval, sizeof(scb_val_t));
-
-               } else WL_SOFTAP((" STA ASSOC list is empty\n"));
-
-
-       if (res != 0)
-               WL_SOFTAP((" Error:%d in :%s\n", res, __FUNCTION__));
-       else if (assoc_maclist->count) {
-               
-               bcm_mdelay(200);
-       }
-       return res;
-}
-
-
-
-static int iwpriv_softap_stop(struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *ext)
-{
-       int res = 0;
-       wl_iw_t *iw;
-
-       WL_SOFTAP(("got iwpriv AP_BSS_STOP \n"));
-
-       if ((!dev) && (!ap_net_dev)) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return res;
-       }
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK_SOFTAP_SET(iw->pub);
-       WAKE_LOCK_INIT(iw->pub, WAKE_LOCK_SOFTAP_STOP, "SoftAP_STOP");
-       WAKE_LOCK(iw->pub, WAKE_LOCK_SOFTAP_STOP);
-
-       if  ((ap_cfg_running == TRUE)) {
-#ifdef AP_ONLY
-                wl_iw_softap_deassoc_stations(dev);
-#else
-                wl_iw_softap_deassoc_stations(ap_net_dev);
-
-               if ((res = dev_iw_write_cfg1_bss_var(dev, 2)) < 0)
-                       WL_ERROR(("%s failed to del BSS err = %d", __FUNCTION__, res));
-#endif
-
-               
-               bcm_mdelay(100);
-
-               wrqu->data.length = 0;
-               ap_cfg_running = FALSE;
-       }
-       else
-               WL_ERROR(("%s: was called when SoftAP is OFF : move on\n", __FUNCTION__));
-
-       WAKE_UNLOCK(iw->pub, WAKE_LOCK_SOFTAP_STOP);
-       WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_SOFTAP_STOP);
-       MUTEX_UNLOCK_SOFTAP_SET(iw->pub);
-
-       WL_SOFTAP(("%s Done with %d\n", __FUNCTION__, res));
-       return res;
-}
-
-
-
-static int iwpriv_fw_reload(struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *ext)
-{
-
-       int ret = -1;
-       char extra[256];
-       char *fwstr = fw_path ; 
-
-       WL_SOFTAP(("current firmware_path[]=%s\n", fwstr));
-
-       WL_TRACE((">Got FW_RELOAD cmd:"
-                               "info->cmd:%x, info->flags:%x, u.data:%p, u.len:%d, \
-                               fw_path:%p, len:%d \n",
-                               info->cmd, info->flags,
-                               wrqu->data.pointer, wrqu->data.length, fwstr, strlen(fwstr)));
-
-
-       if ((wrqu->data.length > 4) && (wrqu->data.length < sizeof(extra))) {
-
-               char *str_ptr;
-
-               if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) {
-                       ret = -EFAULT;
-                       goto exit_proc;
-               }
-
-               
-               extra[wrqu->data.length] = 8;
-               str_ptr = extra;
-
-               if (get_parmeter_from_string(&str_ptr, "FW_PATH=", PTYPE_STRING, fwstr, 255) != 0) {
-                       WL_ERROR(("Error: extracting FW_PATH='' string\n"));
-                       goto exit_proc;
-               }
-
-               if  (strstr(fwstr, "apsta") != NULL) {
-                         WL_SOFTAP(("GOT APSTA FIRMWARE\n"));
-                         ap_fw_loaded = TRUE;
-               } else {
-                       WL_SOFTAP(("GOT STA FIRMWARE\n"));
-                       ap_fw_loaded = FALSE;
-               }
-
-               WL_SOFTAP(("SET firmware_path[]=%s , str_p:%p\n", fwstr, fwstr));
-               ret = 0;
-       } else {
-               WL_ERROR(("Error: ivalid param len:%d\n", wrqu->data.length));
-       }
-
-exit_proc:
-       return ret;
-}
-#ifdef SOFTAP
-
-static int iwpriv_wpasupp_loop_tst(struct net_device *dev,
-            struct iw_request_info *info,
-            union iwreq_data *wrqu,
-            char *ext)
-{
-       int res = 0;
-       char  *params = NULL;
-
-       WL_TRACE((">Got IWPRIV  wp_supp loopback cmd test:"
-                               "info->cmd:%x, info->flags:%x, u.data:%p, u.len:%d\n",
-                               info->cmd, info->flags,
-                               wrqu->data.pointer, wrqu->data.length));
-
-       if (wrqu->data.length != 0) {
-
-               if (!(params = kmalloc(wrqu->data.length+1, GFP_KERNEL)))
-                       return -ENOMEM;
-
-
-               if (copy_from_user(params, wrqu->data.pointer, wrqu->data.length)) {
-                       kfree(params);
-                       return -EFAULT;
-               }
-
-               params[wrqu->data.length] = 0;
-               WL_SOFTAP(("\n>> copied from user:\n %s\n", params));
-       } else {
-               WL_ERROR(("ERROR param length is 0\n"));
-               return -EFAULT;
-       }
-
-       
-       res = wl_iw_send_priv_event(dev, params);
-       kfree(params);
-
-       return res;
-}
-#endif 
-
-
-static int
-       iwpriv_en_ap_bss(
-               struct net_device *dev,
-               struct iw_request_info *info,
-               void *wrqu,
-               char *extra)
-{
-       int res = 0;
-       wl_iw_t *iw;
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return -1;
-       }
-
-       WL_TRACE(("%s: rcvd IWPRIV IOCTL:  for dev:%s\n", __FUNCTION__, dev->name));
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK_SOFTAP_SET(iw->pub);
-       WAKE_LOCK_INIT(iw->pub, WAKE_LOCK_SOFTAP_START, "SoftAP_START");
-       WAKE_LOCK(iw->pub, WAKE_LOCK_SOFTAP_START);
-
-       
-#ifndef AP_ONLY
-       if ((res = wl_iw_set_ap_security(dev, &my_ap)) != 0) {
-               WL_ERROR((" %s ERROR setting SOFTAP security in :%d\n", __FUNCTION__, res));
-       }
-       else {
-               
-               if ((res = dev_iw_write_cfg1_bss_var(dev, 1)) < 0)
-                       WL_ERROR(("%s fail to set bss up err=%d\n", __FUNCTION__, res));
-               else
-                       
-                       bcm_mdelay(100);
-       }
-
-#endif 
-
-       WL_SOFTAP(("%s done with res %d \n", __FUNCTION__, res));
-       WAKE_UNLOCK(iw->pub, WAKE_LOCK_SOFTAP_START);
-       WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_SOFTAP_START);
-       MUTEX_UNLOCK_SOFTAP_SET(iw->pub);
-       return res;
-}
-
-static int
-get_assoc_sta_list(struct net_device *dev, char *buf, int len)
-{
-       
-       WL_TRACE(("calling dev_wlc_ioctl(dev:%p, cmd:%d, buf:%p, len:%d)\n",
-               dev, WLC_GET_ASSOCLIST, buf, len));
-
-       dev_wlc_ioctl(dev, WLC_GET_ASSOCLIST, buf, len);
-
-       return 0;
-}
-
-
-static int
-set_ap_mac_list(struct net_device *dev, char *buf)
-{
-       struct mac_list_set *mac_list_set = (struct mac_list_set *)buf;
-       struct maclist *white_maclist = (struct maclist *)&mac_list_set->white_list;
-       struct maclist *black_maclist = (struct maclist *)&mac_list_set->black_list;
-       int mac_mode = mac_list_set->mode;
-       int length;
-       int i;
-
-       ap_macmode = mac_mode;
-       if (mac_mode == MACLIST_MODE_DISABLED) {
-               
-               bzero(&ap_black_list, sizeof(struct mflist));
-
-               
-               dev_wlc_ioctl(dev, WLC_SET_MACMODE, &mac_mode, sizeof(mac_mode));
-       } else {
-               scb_val_t scbval;
-               char mac_buf[256] = {0};
-               struct maclist *assoc_maclist = (struct maclist *) mac_buf;
-
-               mac_mode = MACLIST_MODE_ALLOW;
-               
-               dev_wlc_ioctl(dev, WLC_SET_MACMODE, &mac_mode, sizeof(mac_mode));
-
-               
-               length = sizeof(white_maclist->count)+white_maclist->count*ETHER_ADDR_LEN;
-               dev_wlc_ioctl(dev, WLC_SET_MACLIST, white_maclist, length);
-               WL_SOFTAP(("White List, length %d:\n", length));
-               for (i = 0; i < white_maclist->count; i++)
-                       WL_SOFTAP(("mac %d: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                               i, white_maclist->ea[i].octet[0], white_maclist->ea[i].octet[1], \
-                               white_maclist->ea[i].octet[2], \
-                               white_maclist->ea[i].octet[3], white_maclist->ea[i].octet[4], \
-                               white_maclist->ea[i].octet[5]));
-
-               
-               bcopy(black_maclist, &ap_black_list, sizeof(ap_black_list));
-
-               WL_SOFTAP(("Black List, size %d:\n", sizeof(ap_black_list)));
-               for (i = 0; i < ap_black_list.count; i++)
-                       WL_SOFTAP(("mac %d: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                               i, ap_black_list.ea[i].octet[0], ap_black_list.ea[i].octet[1], \
-                               ap_black_list.ea[i].octet[2], \
-                               ap_black_list.ea[i].octet[3], \
-                               ap_black_list.ea[i].octet[4], ap_black_list.ea[i].octet[5]));
-
-               
-               dev_wlc_ioctl(dev, WLC_GET_ASSOCLIST, assoc_maclist, 256);
-               if (assoc_maclist->count) {
-                       int j;
-                       for (i = 0; i < assoc_maclist->count; i++) {
-                               for (j = 0; j < white_maclist->count; j++) {
-                                       if (!bcmp(&assoc_maclist->ea[i], &white_maclist->ea[j], \
-                                               ETHER_ADDR_LEN)) {
-                                               WL_SOFTAP(("match allow, let it be\n"));
-                                               break;
-                                       }
-                               }
-                               if (j == white_maclist->count) {
-                                               WL_SOFTAP(("match black, deauth it\n"));
-                                               scbval.val = htod32(1);
-                                               bcopy(&assoc_maclist->ea[i], &scbval.ea, \
-                                               ETHER_ADDR_LEN);
-                                               dev_wlc_ioctl(dev, \
-                                                       WLC_SCB_DEAUTHENTICATE_FOR_REASON, &scbval,
-                                                       sizeof(scb_val_t));
-                               }
-                       }
-               }
-       }
-       return 0;
-}
-#endif /* SOFTAP */
-
-
-#ifdef SOFTAP
-int set_macfilt_from_string(struct mflist *pmflist, char **param_str)
-{
-       return 0;
-}
-#endif
-
-
-#ifdef SOFTAP
-#define PARAM_OFFSET PROFILE_OFFSET
-
-int wl_iw_process_private_ascii_cmd(
-                       struct net_device *dev,
-                       struct iw_request_info *info,
-                       union iwreq_data *dwrq,
-                       char *cmd_str)
-{
-       int ret = 0;
-       char *sub_cmd = cmd_str + PROFILE_OFFSET + strlen("ASCII_CMD=");
-
-       WL_SOFTAP(("\n %s: ASCII_CMD: offs_0:%s, offset_32:\n'%s'\n",
-               __FUNCTION__, cmd_str, cmd_str + PROFILE_OFFSET));
-
-       if (strnicmp(sub_cmd, "AP_CFG", strlen("AP_CFG")) == 0) {
-
-               WL_SOFTAP((" AP_CFG \n"));
-
-               
-               if (init_ap_profile_from_string(cmd_str+PROFILE_OFFSET, &my_ap) != 0) {
-                               WL_ERROR(("ERROR: SoftAP CFG prams !\n"));
-                               ret = -1;
-               } else {
-                       ret = set_ap_cfg(dev, &my_ap);
-               }
-
-       } else if (strnicmp(sub_cmd, "AP_BSS_START", strlen("AP_BSS_START")) == 0) {
-
-               WL_SOFTAP(("\n SOFTAP - ENABLE BSS \n"));
-
-               
-               WL_SOFTAP(("\n!!! got 'WL_AP_EN_BSS' from WPA supplicant, dev:%s\n", dev->name));
-
-#ifndef AP_ONLY
-               if (ap_net_dev == NULL) {
-                                printf("\n ERROR: SOFTAP net_dev* is NULL !!!\n");
-               } else {
-                         
-                       if ((ret = iwpriv_en_ap_bss(ap_net_dev, info, dwrq, cmd_str)) < 0)
-                               WL_ERROR(("%s line %d fail to set bss up\n", \
-                                       __FUNCTION__, __LINE__));
-               }
-#else
-               if ((ret = iwpriv_en_ap_bss(dev, info, dwrq, cmd_str)) < 0)
-                               WL_ERROR(("%s line %d fail to set bss up\n", \
-                                       __FUNCTION__, __LINE__));
-#endif
-       } else if (strnicmp(sub_cmd, "ASSOC_LST", strlen("ASSOC_LST")) == 0) {
-
-               
-
-       } else if (strnicmp(sub_cmd, "AP_BSS_STOP", strlen("AP_BSS_STOP")) == 0) {
-
-               WL_SOFTAP((" \n temp DOWN SOFTAP\n"));
-#ifndef AP_ONLY
-               if ((ret = dev_iw_write_cfg1_bss_var(dev, 0)) < 0) {
-                               WL_ERROR(("%s line %d fail to set bss down\n", \
-                                       __FUNCTION__, __LINE__));
-               }
-#endif
-       }
-
-       return ret;
-
-}
-#endif 
-static int wl_iw_set_priv(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *ext
-)
-{
-       int ret = 0;
-       char * extra;
-
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-       if (!(extra = kmalloc(dwrq->length, GFP_KERNEL)))
-           return -ENOMEM;
-
-       if (copy_from_user(extra, dwrq->pointer, dwrq->length)) {
-           kfree(extra);
-           return -EFAULT;
-       }
-
-       WL_TRACE(("%s: SIOCSIWPRIV request %s, info->cmd:%x, info->flags:%d\n dwrq->length:%d\n",
-               dev->name, extra, info->cmd, info->flags, dwrq->length));
-
-       
-       if (dwrq->length && extra) {
-               WAKE_LOCK_INIT(iw->pub, WAKE_LOCK_PRIV, "wl_iw_set_priv");
-               WAKE_LOCK(iw->pub, WAKE_LOCK_PRIV);
-
-               if (g_onoff == G_WLAN_SET_OFF) {
-                       if (strnicmp(extra, "START", strlen("START")) != 0) {
-                                       WL_ERROR(("%s First IOCTL after stop is NOT START \n", \
-                                                               __FUNCTION__));
-                               WAKE_UNLOCK(iw->pub, WAKE_LOCK_PRIV);
-                               WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_PRIV);
-                               kfree(extra);
-                               return -EFAULT;
-                       } else {
-                               wl_iw_control_wl_on(dev, info);
-                               WL_TRACE(("%s, Received regular START command\n", __FUNCTION__));
-                       }
-               }
-
-           if (strnicmp(extra, "SCAN-ACTIVE", strlen("SCAN-ACTIVE")) == 0) {
-#ifdef ENABLE_ACTIVE_PASSIVE_SCAN_SUPPRESS
-                       WL_TRACE(("%s: active scan setting suppressed\n", dev->name));
-#else
-                       ret = wl_iw_set_active_scan(dev, info, (union iwreq_data *)dwrq, extra);
-#endif 
-           }
-           else if (strnicmp(extra, "SCAN-PASSIVE", strlen("SCAN-PASSIVE")) == 0)
-#ifdef ENABLE_ACTIVE_PASSIVE_SCAN_SUPPRESS
-                       WL_TRACE(("%s: passive scan setting suppressed\n", dev->name));
-#else
-                       ret = wl_iw_set_passive_scan(dev, info, (union iwreq_data *)dwrq, extra);
-#endif 
-           else if (strnicmp(extra, "RSSI", strlen("RSSI")) == 0)
-                       ret = wl_iw_get_rssi(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "LINKSPEED", strlen("LINKSPEED")) == 0)
-                       ret = wl_iw_get_link_speed(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "MACADDR", strlen("MACADDR")) == 0)
-                       ret = wl_iw_get_macaddr(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "COUNTRY", strlen("COUNTRY")) == 0)
-                       ret = wl_iw_set_country(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "STOP", strlen("STOP")) == 0)
-                       ret = wl_iw_control_wl_off(dev, info);
-           else if (strnicmp(extra, BAND_GET_CMD, strlen(BAND_GET_CMD)) == 0)
-                       ret = wl_iw_get_band(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, BAND_SET_CMD, strlen(BAND_SET_CMD)) == 0)
-                       ret = wl_iw_set_band(dev, info, (union iwreq_data *)dwrq, extra);
-#if defined(CSCAN)
-           
-           else if (strnicmp(extra, CSCAN_COMMAND, strlen(CSCAN_COMMAND)) == 0)
-                       ret = wl_iw_set_cscan(dev, info, (union iwreq_data *)dwrq, extra);
-#endif 
-#ifdef CUSTOMER_HW2
-           else if (strnicmp(extra, "POWERMODE", strlen("POWERMODE")) == 0)
-                       ret = wl_iw_set_power_mode(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "BTCOEXMODE", strlen("BTCOEXMODE")) == 0)
-                       ret = wl_iw_set_btcoex_dhcp(dev, info, (union iwreq_data *)dwrq, extra);
-#else
-           else if (strnicmp(extra, "POWERMODE", strlen("POWERMODE")) == 0)
-                       ret = wl_iw_set_btcoex_dhcp(dev, info, (union iwreq_data *)dwrq, extra);
-#endif
-#ifdef SOFTAP
-           else if (strnicmp(extra, "ASCII_CMD", strlen("ASCII_CMD")) == 0) {
-               
-                   wl_iw_process_private_ascii_cmd(dev, info, (union iwreq_data *)dwrq, extra);
-           }
-               else if (strnicmp(extra, "AP_MAC_LIST_SET", strlen("AP_MAC_LIST_SET")) == 0) {
-                       WL_SOFTAP(("penguin, set AP_MAC_LIST_SET\n"));
-                       set_ap_mac_list(dev, (extra + PROFILE_OFFSET));
-           }
-#endif 
-           else {
-                       WL_TRACE(("Unkown PRIVATE command %s\n", extra));
-                       snprintf(extra, MAX_WX_STRING, "OK");
-                       dwrq->length = strlen("OK") + 1;
-               }
-               WAKE_UNLOCK(iw->pub, WAKE_LOCK_PRIV);
-               WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_PRIV);
-       }
-
-       if (extra) {
-           if (copy_to_user(dwrq->pointer, extra, dwrq->length)) {
-                       kfree(extra);
-                       return -EFAULT;
-           }
-
-           kfree(extra);
-       }
-
-       return ret;
-}
-
-static const iw_handler wl_iw_handler[] =
-{
-       (iw_handler) wl_iw_config_commit,       
-       (iw_handler) wl_iw_get_name,            
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_freq,            
-       (iw_handler) wl_iw_get_freq,            
-       (iw_handler) wl_iw_set_mode,            
-       (iw_handler) wl_iw_get_mode,            
-       (iw_handler) wl_iw_set_sens,
-       (iw_handler) wl_iw_get_sens,
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_get_range,           
-       (iw_handler) wl_iw_set_priv,            
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_spy,             
-       (iw_handler) wl_iw_get_spy,             
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_wap,             
-       (iw_handler) wl_iw_get_wap,             
-#if WIRELESS_EXT > 17
-       (iw_handler) wl_iw_mlme,                
-#else
-       (iw_handler) NULL,                      
-#endif
-#if defined(WL_IW_USE_ISCAN)
-       (iw_handler) wl_iw_iscan_get_aplist,    
-#else
-       (iw_handler) wl_iw_get_aplist,          
-#endif 
-#if WIRELESS_EXT > 13
-#if defined(WL_IW_USE_ISCAN)
-       (iw_handler) wl_iw_iscan_set_scan,      
-       (iw_handler) wl_iw_iscan_get_scan,      
-#else
-       (iw_handler) wl_iw_set_scan,            
-       (iw_handler) wl_iw_get_scan,            
-#endif
-#else  
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-#endif 
-       (iw_handler) wl_iw_set_essid,           
-       (iw_handler) wl_iw_get_essid,           
-       (iw_handler) wl_iw_set_nick,            
-       (iw_handler) wl_iw_get_nick,            
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_rate,            
-       (iw_handler) wl_iw_get_rate,            
-       (iw_handler) wl_iw_set_rts,             
-       (iw_handler) wl_iw_get_rts,             
-       (iw_handler) wl_iw_set_frag,            
-       (iw_handler) wl_iw_get_frag,            
-       (iw_handler) wl_iw_set_txpow,           
-       (iw_handler) wl_iw_get_txpow,           
-#if WIRELESS_EXT > 10
-       (iw_handler) wl_iw_set_retry,           
-       (iw_handler) wl_iw_get_retry,           
-#endif 
-       (iw_handler) wl_iw_set_encode,          
-       (iw_handler) wl_iw_get_encode,          
-       (iw_handler) wl_iw_set_power,           
-       (iw_handler) wl_iw_get_power,           
-#if WIRELESS_EXT > 17
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_wpaie,           
-       (iw_handler) wl_iw_get_wpaie,           
-       (iw_handler) wl_iw_set_wpaauth,         
-       (iw_handler) wl_iw_get_wpaauth,         
-       (iw_handler) wl_iw_set_encodeext,       
-       (iw_handler) wl_iw_get_encodeext,       
-#ifdef BCMWPA2
-       (iw_handler) wl_iw_set_pmksa,                   
-#endif
-#endif 
-};
-
-#if WIRELESS_EXT > 12
-static const iw_handler wl_iw_priv_handler[] = {
-       NULL,
-       (iw_handler)wl_iw_set_active_scan,
-       NULL,
-       (iw_handler)wl_iw_get_rssi,
-       NULL,
-       (iw_handler)wl_iw_set_passive_scan,
-       NULL,
-       (iw_handler)wl_iw_get_link_speed,
-       NULL,
-       (iw_handler)wl_iw_get_macaddr,
-       NULL,
-       (iw_handler)wl_iw_control_wl_off,
-       NULL,
-       (iw_handler)wl_iw_control_wl_on,
-#ifdef SOFTAP       
-
-       
-       NULL,
-       (iw_handler)iwpriv_set_ap_config,
-
-       
-       
-       NULL,
-       (iw_handler)iwpriv_get_assoc_list,
-
-       
-       NULL,
-       (iw_handler)iwpriv_set_mac_filters,
-
-       
-       NULL,
-       (iw_handler)iwpriv_en_ap_bss,
-
-       
-       NULL,
-       (iw_handler)iwpriv_wpasupp_loop_tst,
-       
-       NULL,
-       (iw_handler)iwpriv_softap_stop,
-       
-       NULL,
-       (iw_handler)iwpriv_fw_reload,
-#endif 
-#if defined(CSCAN)
-       
-       NULL,
-       (iw_handler)iwpriv_set_cscan
-#endif         
-};
-
-static const struct iw_priv_args wl_iw_priv_args[] =
-{
-       {       
-               WL_IW_SET_ACTIVE_SCAN,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "SCAN-ACTIVE"
-       },
-       {
-               WL_IW_GET_RSSI,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "RSSI"
-       },
-       {
-               WL_IW_SET_PASSIVE_SCAN,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "SCAN-PASSIVE"
-       },
-       {
-               WL_IW_GET_LINK_SPEED,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "LINKSPEED"
-       },
-       {
-               WL_IW_GET_CURR_MACADDR,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "Macaddr"
-       },
-       {
-               WL_IW_SET_STOP,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "STOP"
-       },
-       {
-               WL_IW_SET_START,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "START"
-       },
-
-#ifdef SOFTAP
-       
-       
-       {
-               WL_SET_AP_CFG,
-               IW_PRIV_TYPE_CHAR |  256,      
-               0,
-               "AP_SET_CFG"
-       },
-
-       {
-               WL_AP_STA_LIST,
-               0,                     
-               IW_PRIV_TYPE_CHAR | 0, 
-               "AP_GET_STA_LIST"
-       },
-
-       {
-               WL_AP_MAC_FLTR,
-               IW_PRIV_TYPE_CHAR | 256,                      
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,    
-               "AP_SET_MAC_FLTR"
-       },
-
-       { 
-               WL_AP_BSS_START,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "AP_BSS_START"
-       },
-
-       {
-               AP_LPB_CMD,
-               IW_PRIV_TYPE_CHAR | 256,   
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,    
-               "AP_LPB_CMD"
-       },
-
-       { 
-               WL_AP_STOP,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,   
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,   
-               "AP_BSS_STOP"
-       },
-       { 
-               WL_FW_RELOAD,
-               IW_PRIV_TYPE_CHAR | 256,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,
-               "WL_FW_RELOAD"
-       },
-#endif 
-#if defined(CSCAN)
-       { 
-               WL_COMBO_SCAN,
-               IW_PRIV_TYPE_CHAR | 1024,  
-               0,
-               "CSCAN"
-       },
-#endif 
-       };
-
-const struct iw_handler_def wl_iw_handler_def =
-{
-       .num_standard = ARRAYSIZE(wl_iw_handler),
-       .standard = (iw_handler *) wl_iw_handler,
-       .num_private = ARRAYSIZE(wl_iw_priv_handler),
-       .num_private_args = ARRAY_SIZE(wl_iw_priv_args),
-       .private = (iw_handler *)wl_iw_priv_handler,
-       .private_args = (void *) wl_iw_priv_args,
-
-#if WIRELESS_EXT >= 19
-       get_wireless_stats: dhd_get_wireless_stats,
-#endif 
-       };
-#endif 
-
-
-
-int wl_iw_ioctl(
-       struct net_device *dev,
-       struct ifreq *rq,
-       int cmd
-)
-{
-       struct iwreq *wrq = (struct iwreq *) rq;
-       struct iw_request_info info;
-       iw_handler handler;
-       char *extra = NULL;
-       int token_size = 1, max_tokens = 0, ret = 0;
-
-       WL_TRACE(("\n%s, cmd:%x alled via dhd->do_ioctl()entry point\n", __FUNCTION__, cmd));
-       if (cmd < SIOCIWFIRST ||
-               IW_IOCTL_IDX(cmd) >= ARRAYSIZE(wl_iw_handler) ||
-               !(handler = wl_iw_handler[IW_IOCTL_IDX(cmd)])) {
-                       WL_ERROR(("%s: error in cmd=%x : not supported\n", __FUNCTION__, cmd));
-                       return -EOPNOTSUPP;
-       }
-
-       switch (cmd) {
-
-       case SIOCSIWESSID:
-       case SIOCGIWESSID:
-       case SIOCSIWNICKN:
-       case SIOCGIWNICKN:
-               max_tokens = IW_ESSID_MAX_SIZE + 1;
-               break;
-
-       case SIOCSIWENCODE:
-       case SIOCGIWENCODE:
-#if WIRELESS_EXT > 17
-       case SIOCSIWENCODEEXT:
-       case SIOCGIWENCODEEXT:
-#endif
-               max_tokens = wrq->u.data.length;
-               break;
-
-       case SIOCGIWRANGE:
-               
-               max_tokens = sizeof(struct iw_range) + 500;
-               break;
-
-       case SIOCGIWAPLIST:
-               token_size = sizeof(struct sockaddr) + sizeof(struct iw_quality);
-               max_tokens = IW_MAX_AP;
-               break;
-
-#if WIRELESS_EXT > 13
-       case SIOCGIWSCAN:
-#if defined(WL_IW_USE_ISCAN)
-       if (g_iscan)
-               max_tokens = wrq->u.data.length;
-       else
-#endif
-               max_tokens = IW_SCAN_MAX_DATA;
-               break;
-#endif 
-
-       case SIOCSIWSPY:
-               token_size = sizeof(struct sockaddr);
-               max_tokens = IW_MAX_SPY;
-               break;
-
-       case SIOCGIWSPY:
-               token_size = sizeof(struct sockaddr) + sizeof(struct iw_quality);
-               max_tokens = IW_MAX_SPY;
-               break;
-
-#if WIRELESS_EXT > 17
-       case SIOCSIWPMKSA:
-       case SIOCSIWGENIE:
-#endif 
-       case SIOCSIWPRIV:
-               max_tokens = wrq->u.data.length;
-               break;
-       }
-
-       if (max_tokens && wrq->u.data.pointer) {
-               if (wrq->u.data.length > max_tokens) {
-                       WL_ERROR(("%s: error in cmd=%x wrq->u.data.length=%d  > max_tokens=%d\n", \
-                               __FUNCTION__, cmd, wrq->u.data.length, max_tokens));
-                       return -E2BIG;
-               }
-               if (!(extra = kmalloc(max_tokens * token_size, GFP_KERNEL)))
-                       return -ENOMEM;
-
-               if (copy_from_user(extra, wrq->u.data.pointer, wrq->u.data.length * token_size)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-       }
-
-       info.cmd = cmd;
-       info.flags = 0;
-
-       ret = handler(dev, &info, &wrq->u, extra);
-
-       if (extra) {
-               if (copy_to_user(wrq->u.data.pointer, extra, wrq->u.data.length * token_size)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-
-               kfree(extra);
-       }
-
-       return ret;
-}
-
-
-bool
-wl_iw_conn_status_str(uint32 event_type, uint32 status, uint32 reason,
-       char* stringBuf, uint buflen)
-{
-       typedef struct conn_fail_event_map_t {
-               uint32 inEvent;                 
-               uint32 inStatus;                
-               uint32 inReason;                
-               const char* outName;    
-               const char* outCause;   
-       } conn_fail_event_map_t;
-
-       
-#      define WL_IW_DONT_CARE  9999
-       const conn_fail_event_map_t event_map [] = {
-               
-               
-               {WLC_E_SET_SSID,     WLC_E_STATUS_SUCCESS,   WL_IW_DONT_CARE,
-               "Conn", "Success"},
-               {WLC_E_SET_SSID,     WLC_E_STATUS_NO_NETWORKS, WL_IW_DONT_CARE,
-               "Conn", "NoNetworks"},
-               {WLC_E_SET_SSID,     WLC_E_STATUS_FAIL,      WL_IW_DONT_CARE,
-               "Conn", "ConfigMismatch"},
-               {WLC_E_PRUNE,        WL_IW_DONT_CARE,        WLC_E_PRUNE_ENCR_MISMATCH,
-               "Conn", "EncrypMismatch"},
-               {WLC_E_PRUNE,        WL_IW_DONT_CARE,        WLC_E_RSN_MISMATCH,
-               "Conn", "RsnMismatch"},
-               {WLC_E_AUTH,         WLC_E_STATUS_TIMEOUT,   WL_IW_DONT_CARE,
-               "Conn", "AuthTimeout"},
-               {WLC_E_AUTH,         WLC_E_STATUS_FAIL,      WL_IW_DONT_CARE,
-               "Conn", "AuthFail"},
-               {WLC_E_AUTH,         WLC_E_STATUS_NO_ACK,    WL_IW_DONT_CARE,
-               "Conn", "AuthNoAck"},
-               {WLC_E_REASSOC,      WLC_E_STATUS_FAIL,      WL_IW_DONT_CARE,
-               "Conn", "ReassocFail"},
-               {WLC_E_REASSOC,      WLC_E_STATUS_TIMEOUT,   WL_IW_DONT_CARE,
-               "Conn", "ReassocTimeout"},
-               {WLC_E_REASSOC,      WLC_E_STATUS_ABORT,     WL_IW_DONT_CARE,
-               "Conn", "ReassocAbort"},
-               {WLC_E_PSK_SUP,      WLC_SUP_KEYED,          WL_IW_DONT_CARE,
-               "Sup", "ConnSuccess"},
-               {WLC_E_PSK_SUP,      WL_IW_DONT_CARE,        WL_IW_DONT_CARE,
-               "Sup", "WpaHandshakeFail"},
-               {WLC_E_DEAUTH_IND,   WL_IW_DONT_CARE,        WL_IW_DONT_CARE,
-               "Conn", "Deauth"},
-               {WLC_E_DISASSOC_IND, WL_IW_DONT_CARE,        WL_IW_DONT_CARE,
-               "Conn", "DisassocInd"},
-               {WLC_E_DISASSOC,     WL_IW_DONT_CARE,        WL_IW_DONT_CARE,
-               "Conn", "Disassoc"}
-       };
-
-       const char* name = "";
-       const char* cause = NULL;
-       int i;
-
-       
-       for (i = 0;  i < sizeof(event_map)/sizeof(event_map[0]);  i++) {
-               const conn_fail_event_map_t* row = &event_map[i];
-               if (row->inEvent == event_type &&
-                   (row->inStatus == status || row->inStatus == WL_IW_DONT_CARE) &&
-                   (row->inReason == reason || row->inReason == WL_IW_DONT_CARE)) {
-                       name = row->outName;
-                       cause = row->outCause;
-                       break;
-               }
-       }
-
-       
-       if (cause) {
-               memset(stringBuf, 0, buflen);
-               snprintf(stringBuf, buflen, "%s %s %02d %02d",
-                       name, cause, status, reason);
-               WL_INFORM(("Connection status: %s\n", stringBuf));
-               return TRUE;
-       } else {
-               return FALSE;
-       }
-}
-
-#if WIRELESS_EXT > 14
-
-static bool
-wl_iw_check_conn_fail(wl_event_msg_t *e, char* stringBuf, uint buflen)
-{
-       uint32 event = ntoh32(e->event_type);
-       uint32 status =  ntoh32(e->status);
-       uint32 reason =  ntoh32(e->reason);
-
-       if (wl_iw_conn_status_str(event, status, reason, stringBuf, buflen)) {
-               return TRUE;
-       }
-       else
-               return FALSE;
-}
-#endif 
-
-#ifndef IW_CUSTOM_MAX
-#define IW_CUSTOM_MAX 256 
-#endif 
-
-void
-wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void* data)
-{
-#if WIRELESS_EXT > 13
-       union iwreq_data wrqu;
-       char extra[IW_CUSTOM_MAX + 1];
-       int cmd = 0;
-       uint32 event_type = ntoh32(e->event_type);
-       uint16 flags =  ntoh16(e->flags);
-       uint32 datalen = ntoh32(e->datalen);
-       uint32 status =  ntoh32(e->status);
-       wl_iw_t *iw;
-       uint32 toto;
-
-       memset(&wrqu, 0, sizeof(wrqu));
-       memset(extra, 0, sizeof(extra));
-       iw = 0;
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return;
-       }
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-
-       //WL_TRACE(("%s: dev=%s event=%d \n", __FUNCTION__, dev->name, event_type));
-
-       
-       switch (event_type) {
-#if defined(SOFTAP)
-       case WLC_E_PRUNE:
-               if (ap_cfg_running) {
-                       char *macaddr = (char *)&e->addr;
-                       WL_SOFTAP(("PRUNE received, %02X:%02X:%02X:%02X:%02X:%02X!\n",
-                               macaddr[0], macaddr[1], macaddr[2], macaddr[3], \
-                               macaddr[4], macaddr[5]));
-
-                       
-                       if (ap_macmode)
-                       {
-                               int i;
-                               for (i = 0; i < ap_black_list.count; i++) {
-                                       if (!bcmp(macaddr, &ap_black_list.ea[i], \
-                                               sizeof(struct ether_addr))) {
-                                               WL_SOFTAP(("mac in black list, ignore it\n"));
-                                               break;
-                                       }
-                               }
-
-                               if (i == ap_black_list.count) {
-                                       
-                                       char mac_buf[32] = {0};
-                                       sprintf(mac_buf, "STA_BLOCK %02X:%02X:%02X:%02X:%02X:%02X",
-                                               macaddr[0], macaddr[1], macaddr[2],
-                                               macaddr[3], macaddr[4], macaddr[5]);
-                                       wl_iw_send_priv_event(priv_dev, mac_buf);
-                               }
-                       }
-               }
-               break;
-#endif 
-       case WLC_E_TXFAIL:
-               cmd = IWEVTXDROP;
-               memcpy(wrqu.addr.sa_data, &e->addr, ETHER_ADDR_LEN);
-               wrqu.addr.sa_family = ARPHRD_ETHER;
-               break;
-#if WIRELESS_EXT > 14
-       case WLC_E_JOIN:
-       case WLC_E_ASSOC_IND:
-       case WLC_E_REASSOC_IND:
-#if defined(SOFTAP)
-               WL_SOFTAP(("STA connect received %d\n", event_type));
-               if (ap_cfg_running) {
-                       wl_iw_send_priv_event(priv_dev, "STA_JOIN");
-                       return;
-               }
-#endif 
-               memcpy(wrqu.addr.sa_data, &e->addr, ETHER_ADDR_LEN);
-               wrqu.addr.sa_family = ARPHRD_ETHER;
-               cmd = IWEVREGISTERED;
-               break;
-       case WLC_E_DEAUTH_IND:
-       case WLC_E_DISASSOC_IND:
-#if defined(SOFTAP)
-               WL_SOFTAP(("STA disconnect received %d\n", event_type));
-               if (ap_cfg_running) {
-                       wl_iw_send_priv_event(priv_dev, "STA_LEAVE");
-                       return;
-               }
-#endif 
-               cmd = SIOCGIWAP;
-               bzero(wrqu.addr.sa_data, ETHER_ADDR_LEN);
-               wrqu.addr.sa_family = ARPHRD_ETHER;
-               bzero(&extra, ETHER_ADDR_LEN);
-               break;
-       case WLC_E_LINK:
-       case WLC_E_NDIS_LINK:
-               cmd = SIOCGIWAP;
-               if (!(flags & WLC_EVENT_MSG_LINK)) {
-                       
-                       
-#ifdef SOFTAP
-#ifdef AP_ONLY
-               if (ap_cfg_running) {
-#else
-               if (ap_cfg_running && !strncmp(dev->name, "wl0.1", 5)) {
-#endif 
-                       
-                       WL_SOFTAP(("AP DOWN %d\n", event_type));
-                       wl_iw_send_priv_event(priv_dev, "AP_DOWN");
-               } else {
-                       WL_TRACE(("STA_Link Down\n"));
-                       g_ss_cache_ctrl.m_link_down = 1;
-               }
-#else          
-               g_ss_cache_ctrl.m_link_down = 1;
-#endif 
-                       WL_TRACE(("Link Down\n"));
-
-                       bzero(wrqu.addr.sa_data, ETHER_ADDR_LEN);
-                       bzero(&extra, ETHER_ADDR_LEN);
-                       WAKE_LOCK_TIMEOUT(iw->pub, WAKE_LOCK_LINK_DOWN_TMOUT, 20 * HZ);
-               }
-               else {
-                       
-                       memcpy(wrqu.addr.sa_data, &e->addr, ETHER_ADDR_LEN);
-                       g_ss_cache_ctrl.m_link_down = 0;
-                       
-                       memcpy(g_ss_cache_ctrl.m_active_bssid, &e->addr, ETHER_ADDR_LEN);
-#ifdef SOFTAP
-
-#ifdef AP_ONLY
-                       if (ap_cfg_running) {
-#else
-                       if (ap_cfg_running && !strncmp(dev->name, "wl0.1", 5)) {
-#endif
-                       
-                               WL_SOFTAP(("AP UP %d\n", event_type));
-                               wl_iw_send_priv_event(priv_dev, "AP_UP");
-                       } else {
-                               WL_TRACE(("STA_LINK_UP\n"));
-                       }
-#else
-#endif 
-                       WL_TRACE(("Link UP\n"));
-
-               }
-               wrqu.addr.sa_family = ARPHRD_ETHER;
-               break;
-       case WLC_E_ACTION_FRAME:
-               cmd = IWEVCUSTOM;
-               if (datalen + 1 <= sizeof(extra)) {
-                       wrqu.data.length = datalen + 1;
-                       extra[0] = WLC_E_ACTION_FRAME;
-                       memcpy(&extra[1], data, datalen);
-                       WL_TRACE(("WLC_E_ACTION_FRAME len %d \n", wrqu.data.length));
-               }
-               break;
-
-       case WLC_E_ACTION_FRAME_COMPLETE:
-               cmd = IWEVCUSTOM;
-               memcpy(&toto, data, 4);
-               if (sizeof(status) + 1 <= sizeof(extra)) {
-                       wrqu.data.length = sizeof(status) + 1;
-                       extra[0] = WLC_E_ACTION_FRAME_COMPLETE;
-                       memcpy(&extra[1], &status, sizeof(status));
-                       printf("wl_iw_event status %d PacketId %d \n", status, toto);
-                       printf("WLC_E_ACTION_FRAME_COMPLETE len %d \n", wrqu.data.length);
-               }
-               break;
-#endif 
-#if WIRELESS_EXT > 17
-       case WLC_E_MIC_ERROR: {
-               struct  iw_michaelmicfailure  *micerrevt = (struct  iw_michaelmicfailure  *)&extra;
-               cmd = IWEVMICHAELMICFAILURE;
-               wrqu.data.length = sizeof(struct iw_michaelmicfailure);
-               if (flags & WLC_EVENT_MSG_GROUP)
-                       micerrevt->flags |= IW_MICFAILURE_GROUP;
-               else
-                       micerrevt->flags |= IW_MICFAILURE_PAIRWISE;
-               memcpy(micerrevt->src_addr.sa_data, &e->addr, ETHER_ADDR_LEN);
-               micerrevt->src_addr.sa_family = ARPHRD_ETHER;
-
-               break;
-       }
-#ifdef BCMWPA2
-       case WLC_E_PMKID_CACHE: {
-               if (data)
-               {
-                       struct iw_pmkid_cand *iwpmkidcand = (struct iw_pmkid_cand *)&extra;
-                       pmkid_cand_list_t *pmkcandlist;
-                       pmkid_cand_t    *pmkidcand;
-                       int count;
-
-                       cmd = IWEVPMKIDCAND;
-                       pmkcandlist = data;
-                       count = ntoh32_ua((uint8 *)&pmkcandlist->npmkid_cand);
-                       ASSERT(count >= 0);
-                       wrqu.data.length = sizeof(struct iw_pmkid_cand);
-                       pmkidcand = pmkcandlist->pmkid_cand;
-                       while (count) {
-                               bzero(iwpmkidcand, sizeof(struct iw_pmkid_cand));
-                               if (pmkidcand->preauth)
-                                       iwpmkidcand->flags |= IW_PMKID_CAND_PREAUTH;
-                               bcopy(&pmkidcand->BSSID, &iwpmkidcand->bssid.sa_data,
-                                       ETHER_ADDR_LEN);
-#ifndef SANDGATE2G
-                               wireless_send_event(dev, cmd, &wrqu, extra);
-#endif
-                               pmkidcand++;
-                               count--;
-                       }
-               }
-               return;
-       }
-#endif 
-#endif 
-
-       case WLC_E_SCAN_COMPLETE:
-#if defined(WL_IW_USE_ISCAN)
-               if ((g_iscan) && (g_iscan->sysioc_pid >= 0) &&
-                       (g_iscan->iscan_state != ISCAN_STATE_IDLE))
-               {
-                       up(&g_iscan->sysioc_sem);
-               } else {
-                       cmd = SIOCGIWSCAN;
-                       wrqu.data.length = strlen(extra);
-                       WL_TRACE(("Event WLC_E_SCAN_COMPLETE from specific scan %d\n", \
-                               g_iscan->iscan_state));
-               }
-#else
-               cmd = SIOCGIWSCAN;
-               wrqu.data.length = strlen(extra);
-               WL_TRACE(("Event WLC_E_SCAN_COMPLETE\n"));
-#endif 
-       break;
-
-       default:
-               
-               WL_TRACE(("Unknown Event %d: ignoring\n", event_type));
-               break;
-       }
-#ifndef SANDGATE2G
-               if (cmd) {
-                       if (cmd == SIOCGIWSCAN)
-                               wireless_send_event(dev, cmd, &wrqu, NULL);
-                       else
-                               wireless_send_event(dev, cmd, &wrqu, extra);
-               }
-#endif
-
-#if WIRELESS_EXT > 14
-       
-       memset(extra, 0, sizeof(extra));
-       if (wl_iw_check_conn_fail(e, extra, sizeof(extra))) {
-               cmd = IWEVCUSTOM;
-               wrqu.data.length = strlen(extra);
-#ifndef SANDGATE2G
-               wireless_send_event(dev, cmd, &wrqu, extra);
-#endif
-       }
-#endif 
-
-#endif 
-}
-
-int wl_iw_get_wireless_stats(struct net_device *dev, struct iw_statistics *wstats)
-{
-       int res = 0;
-       wl_cnt_t cnt;
-       int phy_noise;
-       int rssi;
-       scb_val_t scb_val;
-
-       phy_noise = 0;
-       if ((res = dev_wlc_ioctl(dev, WLC_GET_PHY_NOISE, &phy_noise, sizeof(phy_noise))))
-               goto done;
-
-       phy_noise = dtoh32(phy_noise);
-       WL_TRACE(("wl_iw_get_wireless_stats phy noise=%d\n", phy_noise));
-
-       bzero(&scb_val, sizeof(scb_val_t));
-       if ((res = dev_wlc_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t))))
-               goto done;
-
-       rssi = dtoh32(scb_val.val);
-       WL_TRACE(("wl_iw_get_wireless_stats rssi=%d\n", rssi));
-       if (rssi <= WL_IW_RSSI_NO_SIGNAL)
-               wstats->qual.qual = 0;
-       else if (rssi <= WL_IW_RSSI_VERY_LOW)
-               wstats->qual.qual = 1;
-       else if (rssi <= WL_IW_RSSI_LOW)
-               wstats->qual.qual = 2;
-       else if (rssi <= WL_IW_RSSI_GOOD)
-               wstats->qual.qual = 3;
-       else if (rssi <= WL_IW_RSSI_VERY_GOOD)
-               wstats->qual.qual = 4;
-       else
-               wstats->qual.qual = 5;
-
-       
-       wstats->qual.level = 0x100 + rssi;
-       wstats->qual.noise = 0x100 + phy_noise;
-#if WIRELESS_EXT > 18
-       wstats->qual.updated |= (IW_QUAL_ALL_UPDATED | IW_QUAL_DBM);
-#else
-       wstats->qual.updated |= 7;
-#endif 
-
-#if WIRELESS_EXT > 11
-       WL_TRACE(("wl_iw_get_wireless_stats counters=%d\n", (int)sizeof(wl_cnt_t)));
-
-       memset(&cnt, 0, sizeof(wl_cnt_t));
-       res = dev_wlc_bufvar_get(dev, "counters", (char *)&cnt, sizeof(wl_cnt_t));
-       if (res)
-       {
-               WL_ERROR(("wl_iw_get_wireless_stats counters failed error=%d\n", res));
-               goto done;
-       }
-
-       cnt.version = dtoh16(cnt.version);
-       if (cnt.version != WL_CNT_T_VERSION) {
-               WL_TRACE(("\tIncorrect version of counters struct: expected %d; got %d\n",
-                       WL_CNT_T_VERSION, cnt.version));
-               goto done;
-       }
-
-       wstats->discard.nwid = 0;
-       wstats->discard.code = dtoh32(cnt.rxundec);
-       wstats->discard.fragment = dtoh32(cnt.rxfragerr);
-       wstats->discard.retries = dtoh32(cnt.txfail);
-       wstats->discard.misc = dtoh32(cnt.rxrunt) + dtoh32(cnt.rxgiant);
-       wstats->miss.beacon = 0;
-
-       WL_TRACE(("wl_iw_get_wireless_stats counters txframe=%d txbyte=%d\n",
-               dtoh32(cnt.txframe), dtoh32(cnt.txbyte)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxfrmtoolong=%d\n", dtoh32(cnt.rxfrmtoolong)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxbadplcp=%d\n", dtoh32(cnt.rxbadplcp)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxundec=%d\n", dtoh32(cnt.rxundec)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxfragerr=%d\n", dtoh32(cnt.rxfragerr)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters txfail=%d\n", dtoh32(cnt.txfail)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxrunt=%d\n", dtoh32(cnt.rxrunt)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxgiant=%d\n", dtoh32(cnt.rxgiant)));
-
-#endif 
-
-done:
-       return res;
-}
-static void
-wl_iw_bt_flag_set(
-       struct net_device *dev,
-       bool set)
-{
-       char buf_flag7_dhcp_on[8] = { 7, 00, 00, 00, 0x1, 0x0, 0x00, 0x00 };
-       char buf_flag7_default[8]   = { 7, 00, 00, 00, 0x0, 0x00, 0x00, 0x00};
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       rtnl_lock();
-#endif
-
-       if (set == TRUE) {
-               
-               dev_wlc_bufvar_set(dev, "btc_flags", \
-                                       (char *)&buf_flag7_dhcp_on[0], sizeof(buf_flag7_dhcp_on));
-       }
-       else  {
-               
-               dev_wlc_bufvar_set(dev, "btc_flags", \
-                                       (char *)&buf_flag7_default[0], sizeof(buf_flag7_default));
-       }
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       rtnl_unlock();
-#endif
-}
-
-static void
-wl_iw_bt_timerfunc(ulong data)
-{
-       bt_info_t  *bt_local = (bt_info_t *)data;
-       bt_local->timer_on = 0;
-       WL_TRACE(("%s\n", __FUNCTION__));
-       
-       up(&bt_local->bt_sem);
-}
-
-static int
-_bt_dhcp_sysioc_thread(void *data)
-{
-       DAEMONIZE("dhcp_sysioc");
-
-       while (down_interruptible(&g_bt->bt_sem) == 0) {
-               if (g_bt->timer_on) {
-                       del_timer(&g_bt->timer);
-                       g_bt->timer_on = 0;
-               }
-
-               switch (g_bt->bt_state) {
-                       case BT_DHCP_START:
-                               
-                               g_bt->bt_state = BT_DHCP_OPPORTUNITY_WINDOW;
-                               mod_timer(&g_bt->timer, jiffies + \
-                                          BT_DHCP_OPPORTUNITY_WINDOW_TIEM*HZ/1000);
-                               g_bt->timer_on = 1;
-                               break;
-                       case BT_DHCP_OPPORTUNITY_WINDOW:
-                               
-                               WL_TRACE(("%s waiting for %d msec expired, force bt flag\n", \
-                                               __FUNCTION__, BT_DHCP_OPPORTUNITY_WINDOW_TIEM));
-                               if (g_bt->dev) wl_iw_bt_flag_set(g_bt->dev, TRUE);
-                               g_bt->bt_state = BT_DHCP_FLAG_FORCE_TIMEOUT;
-                               mod_timer(&g_bt->timer, jiffies + BT_DHCP_FLAG_FORCE_TIME*HZ/1000);
-                               g_bt->timer_on = 1;
-                               break;
-                       case BT_DHCP_FLAG_FORCE_TIMEOUT:
-                               
-                               WL_TRACE(("%s waiting for %d msec expired remove bt flag\n", \
-                                               __FUNCTION__, BT_DHCP_FLAG_FORCE_TIME));
-                               
-                               if (g_bt->dev)  wl_iw_bt_flag_set(g_bt->dev, FALSE);
-                               g_bt->bt_state = BT_DHCP_IDLE;
-                               g_bt->timer_on = 0;
-                               break;
-                       default:
-                               WL_ERROR(("%s error g_status=%d !!!\n", __FUNCTION__, \
-                                         g_bt->bt_state));
-                               if (g_bt->dev) wl_iw_bt_flag_set(g_bt->dev, FALSE);
-                               g_bt->bt_state = BT_DHCP_IDLE;
-                               g_bt->timer_on = 0;
-                               break;
-                }
-       }
-
-       if (g_bt->timer_on) {
-               del_timer(&g_bt->timer);
-               g_bt->timer_on = 0;
-       }
-       complete_and_exit(&g_bt->bt_exited, 0);
-}
-
-static void
-wl_iw_bt_release(void)
-{
-       bt_info_t *bt_local = g_bt;
-
-       if (!bt_local) {
-               return;
-       }
-
-       if (bt_local->bt_pid >= 0) {
-               KILL_PROC(bt_local->bt_pid, SIGTERM);
-               wait_for_completion(&bt_local->bt_exited);
-       }
-       kfree(bt_local);
-       g_bt = NULL;
-}
-
-static int
-wl_iw_bt_init(struct net_device *dev)
-{
-       bt_info_t *bt_dhcp = NULL;
-
-       bt_dhcp = kmalloc(sizeof(bt_info_t), GFP_KERNEL);
-       if (!bt_dhcp)
-               return -ENOMEM;
-
-       memset(bt_dhcp, 0, sizeof(bt_info_t));
-       bt_dhcp->bt_pid = -1;
-       g_bt = bt_dhcp;
-       bt_dhcp->dev = dev;
-       bt_dhcp->bt_state = BT_DHCP_IDLE;
-
-       
-       bt_dhcp->timer_ms    = 10;
-       init_timer(&bt_dhcp->timer);
-       bt_dhcp->timer.data = (ulong)bt_dhcp;
-       bt_dhcp->timer.function = wl_iw_bt_timerfunc;
-
-       sema_init(&bt_dhcp->bt_sem, 0);
-       init_completion(&bt_dhcp->bt_exited);
-       bt_dhcp->bt_pid = kernel_thread(_bt_dhcp_sysioc_thread, bt_dhcp, 0);
-       if (bt_dhcp->bt_pid < 0) {
-               WL_ERROR(("Failed in %s\n", __FUNCTION__));
-               return -ENOMEM;
-       }
-
-       return 0;
-}
-
-int wl_iw_attach(struct net_device *dev, void * dhdp)
-{
-       int params_size;
-       wl_iw_t *iw;
-#if defined(WL_IW_USE_ISCAN)
-       iscan_info_t *iscan = NULL;
-
-       if (!dev)
-               return 0;
-
-       
-#ifdef CSCAN
-       params_size = (WL_SCAN_PARAMS_FIXED_SIZE + OFFSETOF(wl_iscan_params_t, params)) +
-           (WL_NUMCHANNELS * sizeof(uint16)) + WL_SCAN_PARAMS_SSID_MAX * sizeof(wlc_ssid_t);
-#else
-       params_size = (WL_SCAN_PARAMS_FIXED_SIZE + OFFSETOF(wl_iscan_params_t, params));
-#endif 
-       iscan = kmalloc(sizeof(iscan_info_t), GFP_KERNEL);
-
-       if (!iscan)
-               return -ENOMEM;
-       memset(iscan, 0, sizeof(iscan_info_t));
-
-       
-       iscan->iscan_ex_params_p = (wl_iscan_params_t*)kmalloc(params_size, GFP_KERNEL);
-       if (!iscan->iscan_ex_params_p)
-               return -ENOMEM;
-       iscan->iscan_ex_param_size = params_size;
-       iscan->sysioc_pid = -1;
-       
-       g_iscan = iscan;
-       iscan->dev = dev;
-       iscan->iscan_state = ISCAN_STATE_IDLE;
-
-       g_first_broadcast_scan = BROADCAST_SCAN_FIRST_IDLE;
-       g_iscan->scan_flag = 0;
-
-       
-       iscan->timer_ms    = 3000;
-       init_timer(&iscan->timer);
-       iscan->timer.data = (ulong)iscan;
-       iscan->timer.function = wl_iw_timerfunc;
-
-       sema_init(&iscan->sysioc_sem, 0);
-       init_completion(&iscan->sysioc_exited);
-       iscan->sysioc_pid = kernel_thread(_iscan_sysioc_thread, iscan, 0);
-       if (iscan->sysioc_pid < 0)
-               return -ENOMEM;
-#endif 
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       iw->pub = (dhd_pub_t *)dhdp;
-       MUTEX_LOCK_INIT(iw->pub);
-       MUTEX_LOCK_WL_SCAN_SET_INIT();
-#ifdef SOFTAP
-       priv_dev = dev;
-       MUTEX_LOCK_SOFTAP_SET_INIT(iw->pub);
-#endif 
-       g_scan = NULL;
-
-       
-       g_scan = (void *)kmalloc(G_SCAN_RESULTS, GFP_KERNEL);
-       if (!g_scan)
-               return -ENOMEM;
-
-       memset(g_scan, 0, G_SCAN_RESULTS);
-       g_scan_specified_ssid = 0;
-
-#if !defined(CSCAN)
-       
-       wl_iw_init_ss_cache_ctrl();
-#endif 
-       
-       wl_iw_bt_init(dev);
-
-
-       return 0;
-}
-
-void wl_iw_detach(void)
-{
-#if defined(WL_IW_USE_ISCAN)
-       iscan_buf_t  *buf;
-       iscan_info_t *iscan = g_iscan;
-
-       if (!iscan)
-               return;
-       if (iscan->sysioc_pid >= 0) {
-               KILL_PROC(iscan->sysioc_pid, SIGTERM);
-               wait_for_completion(&iscan->sysioc_exited);
-       }
-       MUTEX_LOCK_WL_SCAN_SET();
-       while (iscan->list_hdr) {
-               buf = iscan->list_hdr->next;
-               kfree(iscan->list_hdr);
-               iscan->list_hdr = buf;
-       }
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       kfree(iscan->iscan_ex_params_p);
-       kfree(iscan);
-       g_iscan = NULL;
-#endif 
-
-       if (g_scan)
-               kfree(g_scan);
-
-       g_scan = NULL;
-#if !defined(CSCAN)
-       wl_iw_release_ss_cache_ctrl();
-#endif 
-       wl_iw_bt_release();
-
-#ifdef SOFTAP
-       if (ap_cfg_running) {
-               WL_TRACE(("\n%s AP is going down\n", __FUNCTION__));
-               
-               wl_iw_send_priv_event(priv_dev, "AP_DOWN");
-       }
-#endif
-
-}
diff --git a/drivers/net/wireless/bcm4319/wl_iw.h b/drivers/net/wireless/bcm4319/wl_iw.h
deleted file mode 100644 (file)
index 12c7c19..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Linux Wireless Extensions support
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: wl_iw.h,v 1.5.34.1.6.24 2010/07/27 20:46:02 Exp $
- */
-
-
-#ifndef _wl_iw_h_
-#define _wl_iw_h_
-
-#include <linux/wireless.h>
-
-#include <typedefs.h>
-#include <proto/ethernet.h>
-#include <wlioctl.h>
-
-#define WL_SCAN_PARAMS_SSID_MAX        10
-#define GET_SSID                       "SSID="
-#define GET_CHANNEL                    "CH="
-#define GET_NPROBE                     "NPROBE="
-#define GET_ACTIVE_ASSOC_DWELL         "ACTIVE="
-#define GET_PASSIVE_ASSOC_DWELL        "PASSIVE="
-#define GET_HOME_DWELL                 "HOME="
-#define GET_SCAN_TYPE                  "TYPE="
-
-#define BAND_GET_CMD                           "BANDGET"
-#define BAND_SET_CMD                           "BANDSET"
-
-
-#define        WL_IW_RSSI_MINVAL               -200    
-#define        WL_IW_RSSI_NO_SIGNAL    -91     
-#define        WL_IW_RSSI_VERY_LOW     -80     
-#define        WL_IW_RSSI_LOW          -70     
-#define        WL_IW_RSSI_GOOD         -68     
-#define        WL_IW_RSSI_VERY_GOOD    -58     
-#define        WL_IW_RSSI_EXCELLENT    -57     
-#define        WL_IW_RSSI_INVALID       0      
-#define MAX_WX_STRING 80
-#define isprint(c) bcm_isprint(c)
-#define WL_IW_SET_ACTIVE_SCAN  (SIOCIWFIRSTPRIV+1)
-#define WL_IW_GET_RSSI                 (SIOCIWFIRSTPRIV+3)
-#define WL_IW_SET_PASSIVE_SCAN (SIOCIWFIRSTPRIV+5)
-#define WL_IW_GET_LINK_SPEED   (SIOCIWFIRSTPRIV+7)
-#define WL_IW_GET_CURR_MACADDR (SIOCIWFIRSTPRIV+9)
-#define WL_IW_SET_STOP                         (SIOCIWFIRSTPRIV+11)
-#define WL_IW_SET_START                        (SIOCIWFIRSTPRIV+13)
-
-
-#define WL_SET_AP_CFG           (SIOCIWFIRSTPRIV+15)
-#define WL_AP_STA_LIST          (SIOCIWFIRSTPRIV+17)
-#define WL_AP_MAC_FLTR         (SIOCIWFIRSTPRIV+19)
-#define WL_AP_BSS_START         (SIOCIWFIRSTPRIV+21)
-#define AP_LPB_CMD              (SIOCIWFIRSTPRIV+23)
-#define WL_AP_STOP              (SIOCIWFIRSTPRIV+25)
-#define WL_FW_RELOAD            (SIOCIWFIRSTPRIV+27)
-#define WL_COMBO_SCAN            (SIOCIWFIRSTPRIV+29)
-#define WL_AP_SPARE3            (SIOCIWFIRSTPRIV+31)
-#define                G_SCAN_RESULTS 8*1024
-#define                WE_ADD_EVENT_FIX        0x80
-#define          G_WLAN_SET_ON 0
-#define          G_WLAN_SET_OFF        1
-
-#define CHECK_EXTRA_FOR_NULL(extra) \
-if (!extra) { \
-       WL_ERROR(("%s: error : extra is null pointer\n", __FUNCTION__)); \
-       return -EINVAL; \
-}
-
-typedef struct wl_iw {
-       char nickname[IW_ESSID_MAX_SIZE];
-
-       struct iw_statistics wstats;
-
-       int spy_num;
-       uint32 pwsec;                   
-       uint32 gwsec;                   
-       bool privacy_invoked;           
-
-       struct ether_addr spy_addr[IW_MAX_SPY];
-       struct iw_quality spy_qual[IW_MAX_SPY];
-       void  *wlinfo;
-       dhd_pub_t * pub;
-} wl_iw_t;
-
-int     wl_control_wl_start(struct net_device *dev);
-#define WLC_IW_SS_CACHE_MAXLEN                         512
-#define WLC_IW_SS_CACHE_CTRL_FIELD_MAXLEN      32
-#define WLC_IW_BSS_INFO_MAXLEN                                 \
-       (WLC_IW_SS_CACHE_MAXLEN - WLC_IW_SS_CACHE_CTRL_FIELD_MAXLEN)
-
-typedef struct wl_iw_ss_cache {
-       struct wl_iw_ss_cache *next;
-       uint32 buflen;
-       uint32 version;
-       uint32 count;
-       int dirty;
-       wl_bss_info_t bss_info[1];
-} wl_iw_ss_cache_t;
-
-typedef struct wl_iw_ss_cache_ctrl {
-       wl_iw_ss_cache_t *m_cache_head; 
-       int m_link_down;                
-       int m_timer_expired;            
-       char m_active_bssid[ETHER_ADDR_LEN];    
-       uint m_prev_scan_mode;  
-       uint m_cons_br_scan_cnt;        
-       struct timer_list *m_timer;     
-} wl_iw_ss_cache_ctrl_t;
-typedef enum broadcast_first_scan {
-       BROADCAST_SCAN_FIRST_IDLE = 0,
-       BROADCAST_SCAN_FIRST_STARTED,
-       BROADCAST_SCAN_FIRST_RESULT_READY,
-       BROADCAST_SCAN_FIRST_RESULT_CONSUMED
-} broadcast_first_scan_t;
-#ifdef SOFTAP
-#define SSID_LEN       33
-#define SEC_LEN                16
-#define KEY_LEN                65
-#define PROFILE_OFFSET 32
-struct ap_profile {
-       uint8   ssid[SSID_LEN];
-       uint8   sec[SEC_LEN];
-       uint8   key[KEY_LEN];
-       uint32  channel; 
-       uint32  preamble;
-       uint32  max_scb;        
-};
-
-
-#define MACLIST_MODE_DISABLED  0
-#define MACLIST_MODE_ENABLED   1
-#define MACLIST_MODE_ALLOW             2
-struct mflist {
-       uint count;
-       struct ether_addr ea[16];
-};
-struct mac_list_set {
-       uint32  mode;
-       struct mflist white_list;
-       struct mflist black_list;
-};
-#endif   
-
-#if WIRELESS_EXT > 12
-#include <net/iw_handler.h>
-extern const struct iw_handler_def wl_iw_handler_def;
-#endif 
-
-extern int wl_iw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-extern void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void* data);
-extern int wl_iw_get_wireless_stats(struct net_device *dev, struct iw_statistics *wstats);
-int wl_iw_attach(struct net_device *dev, void * dhdp);
-void wl_iw_detach(void);
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-#define IWE_STREAM_ADD_EVENT(info, stream, ends, iwe, extra) \
-       iwe_stream_add_event(info, stream, ends, iwe, extra)
-#define IWE_STREAM_ADD_VALUE(info, event, value, ends, iwe, event_len) \
-       iwe_stream_add_value(info, event, value, ends, iwe, event_len)
-#define IWE_STREAM_ADD_POINT(info, stream, ends, iwe, extra) \
-       iwe_stream_add_point(info, stream, ends, iwe, extra)
-#else
-#define IWE_STREAM_ADD_EVENT(info, stream, ends, iwe, extra) \
-       iwe_stream_add_event(stream, ends, iwe, extra)
-#define IWE_STREAM_ADD_VALUE(info, event, value, ends, iwe, event_len) \
-       iwe_stream_add_value(event, value, ends, iwe, event_len)
-#define IWE_STREAM_ADD_POINT(info, stream, ends, iwe, extra) \
-       iwe_stream_add_point(stream, ends, iwe, extra)
-#endif
-
-#if defined(CSCAN)
-
-typedef struct cscan_tlv {
-       char prefix;
-       char version;
-       char subver;
-       char reserved;
-} cscan_tlv_t;
-
-#define CSCAN_COMMAND                          "CSCAN "
-#define CSCAN_TLV_PREFIX                       'S'
-#define CSCAN_TLV_VERSION                      1
-#define CSCAN_TLV_SUBVERSION                   0
-#define CSCAN_TLV_TYPE_SSID_IE          'S'
-#define CSCAN_TLV_TYPE_CHANNEL_IE   'C'
-#define CSCAN_TLV_TYPE_NPROBE_IE     'N'
-#define CSCAN_TLV_TYPE_ACTIVE_IE      'A'
-#define CSCAN_TLV_TYPE_PASSIVE_IE    'P'
-#define CSCAN_TLV_TYPE_HOME_IE         'H'
-#define CSCAN_TLV_TYPE_STYPE_IE        'T'
-
-extern int wl_iw_parse_channel_list_tlv(char** list_str, uint16* channel_list, \
-                                       int channel_num, int *bytes_left);
-
-extern int wl_iw_parse_data_tlv(char** list_str, void  *dst, int dst_size, \
-                                       const char token, int input_size, int *bytes_left);
-
-extern int wl_iw_parse_ssid_list_tlv(char** list_str, wlc_ssid_t* ssid, \
-                                       int max, int *bytes_left);
-
-extern int wl_iw_parse_ssid_list(char** list_str, wlc_ssid_t* ssid, int idx, int max);
-
-extern int wl_iw_parse_channel_list(char** list_str, uint16* channel_list, int channel_num);
-
-#endif 
-
-#endif 
diff --git a/drivers/net/wireless/bcm4319/wl_iw_dbg.c b/drivers/net/wireless/bcm4319/wl_iw_dbg.c
deleted file mode 100644 (file)
index 2bc03de..0000000
+++ /dev/null
@@ -1,7895 +0,0 @@
-/*
- * Linux Wireless Extensions support
- *
- * Copyright (C) 1999-2010, Broadcom Corporation
- * 
- *      Unless you and Broadcom execute a separate written software license
- * agreement governing use of this software, this software is licensed to you
- * under the terms of the GNU General Public License version 2 (the "GPL"),
- * available at http://www.broadcom.com/licenses/GPLv2.php, with the
- * following added to such license:
- * 
- *      As a special exception, the copyright holders of this software give you
- * permission to link this software with independent modules, and to copy and
- * distribute the resulting executable under terms of your choice, provided that
- * you also meet, for each linked independent module, the terms and conditions of
- * the license of that module.  An independent module is a module which is not
- * derived from this software.  The special exception does not apply to any
- * modifications of the software.
- * 
- *      Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a license
- * other than the GPL, without Broadcom's express prior written consent.
- *
- * $Id: wl_iw.c,v 1.51.4.9.2.6.4.124 2010/07/27 20:46:02 Exp $
- */
-
-#include <wlioctl.h>
-
-#include <typedefs.h>
-#include <linuxver.h>
-#include <osl.h>
-
-#include <bcmutils.h>
-#include <bcmendian.h>
-#include <proto/ethernet.h>
-
-#include <linux/if_arp.h>
-#include <asm/uaccess.h>
-
-#include <dngl_stats.h>
-#include <dhd.h>
-#include <dhdioctl.h>
-
-typedef void wlc_info_t;
-typedef void wl_info_t;
-typedef const struct si_pub  si_t;
-#include <wlioctl.h>
-
-#include <proto/ethernet.h>
-#include <dngl_stats.h>
-#include <dhd.h>
-#include <dhd_dbg.h>
-#define WL_ERROR(x)  DHD_ERROR(x)
-#define WL_TRACE(x)  DHD_TRACE(x)
-#define WL_ASSOC(x)  DHD_TRACE(x)
-#define WL_INFORM(x) DHD_TRACE(x)
-#define WL_WSEC(x)   DHD_TRACE(x)
-#define WL_SCAN(x)   DHD_TRACE(x)
-
-#include <wl_iw.h>
-
-#ifndef IW_ENCODE_ALG_SM4
-#define IW_ENCODE_ALG_SM4 0x20
-#endif
-
-#ifndef IW_AUTH_WAPI_ENABLED
-#define IW_AUTH_WAPI_ENABLED 0x20
-#endif
-
-#ifndef IW_AUTH_WAPI_VERSION_1
-#define IW_AUTH_WAPI_VERSION_1 0x00000008
-#endif
-
-#ifndef IW_AUTH_CIPHER_SMS4
-#define IW_AUTH_CIPHER_SMS4    0x00000020
-#endif
-
-#ifndef IW_AUTH_KEY_MGMT_WAPI_PSK
-#define IW_AUTH_KEY_MGMT_WAPI_PSK 4
-#endif
-
-#ifndef IW_AUTH_KEY_MGMT_WAPI_CERT
-#define IW_AUTH_KEY_MGMT_WAPI_CERT 8
-#endif
-
-
-#define IW_WSEC_ENABLED(wsec)  ((wsec) & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED | SMS4_ENABLED))
-
-#include <linux/rtnetlink.h>
-
-#define WL_IW_USE_ISCAN  1
-#define ENABLE_ACTIVE_PASSIVE_SCAN_SUPPRESS  1
-
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
-       struct mutex  g_wl_ss_scan_lock; 
-#endif 
-
-#if defined(SOFTAP)
-#define WL_SOFTAP(x) DHD_TRACE(x)
-static struct net_device *priv_dev;
-static bool    ap_cfg_running = FALSE;
-static bool    ap_fw_loaded = FALSE;
-struct net_device *ap_net_dev = NULL;
-struct semaphore  ap_eth_sema;
-static int wl_iw_set_ap_security(struct net_device *dev, struct ap_profile *ap);
-static int wl_iw_softap_deassoc_stations(struct net_device *dev);
-#endif 
-
-#define WL_IW_IOCTL_CALL(func_call) \
-       do {                            \
-               func_call;              \
-       } while (0)
-
-static int             g_onoff = G_WLAN_SET_ON;
-
-extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
-       uint32 reason, char* stringBuf, uint buflen);
-#include <bcmsdbus.h>
-extern void dhd_customer_gpio_wlan_ctrl(int onoff);
-extern uint dhd_dev_reset(struct net_device *dev, uint8 flag);
-extern void dhd_dev_init_ioctl(struct net_device *dev);
-int dev_iw_write_cfg1_bss_var(struct net_device *dev, int val);
-
-uint wl_msg_level = WL_ERROR_VAL;
-
-#define MAX_WLIW_IOCTL_LEN 1024
-
-#if defined(IL_BIGENDIAN)
-#include <bcmendian.h>
-#define htod32(i) (bcmswap32(i))
-#define htod16(i) (bcmswap16(i))
-#define dtoh32(i) (bcmswap32(i))
-#define dtoh16(i) (bcmswap16(i))
-#define htodchanspec(i) htod16(i)
-#define dtohchanspec(i) dtoh16(i)
-#else
-#define htod32(i) i
-#define htod16(i) i
-#define dtoh32(i) i
-#define dtoh16(i) i
-#define htodchanspec(i) i
-#define dtohchanspec(i) i
-#endif
-
-#ifdef CONFIG_WIRELESS_EXT
-
-extern struct iw_statistics *dhd_get_wireless_stats(struct net_device *dev);
-extern int dhd_wait_pend8021x(struct net_device *dev);
-#endif 
-
-#if WIRELESS_EXT < 19
-#define IW_IOCTL_IDX(cmd)      ((cmd) - SIOCIWFIRST)
-#define IW_EVENT_IDX(cmd)      ((cmd) - IWEVFIRST)
-#endif 
-
-static void *g_scan = NULL;
-static volatile uint g_scan_specified_ssid;    
-static wlc_ssid_t g_specific_ssid;             
-
-static wlc_ssid_t g_ssid;
-
-static wl_iw_ss_cache_ctrl_t g_ss_cache_ctrl;  
-static volatile uint g_first_broadcast_scan;   
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
-#define DAEMONIZE(a) daemonize(a); \
-       allow_signal(SIGKILL); \
-       allow_signal(SIGTERM);
-#else 
-#define RAISE_RX_SOFTIRQ() \
-       cpu_raise_softirq(smp_processor_id(), NET_RX_SOFTIRQ)
-#define DAEMONIZE(a) daemonize(); \
-       do { if (a) \
-               strncpy(current->comm, a, MIN(sizeof(current->comm), (strlen(a) + 1))); \
-       } while (0);
-#endif 
-
-#if defined(WL_IW_USE_ISCAN)
-#if  !defined(CSCAN)
-static void wl_iw_free_ss_cache(void);
-static int   wl_iw_run_ss_cache_timer(int kick_off);
-#endif 
-int  wl_iw_iscan_set_scan_broadcast_prep(struct net_device *dev, uint flag);
-static int dev_wlc_bufvar_set(struct net_device *dev, char *name, char *buf, int len);
-#define ISCAN_STATE_IDLE   0
-#define ISCAN_STATE_SCANING 1
-
-#define WLC_IW_ISCAN_MAXLEN   2048
-typedef struct iscan_buf {
-       struct iscan_buf * next;
-       char   iscan_buf[WLC_IW_ISCAN_MAXLEN];
-} iscan_buf_t;
-
-typedef struct iscan_info {
-       struct net_device *dev;
-       struct timer_list timer;
-       uint32 timer_ms;
-       uint32 timer_on;
-       int    iscan_state;
-       iscan_buf_t * list_hdr;
-       iscan_buf_t * list_cur;
-       
-       long sysioc_pid;
-       struct semaphore sysioc_sem;
-       struct completion sysioc_exited;
-
-       uint32 scan_flag;       
-#if defined CSCAN
-       char ioctlbuf[WLC_IOCTL_MEDLEN];
-#else
-       char ioctlbuf[WLC_IOCTL_SMLEN];
-#endif 
-       
-       wl_iscan_params_t *iscan_ex_params_p;
-       int iscan_ex_param_size;
-} iscan_info_t;
-#define  COEX_DHCP 1 
-static void wl_iw_bt_flag_set(struct net_device *dev, bool set);
-static void wl_iw_bt_release(void);
-
-typedef enum bt_coex_status {
-       BT_DHCP_IDLE = 0,
-       BT_DHCP_START,
-       BT_DHCP_OPPORTUNITY_WINDOW,
-       BT_DHCP_FLAG_FORCE_TIMEOUT
-} coex_status_t;
-#define BT_DHCP_OPPORTUNITY_WINDOW_TIEM        2500    
-#define BT_DHCP_FLAG_FORCE_TIME                                5500    
-
-typedef struct bt_info {
-       struct net_device *dev;
-       struct timer_list timer;
-       uint32 timer_ms;
-       uint32 timer_on;
-       int     bt_state;
-
-       
-       long bt_pid;
-       struct semaphore bt_sem;
-       struct completion bt_exited;
-} bt_info_t;
-
-bt_info_t *g_bt = NULL;
-static void wl_iw_bt_timerfunc(ulong data);
-iscan_info_t *g_iscan = NULL;
-static void wl_iw_timerfunc(ulong data);
-static void wl_iw_set_event_mask(struct net_device *dev);
-static int
-wl_iw_iscan(iscan_info_t *iscan, wlc_ssid_t *ssid, uint16 action);
-#endif 
-static int
-wl_iw_set_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-);
-static int
-wl_iw_get_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-);
-
-static uint
-wl_iw_get_scan_prep(
-       wl_scan_results_t *list,
-       struct iw_request_info *info,
-       char *extra,
-       short max_size
-);
-
-
-static void swap_key_from_BE(
-               wl_wsec_key_t *key
-)
-{
-       key->index = htod32(key->index);
-       key->len = htod32(key->len);
-       key->algo = htod32(key->algo);
-       key->flags = htod32(key->flags);
-       key->rxiv.hi = htod32(key->rxiv.hi);
-       key->rxiv.lo = htod16(key->rxiv.lo);
-       key->iv_initialized = htod32(key->iv_initialized);
-}
-
-static void swap_key_to_BE(
-               wl_wsec_key_t *key
-)
-{
-       key->index = dtoh32(key->index);
-       key->len = dtoh32(key->len);
-       key->algo = dtoh32(key->algo);
-       key->flags = dtoh32(key->flags);
-       key->rxiv.hi = dtoh32(key->rxiv.hi);
-       key->rxiv.lo = dtoh16(key->rxiv.lo);
-       key->iv_initialized = dtoh32(key->iv_initialized);
-}
-
-
-static const char* cmd2nam(int cmd)
-{
-       const char *n="";
-#if defined(DHD_DEBUG)
-       int i=0;
-       struct _WLCNVStruct {
-               const char *n;
-               int v;
-       } wlcnv[] = {
-               {"WLC_GET_MAGIC", 0},
-               {"WLC_GET_VERSION", 1},
-               {"WLC_UP", 2},
-               {"WLC_DOWN", 3},
-               {"WLC_GET_LOOP", 4},
-               {"WLC_SET_LOOP", 5},
-               {"WLC_DUMP", 6},
-               {"WLC_GET_MSGLEVEL", 7},
-               {"WLC_SET_MSGLEVEL", 8},
-               {"WLC_GET_PROMISC", 9},
-               {"WLC_SET_PROMISC", 10},
-               {"WLC_GET_RATE", 12},
-               {"WLC_GET_INSTANCE", 14},
-               {"WLC_GET_INFRA", 19},
-               {"WLC_SET_INFRA", 20},
-               {"WLC_GET_AUTH", 21},
-               {"WLC_SET_AUTH", 22},
-               {"WLC_GET_BSSID", 23},
-               {"WLC_SET_BSSID", 24},
-               {"WLC_GET_SSID", 25},
-               {"WLC_SET_SSID", 26},
-               {"WLC_RESTART", 27},
-               {"WLC_GET_CHANNEL", 29},
-               {"WLC_SET_CHANNEL", 30},
-               {"WLC_GET_SRL", 31},
-               {"WLC_SET_SRL", 32},
-               {"WLC_GET_LRL", 33},
-               {"WLC_SET_LRL", 34},
-               {"WLC_GET_PLCPHDR", 35},
-               {"WLC_SET_PLCPHDR", 36},
-               {"WLC_GET_RADIO", 37},
-               {"WLC_SET_RADIO", 38},
-               {"WLC_GET_PHYTYPE", 39},
-               {"WLC_DUMP_RATE", 40},
-               {"WLC_SET_RATE_PARAMS", 41},
-               {"WLC_GET_KEY", 44},
-               {"WLC_SET_KEY", 45},
-               {"WLC_GET_REGULATORY", 46},
-               {"WLC_SET_REGULATORY", 47},
-               {"WLC_GET_PASSIVE_SCAN", 48},
-               {"WLC_SET_PASSIVE_SCAN", 49},
-               {"WLC_SCAN", 50},
-               {"WLC_SCAN_RESULTS", 51},
-               {"WLC_DISASSOC", 52},
-               {"WLC_REASSOC", 53},
-               {"WLC_GET_ROAM_TRIGGER", 54},
-               {"WLC_SET_ROAM_TRIGGER", 55},
-               {"WLC_GET_ROAM_DELTA", 56},
-               {"WLC_SET_ROAM_DELTA", 57},
-               {"WLC_GET_ROAM_SCAN_PERIOD", 58},
-               {"WLC_SET_ROAM_SCAN_PERIOD", 59},
-               {"WLC_EVM", 60},
-               {"WLC_GET_TXANT", 61},
-               {"WLC_SET_TXANT", 62},
-               {"WLC_GET_ANTDIV", 63},
-               {"WLC_SET_ANTDIV", 64},
-               {"WLC_GET_CLOSED", 67},
-               {"WLC_SET_CLOSED", 68},
-               {"WLC_GET_MACLIST", 69},
-               {"WLC_SET_MACLIST", 70},
-               {"WLC_GET_RATESET", 71},
-               {"WLC_SET_RATESET", 72},
-               {"WLC_LONGTRAIN", 74},
-               {"WLC_GET_BCNPRD", 75},
-               {"WLC_SET_BCNPRD", 76},
-               {"WLC_GET_DTIMPRD", 77},
-               {"WLC_SET_DTIMPRD", 78},
-               {"WLC_GET_SROM", 79},
-               {"WLC_SET_SROM", 80},
-               {"WLC_GET_WEP_RESTRICT", 81},
-               {"WLC_SET_WEP_RESTRICT", 82},
-               {"WLC_GET_COUNTRY", 83},
-               {"WLC_SET_COUNTRY", 84},
-               {"WLC_GET_PM", 85},
-               {"WLC_SET_PM", 86},
-               {"WLC_GET_WAKE", 87},
-               {"WLC_SET_WAKE", 88},
-               {"WLC_GET_FORCELINK", 90},
-               {"WLC_SET_FORCELINK", 91},
-               {"WLC_FREQ_ACCURACY", 92},
-               {"WLC_CARRIER_SUPPRESS", 93},
-               {"WLC_GET_PHYREG", 94},
-               {"WLC_SET_PHYREG", 95},
-               {"WLC_GET_RADIOREG", 96},
-               {"WLC_SET_RADIOREG", 97},
-               {"WLC_GET_REVINFO", 98},
-               {"WLC_GET_UCANTDIV", 99},
-               {"WLC_SET_UCANTDIV", 100},
-               {"WLC_R_REG", 101},
-               {"WLC_W_REG", 102},
-               {"WLC_GET_MACMODE", 105},
-               {"WLC_SET_MACMODE", 106},
-               {"WLC_GET_MONITOR", 107},
-               {"WLC_SET_MONITOR", 108},
-               {"WLC_GET_GMODE", 109},
-               {"WLC_SET_GMODE", 110},
-               {"WLC_GET_LEGACY_ERP", 111},
-               {"WLC_SET_LEGACY_ERP", 112},
-               {"WLC_GET_RX_ANT", 113},
-               {"WLC_GET_CURR_RATESET", 114},
-               {"WLC_GET_SCANSUPPRESS", 115},
-               {"WLC_SET_SCANSUPPRESS", 116},
-               {"WLC_GET_AP", 117},
-               {"WLC_SET_AP", 118},
-               {"WLC_GET_EAP_RESTRICT", 119},
-               {"WLC_SET_EAP_RESTRICT", 120},
-               {"WLC_SCB_AUTHORIZE", 121},
-               {"WLC_SCB_DEAUTHORIZE", 122},
-               {"WLC_GET_WDSLIST", 123},
-               {"WLC_SET_WDSLIST", 124},
-               {"WLC_GET_ATIM", 125},
-               {"WLC_SET_ATIM", 126},
-               {"WLC_GET_RSSI", 127},
-               {"WLC_GET_PHYANTDIV", 128},
-               {"WLC_SET_PHYANTDIV", 129},
-               {"WLC_AP_RX_ONLY", 130},
-               {"WLC_GET_TX_PATH_PWR", 131},
-               {"WLC_SET_TX_PATH_PWR", 132},
-               {"WLC_GET_WSEC", 133},
-               {"WLC_SET_WSEC", 134},
-               {"WLC_GET_PHY_NOISE", 135},
-               {"WLC_GET_BSS_INFO", 136},
-               {"WLC_GET_PKTCNTS", 137},
-               {"WLC_GET_LAZYWDS", 138},
-               {"WLC_SET_LAZYWDS", 139},
-               {"WLC_GET_BANDLIST", 140},
-               {"WLC_GET_BAND", 141},
-               {"WLC_SET_BAND", 142},
-               {"WLC_SCB_DEAUTHENTICATE", 143},
-               {"WLC_GET_SHORTSLOT", 144},
-               {"WLC_GET_SHORTSLOT_OVERRIDE", 145},
-               {"WLC_SET_SHORTSLOT_OVERRIDE", 146},
-               {"WLC_GET_SHORTSLOT_RESTRICT", 147},
-               {"WLC_SET_SHORTSLOT_RESTRICT", 148},
-               {"WLC_GET_GMODE_PROTECTION", 149},
-               {"WLC_GET_GMODE_PROTECTION_OVERRIDE", 150},
-               {"WLC_SET_GMODE_PROTECTION_OVERRIDE", 151},
-               {"WLC_UPGRADE", 152},
-               {"WLC_GET_IGNORE_BCNS", 155},
-               {"WLC_SET_IGNORE_BCNS", 156},
-               {"WLC_GET_SCB_TIMEOUT", 157},
-               {"WLC_SET_SCB_TIMEOUT", 158},
-               {"WLC_GET_ASSOCLIST", 159},
-               {"WLC_GET_CLK", 160},
-               {"WLC_SET_CLK", 161},
-               {"WLC_GET_UP", 162},
-               {"WLC_OUT", 163},
-               {"WLC_GET_WPA_AUTH", 164},
-               {"WLC_SET_WPA_AUTH", 165},
-               {"WLC_GET_UCFLAGS", 166},
-               {"WLC_SET_UCFLAGS", 167},
-               {"WLC_GET_PWRIDX", 168},
-               {"WLC_SET_PWRIDX", 169},
-               {"WLC_GET_TSSI", 170},
-               {"WLC_GET_SUP_RATESET_OVERRIDE", 171},
-               {"WLC_SET_SUP_RATESET_OVERRIDE", 172},
-               {"WLC_GET_PROTECTION_CONTROL", 178},
-               {"WLC_SET_PROTECTION_CONTROL", 179},
-               {"WLC_GET_PHYLIST", 180},
-               {"WLC_ENCRYPT_STRENGTH", 181},
-               {"WLC_DECRYPT_STATUS", 182},
-               {"WLC_GET_KEY_SEQ", 183},
-               {"WLC_GET_SCAN_CHANNEL_TIME", 184},
-               {"WLC_SET_SCAN_CHANNEL_TIME", 185},
-               {"WLC_GET_SCAN_UNASSOC_TIME", 186},
-               {"WLC_SET_SCAN_UNASSOC_TIME", 187},
-               {"WLC_GET_SCAN_HOME_TIME", 188},
-               {"WLC_SET_SCAN_HOME_TIME", 189},
-               {"WLC_GET_SCAN_NPROBES", 190},
-               {"WLC_SET_SCAN_NPROBES", 191},
-               {"WLC_GET_PRB_RESP_TIMEOUT", 192},
-               {"WLC_SET_PRB_RESP_TIMEOUT", 193},
-               {"WLC_GET_ATTEN", 194},
-               {"WLC_SET_ATTEN", 195},
-               {"WLC_GET_SHMEM", 196},
-               {"WLC_SET_SHMEM", 197},
-               {"WLC_SET_WSEC_TEST", 200},
-               {"WLC_SCB_DEAUTHENTICATE_FOR_REASON", 201},
-               {"WLC_TKIP_COUNTERMEASURES", 202},
-               {"WLC_GET_PIOMODE", 203},
-               {"WLC_SET_PIOMODE", 204},
-               {"WLC_SET_ASSOC_PREFER", 205},
-               {"WLC_GET_ASSOC_PREFER", 206},
-               {"WLC_SET_ROAM_PREFER", 207},
-               {"WLC_GET_ROAM_PREFER", 208},
-               {"WLC_SET_LED", 209},
-               {"WLC_GET_LED", 210},
-               {"WLC_GET_INTERFERENCE_MODE", 211},
-               {"WLC_SET_INTERFERENCE_MODE", 212},
-               {"WLC_GET_CHANNEL_QA", 213},
-               {"WLC_START_CHANNEL_QA", 214},
-               {"WLC_GET_CHANNEL_SEL", 215},
-               {"WLC_START_CHANNEL_SEL", 216},
-               {"WLC_GET_VALID_CHANNELS", 217},
-               {"WLC_GET_FAKEFRAG", 218},
-               {"WLC_SET_FAKEFRAG", 219},
-               {"WLC_GET_PWROUT_PERCENTAGE", 220},
-               {"WLC_SET_PWROUT_PERCENTAGE", 221},
-               {"WLC_SET_BAD_FRAME_PREEMPT", 222},
-               {"WLC_GET_BAD_FRAME_PREEMPT", 223},
-               {"WLC_SET_LEAP_LIST", 224},
-               {"WLC_GET_LEAP_LIST", 225},
-               {"WLC_GET_CWMIN", 226},
-               {"WLC_SET_CWMIN", 227},
-               {"WLC_GET_CWMAX", 228},
-               {"WLC_SET_CWMAX", 229},
-               {"WLC_GET_WET", 230},
-               {"WLC_SET_WET", 231},
-               {"WLC_GET_PUB", 232},
-               {"WLC_GET_KEY_PRIMARY", 235},
-               {"WLC_SET_KEY_PRIMARY", 236},
-               {"WLC_GET_ACI_ARGS", 238},
-               {"WLC_SET_ACI_ARGS", 239},
-               {"WLC_UNSET_CALLBACK", 240},
-               {"WLC_SET_CALLBACK", 241},
-               {"WLC_GET_RADAR", 242},
-               {"WLC_SET_RADAR", 243},
-               {"WLC_SET_SPECT_MANAGMENT", 244},
-               {"WLC_GET_SPECT_MANAGMENT", 245},
-               {"WLC_WDS_GET_REMOTE_HWADDR", 246},
-               {"WLC_WDS_GET_WPA_SUP", 247},
-               {"WLC_SET_CS_SCAN_TIMER", 248},
-               {"WLC_GET_CS_SCAN_TIMER", 249},
-               {"WLC_MEASURE_REQUEST", 250},
-               {"WLC_INIT", 251},
-               {"WLC_SEND_QUIET", 252},
-               {"WLC_KEEPALIVE", 253},
-               {"WLC_SEND_PWR_CONSTRAINT", 254},
-               {"WLC_UPGRADE_STATUS", 255},
-               {"WLC_CURRENT_PWR", 256},
-               {"WLC_GET_SCAN_PASSIVE_TIME", 257},
-               {"WLC_SET_SCAN_PASSIVE_TIME", 258},
-               {"WLC_LEGACY_LINK_BEHAVIOR", 259},
-               {"WLC_GET_CHANNELS_IN_COUNTRY", 260},
-               {"WLC_GET_COUNTRY_LIST", 261},
-               {"WLC_GET_VAR", 262},
-               {"WLC_SET_VAR", 263},
-               {"WLC_NVRAM_GET", 264},
-               {"WLC_NVRAM_SET", 265},
-               {"WLC_NVRAM_DUMP", 266},
-               {"WLC_REBOOT", 267},
-               {"WLC_SET_WSEC_PMK", 268},
-               {"WLC_GET_AUTH_MODE", 269},
-               {"WLC_SET_AUTH_MODE", 270},
-               {"WLC_GET_WAKEENTRY", 271},
-               {"WLC_SET_WAKEENTRY", 272},
-               {"WLC_NDCONFIG_ITEM", 273},
-               {"WLC_NVOTPW", 274},
-               {"WLC_OTPW", 275},
-               {"WLC_IOV_BLOCK_GET", 276},
-               {"WLC_IOV_MODULES_GET", 277},
-               {"WLC_SOFT_RESET", 278},
-               {"WLC_GET_ALLOW_MODE", 279},
-               {"WLC_SET_ALLOW_MODE", 280},
-               {"WLC_GET_DESIRED_BSSID", 281},
-               {"WLC_SET_DESIRED_BSSID", 282},
-               {"WLC_DISASSOC_MYAP", 283},
-               {"WLC_GET_NBANDS", 284},
-               {"WLC_GET_BANDSTATES", 285},
-               {"WLC_GET_WLC_BSS_INFO", 286},
-               {"WLC_GET_ASSOC_INFO", 287},
-               {"WLC_GET_OID_PHY", 288},
-               {"WLC_SET_OID_PHY", 289},
-               {"WLC_SET_ASSOC_TIME", 290},
-               {"WLC_GET_DESIRED_SSID", 291},
-               {"WLC_GET_CHANSPEC", 292},
-               {"WLC_GET_ASSOC_STATE", 293},
-               {"WLC_SET_PHY_STATE", 294},
-               {"WLC_GET_SCAN_PENDING", 295},
-               {"WLC_GET_SCANREQ_PENDING", 296},
-               {"WLC_GET_PREV_ROAM_REASON", 297},
-               {"WLC_SET_PREV_ROAM_REASON", 298},
-               {"WLC_GET_BANDSTATES_PI", 299},
-               {"WLC_GET_PHY_STATE", 300},
-               {"WLC_GET_BSS_WPA_RSN", 301},
-               {"WLC_GET_BSS_WPA2_RSN", 302},
-               {"WLC_GET_BSS_BCN_TS", 303},
-               {"WLC_GET_INT_DISASSOC", 304},
-               {"WLC_SET_NUM_PEERS", 305},     
-               {"WLC_GET_NUM_BSS", 306},
-               {"WLC_LAST", 307},
-       };
-
-       while (i < sizeof(wlcnv)/sizeof(wlcnv[0])) {
-               if (wlcnv[i].v == cmd) {
-                       n = wlcnv[i].n;
-                       break;
-               }
-               ++i;
-       }
-#endif /* DHD_DEBUG */
-       return n;
-}
-
-static int dev_wlc_ioctl(      struct net_device *dev,
-       int cmd,
-       void *arg,
-       int len
-)
-{
-       struct ifreq ifr;
-       wl_ioctl_t ioc;
-       mm_segment_t fs;
-       int ret = -EINVAL;
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return ret;
-       }
-
-       WL_INFORM(("\n%s, PID:%x: send Local IOCTL -> dhd: cmd:%s(%d), buf:%p, len:%d ,\n",
-               __FUNCTION__, current->pid, cmd2nam(cmd), cmd, arg, len));
-
-       if (g_onoff == G_WLAN_SET_ON) 
-       {
-               memset(&ioc, 0, sizeof(ioc));
-               ioc.cmd = cmd;
-               ioc.buf = arg;
-               ioc.len = len;
-
-               strcpy(ifr.ifr_name, dev->name);
-               ifr.ifr_data = (caddr_t) &ioc;
-
-               
-               ret = dev_open(dev);
-               if (ret) {
-                       WL_ERROR(("%s: Error dev_open: %d\n", __func__, ret));
-                       return ret;
-               }
-
-               fs = get_fs();
-               set_fs(get_ds());
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
-               //printk("Calling dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE)\n");
-               ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
-#else
-               ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
-#endif 
-               set_fs(fs);
-       }
-       else {
-               WL_TRACE(("%s: call after driver stop : ignored\n", __FUNCTION__));
-       }
-       return ret;
-}
-
-static int
-dev_wlc_intvar_get_reg(
-       struct net_device *dev,
-       char *name,
-       uint  reg,
-       int *retval)
-{
-       union {
-               char buf[WLC_IOCTL_SMLEN];
-               int val;
-       } var;
-       int error;
-
-       uint len;
-       len = bcm_mkiovar(name, (char *)(&reg), sizeof(reg), (char *)(&var), sizeof(var.buf));
-       ASSERT(len);
-       error = dev_wlc_ioctl(dev, WLC_GET_VAR, (void *)&var, len);
-
-       *retval = dtoh32(var.val);
-       return (error);
-}
-
-
-static int
-dev_wlc_intvar_set_reg(
-       struct net_device *dev,
-       char *name,
-       char *addr,
-       char * val)
-{
-       char reg_addr[8];
-
-       memset(reg_addr, 0, sizeof(reg_addr));
-       memcpy((char *)&reg_addr[0], (char *)addr, 4);
-       memcpy((char *)&reg_addr[4], (char *)val, 4);
-
-       return (dev_wlc_bufvar_set(dev, name,  (char *)&reg_addr[0], sizeof(reg_addr)));
-}
-
-
-
-
-static int
-dev_wlc_intvar_set(
-       struct net_device *dev,
-       char *name,
-       int val)
-{
-       char buf[WLC_IOCTL_SMLEN];
-       uint len;
-
-       val = htod32(val);
-       len = bcm_mkiovar(name, (char *)(&val), sizeof(val), buf, sizeof(buf));
-       ASSERT(len);
-
-       return (dev_wlc_ioctl(dev, WLC_SET_VAR, buf, len));
-}
-
-#if defined(WL_IW_USE_ISCAN)
-static int
-dev_iw_iovar_setbuf(
-       struct net_device *dev,
-       char *iovar,
-       void *param,
-       int paramlen,
-       void *bufptr,
-       int buflen)
-{
-       int iolen;
-
-       iolen = bcm_mkiovar(iovar, param, paramlen, bufptr, buflen);
-       ASSERT(iolen);
-
-       if (iolen == 0)
-               return 0;
-
-       return (dev_wlc_ioctl(dev, WLC_SET_VAR, bufptr, iolen));
-}
-
-static int
-dev_iw_iovar_getbuf(
-       struct net_device *dev,
-       char *iovar,
-       void *param,
-       int paramlen,
-       void *bufptr,
-       int buflen)
-{
-       int iolen;
-
-       iolen = bcm_mkiovar(iovar, param, paramlen, bufptr, buflen);
-       ASSERT(iolen);
-
-       return (dev_wlc_ioctl(dev, WLC_GET_VAR, bufptr, buflen));
-}
-#endif 
-
-
-#if WIRELESS_EXT > 17
-static int
-dev_wlc_bufvar_set(
-       struct net_device *dev,
-       char *name,
-       char *buf, int len)
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
-       char ioctlbuf[MAX_WLIW_IOCTL_LEN];
-#else
-       static char ioctlbuf[MAX_WLIW_IOCTL_LEN];
-#endif 
-       uint buflen;
-
-       buflen = bcm_mkiovar(name, buf, len, ioctlbuf, sizeof(ioctlbuf));
-       ASSERT(buflen);
-
-       return (dev_wlc_ioctl(dev, WLC_SET_VAR, ioctlbuf, buflen));
-}
-#endif 
-
-
-static int
-dev_wlc_bufvar_get(
-       struct net_device *dev,
-       char *name,
-       char *buf, int buflen)
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
-       char ioctlbuf[MAX_WLIW_IOCTL_LEN];
-#else
-       static char ioctlbuf[MAX_WLIW_IOCTL_LEN];
-#endif 
-       int error;
-       uint len;
-
-       len = bcm_mkiovar(name, NULL, 0, ioctlbuf, sizeof(ioctlbuf));
-       ASSERT(len);
-       error = dev_wlc_ioctl(dev, WLC_GET_VAR, (void *)ioctlbuf, MAX_WLIW_IOCTL_LEN);
-       if (!error)
-               bcopy(ioctlbuf, buf, buflen);
-
-       return (error);
-}
-
-
-
-static int
-dev_wlc_intvar_get(
-       struct net_device *dev,
-       char *name,
-       int *retval)
-{
-       union {
-               char buf[WLC_IOCTL_SMLEN];
-               int val;
-       } var;
-       int error;
-
-       uint len;
-       uint data_null;
-
-       len = bcm_mkiovar(name, (char *)(&data_null), 0, (char *)(&var), sizeof(var.buf));
-       ASSERT(len);
-       error = dev_wlc_ioctl(dev, WLC_GET_VAR, (void *)&var, len);
-
-       *retval = dtoh32(var.val);
-
-       return (error);
-}
-
-
-#if WIRELESS_EXT > 12
-static int
-wl_iw_set_active_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int as = 0;
-       int error = 0;
-       char *p = extra;
-
-#if defined(WL_IW_USE_ISCAN)
-       if (g_iscan->iscan_state == ISCAN_STATE_IDLE)
-#endif 
-               error = dev_wlc_ioctl(dev, WLC_SET_PASSIVE_SCAN, &as, sizeof(as));
-#if defined(WL_IW_USE_ISCAN)
-       else
-               g_iscan->scan_flag = as;
-#endif 
-       p += snprintf(p, MAX_WX_STRING, "OK");
-
-       wrqu->data.length = p - extra + 1;
-       return error;
-}
-
-static int
-wl_iw_set_passive_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int ps = 1;
-       int error = 0;
-       char *p = extra;
-
-#if defined(WL_IW_USE_ISCAN)
-       if (g_iscan->iscan_state == ISCAN_STATE_IDLE) {
-#endif 
-
-                
-               if (g_scan_specified_ssid == 0) {
-                       error = dev_wlc_ioctl(dev, WLC_SET_PASSIVE_SCAN, &ps, sizeof(ps));
-               }
-#if defined(WL_IW_USE_ISCAN)
-       }
-       else
-               g_iscan->scan_flag = ps;
-#endif 
-
-       p += snprintf(p, MAX_WX_STRING, "OK");
-
-       wrqu->data.length = p - extra + 1;
-       return error;
-}
-
-static int
-wl_iw_get_macaddr(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error;
-       char buf[128];
-       struct ether_addr *id;
-       char *p = extra;
-
-       
-       strcpy(buf, "cur_etheraddr");
-       error = dev_wlc_ioctl(dev, WLC_GET_VAR, buf, sizeof(buf));
-       id = (struct ether_addr *) buf;
-       p += snprintf(p, MAX_WX_STRING, "Macaddr = %02X:%02X:%02X:%02X:%02X:%02X\n",
-               id->octet[0], id->octet[1], id->octet[2],
-               id->octet[3], id->octet[4], id->octet[5]);
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-
-
-
-static int
-wl_iw_set_country(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       char country_code[WLC_CNTRY_BUF_SZ];
-       int error = 0;
-       char *p = extra;
-       int country_offset;
-       int country_code_size;
-
-       memset(country_code, 0, sizeof(country_code));
-
-       
-       country_offset = strcspn(extra, " ");
-       country_code_size = strlen(extra) - country_offset;
-
-       
-       if (country_offset != 0) {
-               strncpy(country_code, extra + country_offset +1,
-                       MIN(country_code_size, sizeof(country_code)));
-
-               
-               if ((error = dev_wlc_ioctl(dev, WLC_SET_COUNTRY,
-                       &country_code, sizeof(country_code))) >= 0) {
-                       p += snprintf(p, MAX_WX_STRING, "OK");
-                       WL_TRACE(("%s: set country %s OK\n", __FUNCTION__, country_code));
-                       goto exit;
-               }
-       }
-
-       WL_ERROR(("%s: set country %s failed code %d\n", __FUNCTION__, country_code, error));
-       p += snprintf(p, MAX_WX_STRING, "FAIL");
-
-exit:
-       wrqu->data.length = p - extra + 1;
-       return error;
-}
-
-#ifdef CUSTOMER_HW2
-static int
-wl_iw_set_power_mode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = 0;
-       char *p = extra;
-       static int  pm = PM_FAST;
-       int  pm_local = PM_OFF;
-       char powermode_val = 0;
-
-       strncpy((char *)&powermode_val, extra + strlen("POWERMODE") +1, 1);
-
-       if (strnicmp((char *)&powermode_val, "1", strlen("1")) == 0) {
-
-               WL_TRACE(("%s: DHCP session starts\n", __FUNCTION__));
-
-               dev_wlc_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm));
-               dev_wlc_ioctl(dev, WLC_SET_PM, &pm_local, sizeof(pm_local));
-       }
-       else if (strnicmp((char *)&powermode_val, "0", strlen("0")) == 0) {
-
-               WL_TRACE(("%s: DHCP session done\n", __FUNCTION__));
-
-
-               dev_wlc_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm));
-       }
-       else {
-               WL_ERROR(("Unkwown yet power setting, ignored\n"));
-       }
-
-       p += snprintf(p, MAX_WX_STRING, "OK");
-
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-#endif 
-static int
-wl_iw_set_btcoex_dhcp(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = 0;
-       char *p = extra;
-#ifndef CUSTOMER_HW2
-       static int  pm = PM_FAST;
-       int  pm_local = PM_OFF;
-#endif
-       char powermode_val = 0;
-       char buf_reg66va_dhcp_on[8] = { 66, 00, 00, 00, 0x10, 0x27, 0x00, 0x00 };
-       char buf_reg41va_dhcp_on[8] = { 41, 00, 00, 00, 0x33, 0x00, 0x00, 0x00 };
-       char buf_reg68va_dhcp_on[8] = { 68, 00, 00, 00, 0x90, 0x01, 0x00, 0x00 };
-
-       uint32 regaddr;
-       static uint32 saved_reg66;
-       static uint32 saved_reg41;
-       static uint32 saved_reg68;
-       static bool saved_status = FALSE;
-
-       char buf_flag7_default[8] =   { 7, 00, 00, 00, 0x0, 0x00, 0x00, 0x00};
-#ifndef CUSTOMER_HW2
-       uint32 temp1, temp2;
-#endif 
-
-       
-#ifdef  CUSTOMER_HW2
-       strncpy((char *)&powermode_val, extra + strlen("BTCOEXMODE") +1, 1);
-#else
-       strncpy((char *)&powermode_val, extra + strlen("POWERMODE") +1, 1);
-#endif
-
-       if (strnicmp((char *)&powermode_val, "1", strlen("1")) == 0) {
-
-               WL_TRACE(("%s: DHCP session starts\n", __FUNCTION__));
-
-               
-               if ((saved_status == FALSE) &&
-#ifndef CUSTOMER_HW2
-                       (!dev_wlc_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm))) &&
-#endif
-                       (!dev_wlc_intvar_get_reg(dev, "btc_params", 66,  &saved_reg66)) &&
-                       (!dev_wlc_intvar_get_reg(dev, "btc_params", 41,  &saved_reg41)) &&
-                       (!dev_wlc_intvar_get_reg(dev, "btc_params", 68,  &saved_reg68)))   {
-                               saved_status = TRUE;
-                               WL_TRACE(("Saved 0x%x 0x%x 0x%x\n", \
-                                       saved_reg66, saved_reg41, saved_reg68));
-
-                               
-#ifndef CUSTOMER_HW2
-                               dev_wlc_ioctl(dev, WLC_SET_PM, &pm_local, sizeof(pm_local));
-#endif
-
-                               
-                               dev_wlc_bufvar_set(dev, "btc_params", \
-                                       (char *)&buf_reg66va_dhcp_on[0], \
-                                                sizeof(buf_reg66va_dhcp_on));
-                               
-                               dev_wlc_bufvar_set(dev, "btc_params", \
-                                       (char *)&buf_reg41va_dhcp_on[0], \
-                                                sizeof(buf_reg41va_dhcp_on));
-                               
-                               dev_wlc_bufvar_set(dev, "btc_params", \
-                                       (char *)&buf_reg68va_dhcp_on[0], \
-                                                sizeof(buf_reg68va_dhcp_on));
-                               
-#ifndef CUSTOMER_HW2
-                               if ((!dev_wlc_intvar_get_reg(dev, "btc_params", 12, &temp1)) &&
-                                       (!dev_wlc_intvar_get_reg(dev, "btc_params", 13, &temp2)))
-                               {
-                                       if ((temp1 != 0) && (temp2 != 0)) {
-#endif
-                                               g_bt->bt_state = BT_DHCP_START;
-                                               g_bt->timer_on = 1;
-                                               mod_timer(&g_bt->timer, g_bt->timer.expires);
-                                               WL_TRACE(("%s enable BT DHCP Timer\n", \
-                                                       __FUNCTION__));
-#ifndef CUSTOMER_HW2
-                                       }
-                               }
-#endif
-               }
-               else if (saved_status == TRUE) {
-                       WL_ERROR(("%s was called w/o DHCP OFF. Continue\n", __FUNCTION__));
-               }
-       }
-#ifdef  CUSTOMER_HW2
-       else if (strnicmp((char *)&powermode_val, "2", strlen("2")) == 0) {
-#else
-       else if (strnicmp((char *)&powermode_val, "0", strlen("0")) == 0) {
-#endif
-
-               WL_TRACE(("%s: DHCP session done\n", __FUNCTION__));
-
-               
-#ifndef CUSTOMER_HW2
-               dev_wlc_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm));
-#endif
-
-               
-               WL_TRACE(("%s disable BT DHCP Timer\n", __FUNCTION__));
-               if (g_bt->timer_on) {
-                       g_bt->timer_on = 0;
-                       del_timer_sync(&g_bt->timer);
-               }
-
-               
-               dev_wlc_bufvar_set(dev, "btc_flags", \
-                               (char *)&buf_flag7_default[0], sizeof(buf_flag7_default));
-
-               
-               if (saved_status) {
-                       regaddr = 66;
-                       dev_wlc_intvar_set_reg(dev, "btc_params", \
-                               (char *)&regaddr, (char *)&saved_reg66);
-                       regaddr = 41;
-                       dev_wlc_intvar_set_reg(dev, "btc_params", \
-                               (char *)&regaddr, (char *)&saved_reg41);
-                       regaddr = 68;
-                       dev_wlc_intvar_set_reg(dev, "btc_params", \
-                               (char *)&regaddr, (char *)&saved_reg68);
-               }
-               saved_status = FALSE;
-
-       }
-       else {
-               WL_ERROR(("Unkwown yet power setting, ignored\n"));
-       }
-
-       p += snprintf(p, MAX_WX_STRING, "OK");
-
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-
-int
-wl_format_ssid(char* ssid_buf, uint8* ssid, int ssid_len)
-{
-       int i, c;
-       char *p = ssid_buf;
-
-       if (ssid_len > 32) ssid_len = 32;
-
-       for (i = 0; i < ssid_len; i++) {
-               c = (int)ssid[i];
-               if (c == '\\') {
-                       *p++ = '\\';
-                       *p++ = '\\';
-               } else if (isprint((uchar)c)) {
-                       *p++ = (char)c;
-               } else {
-                       p += sprintf(p, "\\x%02X", c);
-               }
-       }
-       *p = '\0';
-
-       return p - ssid_buf;
-}
-
-static int
-wl_iw_get_link_speed(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = 0;
-       char *p = extra;
-       static int link_speed;
-
-       
-       if (g_onoff == G_WLAN_SET_ON) {
-               error = dev_wlc_ioctl(dev, WLC_GET_RATE, &link_speed, sizeof(link_speed));
-               link_speed *= 500000;
-       }
-
-       p += snprintf(p, MAX_WX_STRING, "LinkSpeed %d", link_speed/1000000);
-
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-
-
-static int
-wl_iw_get_band(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = -1;
-       char *p = extra;
-       static int band;
-
-       if (g_onoff == G_WLAN_SET_ON) {
-               error = dev_wlc_ioctl(dev, WLC_GET_BAND, &band, sizeof(band));
-
-               p += snprintf(p, MAX_WX_STRING, "Band %d", band);
-
-               wrqu->data.length = p - extra + 1;
-       }
-       return error;
-}
-
-
-static int
-wl_iw_set_band(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error = -1;
-       char *p = extra;
-       char band;
-
-       if (g_onoff == G_WLAN_SET_ON) {
-
-               band = *(extra + strlen(BAND_SET_CMD) + 1) - '0';
-
-               if ((band == WLC_BAND_AUTO) || (band == WLC_BAND_5G) || (band == WLC_BAND_2G)) {
-
-                       
-                       if ((error = dev_wlc_ioctl(dev, WLC_SET_BAND,
-                               &band, sizeof(band))) >= 0) {
-                               p += snprintf(p, MAX_WX_STRING, "OK");
-                               WL_TRACE(("%s: set band %d OK\n", __FUNCTION__, band));
-                               goto exit;
-                       }
-                       else  WL_ERROR(("%s: set band %d failed code %d\n", __FUNCTION__, \
-                                       band, error));
-               }
-               else  WL_ERROR(("%s Incorrect band setting, ignored\n", __FUNCTION__));
-       }
-
-       p += snprintf(p, MAX_WX_STRING, "FAIL");
-
-exit:
-       wrqu->data.length = p - extra + 1;
-       return error;
-}
-
-
-static int
-wl_iw_get_rssi(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       static int rssi = 0;
-       static wlc_ssid_t ssid = {0};
-       int error = 0;
-       char *p = extra;
-       static char ssidbuf[SSID_FMT_BUF_LEN];
-       scb_val_t scb_val;
-
-       bzero(&scb_val, sizeof(scb_val_t));
-
-       if (g_onoff == G_WLAN_SET_ON) {
-               error = dev_wlc_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
-               rssi = dtoh32(scb_val.val);
-
-               error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid));
-
-               ssid.SSID_len = dtoh32(ssid.SSID_len);
-       }
-
-       wl_format_ssid(ssidbuf, ssid.SSID, dtoh32(ssid.SSID_len));
-       p += snprintf(p, MAX_WX_STRING, "%s rssi %d ", ssidbuf, rssi);
-       wrqu->data.length = p - extra + 1;
-
-       return error;
-}
-
-int
-wl_iw_send_priv_event(
-       struct net_device *dev,
-       char *flag
-)
-{
-       union iwreq_data wrqu;
-       char extra[IW_CUSTOM_MAX + 1];
-       int cmd;
-
-       cmd = IWEVCUSTOM;
-       memset(&wrqu, 0, sizeof(wrqu));
-       if (strlen(flag) > sizeof(extra))
-               return -1;
-
-       strcpy(extra, flag);
-       wrqu.data.length = strlen(extra);
-       wireless_send_event(dev, cmd, &wrqu, extra);
-       WL_TRACE(("Send IWEVCUSTOM Event as %s\n", extra));
-
-       return 0;
-}
-
-
-int
-wl_control_wl_start(struct net_device *dev)
-{
-       int ret = 0;
-       wl_iw_t *iw;
-
-       WL_TRACE(("Enter %s \n", __FUNCTION__));
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return -1;
-       }
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK(iw->pub);
-
-       if (g_onoff == G_WLAN_SET_OFF) {
-               dhd_customer_gpio_wlan_ctrl(WLAN_RESET_ON);
-
-#if defined(BCMLXSDMMC)
-               sdioh_start(NULL, 0);
-#endif
-
-               dhd_dev_reset(dev, 0);
-
-#if defined(BCMLXSDMMC)
-               sdioh_start(NULL, 1);
-#endif
-
-               dhd_dev_init_ioctl(dev);
-
-               g_onoff = G_WLAN_SET_ON;
-       }
-       WL_TRACE(("Exited %s \n", __FUNCTION__));
-
-       MUTEX_UNLOCK(iw->pub);
-       return ret;
-}
-static int
-wl_iw_control_wl_off(
-       struct net_device *dev,
-       struct iw_request_info *info
-)
-{
-       int ret = 0;
-       wl_iw_t *iw;
-
-       WL_TRACE(("Enter %s\n", __FUNCTION__));
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return -1;
-       }
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK(iw->pub);
-
-#ifdef SOFTAP
-       ap_cfg_running = FALSE;
-#endif 
-
-       if (g_onoff == G_WLAN_SET_ON) {
-               g_onoff = G_WLAN_SET_OFF;
-
-#if defined(WL_IW_USE_ISCAN)
-               g_iscan->iscan_state = ISCAN_STATE_IDLE;
-#endif 
-
-               dhd_dev_reset(dev, 1);
-
-#if defined(WL_IW_USE_ISCAN)
-#if !defined(CSCAN)
-               
-               wl_iw_free_ss_cache();
-               wl_iw_run_ss_cache_timer(0);
-               
-               g_ss_cache_ctrl.m_link_down = 1;
-#endif 
-               memset(g_scan, 0, G_SCAN_RESULTS);
-               g_scan_specified_ssid = 0;
-               
-               g_first_broadcast_scan = BROADCAST_SCAN_FIRST_IDLE;
-#endif 
-
-#if defined(BCMLXSDMMC)
-               sdioh_stop(NULL);
-#endif
-
-               dhd_customer_gpio_wlan_ctrl(WLAN_RESET_OFF);
-
-               wl_iw_send_priv_event(dev, "STOP");
-
-       }
-
-       MUTEX_UNLOCK(iw->pub);
-
-       WL_TRACE(("Exited %s\n", __FUNCTION__));
-
-       return ret;
-}
-
-static int
-wl_iw_control_wl_on(
-       struct net_device *dev,
-       struct iw_request_info *info
-)
-{
-       int ret = 0;
-
-       WL_TRACE(("Enter %s \n", __FUNCTION__));
-
-       ret = wl_control_wl_start(dev);
-
-       wl_iw_send_priv_event(dev, "START");
-
-#if !defined(CSCAN)
-#ifdef SOFTAP
-       if (!ap_fw_loaded) {
-               wl_iw_iscan_set_scan_broadcast_prep(dev, 0);
-       }
-#else
-       wl_iw_iscan_set_scan_broadcast_prep(dev, 0);
-#endif
-#endif 
-
-       WL_TRACE(("Exited %s \n", __FUNCTION__));
-
-       return ret;
-}
-
-#ifdef SOFTAP
-static struct ap_profile my_ap;
-static int set_ap_cfg(struct net_device *dev, struct ap_profile *ap); 
-static int get_assoc_sta_list(struct net_device *dev, char *buf, int len);
-static int set_ap_mac_list(struct net_device *dev, char *buf);
-#endif /* SOFTAP */
-
-int hex2num(char c)
-{
-       if (c >= '0' && c <= '9')
-               return c - '0';
-       if (c >= 'a' && c <= 'f')
-               return c - 'a' + 10;
-       if (c >= 'A' && c <= 'F')
-               return c - 'A' + 10;
-       return -1;
-}
-
-int hex2byte(const char *hex)
-{
-       int a, b;
-       a = hex2num(*hex++);
-       if (a < 0)
-               return -1;
-       b = hex2num(*hex++);
-       if (b < 0)
-               return -1;
-       return (a << 4) | b;
-}
-
-
-
-int hstr_2_buf(const char *txt, u8 *buf, int len)
-{
-       int i;
-
-       for (i = 0; i < len; i++) {
-               int a, b;
-
-               a = hex2num(*txt++);
-               if (a < 0)
-                       return -1;
-               b = hex2num(*txt++);
-               if (b < 0)
-                       return -1;
-               *buf++ = (a << 4) | b;
-       }
-
-       return 0;
-}
-
-
-
-#if defined(SOFTAP) || defined(CSCAN)
-
-/* parameter type */
-#define PTYPE_STRING   0
-#define PTYPE_INTDEC   1   
-#define PTYPE_INTHEX   2
-#define PTYPE_STR_HEX  3  
-
-int get_parmeter_from_string(
-                       char **str_ptr, const char *token,
-                       int param_type, void  *dst, int param_max_len)
-{
-       char int_str[7] = "0";
-       int parm_str_len;
-       char  *param_str_begin;
-       char  *param_str_end;
-       char  *orig_str = *str_ptr;
-
-       if ((*str_ptr) && !strncmp(*str_ptr, token, strlen(token))) {
-
-               strsep(str_ptr, "=,"); 
-               param_str_begin = *str_ptr;
-               strsep(str_ptr, "=,"); 
-
-               if (*str_ptr == NULL) {
-                       
-                       parm_str_len = strlen(param_str_begin);
-               } else {
-                       param_str_end = *str_ptr-1;  
-                       parm_str_len = param_str_end - param_str_begin;
-               }
-
-               WL_TRACE((" 'token:%s', len:%d, ", token, parm_str_len));
-
-               if (parm_str_len > param_max_len) {
-                       WL_ERROR((" WARNING: extracted param len:%d is > MAX:%d\n",
-                               parm_str_len, param_max_len));
-
-                       parm_str_len = param_max_len;
-               }
-
-               switch (param_type) {
-
-                       case PTYPE_INTDEC: {
-                       
-                               int *pdst_int = dst;
-                               char *eptr;
-                               if (parm_str_len > sizeof(int_str))
-                                        parm_str_len = sizeof(int_str);
-
-                               memcpy(int_str, param_str_begin, parm_str_len);
-
-                               *pdst_int = simple_strtoul(int_str, &eptr, 10);
-
-                               WL_TRACE((" written as integer:%d\n",  *pdst_int));
-                       }
-                       break;
-                       case PTYPE_STR_HEX: {
-                               u8 *buf = dst;
-                               
-                               param_max_len = param_max_len >> 1;  
-                               hstr_2_buf(param_str_begin, buf, param_max_len);
-                               print_buf(buf, param_max_len, 0);
-                       }
-                       break;
-                       default:
-                               
-                               memcpy(dst, param_str_begin, parm_str_len);
-                               *((char *)dst + parm_str_len) = 0; 
-                               WL_ERROR((" written as a string:%s\n", (char *)dst));
-                       break;
-
-               }
-
-               return 0;
-       } else {
-               WL_ERROR(("\n %s: ERROR: can't find token:%s in str:%s \n",
-                       __FUNCTION__, token, orig_str));
-
-        return -1;
-       }
-}
-
-#endif 
-
-
-#ifdef SOFTAP
-int init_ap_profile_from_string(char *param_str, struct ap_profile *ap_cfg)
-{
-       char *str_ptr = param_str;
-       char sub_cmd[16];
-       int ret = 0;
-
-       memset(sub_cmd, 0, sizeof(sub_cmd));
-       memset(ap_cfg, 0, sizeof(struct ap_profile));
-
-       
-       if (get_parmeter_from_string(&str_ptr, "ASCII_CMD=",
-               PTYPE_STRING, sub_cmd, SSID_LEN) != 0) {
-        return -1;
-       }
-       if (strncmp(sub_cmd, "AP_CFG", 6)) {
-          WL_ERROR(("ERROR: sub_cmd:%s != 'AP_CFG'!\n", sub_cmd));
-               return -1;
-       }
-
-       
-       
-       ret = get_parmeter_from_string(&str_ptr, "SSID=", PTYPE_STRING, ap_cfg->ssid, SSID_LEN);
-
-       ret |= get_parmeter_from_string(&str_ptr, "SEC=", PTYPE_STRING,  ap_cfg->sec, SEC_LEN);
-
-       ret |= get_parmeter_from_string(&str_ptr, "KEY=", PTYPE_STRING,  ap_cfg->key, KEY_LEN);
-
-       ret |= get_parmeter_from_string(&str_ptr, "CHANNEL=", PTYPE_INTDEC, &ap_cfg->channel, 5);
-
-       ret |= get_parmeter_from_string(&str_ptr, "PREAMBLE=", PTYPE_INTDEC, &ap_cfg->preamble, 5);
-
-       ret |= get_parmeter_from_string(&str_ptr, "MAX_SCB=", PTYPE_INTDEC,  &ap_cfg->max_scb, 5);
-
-       return ret;
-}
-#endif 
-
-
-
-#ifdef SOFTAP
-static int iwpriv_set_ap_config(struct net_device *dev,
-            struct iw_request_info *info,
-            union iwreq_data *wrqu,
-            char *ext)
-{
-       int res = 0;
-       char  *extra = NULL;
-       struct ap_profile *ap_cfg = &my_ap;
-
-       WL_TRACE(("> Got IWPRIV SET_AP IOCTL: info->cmd:%x, info->flags:%x, u.data:%p, u.len:%d\n",
-               info->cmd, info->flags,
-               wrqu->data.pointer, wrqu->data.length));
-
-
-       if (wrqu->data.length != 0) {
-
-               char *str_ptr;
-
-               if (!(extra = kmalloc(wrqu->data.length+1, GFP_KERNEL)))
-                       return -ENOMEM;
-
-               if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-
-               extra[wrqu->data.length] = 0;
-               WL_SOFTAP((" Got str param in iw_point:\n %s\n", extra));
-
-               memset(ap_cfg, 0, sizeof(struct ap_profile));
-
-               
-
-               str_ptr = extra;
-
-               if ((res = init_ap_profile_from_string(extra, ap_cfg)) < 0) {
-                       WL_ERROR(("%s failed to parse %d\n", __FUNCTION__, res));
-                       kfree(extra);
-                       return -1;
-               }
-
-       } else {
-        
-         WL_ERROR(("IWPRIV argument len = 0 \n"));
-         return -1;
-       }
-
-       if ((res = set_ap_cfg(dev, ap_cfg)) < 0)
-               WL_ERROR(("%s failed to set_ap_cfg %d\n", __FUNCTION__, res));
-
-       kfree(extra);
-
-       return res;
-}
-#endif 
-
-
-
-#ifdef SOFTAP
-static int iwpriv_get_assoc_list(struct net_device *dev,
-        struct iw_request_info *info,
-        union iwreq_data *p_iwrq,
-        char *extra)
-{
-       int i, ret = 0;
-       char mac_buf[256];
-       struct maclist *sta_maclist = (struct maclist *)mac_buf;
-
-       char mac_lst[256];
-       char *p_mac_str;
-
-       WL_TRACE(("\n %s: IWPRIV IOCTL: cmd:%hx, flags:%hx, extra:%p, iwp.len:%d, \
-               iwp.len:%p, iwp.flags:%x  \n", __FUNCTION__, info->cmd, info->flags, \
-               extra, p_iwrq->data.length, p_iwrq->data.pointer, p_iwrq->data.flags));
-
-       WL_SOFTAP(("extra:%s\n", extra));
-       print_buf((u8 *)p_iwrq, 16, 0);
-
-       memset(sta_maclist, 0, sizeof(mac_buf));
-
-       sta_maclist->count = 8;
-
-       WL_TRACE((" net device:%s, buf_sz:%d\n", dev->name, sizeof(mac_buf)));
-       get_assoc_sta_list(dev, mac_buf, 256);
-       WL_TRACE((" got %d stations\n", sta_maclist->count));
-
-       
-       memset(mac_lst, 0, sizeof(mac_lst));
-       p_mac_str = mac_lst;
-
-       for (i = 0; i < 8; i++) {
-               struct ether_addr * id = &sta_maclist->ea[i];
-
-               WL_SOFTAP(("dhd_drv>> sta_mac[%d] :", i));
-               print_buf((unsigned char *)&sta_maclist->ea[i], 6, 0);
-
-               
-               p_mac_str += snprintf(p_mac_str, MAX_WX_STRING,
-                       "Mac[%d]=%02X:%02X:%02X:%02X:%02X:%02X\n", i,
-                       id->octet[0], id->octet[1], id->octet[2],
-                       id->octet[3], id->octet[4], id->octet[5]);
-
-       }
-
-       p_iwrq->data.length = strlen(mac_lst);
-
-       WL_TRACE(("u.pointer:%p\n", p_iwrq->data.pointer));
-       WL_TRACE(("resulting str:\n%s \n len:%d\n\n", mac_lst, p_iwrq->data.length));
-
-       if (p_iwrq->data.length) {
-               if (copy_to_user(p_iwrq->data.pointer, mac_lst, p_iwrq->data.length)) {
-                       WL_ERROR(("%s: Can't copy to user\n", __FUNCTION__));
-                       return -EFAULT;
-               }
-       }
-
-       WL_ERROR(("Exited %s \n", __FUNCTION__));
-       return ret;
-}
-#endif 
-
-
-#ifdef SOFTAP
-static int iwpriv_set_mac_filters(struct net_device *dev,
-        struct iw_request_info *info,
-        union iwreq_data *wrqu,
-        char *ext)
-{
-
-       int i, ret = -1;
-       char  * extra = NULL;
-       u8  macfilt[8][6];
-       int mac_cnt = 0; 
-       char sub_cmd[16];
-
-       WL_TRACE((">>> Got IWPRIV SET_MAC_FILTER IOCTL:  info->cmd:%x, \
-                       info->flags:%x, u.data:%p, u.len:%d\n",
-                       info->cmd, info->flags,
-                       wrqu->data.pointer, wrqu->data.length));
-
-       if (wrqu->data.length != 0) {
-
-               char *str_ptr;
-
-               if (!(extra = kmalloc(wrqu->data.length+1, GFP_KERNEL)))
-                       return -ENOMEM;
-
-               if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-
-               extra[wrqu->data.length] = 0;
-               WL_SOFTAP((" Got parameter string in iw_point:\n %s \n", extra));
-
-               memset(macfilt, 0, sizeof(macfilt));
-               memset(sub_cmd, 0, sizeof(sub_cmd));
-
-               
-               str_ptr = extra;
-
-               
-          if (get_parmeter_from_string(&str_ptr, "ASCII_CMD=", PTYPE_STRING, sub_cmd, 15) != 0) {
-                goto exit_proc;
-          }
-
-#define MAC_FILT_MAX 8
-          
-               if (strncmp(sub_cmd, "MAC_FLT_W", strlen("MAC_FLT_W"))) {
-                  WL_ERROR(("ERROR: sub_cmd:%s != 'MAC_FLT_W'!\n", sub_cmd));
-                       goto exit_proc;
-               }
-
-               if (get_parmeter_from_string(&str_ptr, "MAC_CNT=",
-                       PTYPE_INTDEC, &mac_cnt, 4) != 0) {
-                       WL_ERROR(("ERROR: MAC_CNT param is missing \n"));
-                       goto exit_proc;
-               }
-
-               if (mac_cnt > MAC_FILT_MAX) {
-                       WL_ERROR(("ERROR: number of MAC filters > MAX\n"));
-                       goto exit_proc;
-               }
-
-               for (i=0; i< mac_cnt; i++)      
-               if (get_parmeter_from_string(&str_ptr, "MAC=",
-                       PTYPE_STR_HEX, macfilt[i], 12) != 0) {
-                       WL_ERROR(("ERROR: MAC_filter[%d] is missing !\n", i));
-                       goto exit_proc;
-               }
-
-               for (i = 0; i < mac_cnt; i++) {
-                  WL_SOFTAP(("mac_filt[%d]:", i));
-                  print_buf(macfilt[i], 6, 0);
-               }
-
-               
-               wrqu->data.pointer = NULL;
-               wrqu->data.length = 0;
-               ret = 0;
-
-       } else {
-        
-         WL_ERROR(("IWPRIV argument len is 0\n"));
-         return -1;
-       }
-
-       exit_proc:
-       kfree(extra);
-       return ret;
-}
-#endif 
-
-#endif 
-
-#if WIRELESS_EXT < 13
-struct iw_request_info
-{
-       __u16           cmd;            
-       __u16           flags;          
-};
-
-typedef int (*iw_handler)(struct net_device *dev,
-                struct iw_request_info *info,
-                void *wrqu,
-                char *extra);
-#endif 
-
-static int
-wl_iw_config_commit(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       void *zwrq,
-       char *extra
-)
-{      
-       wlc_ssid_t ssid;
-       int error;
-       struct sockaddr bssid;
-
-       WL_TRACE(("%s: SIOCSIWCOMMIT\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid))))
-               return error;
-
-       ssid.SSID_len = dtoh32(ssid.SSID_len);
-
-       if (!ssid.SSID_len)
-               return 0;
-
-       bzero(&bssid, sizeof(struct sockaddr));
-       if ((error = dev_wlc_ioctl(dev, WLC_REASSOC, &bssid, ETHER_ADDR_LEN))) {
-               WL_ERROR(("%s: WLC_REASSOC to %s failed \n", __FUNCTION__, ssid.SSID));
-               return error;
-       }
-
-       return 0;
-}
-
-static int
-wl_iw_get_name(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       char *cwrq,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCGIWNAME\n", dev->name));
-
-       strcpy(cwrq, "IEEE 802.11-DS");
-
-       return 0;
-}
-
-static int
-wl_iw_set_freq(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_freq *fwrq,
-       char *extra
-)
-{
-       int error, chan;
-       uint sf = 0;
-
-       WL_TRACE(("%s %s: SIOCSIWFREQ : e=%d m=%d\n", __func__, dev->name, fwrq->e, fwrq->m));
-
-#if defined(SOFTAP)
-       if (ap_cfg_running) {
-               WL_TRACE(("%s:>> not executed, 'SOFT_AP is active' \n", __FUNCTION__));
-               return 0;
-       }
-#endif
-
-       
-       if (fwrq->e == 0 && fwrq->m < MAXCHANNEL) 
-       {
-               chan = fwrq->m;
-       }
-       else 
-       {
-               if (fwrq->e >= 6) 
-               {
-                       fwrq->e -= 6;
-                       while (fwrq->e--)
-                               fwrq->m *= 10;
-               } 
-               else if (fwrq->e < 6) 
-               {
-                       while (fwrq->e++ < 6)
-                               fwrq->m /= 10;
-               }
-       
-               if (fwrq->m > 4000 && fwrq->m < 5000)
-                       sf = WF_CHAN_FACTOR_4_G; 
-
-               chan = wf_mhz2channel(fwrq->m, sf);
-       }
-       chan = htod32(chan);    
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_CHANNEL, &chan, sizeof(chan))))
-               return error;
-
-       
-       return -EINPROGRESS;
-}
-
-static int
-wl_iw_get_freq(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_freq *fwrq,
-       char *extra
-)
-{
-       channel_info_t ci;
-       int error;
-
-       WL_TRACE(("%s: SIOCGIWFREQ\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_CHANNEL, &ci, sizeof(ci))))
-               return error;
-
-       
-       fwrq->m = dtoh32(ci.hw_channel);
-       fwrq->e = dtoh32(0);
-       return 0;
-}
-
-static int
-wl_iw_set_mode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       __u32 *uwrq,
-       char *extra
-)
-{
-       int infra = 0, ap = 0, error = 0;
-
-       WL_TRACE(("%s: SIOCSIWMODE\n", dev->name));
-
-       switch (*uwrq) {
-       case IW_MODE_MASTER:
-               infra = ap = 1;
-               break;
-       case IW_MODE_ADHOC:
-       case IW_MODE_AUTO:
-               break;
-       case IW_MODE_INFRA:
-               infra = 1;
-               break;
-       default:
-               return -EINVAL;
-       }
-       infra = htod32(infra);
-       ap = htod32(ap);
-
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra))) ||
-           (error = dev_wlc_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap))))
-               return error;
-
-       
-       return -EINPROGRESS;
-}
-
-static int
-wl_iw_get_mode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       __u32 *uwrq,
-       char *extra
-)
-{
-       int error, infra = 0, ap = 0;
-
-       WL_TRACE(("%s: SIOCGIWMODE\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_INFRA, &infra, sizeof(infra))) ||
-           (error = dev_wlc_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap))))
-               return error;
-
-       infra = dtoh32(infra);
-       ap = dtoh32(ap);
-       *uwrq = infra ? ap ? IW_MODE_MASTER : IW_MODE_INFRA : IW_MODE_ADHOC;
-
-       return 0;
-}
-
-static int
-wl_iw_set_sens(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       __u32 *uwrq,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCSIWSENS\n", dev->name));
-       return 0;
-}
-
-static int
-wl_iw_get_sens(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       static int rssi = 0;
-       static wlc_ssid_t ssid = {0};
-       int error = 0;
-       static char ssidbuf[SSID_FMT_BUF_LEN];
-       scb_val_t scb_val;
-
-       WL_TRACE(("%s: SIOCGIWSENS\n", dev->name));
-       
-       bzero(&scb_val, sizeof(scb_val_t));
-       
-       if (g_onoff == G_WLAN_SET_ON) {
-               error = dev_wlc_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
-               if (error) {
-                       WL_ERROR(("%s: Fails %d\n", __FUNCTION__, error));
-                       return error;
-               }
-               rssi = dtoh32(scb_val.val);
-               
-               error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid));
-               if (!error) {
-                       ssid.SSID_len = dtoh32(ssid.SSID_len);
-                       wl_format_ssid(ssidbuf, ssid.SSID, dtoh32(ssid.SSID_len));
-               }
-       }
-       
-       wrqu->sens.value = -rssi;
-    
-       return error;
-}
-
-static int
-wl_iw_get_range(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       struct iw_range *range = (struct iw_range *) extra;
-       wl_uint32_list_t *list;
-       wl_rateset_t rateset;
-       int8 *channels;
-       int error, i, k;
-       uint sf, ch;
-
-       int phytype;
-       int bw_cap = 0, sgi_tx = 0, nmode = 0;
-       channel_info_t ci;
-       uint8 nrate_list2copy = 0;
-       uint16 nrate_list[4][8] = { {13, 26, 39, 52, 78, 104, 117, 130},
-               {14, 29, 43, 58, 87, 116, 130, 144},
-               {27, 54, 81, 108, 162, 216, 243, 270},
-               {30, 60, 90, 120, 180, 240, 270, 300}};
-
-       WL_TRACE(("%s: SIOCGIWRANGE\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       channels = kmalloc((MAXCHANNEL+1)*4, GFP_KERNEL);
-       if (!channels) {
-               WL_ERROR(("Could not alloc channels\n"));
-               return -ENOMEM;
-       }
-       list = (wl_uint32_list_t *)channels;
-
-       dwrq->length = sizeof(struct iw_range);
-       memset(range, 0, sizeof(range));
-
-       
-       range->min_nwid = range->max_nwid = 0;
-
-       
-       list->count = htod32(MAXCHANNEL);
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_VALID_CHANNELS, channels, (MAXCHANNEL+1)*4))) {
-               kfree(channels);
-               return error;
-       }
-       for (i = 0; i < dtoh32(list->count) && i < IW_MAX_FREQUENCIES; i++) {
-               range->freq[i].i = dtoh32(list->element[i]);
-
-               ch = dtoh32(list->element[i]);
-               if (ch <= CH_MAX_2G_CHANNEL)
-                       sf = WF_CHAN_FACTOR_2_4_G;
-               else
-                       sf = WF_CHAN_FACTOR_5_G;
-
-               range->freq[i].m = wf_channel2mhz(ch, sf);
-               range->freq[i].e = 6;
-       }
-       range->num_frequency = range->num_channels = i;
-
-       
-       range->max_qual.qual = 5;
-       
-       range->max_qual.level = 0x100 - 200;    
-       
-       range->max_qual.noise = 0x100 - 200;    
-       
-       range->sensitivity = 65535;
-
-#if WIRELESS_EXT > 11
-       
-       range->avg_qual.qual = 3;
-       
-       range->avg_qual.level = 0x100 + WL_IW_RSSI_GOOD;
-       
-       range->avg_qual.noise = 0x100 - 75;     
-#endif 
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_CURR_RATESET, &rateset, sizeof(rateset)))) {
-               kfree(channels);
-               return error;
-       }
-       rateset.count = dtoh32(rateset.count);
-       range->num_bitrates = rateset.count;
-       for (i = 0; i < rateset.count && i < IW_MAX_BITRATES; i++)
-               range->bitrate[i] = (rateset.rates[i]& 0x7f) * 500000; 
-       dev_wlc_intvar_get(dev, "nmode", &nmode);
-       dev_wlc_ioctl(dev, WLC_GET_PHYTYPE, &phytype, sizeof(phytype));
-
-       if (nmode == 1 && phytype == WLC_PHY_TYPE_SSN) {
-               dev_wlc_intvar_get(dev, "mimo_bw_cap", &bw_cap);
-               dev_wlc_intvar_get(dev, "sgi_tx", &sgi_tx);
-               dev_wlc_ioctl(dev, WLC_GET_CHANNEL, &ci, sizeof(channel_info_t));
-               ci.hw_channel = dtoh32(ci.hw_channel);
-
-               if (bw_cap == 0 ||
-                       (bw_cap == 2 && ci.hw_channel <= 14)) {
-                       if (sgi_tx == 0)
-                               nrate_list2copy = 0;
-                       else
-                               nrate_list2copy = 1;
-               }
-               if (bw_cap == 1 ||
-                       (bw_cap == 2 && ci.hw_channel >= 36)) {
-                       if (sgi_tx == 0)
-                               nrate_list2copy = 2;
-                       else
-                               nrate_list2copy = 3;
-               }
-               range->num_bitrates += 8;
-               for (k = 0; i < range->num_bitrates; k++, i++) {
-                       
-                       range->bitrate[i] = (nrate_list[nrate_list2copy][k]) * 500000;
-               }
-       }
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_PHYTYPE, &i, sizeof(i)))) {
-               kfree(channels);
-               return error;
-       }
-       i = dtoh32(i);
-       if (i == WLC_PHY_TYPE_A)
-               range->throughput = 24000000;   
-       else
-               range->throughput = 1500000;    
-
-       
-       range->min_rts = 0;
-       range->max_rts = 2347;
-       range->min_frag = 256;
-       range->max_frag = 2346;
-
-       range->max_encoding_tokens = DOT11_MAX_DEFAULT_KEYS;
-       range->num_encoding_sizes = 4;
-       range->encoding_size[0] = WEP1_KEY_SIZE;
-       range->encoding_size[1] = WEP128_KEY_SIZE;
-#if WIRELESS_EXT > 17
-       range->encoding_size[2] = TKIP_KEY_SIZE;
-#else
-       range->encoding_size[2] = 0;
-#endif
-       range->encoding_size[3] = AES_KEY_SIZE;
-
-       
-       range->min_pmp = 0;
-       range->max_pmp = 0;
-       range->min_pmt = 0;
-       range->max_pmt = 0;
-       range->pmp_flags = 0;
-       range->pm_capa = 0;
-
-       
-       range->num_txpower = 2;
-       range->txpower[0] = 1;
-       range->txpower[1] = 255;
-       range->txpower_capa = IW_TXPOW_MWATT;
-
-#if WIRELESS_EXT > 10
-       range->we_version_compiled = WIRELESS_EXT;
-       range->we_version_source = 19;
-
-       
-       range->retry_capa = IW_RETRY_LIMIT;
-       range->retry_flags = IW_RETRY_LIMIT;
-       range->r_time_flags = 0;
-       
-       range->min_retry = 1;
-       range->max_retry = 255;
-       
-       range->min_r_time = 0;
-       range->max_r_time = 0;
-#endif 
-
-#if WIRELESS_EXT > 17
-       range->enc_capa = IW_ENC_CAPA_WPA;
-       range->enc_capa |= IW_ENC_CAPA_CIPHER_TKIP;
-       range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP;
-#ifdef BCMWPA2
-       range->enc_capa |= IW_ENC_CAPA_WPA2;
-#endif
-
-       
-       IW_EVENT_CAPA_SET_KERNEL(range->event_capa);
-       
-       IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP);
-       IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN);
-       IW_EVENT_CAPA_SET(range->event_capa, IWEVTXDROP);
-       IW_EVENT_CAPA_SET(range->event_capa, IWEVMICHAELMICFAILURE);
-#ifdef BCMWPA2
-       IW_EVENT_CAPA_SET(range->event_capa, IWEVPMKIDCAND);
-#endif
-#endif 
-
-       kfree(channels);
-
-       return 0;
-}
-
-static int
-rssi_to_qual(int rssi)
-{
-       if (rssi <= WL_IW_RSSI_NO_SIGNAL)
-               return 0;
-       else if (rssi <= WL_IW_RSSI_VERY_LOW)
-               return 1;
-       else if (rssi <= WL_IW_RSSI_LOW)
-               return 2;
-       else if (rssi <= WL_IW_RSSI_GOOD)
-               return 3;
-       else if (rssi <= WL_IW_RSSI_VERY_GOOD)
-               return 4;
-       else
-               return 5;
-}
-
-static int
-wl_iw_set_spy(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-       struct sockaddr *addr = (struct sockaddr *) extra;
-       int i;
-
-       WL_TRACE(("%s: SIOCSIWSPY\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       iw->spy_num = MIN(ARRAYSIZE(iw->spy_addr), dwrq->length);
-       for (i = 0; i < iw->spy_num; i++)
-               memcpy(&iw->spy_addr[i], addr[i].sa_data, ETHER_ADDR_LEN);
-       memset(iw->spy_qual, 0, sizeof(iw->spy_qual));
-
-       return 0;
-}
-
-static int
-wl_iw_get_spy(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-       struct sockaddr *addr = (struct sockaddr *) extra;
-       struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
-       int i;
-
-       WL_TRACE(("%s: SIOCGIWSPY\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       dwrq->length = iw->spy_num;
-       for (i = 0; i < iw->spy_num; i++) {
-               memcpy(addr[i].sa_data, &iw->spy_addr[i], ETHER_ADDR_LEN);
-               addr[i].sa_family = AF_UNIX;
-               memcpy(&qual[i], &iw->spy_qual[i], sizeof(struct iw_quality));
-               iw->spy_qual[i].updated = 0;
-       }
-
-       return 0;
-}
-
-static int
-wl_iw_set_wap(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct sockaddr *awrq,
-       char *extra
-)
-{
-       int error = -EINVAL;
-       wl_join_params_t join_params;
-
-       WL_TRACE(("%s: SIOCSIWAP\n", dev->name));
-
-       if (awrq->sa_family != ARPHRD_ETHER) {
-               WL_ERROR(("Invalid Header...sa_family\n"));
-               return -EINVAL;
-       }
-
-       
-       if (ETHER_ISBCAST(awrq->sa_data) || ETHER_ISNULLADDR(awrq->sa_data)) {
-               scb_val_t scbval;
-               
-               bzero(&scbval, sizeof(scb_val_t));
-               
-               (void) dev_wlc_ioctl(dev, WLC_DISASSOC, &scbval, sizeof(scb_val_t));
-               return 0;
-       }
-
-
-       
-       memset(&join_params, 0, sizeof(join_params));
-
-       memcpy(join_params.ssid.SSID, g_ssid.SSID, g_ssid.SSID_len);
-       join_params.ssid.SSID_len = htod32(g_ssid.SSID_len);
-       memcpy(&join_params.params.bssid, awrq->sa_data, ETHER_ADDR_LEN);
-
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_SSID, &join_params, sizeof(join_params)))) {
-               WL_ERROR(("Invalid ioctl data.\n"));
-               return error;
-       }
-
-       
-       memset(&g_ssid, 0, sizeof(g_ssid));
-       return 0;
-}
-
-static int
-wl_iw_get_wap(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct sockaddr *awrq,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCGIWAP\n", dev->name));
-
-       awrq->sa_family = ARPHRD_ETHER;
-       memset(awrq->sa_data, 0, ETHER_ADDR_LEN);
-
-       
-       (void) dev_wlc_ioctl(dev, WLC_GET_BSSID, awrq->sa_data, ETHER_ADDR_LEN);
-
-       return 0;
-}
-
-#if WIRELESS_EXT > 17
-static int
-wl_iw_mlme(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct sockaddr *awrq,
-       char *extra
-)
-{
-       struct iw_mlme *mlme;
-       scb_val_t scbval;
-       int error  = -EINVAL;
-
-       WL_TRACE(("%s: SIOCSIWMLME DISASSOC/DEAUTH\n", dev->name));
-
-       mlme = (struct iw_mlme *)extra;
-       if (mlme == NULL) {
-               WL_ERROR(("Invalid ioctl data.\n"));
-               return error;
-       }
-
-       scbval.val = mlme->reason_code;
-       bcopy(&mlme->addr.sa_data, &scbval.ea, ETHER_ADDR_LEN);
-
-       if (mlme->cmd == IW_MLME_DISASSOC) {
-               scbval.val = htod32(scbval.val);
-               error = dev_wlc_ioctl(dev, WLC_DISASSOC, &scbval, sizeof(scb_val_t));
-       }
-       else if (mlme->cmd == IW_MLME_DEAUTH) {
-               scbval.val = htod32(scbval.val);
-               error = dev_wlc_ioctl(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON, &scbval,
-                       sizeof(scb_val_t));
-       }
-       else {
-               WL_ERROR(("Invalid ioctl data.\n"));
-               return error;
-       }
-
-       return error;
-}
-#endif 
-
-static int
-wl_iw_get_aplist(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_scan_results_t *list;
-       struct sockaddr *addr = (struct sockaddr *) extra;
-       struct iw_quality qual[IW_MAX_AP];
-       wl_bss_info_t *bi = NULL;
-       int error, i;
-       uint buflen = dwrq->length;
-
-       WL_TRACE(("%s: SIOCGIWAPLIST\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       
-       list = kmalloc(buflen, GFP_KERNEL);
-       if (!list)
-               return -ENOMEM;
-       memset(list, 0, buflen);
-       list->buflen = htod32(buflen);
-       if ((error = dev_wlc_ioctl(dev, WLC_SCAN_RESULTS, list, buflen))) {
-               WL_ERROR(("%d: Scan results error %d\n", __LINE__, error));
-               kfree(list);
-               return error;
-       }
-       list->buflen = dtoh32(list->buflen);
-       list->version = dtoh32(list->version);
-       list->count = dtoh32(list->count);
-       if (list->version != WL_BSS_INFO_VERSION) {
-               WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                        __FUNCTION__, list->version));
-               kfree(list);
-               return -EINVAL;
-       }
-
-       for (i = 0, dwrq->length = 0; i < list->count && dwrq->length < IW_MAX_AP; i++) {
-               bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length)) : list->bss_info;
-               ASSERT(((uintptr)bi + dtoh32(bi->length)) <= ((uintptr)list +
-                       buflen));
-
-               
-               if (!(dtoh16(bi->capability) & DOT11_CAP_ESS))
-                       continue;
-
-               
-               memcpy(addr[dwrq->length].sa_data, &bi->BSSID, ETHER_ADDR_LEN);
-               addr[dwrq->length].sa_family = ARPHRD_ETHER;
-               qual[dwrq->length].qual = rssi_to_qual(dtoh16(bi->RSSI));
-               qual[dwrq->length].level = 0x100 + dtoh16(bi->RSSI);
-               qual[dwrq->length].noise = 0x100 + bi->phy_noise;
-
-               
-#if WIRELESS_EXT > 18
-               qual[dwrq->length].updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
-#else
-               qual[dwrq->length].updated = 7;
-#endif 
-
-               dwrq->length++;
-       }
-
-       kfree(list);
-
-       if (dwrq->length) {
-               memcpy(&addr[dwrq->length], qual, sizeof(struct iw_quality) * dwrq->length);
-               
-               dwrq->flags = 1;
-       }
-
-       return 0;
-}
-
-#ifdef WL_IW_USE_ISCAN
-static int
-wl_iw_iscan_get_aplist(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_scan_results_t *list;
-       iscan_buf_t * buf;
-       iscan_info_t *iscan = g_iscan;
-
-       struct sockaddr *addr = (struct sockaddr *) extra;
-       struct iw_quality qual[IW_MAX_AP];
-       wl_bss_info_t *bi = NULL;
-       int i;
-
-       WL_TRACE(("%s: SIOCGIWAPLIST\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       if ((!iscan) || (iscan->sysioc_pid < 0)) {
-               return wl_iw_get_aplist(dev, info, dwrq, extra);
-       }
-
-       buf = iscan->list_hdr;
-       
-       while (buf) {
-               list = &((wl_iscan_results_t*)buf->iscan_buf)->results;
-               if (list->version != WL_BSS_INFO_VERSION) {
-                       WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                               __FUNCTION__, list->version));
-                       return -EINVAL;
-               }
-
-               bi = NULL;
-               for (i = 0, dwrq->length = 0; i < list->count && dwrq->length < IW_MAX_AP; i++) {
-                       bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length))
-                                 : list->bss_info;
-                       ASSERT(((uintptr)bi + dtoh32(bi->length)) <= ((uintptr)list +
-                               WLC_IW_ISCAN_MAXLEN));
-
-                       
-                       if (!(dtoh16(bi->capability) & DOT11_CAP_ESS))
-                               continue;
-
-                       
-                       memcpy(addr[dwrq->length].sa_data, &bi->BSSID, ETHER_ADDR_LEN);
-                       addr[dwrq->length].sa_family = ARPHRD_ETHER;
-                       qual[dwrq->length].qual = rssi_to_qual(dtoh16(bi->RSSI));
-                       qual[dwrq->length].level = 0x100 + dtoh16(bi->RSSI);
-                       qual[dwrq->length].noise = 0x100 + bi->phy_noise;
-
-                       
-#if WIRELESS_EXT > 18
-                       qual[dwrq->length].updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
-#else
-                       qual[dwrq->length].updated = 7;
-#endif 
-
-                       dwrq->length++;
-               }
-               buf = buf->next;
-       }
-       if (dwrq->length) {
-               memcpy(&addr[dwrq->length], qual, sizeof(struct iw_quality) * dwrq->length);
-               
-               dwrq->flags = 1;
-       }
-
-       return 0;
-}
-
-static int
-wl_iw_iscan_prep(wl_scan_params_t *params, wlc_ssid_t *ssid)
-{
-       int err = 0;
-
-       memcpy(&params->bssid, &ether_bcast, ETHER_ADDR_LEN);
-       params->bss_type = DOT11_BSSTYPE_ANY;
-       params->scan_type = 0;
-       params->nprobes = -1;
-       params->active_time = -1;
-       params->passive_time = -1;
-       params->home_time = -1;
-       params->channel_num = 0;
-
-       params->nprobes = htod32(params->nprobes);
-       params->active_time = htod32(params->active_time);
-       params->passive_time = htod32(params->passive_time);
-       params->home_time = htod32(params->home_time);
-       if (ssid && ssid->SSID_len)
-               memcpy(&params->ssid, ssid, sizeof(wlc_ssid_t));
-
-       return err;
-}
-
-static int
-wl_iw_iscan(iscan_info_t *iscan, wlc_ssid_t *ssid, uint16 action)
-{
-       int err = 0;
-
-       iscan->iscan_ex_params_p->version = htod32(ISCAN_REQ_VERSION);
-       iscan->iscan_ex_params_p->action = htod16(action);
-       iscan->iscan_ex_params_p->scan_duration = htod16(0);
-
-       WL_SCAN(("%s : nprobes=%d\n", __FUNCTION__, iscan->iscan_ex_params_p->params.nprobes));
-       WL_SCAN(("active_time=%d\n", iscan->iscan_ex_params_p->params.active_time));
-       WL_SCAN(("passive_time=%d\n", iscan->iscan_ex_params_p->params.passive_time));
-       WL_SCAN(("home_time=%d\n", iscan->iscan_ex_params_p->params.home_time));
-       WL_SCAN(("scan_type=%d\n", iscan->iscan_ex_params_p->params.scan_type));
-       WL_SCAN(("bss_type=%d\n", iscan->iscan_ex_params_p->params.bss_type));
-
-       
-       (void) dev_iw_iovar_setbuf(iscan->dev, "iscan", iscan->iscan_ex_params_p, \
-               iscan->iscan_ex_param_size, iscan->ioctlbuf, sizeof(iscan->ioctlbuf));
-
-       return err;
-}
-
-static void
-wl_iw_timerfunc(ulong data)
-{
-       iscan_info_t *iscan = (iscan_info_t *)data;
-       if (iscan) {
-               iscan->timer_on = 0;
-               if (iscan->iscan_state != ISCAN_STATE_IDLE) {
-                       WL_TRACE(("timer trigger\n"));
-                       up(&iscan->sysioc_sem);
-               }
-       }
-}
-static void wl_iw_set_event_mask(struct net_device *dev)
-{
-       char eventmask[WL_EVENTING_MASK_LEN];
-       char iovbuf[WL_EVENTING_MASK_LEN + 12]; 
-
-       dev_iw_iovar_getbuf(dev, "event_msgs", "", 0, iovbuf, sizeof(iovbuf));
-       bcopy(iovbuf, eventmask, WL_EVENTING_MASK_LEN);
-       setbit(eventmask, WLC_E_SCAN_COMPLETE);
-       dev_iw_iovar_setbuf(dev, "event_msgs", eventmask, WL_EVENTING_MASK_LEN,
-               iovbuf, sizeof(iovbuf));
-}
-
-static uint32
-wl_iw_iscan_get(iscan_info_t *iscan)
-{
-       iscan_buf_t * buf;
-       iscan_buf_t * ptr;
-       wl_iscan_results_t * list_buf;
-       wl_iscan_results_t list;
-       wl_scan_results_t *results;
-       uint32 status;
-
-       
-       MUTEX_LOCK_WL_SCAN_SET();
-       if (iscan->list_cur) {
-               buf = iscan->list_cur;
-               iscan->list_cur = buf->next;
-       }
-       else {
-               buf = kmalloc(sizeof(iscan_buf_t), GFP_KERNEL);
-               if (!buf) {
-                       WL_ERROR(("%s can't alloc iscan_buf_t : going to abort currect iscan\n", \
-                                               __FUNCTION__));
-                       MUTEX_UNLOCK_WL_SCAN_SET();
-                       return WL_SCAN_RESULTS_NO_MEM;
-               }
-               buf->next = NULL;
-               if (!iscan->list_hdr)
-                       iscan->list_hdr = buf;
-               else {
-                       ptr = iscan->list_hdr;
-                       while (ptr->next) {
-                               ptr = ptr->next;
-                       }
-                       ptr->next = buf;
-               }
-       }
-       memset(buf->iscan_buf, 0, WLC_IW_ISCAN_MAXLEN);
-       list_buf = (wl_iscan_results_t*)buf->iscan_buf;
-       results = &list_buf->results;
-       results->buflen = WL_ISCAN_RESULTS_FIXED_SIZE;
-       results->version = 0;
-       results->count = 0;
-
-       memset(&list, 0, sizeof(list));
-       list.results.buflen = htod32(WLC_IW_ISCAN_MAXLEN);
-       (void) dev_iw_iovar_getbuf(
-               iscan->dev,
-               "iscanresults",
-               &list,
-               WL_ISCAN_RESULTS_FIXED_SIZE,
-               buf->iscan_buf,
-               WLC_IW_ISCAN_MAXLEN);
-       results->buflen = dtoh32(results->buflen);
-       results->version = dtoh32(results->version);
-       results->count = dtoh32(results->count);
-       WL_TRACE(("%s: results->count = %d\n", __func__, results->count));
-
-       //WL_TRACE(("results->buflen = %d\n", results->buflen));
-       status = dtoh32(list_buf->status);
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       return status;
-}
-
-static void wl_iw_force_specific_scan(iscan_info_t *iscan)
-{
-       WL_TRACE(("%s force Specific SCAN for %s\n", __FUNCTION__, g_specific_ssid.SSID));
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       rtnl_lock();
-#endif
-
-       (void) dev_wlc_ioctl(iscan->dev, WLC_SCAN, &g_specific_ssid, sizeof(g_specific_ssid));
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       rtnl_unlock();
-#endif
-}
-static void wl_iw_send_scan_complete(iscan_info_t *iscan)
-{
-#ifndef SANDGATE2G
-       union iwreq_data wrqu;
-
-#if !defined(CSCAN)
-       if (g_first_broadcast_scan == BROADCAST_SCAN_FIRST_STARTED)
-               g_first_broadcast_scan = BROADCAST_SCAN_FIRST_RESULT_READY;
-#endif 
-       memset(&wrqu, 0, sizeof(wrqu));
-       wireless_send_event(iscan->dev, SIOCGIWSCAN, &wrqu, NULL);
-       WL_TRACE(("Send Event ISCAN complete\n"));
-#endif 
-}
-static int
-_iscan_sysioc_thread(void *data)
-{
-       uint32 status;
-       iscan_info_t *iscan = (iscan_info_t *)data;
-       static bool iscan_pass_abort = FALSE;
-       DAEMONIZE("iscan_sysioc");
-
-       status = WL_SCAN_RESULTS_PARTIAL;
-       while (down_interruptible(&iscan->sysioc_sem) == 0) {
-
-#if defined(SOFTAP)
-               if (ap_cfg_running) {
-                WL_TRACE(("%s skipping SCAN ops in AP mode !!!\n", __FUNCTION__));
-                continue;
-               }
-#endif 
-               if (iscan->timer_on) {
-                       del_timer(&iscan->timer);
-                       iscan->timer_on = 0;
-               }
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-               rtnl_lock();
-#endif
-               status = wl_iw_iscan_get(iscan);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-               rtnl_unlock();
-#endif
-       if  (g_scan_specified_ssid && (iscan_pass_abort == TRUE)) {
-               WL_TRACE(("%s Get results from specific scan status=%d\n", __FUNCTION__, status));
-                       wl_iw_send_scan_complete(iscan);
-                       iscan_pass_abort = FALSE;
-                       status  = -1;
-               }
-
-               switch (status) {
-                       case WL_SCAN_RESULTS_PARTIAL:
-                               WL_TRACE(("iscanresults incomplete\n"));
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-                               rtnl_lock();
-#endif
-                               
-                               wl_iw_iscan(iscan, NULL, WL_SCAN_ACTION_CONTINUE);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-                               rtnl_unlock();
-#endif
-                               
-                               mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-                               iscan->timer_on = 1;
-                               break;
-                       case WL_SCAN_RESULTS_SUCCESS:
-                               WL_TRACE(("iscanresults complete\n"));
-                               iscan->iscan_state = ISCAN_STATE_IDLE;
-                               wl_iw_send_scan_complete(iscan);
-                               break;
-                       case WL_SCAN_RESULTS_PENDING:
-                               WL_TRACE(("iscanresults pending\n"));
-                               
-                               mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-                               iscan->timer_on = 1;
-                               break;
-                       case WL_SCAN_RESULTS_ABORTED:
-                               WL_TRACE(("iscanresults aborted\n"));
-                               iscan->iscan_state = ISCAN_STATE_IDLE;
-                               if (g_scan_specified_ssid == 0)
-                                       wl_iw_send_scan_complete(iscan);
-                               else {
-                                       iscan_pass_abort = TRUE;
-                                       wl_iw_force_specific_scan(iscan);
-                               }
-                               break;
-                       case WL_SCAN_RESULTS_NO_MEM:
-                               WL_TRACE(("iscanresults can't alloc memory: skip\n"));
-                               iscan->iscan_state = ISCAN_STATE_IDLE;
-                               break;
-                       default:
-                               WL_TRACE(("iscanresults returned unknown status %d\n", status));
-                               break;
-                }
-       }
-
-       if (iscan->timer_on) {
-               del_timer(&iscan->timer);
-               iscan->timer_on = 0;
-       }
-       complete_and_exit(&iscan->sysioc_exited, 0);
-}
-#endif 
-
-#if !defined(CSCAN)
-
-static void
-wl_iw_set_ss_cache_timer_flag(void)
-{
-       g_ss_cache_ctrl.m_timer_expired = 1;
-       //WL_TRACE(("%s called\n", __FUNCTION__));
-}
-
-static int
-wl_iw_init_ss_cache_ctrl(void)
-{
-       WL_TRACE(("%s :\n", __FUNCTION__));
-       g_ss_cache_ctrl.m_prev_scan_mode = 0;
-       g_ss_cache_ctrl.m_cons_br_scan_cnt = 0;
-       g_ss_cache_ctrl.m_cache_head = NULL;
-       g_ss_cache_ctrl.m_link_down = 0;
-       g_ss_cache_ctrl.m_timer_expired = 0;
-       memset(g_ss_cache_ctrl.m_active_bssid, 0, ETHER_ADDR_LEN);
-
-       g_ss_cache_ctrl.m_timer = kmalloc(sizeof(struct timer_list), GFP_KERNEL);
-       if (!g_ss_cache_ctrl.m_timer) {
-               return -ENOMEM;
-       }
-       g_ss_cache_ctrl.m_timer->function = (void *)wl_iw_set_ss_cache_timer_flag;
-       init_timer(g_ss_cache_ctrl.m_timer);
-
-       return 0;
-}
-
-
-
-static void
-wl_iw_free_ss_cache(void)
-{
-       wl_iw_ss_cache_t *node, *cur;
-       wl_iw_ss_cache_t **spec_scan_head;
-
-       WL_TRACE(("%s called\n", __FUNCTION__));
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       spec_scan_head = &g_ss_cache_ctrl.m_cache_head;
-       node = *spec_scan_head;
-
-       for (;node;) {
-               WL_TRACE(("%s : SSID - %s\n", __FUNCTION__, node->bss_info->SSID));
-               cur = node;
-               node = cur->next;
-               kfree(cur);
-       }
-       *spec_scan_head = NULL;
-       MUTEX_UNLOCK_WL_SCAN_SET();
-}
-
-
-
-static int
-wl_iw_run_ss_cache_timer(int kick_off)
-{
-       struct timer_list **timer;
-
-       timer = &g_ss_cache_ctrl.m_timer;
-
-       if (*timer) {
-               if (kick_off) {
-                       (*timer)->expires = jiffies + 30000 * HZ / 1000;        
-                       add_timer(*timer);
-                       //WL_TRACE(("%s : timer starts \n", __FUNCTION__));
-               } else {
-                       del_timer_sync(*timer);
-                       //WL_TRACE(("%s : timer stops \n", __FUNCTION__));
-               }
-       }
-
-       return 0;
-}
-
-
-void
-wl_iw_release_ss_cache_ctrl(void)
-{
-       WL_TRACE(("%s :\n", __FUNCTION__));
-       wl_iw_free_ss_cache();
-       wl_iw_run_ss_cache_timer(0);
-       if (g_ss_cache_ctrl.m_timer) {
-               kfree(g_ss_cache_ctrl.m_timer);
-       }
-}
-
-
-
-static void
-wl_iw_reset_ss_cache(void)
-{
-       wl_iw_ss_cache_t *node, *prev, *cur;
-       wl_iw_ss_cache_t **spec_scan_head;
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       spec_scan_head = &g_ss_cache_ctrl.m_cache_head;
-       node = *spec_scan_head;
-       prev = node;
-
-       for (;node;) {
-               WL_TRACE(("%s : node SSID %s \n", __FUNCTION__, node->bss_info->SSID));
-               if (!node->dirty) {
-                       cur = node;
-                       if (cur == *spec_scan_head) {
-                               *spec_scan_head = cur->next;
-                               prev = *spec_scan_head;
-                       }
-                       else {
-                               prev->next = cur->next;
-                       }
-                       node = cur->next;
-
-                       WL_TRACE(("%s : Del node : SSID %s\n", __FUNCTION__, cur->bss_info->SSID));
-                       kfree(cur);
-                       continue;
-               }
-
-               node->dirty = 0;
-               prev = node;
-               node = node->next;
-       }
-       MUTEX_UNLOCK_WL_SCAN_SET();
-}
-
-
-static int
-wl_iw_add_bss_to_ss_cache(wl_scan_results_t *ss_list)
-{
-
-       wl_iw_ss_cache_t *node, *prev, *leaf;
-       wl_iw_ss_cache_t **spec_scan_head;
-       wl_bss_info_t *bi = NULL;
-       int i;
-
-       
-       if (!ss_list->count) {
-               return 0;
-       }
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       spec_scan_head = &g_ss_cache_ctrl.m_cache_head;
-       for (i = 0; i < ss_list->count; i++) {
-
-               node = *spec_scan_head;
-               prev = node;
-
-               bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length)) : ss_list->bss_info;
-
-               WL_TRACE(("%s : find %d with specific SSID %s\n", __FUNCTION__, i, bi->SSID));
-               for (;node;) {
-                       if (!memcmp(&node->bss_info->BSSID, &bi->BSSID, ETHER_ADDR_LEN)) {
-                               
-                               WL_TRACE(("dirty marked : SSID %s\n", bi->SSID));
-                               node->dirty = 1;
-                               break;
-                       }
-                       prev = node;
-                       node = node->next;
-               }
-
-               if (node) {
-                       continue;
-               }
-               leaf = kmalloc(bi->length + WLC_IW_SS_CACHE_CTRL_FIELD_MAXLEN, GFP_KERNEL);
-               if (!leaf) {
-                       MUTEX_UNLOCK_WL_SCAN_SET();
-                       return -ENOMEM;
-               }
-
-               memcpy(leaf->bss_info, bi, bi->length);
-               leaf->next = NULL;
-               leaf->dirty = 1;
-               leaf->count = 1;
-               leaf->version = ss_list->version;
-
-               if (!prev) {
-                       *spec_scan_head = leaf;
-               }
-               else {
-                       prev->next = leaf;
-               }
-       }
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       return 0;
-
-}
-
-
-static int
-wl_iw_merge_scan_cache(struct iw_request_info *info, char *extra, uint buflen_from_user,
-__u16 *merged_len)
-{
-       wl_iw_ss_cache_t *node;
-       wl_scan_results_t *list_merge;
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       node = g_ss_cache_ctrl.m_cache_head;
-       for (;node;) {
-               list_merge = (wl_scan_results_t *)node;
-               WL_TRACE(("%s: Cached Specific APs list=%d\n", __FUNCTION__, list_merge->count));
-               if (buflen_from_user - *merged_len > 0) {
-                       *merged_len += (__u16) wl_iw_get_scan_prep(list_merge, info,
-                               extra + *merged_len, buflen_from_user - *merged_len);
-               }
-               else {
-                       WL_TRACE(("%s: exit with break\n", __FUNCTION__));
-                       break;
-               }
-               node = node->next;
-       }
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       return 0;
-}
-
-
-static int
-wl_iw_delete_bss_from_ss_cache(void *addr)
-{
-
-       wl_iw_ss_cache_t *node, *prev;
-       wl_iw_ss_cache_t **spec_scan_head;
-
-       MUTEX_LOCK_WL_SCAN_SET();
-       spec_scan_head = &g_ss_cache_ctrl.m_cache_head;
-       node = *spec_scan_head;
-       prev = node;
-       for (;node;) {
-               if (!memcmp(&node->bss_info->BSSID, addr, ETHER_ADDR_LEN)) {
-                       if (node == *spec_scan_head) {
-                               *spec_scan_head = node->next;
-                       }
-                       else {
-                               prev->next = node->next;
-                       }
-
-                       WL_TRACE(("%s : Del node : %s\n", __FUNCTION__, node->bss_info->SSID));
-                       kfree(node);
-                       break;
-               }
-
-               prev = node;
-               node = node->next;
-       }
-
-       memset(addr, 0, ETHER_ADDR_LEN);
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       return 0;
-
-}
-
-#endif 
-
-
-static int
-wl_iw_set_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int error;
-       WL_TRACE(("\n:%s dev:%s: SIOCSIWSCAN : SCAN\n", __FUNCTION__, dev->name));
-
-
-#if defined(CSCAN)
-               WL_ERROR(("%s: Scan from SIOCGIWSCAN not supported\n", __FUNCTION__));
-               return -EINVAL;
-#endif 
-
-#if defined(SOFTAP)
-       
-       if (ap_cfg_running) {
-               WL_TRACE(("\n>%s: Not executed, reason -'SOFTAP is active'\n", __FUNCTION__));
-               return 0;
-       }
-#endif 
-
-       
-       if (g_onoff == G_WLAN_SET_OFF)
-               return 0;
-
-       
-       memset(&g_specific_ssid, 0, sizeof(g_specific_ssid));
-#ifndef WL_IW_USE_ISCAN
-       
-       g_scan_specified_ssid = 0;
-#endif 
-
-#if WIRELESS_EXT > 17
-       
-       if (wrqu->data.length == sizeof(struct iw_scan_req)) {
-               if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
-                       struct iw_scan_req *req = (struct iw_scan_req *)extra;
-                       if (g_first_broadcast_scan != BROADCAST_SCAN_FIRST_RESULT_CONSUMED) {
-                               
-                               WL_TRACE(("%s Ignoring SC %s first BC is not done = %d\n", \
-                                               __FUNCTION__, req->essid, \
-                                               g_first_broadcast_scan));
-                               return -EBUSY;
-                       }
-                       if (g_scan_specified_ssid) {
-                               WL_TRACE(("%s Specific SCAN is not done ignore scan for = %s \n", \
-                                       __FUNCTION__, req->essid));
-                               
-                               return -EBUSY;
-                       }
-                       else {
-                               g_specific_ssid.SSID_len = MIN(sizeof(g_specific_ssid.SSID), \
-                                                                               req->essid_len);
-                               memcpy(g_specific_ssid.SSID, req->essid, g_specific_ssid.SSID_len);
-                               g_specific_ssid.SSID_len = htod32(g_specific_ssid.SSID_len);
-                               g_scan_specified_ssid = 1;
-                               WL_TRACE(("### Specific scan ssid=%s len=%d\n", \
-                                               g_specific_ssid.SSID, g_specific_ssid.SSID_len));
-                       }
-               }
-       }
-#endif 
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_SCAN, &g_specific_ssid, sizeof(g_specific_ssid)))) {
-               WL_TRACE(("#### Set SCAN for %s failed with %d\n", g_specific_ssid.SSID, error));
-               
-               g_scan_specified_ssid = 0;
-               return -EBUSY;
-       }
-
-       return 0;
-}
-
-#ifdef WL_IW_USE_ISCAN
-int
-wl_iw_iscan_set_scan_broadcast_prep(struct net_device *dev, uint flag)
-{
-       wlc_ssid_t ssid;
-       iscan_info_t *iscan = g_iscan;
-
-#if !defined(CSCAN)
-       
-       if (g_first_broadcast_scan == BROADCAST_SCAN_FIRST_IDLE) {
-               g_first_broadcast_scan = BROADCAST_SCAN_FIRST_STARTED;
-               WL_TRACE(("%s: First Brodcast scan was forced\n", __FUNCTION__));
-       }
-       else if (g_first_broadcast_scan == BROADCAST_SCAN_FIRST_STARTED) {
-               WL_TRACE(("%s: ignore ISCAN request first BS is not done yet\n", __FUNCTION__));
-               return 0;
-       }
-#endif 
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       if (flag)
-               rtnl_lock();
-#endif
-
-       dev_wlc_ioctl(dev, WLC_SET_PASSIVE_SCAN, &iscan->scan_flag, sizeof(iscan->scan_flag));
-       wl_iw_set_event_mask(dev);
-
-       WL_TRACE(("+++: Set Broadcast ISCAN\n"));
-       
-       memset(&ssid, 0, sizeof(ssid));
-
-       iscan->list_cur = iscan->list_hdr;
-       iscan->iscan_state = ISCAN_STATE_SCANING;
-
-       memset(&iscan->iscan_ex_params_p->params, 0, iscan->iscan_ex_param_size);
-       wl_iw_iscan_prep(&iscan->iscan_ex_params_p->params, &ssid);
-       wl_iw_iscan(iscan, &ssid, WL_SCAN_ACTION_START);
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       if (flag)
-               rtnl_unlock();
-#endif
-
-       mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-
-       iscan->timer_on = 1;
-
-       return 0;
-}
-static int
-wl_iw_iscan_set_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       wlc_ssid_t ssid;
-       iscan_info_t *iscan = g_iscan;
-
-       WL_TRACE(("%s: SIOCSIWSCAN : ISCAN\n", dev->name));
-
-#if defined(CSCAN)
-               WL_ERROR(("%s: Scan from SIOCGIWSCAN not supported\n", __FUNCTION__));
-               return -EINVAL;
-#endif 
-
-       
-#if defined(SOFTAP)
-       if (ap_cfg_running) {
-               WL_TRACE(("\n>%s: Not executed, reason -'SOFTAP is active'\n", __FUNCTION__));
-               return 0;
-       }
-#endif
-       
-       if (g_onoff == G_WLAN_SET_OFF) {
-               WL_TRACE(("%s: driver is not up yet after START\n", __FUNCTION__));
-               return 0;
-       }
-
-       
-       if ((!iscan) || (iscan->sysioc_pid < 0)) {
-               WL_TRACE(("%s use backup if iscan thread is not successful\n", \
-                        __FUNCTION__));
-               return wl_iw_set_scan(dev, info, wrqu, extra);
-       }
-
-       if (g_scan_specified_ssid) {
-               WL_TRACE(("%s Specific SCAN already running ignoring BC scan\n", \
-                               __FUNCTION__));
-               return EBUSY;
-       }
-
-       
-       memset(&ssid, 0, sizeof(ssid));
-
-#if WIRELESS_EXT > 17
-       
-       if (wrqu->data.length == sizeof(struct iw_scan_req)) {
-               if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
-                       int as = 0;
-                       struct iw_scan_req *req = (struct iw_scan_req *)extra;
-#if !defined(CSCAN)
-                       if (g_first_broadcast_scan < BROADCAST_SCAN_FIRST_RESULT_CONSUMED) {
-                               
-                               WL_TRACE(("%s First ISCAN in progress : ignoring SC = %s\n", \
-                                        __FUNCTION__, req->essid));
-                               return -EBUSY;
-                       }
-#endif 
-                       ssid.SSID_len = MIN(sizeof(ssid.SSID), req->essid_len);
-                       memcpy(ssid.SSID, req->essid, ssid.SSID_len);
-                       ssid.SSID_len = htod32(ssid.SSID_len);
-                       dev_wlc_ioctl(dev, WLC_SET_PASSIVE_SCAN, &as, sizeof(as));
-                       wl_iw_set_event_mask(dev);
-                       return wl_iw_set_scan(dev, info, wrqu, extra);
-               }
-               else {
-                       g_scan_specified_ssid = 0;
-
-                       if (iscan->iscan_state == ISCAN_STATE_SCANING) {
-                               WL_TRACE(("%s ISCAN already in progress \n", __FUNCTION__));
-                               return 0;
-                       }
-               }
-       }
-#endif 
-
-       wl_iw_iscan_set_scan_broadcast_prep(dev, 0);
-
-       return 0;
-}
-#endif 
-
-#if WIRELESS_EXT > 17
-static bool
-ie_is_wpa_ie(uint8 **wpaie, uint8 **tlvs, int *tlvs_len)
-{
-
-
-       uint8 *ie = *wpaie;
-
-       
-       if ((ie[1] >= 6) &&
-               !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x01"), 4)) {
-               return TRUE;
-       }
-
-       
-       ie += ie[1] + 2;
-       
-       *tlvs_len -= (int)(ie - *tlvs);
-       
-       *tlvs = ie;
-       return FALSE;
-}
-
-static bool
-ie_is_wps_ie(uint8 **wpsie, uint8 **tlvs, int *tlvs_len)
-{
-
-
-       uint8 *ie = *wpsie;
-
-       
-       if ((ie[1] >= 4) &&
-               !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x04"), 4)) {
-               return TRUE;
-       }
-
-       
-       ie += ie[1] + 2;
-       
-       *tlvs_len -= (int)(ie - *tlvs);
-       
-       *tlvs = ie;
-       return FALSE;
-}
-#endif 
-
-static inline int _wpa_snprintf_hex(char *buf, size_t buf_size, const u8 *data,
-       size_t len, int uppercase)
-{
-       size_t i;
-       char *pos = buf, *end = buf + buf_size;
-       int ret;
-       if (buf_size == 0)
-               return 0;
-       for (i = 0; i < len; i++) {
-               ret = snprintf(pos, end - pos, uppercase ? "%02X" : "%02x",
-                       data[i]);
-               if (ret < 0 || ret >= end - pos) {
-                       end[-1] = '\0';
-                       return pos - buf;
-               }
-               pos += ret;
-       }
-       end[-1] = '\0';
-       return pos - buf;
-}
-
-
-int wpa_snprintf_hex(char *buf, size_t buf_size, const u8 *data, size_t len)
-{
-       return _wpa_snprintf_hex(buf, buf_size, data, len, 0);
-}
-
-static int
-wl_iw_handle_scanresults_ies(char **event_p, char *end,
-       struct iw_request_info *info, wl_bss_info_t *bi)
-{
-#if WIRELESS_EXT > 17
-       struct iw_event iwe;
-       char *event;
-       char *buf;
-       int custom_event_len;
-
-       event = *event_p;
-       if (bi->ie_length) {
-               
-               bcm_tlv_t *ie;
-               uint8 *ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
-               int ptr_len = bi->ie_length;
-
-#ifdef BCMWPA2
-               if ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_RSN_ID))) {
-                       iwe.cmd = IWEVGENIE;
-                       iwe.u.data.length = ie->len + 2;
-                       event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)ie);
-               }
-               ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
-#endif 
-
-               while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) {
-                       
-                       if (ie_is_wps_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
-                               iwe.cmd = IWEVGENIE;
-                               iwe.u.data.length = ie->len + 2;
-                               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)ie);
-                               break;
-                       }
-               }
-
-               ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
-               ptr_len = bi->ie_length;
-               while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) {
-                       if (ie_is_wpa_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
-                               iwe.cmd = IWEVGENIE;
-                               iwe.u.data.length = ie->len + 2;
-                               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)ie);
-                               break;
-                       }
-               }
-
-               ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
-               ptr_len = bi->ie_length;
-
-               while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WAPI_ID))) {
-                       WL_TRACE(("%s: found a WAPI IE...\n", __FUNCTION__));
-#ifdef WAPI_IE_USE_GENIE
-                       iwe.cmd = IWEVGENIE;
-                       iwe.u.data.length = ie->len + 2;
-                       event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)ie);
-#else 
-                       iwe.cmd = IWEVCUSTOM;
-                       custom_event_len = strlen("wapi_ie=") + 2*(ie->len + 2);
-                       iwe.u.data.length = custom_event_len;
-
-                       buf = kmalloc(custom_event_len+1, GFP_KERNEL);
-                       if (buf == NULL)
-                       {
-                               WL_ERROR(("malloc(%d) returned NULL...\n", custom_event_len));
-                               break;
-                       }
-
-                       memcpy(buf, "wapi_ie=", 8);
-                       wpa_snprintf_hex(buf + 8, 2+1, &(ie->id), 1);
-                       wpa_snprintf_hex(buf + 10, 2+1, &(ie->len), 1);
-                       wpa_snprintf_hex(buf + 12, 2*ie->len+1, ie->data, ie->len);
-                       event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, buf);
-#endif 
-                       break;
-               }
-       *event_p = event;
-       }
-#endif 
-
-       return 0;
-}
-
-static uint
-wl_iw_get_scan_prep(
-       wl_scan_results_t *list,
-       struct iw_request_info *info,
-       char *extra,
-       short max_size)
-{
-       int  i, j;
-       struct iw_event  iwe;
-       wl_bss_info_t *bi = NULL;
-       char *event = extra, *end = extra + max_size - WE_ADD_EVENT_FIX, *value;
-       int     ret = 0;
-
-       ASSERT(list);
-
-       
-
-       for (i = 0; i < list->count && i < IW_MAX_AP; i++)
-       {
-               if (list->version != WL_BSS_INFO_VERSION) {
-                       WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                               __FUNCTION__, list->version));
-                       return ret;
-                }
-
-               bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length)) : list->bss_info;
-
-               WL_TRACE(("%s : %s\n", __FUNCTION__, bi->SSID));
-
-               
-               iwe.cmd = SIOCGIWAP;
-               iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-               memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_ADDR_LEN);
-               
-               iwe.u.data.length = dtoh32(bi->SSID_len);
-               iwe.cmd = SIOCGIWESSID;
-               iwe.u.data.flags = 1;
-               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, bi->SSID);
-
-               
-               if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
-                       iwe.cmd = SIOCGIWMODE;
-                       if (dtoh16(bi->capability) & DOT11_CAP_ESS)
-                               iwe.u.mode = IW_MODE_INFRA;
-                       else
-                               iwe.u.mode = IW_MODE_ADHOC;
-                       event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_UINT_LEN);
-               }
-
-               
-               iwe.cmd = SIOCGIWFREQ;
-               iwe.u.freq.m = wf_channel2mhz(CHSPEC_CHANNEL(bi->chanspec),
-                       CHSPEC_CHANNEL(bi->chanspec) <= CH_MAX_2G_CHANNEL ?
-                       WF_CHAN_FACTOR_2_4_G : WF_CHAN_FACTOR_5_G);
-               iwe.u.freq.e = 6;
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_FREQ_LEN);
-
-               
-               iwe.cmd = IWEVQUAL;
-               iwe.u.qual.qual = rssi_to_qual(dtoh16(bi->RSSI));
-               iwe.u.qual.level = 0x100 + dtoh16(bi->RSSI);
-               iwe.u.qual.noise = 0x100 + bi->phy_noise;
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_QUAL_LEN);
-
-               
-                wl_iw_handle_scanresults_ies(&event, end, info, bi);
-
-               
-               iwe.cmd = SIOCGIWENCODE;
-               if (dtoh16(bi->capability) & DOT11_CAP_PRIVACY)
-                       iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-               else
-                       iwe.u.data.flags = IW_ENCODE_DISABLED;
-               iwe.u.data.length = 0;
-               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)event);
-
-               
-               if (bi->rateset.count) {
-                       if (((event -extra) + IW_EV_LCP_LEN) <= (uintptr)end) {
-                               value = event + IW_EV_LCP_LEN;
-                               iwe.cmd = SIOCGIWRATE;
-                               
-                               iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
-                               for (j = 0; j < bi->rateset.count && j < IW_MAX_BITRATES; j++) {
-                                       iwe.u.bitrate.value =
-                                               (bi->rateset.rates[j] & 0x7f) * 500000;
-                                       value = IWE_STREAM_ADD_VALUE(info, event, value, end, &iwe,
-                                               IW_EV_PARAM_LEN);
-                               }
-                               event = value;
-                       }
-               }
-       } 
-
-       if ((ret = (event - extra)) < 0) {
-               WL_ERROR(("==> Wrong size\n"));
-               ret = 0;
-       }
-       WL_TRACE(("%s: size=%d bytes prepared \n", __FUNCTION__, (unsigned int)(event - extra)));
-       return (uint)ret;
-}
-
-static int
-wl_iw_get_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       channel_info_t ci;
-       wl_scan_results_t *list_merge;
-       wl_scan_results_t *list = (wl_scan_results_t *) g_scan;
-       int error;
-       uint buflen_from_user = dwrq->length;
-       uint len =  G_SCAN_RESULTS;
-       __u16 len_ret = 0;
-#if  !defined(CSCAN)
-       __u16 merged_len = 0;
-#endif
-#if defined(WL_IW_USE_ISCAN)
-       iscan_info_t *iscan = g_iscan;
-       iscan_buf_t * p_buf;
-#if  !defined(CSCAN)
-       uint32 counter = 0;
-#endif 
-#endif 
-
-       WL_TRACE(("%s: buflen_from_user %d: \n", dev->name, buflen_from_user));
-
-       if (!extra) {
-               WL_TRACE(("%s: wl_iw_get_scan return -EINVAL\n", dev->name));
-               return -EINVAL;
-       }
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_CHANNEL, &ci, sizeof(ci))))
-               return error;
-       ci.scan_channel = dtoh32(ci.scan_channel);
-       if (ci.scan_channel)
-               return -EAGAIN;
-
-#if  !defined(CSCAN)
-       if (g_ss_cache_ctrl.m_timer_expired) {
-               wl_iw_free_ss_cache();
-               g_ss_cache_ctrl.m_timer_expired ^= 1;
-       }
-       if ((!g_scan_specified_ssid && g_ss_cache_ctrl.m_prev_scan_mode) ||
-               g_ss_cache_ctrl.m_cons_br_scan_cnt > 4) {
-               g_ss_cache_ctrl.m_cons_br_scan_cnt = 0;
-               
-               wl_iw_reset_ss_cache();
-       }
-       g_ss_cache_ctrl.m_prev_scan_mode = g_scan_specified_ssid;
-       if (g_scan_specified_ssid) {
-               g_ss_cache_ctrl.m_cons_br_scan_cnt = 0;
-       }
-       else {
-               g_ss_cache_ctrl.m_cons_br_scan_cnt++;
-       }
-#endif 
-
-
-       
-       if (g_scan_specified_ssid) {
-               
-               list = kmalloc(len, GFP_KERNEL);
-               if (!list) {
-                       WL_TRACE(("%s: wl_iw_get_scan return -ENOMEM\n", dev->name));
-                       g_scan_specified_ssid = 0;
-                       return -ENOMEM;
-               }
-       }
-
-       memset(list, 0, len);
-       list->buflen = htod32(len);
-       if ((error = dev_wlc_ioctl(dev, WLC_SCAN_RESULTS, list, len))) {
-               WL_TRACE(("%s: %s : Scan_results ERROR %d\n", dev->name, __FUNCTION__, len));
-               dwrq->length = len;
-               if (g_scan_specified_ssid)
-                       kfree(list);
-               return 0;
-       }
-       list->buflen = dtoh32(list->buflen);
-       list->version = dtoh32(list->version);
-       list->count = dtoh32(list->count);
-
-       
-       if (list->version != WL_BSS_INFO_VERSION) {
-               WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                        __FUNCTION__, list->version));
-               if (g_scan_specified_ssid) {
-                       g_scan_specified_ssid = 0;
-                       kfree(list);
-               }
-               return -EINVAL;
-       }
-
-#if  !defined(CSCAN)
-       if (g_scan_specified_ssid) {
-               
-               wl_iw_add_bss_to_ss_cache(list);
-               kfree(list);
-       }
-#endif
-
-#if  !defined(CSCAN)
-       MUTEX_LOCK_WL_SCAN_SET();
-#if defined(WL_IW_USE_ISCAN)
-       if (g_scan_specified_ssid)
-               WL_TRACE(("%s: Specified scan APs from scan=%d\n", __FUNCTION__, list->count));
-       p_buf = iscan->list_hdr;
-       
-       while (p_buf != iscan->list_cur) {
-               list_merge = &((wl_iscan_results_t*)p_buf->iscan_buf)->results;
-               WL_TRACE(("%s: Bcast APs list=%d\n", __FUNCTION__, list_merge->count));
-               counter += list_merge->count;
-               if (list_merge->count > 0)
-                       len_ret += (__u16) wl_iw_get_scan_prep(list_merge, info,
-                           extra+len_ret, buflen_from_user -len_ret);
-               p_buf = p_buf->next;
-       }
-       WL_TRACE(("%s merged with total Bcast APs=%d\n", __FUNCTION__, counter));
-#else
-       list_merge = (wl_scan_results_t *) g_scan;
-       len_ret = (__u16) wl_iw_get_scan_prep(list_merge, info, extra, buflen_from_user);
-#endif 
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       if (g_ss_cache_ctrl.m_link_down) {
-               
-               wl_iw_delete_bss_from_ss_cache(g_ss_cache_ctrl.m_active_bssid);
-       }
-       
-       wl_iw_merge_scan_cache(info, extra+len_ret, buflen_from_user-len_ret, &merged_len);
-       len_ret += merged_len;
-       wl_iw_run_ss_cache_timer(0);
-       wl_iw_run_ss_cache_timer(1);
-#else  
-
-       
-       if (g_scan_specified_ssid) {
-               WL_TRACE(("%s: Specified scan APs in the list =%d\n", __FUNCTION__, list->count));
-               len_ret = (__u16) wl_iw_get_scan_prep(list, info, extra, buflen_from_user);
-               kfree(list);
-
-#if defined(WL_IW_USE_ISCAN)
-               p_buf = iscan->list_hdr;
-               
-               while (p_buf != iscan->list_cur) {
-                       list_merge = &((wl_iscan_results_t*)p_buf->iscan_buf)->results;
-                       WL_TRACE(("%s: Bcast APs list=%d\n", __FUNCTION__, list_merge->count));
-                       if (list_merge->count > 0)
-                               len_ret += (__u16) wl_iw_get_scan_prep(list_merge, info,
-                                   extra+len_ret, buflen_from_user -len_ret);
-                       p_buf = p_buf->next;
-               }
-#else
-               list_merge = (wl_scan_results_t *) g_scan;
-               WL_TRACE(("%s: Bcast APs list=%d\n", __FUNCTION__, list_merge->count));
-               if (list_merge->count > 0)
-                       len_ret += (__u16) wl_iw_get_scan_prep(list_merge, info, extra+len_ret,
-                               buflen_from_user -len_ret);
-#endif 
-       }
-       else {
-               list = (wl_scan_results_t *) g_scan;
-               len_ret = (__u16) wl_iw_get_scan_prep(list, info, extra, buflen_from_user);
-       }
-#endif 
-
-#if defined(WL_IW_USE_ISCAN)
-       
-       g_scan_specified_ssid = 0;
-#endif 
-       
-       if ((len_ret + WE_ADD_EVENT_FIX) < buflen_from_user)
-               len = len_ret;
-
-       dwrq->length = len;
-       dwrq->flags = 0;        
-
-       WL_TRACE(("%s return to WE %d bytes APs=%d\n", __FUNCTION__, dwrq->length, list->count));
-       return 0;
-}
-
-#if defined(WL_IW_USE_ISCAN)
-static int
-wl_iw_iscan_get_scan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_scan_results_t *list;
-       struct iw_event iwe;
-       wl_bss_info_t *bi = NULL;
-       int ii, j;
-       int apcnt;
-       char *event = extra, *end = extra + dwrq->length, *value;
-       iscan_info_t *iscan = g_iscan;
-       iscan_buf_t * p_buf;
-       uint32  counter = 0;
-#if !defined(CSCAN)
-       __u16 merged_len = 0;
-       uint buflen_from_user = dwrq->length;
-#endif
-
-       WL_TRACE(("%s %s buflen_from_user %d:\n", dev->name, __FUNCTION__, dwrq->length));
-
-#if defined(SOFTAP)
-       if (ap_cfg_running) {
-               WL_TRACE(("%s: Not executed, reason -'SOFTAP is active'\n", __FUNCTION__));
-               return -EINVAL;
-       }
-#endif
-
-       if (!extra) {
-               WL_TRACE(("%s: INVALID SIOCGIWSCAN GET bad parameter\n", dev->name));
-               return -EINVAL;
-       }
-
-#if !defined(CSCAN)
-       if (g_first_broadcast_scan < BROADCAST_SCAN_FIRST_RESULT_READY) {
-               WL_TRACE(("%s %s: first ISCAN results are NOT ready yet \n", \
-                        dev->name, __FUNCTION__));
-               return -EAGAIN;
-       }
-#endif 
-       
-       if ((!iscan) || (iscan->sysioc_pid < 0)) {
-               WL_TRACE(("%ssysioc_pid\n", __FUNCTION__));
-               return wl_iw_get_scan(dev, info, dwrq, extra);
-       }
-
-#if !defined(CSCAN)
-       if (g_ss_cache_ctrl.m_timer_expired) {
-               wl_iw_free_ss_cache();
-               g_ss_cache_ctrl.m_timer_expired ^= 1;
-       }
-       if (g_scan_specified_ssid) {
-               return wl_iw_get_scan(dev, info, dwrq, extra);
-       }
-       else {
-               if (g_ss_cache_ctrl.m_link_down) {
-                       
-                       wl_iw_delete_bss_from_ss_cache(g_ss_cache_ctrl.m_active_bssid);
-               }
-               if (g_ss_cache_ctrl.m_prev_scan_mode || g_ss_cache_ctrl.m_cons_br_scan_cnt > 4) {
-                       g_ss_cache_ctrl.m_cons_br_scan_cnt = 0;
-                       
-                       wl_iw_reset_ss_cache();
-               }
-               g_ss_cache_ctrl.m_prev_scan_mode = g_scan_specified_ssid;
-               g_ss_cache_ctrl.m_cons_br_scan_cnt++;
-       }
-#endif 
-
-       WL_TRACE(("%s: SIOCGIWSCAN GET broadcast results\n", dev->name));
-       apcnt = 0;
-       p_buf = iscan->list_hdr;
-       
-       while (p_buf != iscan->list_cur) {
-           list = &((wl_iscan_results_t*)p_buf->iscan_buf)->results;
-
-       counter += list->count;
-
-           if (list->version != WL_BSS_INFO_VERSION) {
-               WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n", \
-                        __FUNCTION__, list->version));
-               return -EINVAL;
-           }
-
-           bi = NULL;
-           for (ii = 0; ii < list->count && apcnt < IW_MAX_AP; apcnt++, ii++) {
-               bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length)) : list->bss_info;
-               ASSERT(((uintptr)bi + dtoh32(bi->length)) <= ((uintptr)list +
-                       WLC_IW_ISCAN_MAXLEN));
-
-               
-               if (event + ETHER_ADDR_LEN + bi->SSID_len + IW_EV_UINT_LEN + IW_EV_FREQ_LEN +
-                       IW_EV_QUAL_LEN >= end)
-                       return -E2BIG;
-               
-               iwe.cmd = SIOCGIWAP;
-               iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-               memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_ADDR_LEN);
-
-               
-               iwe.u.data.length = dtoh32(bi->SSID_len);
-               iwe.cmd = SIOCGIWESSID;
-               iwe.u.data.flags = 1;
-               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, bi->SSID);
-
-               
-               if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
-                       iwe.cmd = SIOCGIWMODE;
-                       if (dtoh16(bi->capability) & DOT11_CAP_ESS)
-                               iwe.u.mode = IW_MODE_INFRA;
-                       else
-                               iwe.u.mode = IW_MODE_ADHOC;
-                       event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_UINT_LEN);
-               }
-
-               
-               iwe.cmd = SIOCGIWFREQ;
-               iwe.u.freq.m = wf_channel2mhz(CHSPEC_CHANNEL(bi->chanspec),
-                       CHSPEC_CHANNEL(bi->chanspec) <= CH_MAX_2G_CHANNEL ?
-                       WF_CHAN_FACTOR_2_4_G : WF_CHAN_FACTOR_5_G);
-               iwe.u.freq.e = 6;
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_FREQ_LEN);
-
-               
-               iwe.cmd = IWEVQUAL;
-               iwe.u.qual.qual = rssi_to_qual(dtoh16(bi->RSSI));
-               iwe.u.qual.level = 0x100 + dtoh16(bi->RSSI);
-               iwe.u.qual.noise = 0x100 + bi->phy_noise;
-               event = IWE_STREAM_ADD_EVENT(info, event, end, &iwe, IW_EV_QUAL_LEN);
-
-               
-               wl_iw_handle_scanresults_ies(&event, end, info, bi);
-
-               
-               iwe.cmd = SIOCGIWENCODE;
-               if (dtoh16(bi->capability) & DOT11_CAP_PRIVACY)
-                       iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-               else
-                       iwe.u.data.flags = IW_ENCODE_DISABLED;
-               iwe.u.data.length = 0;
-               event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)event);
-
-               
-               if (bi->rateset.count) {
-                       if (event + IW_MAX_BITRATES*IW_EV_PARAM_LEN >= end)
-                               return -E2BIG;
-
-                       value = event + IW_EV_LCP_LEN;
-                       iwe.cmd = SIOCGIWRATE;
-                       
-                       iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
-                       for (j = 0; j < bi->rateset.count && j < IW_MAX_BITRATES; j++) {
-                               iwe.u.bitrate.value = (bi->rateset.rates[j] & 0x7f) * 500000;
-                               value = IWE_STREAM_ADD_VALUE(info, event, value, end, &iwe,
-                                       IW_EV_PARAM_LEN);
-                       }
-                       event = value;
-               }
-           }
-           p_buf = p_buf->next;
-       } 
-
-       dwrq->length = event - extra;
-       dwrq->flags = 0;        
-
-#if !defined(CSCAN)
-       
-       wl_iw_merge_scan_cache(info, event, buflen_from_user - dwrq->length, &merged_len);
-       dwrq->length += merged_len;
-       wl_iw_run_ss_cache_timer(0);
-       wl_iw_run_ss_cache_timer(1);
-       
-       g_first_broadcast_scan = BROADCAST_SCAN_FIRST_RESULT_CONSUMED;
-#endif
-
-       WL_TRACE(("%s return to WE %d bytes APs=%d\n", __FUNCTION__, dwrq->length, counter));
-
-       
-       if (!dwrq->length)
-               return -EAGAIN;
-
-       return 0;
-}
-#endif 
-
-static int
-wl_iw_set_essid(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       int error;
-
-       WL_TRACE(("%s: SIOCSIWESSID\n", dev->name));
-
-
-       
-       memset(&g_ssid, 0, sizeof(g_ssid));
-
-       CHECK_EXTRA_FOR_NULL(extra);
-
-       if (dwrq->length && extra) {
-#if WIRELESS_EXT > 20
-               g_ssid.SSID_len = MIN(sizeof(g_ssid.SSID), dwrq->length);
-#else
-               g_ssid.SSID_len = MIN(sizeof(g_ssid.SSID), dwrq->length-1);
-#endif
-               memcpy(g_ssid.SSID, extra, g_ssid.SSID_len);
-       } else {
-               
-               g_ssid.SSID_len = 0;
-       }
-       g_ssid.SSID_len = htod32(g_ssid.SSID_len);
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_SSID, &g_ssid, sizeof(g_ssid))))
-               return error;
-
-       if (g_ssid.SSID_len) {
-               WL_TRACE(("%s: join SSID=%s\n", __FUNCTION__,  g_ssid.SSID));
-       }
-       return 0;
-}
-
-static int
-wl_iw_get_essid(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wlc_ssid_t ssid;
-       int error;
-
-       WL_TRACE(("%s: SIOCGIWESSID\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid)))) {
-               WL_ERROR(("Error getting the SSID\n"));
-               return error;
-       }
-
-       ssid.SSID_len = dtoh32(ssid.SSID_len);
-
-       
-       memcpy(extra, ssid.SSID, ssid.SSID_len);
-
-       dwrq->length = ssid.SSID_len;
-
-       dwrq->flags = 1; 
-
-       return 0;
-}
-
-static int
-wl_iw_set_nick(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-
-       WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       
-       if (dwrq->length > sizeof(iw->nickname))
-               return -E2BIG;
-
-       memcpy(iw->nickname, extra, dwrq->length);
-       iw->nickname[dwrq->length - 1] = '\0';
-
-       return 0;
-}
-
-static int
-wl_iw_get_nick(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-
-       WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
-
-       if (!extra)
-               return -EINVAL;
-
-       strcpy(extra, iw->nickname);
-       dwrq->length = strlen(extra) + 1;
-
-       return 0;
-}
-
-static int wl_iw_set_rate(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       wl_rateset_t rateset;
-       int error, rate, i, error_bg, error_a;
-
-       WL_TRACE(("%s: SIOCSIWRATE\n", dev->name));
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_CURR_RATESET, &rateset, sizeof(rateset))))
-               return error;
-
-       rateset.count = dtoh32(rateset.count);
-
-       if (vwrq->value < 0) {
-               
-               rate = rateset.rates[rateset.count - 1] & 0x7f;
-       } else if (vwrq->value < rateset.count) {
-               
-               rate = rateset.rates[vwrq->value] & 0x7f;
-       } else {
-               
-               rate = vwrq->value / 500000;
-       }
-
-       if (vwrq->fixed) {
-               
-               error_bg = dev_wlc_intvar_set(dev, "bg_rate", rate);
-               error_a = dev_wlc_intvar_set(dev, "a_rate", rate);
-
-               if (error_bg && error_a)
-                       return (error_bg | error_a);
-       } else {
-               
-               
-               error_bg = dev_wlc_intvar_set(dev, "bg_rate", 0);
-               
-               error_a = dev_wlc_intvar_set(dev, "a_rate", 0);
-
-               if (error_bg && error_a)
-                       return (error_bg | error_a);
-
-               
-               for (i = 0; i < rateset.count; i++)
-                       if ((rateset.rates[i] & 0x7f) > rate)
-                               break;
-               rateset.count = htod32(i);
-
-               
-               if ((error = dev_wlc_ioctl(dev, WLC_SET_RATESET, &rateset, sizeof(rateset))))
-                       return error;
-       }
-
-       return 0;
-}
-
-static int wl_iw_get_rate(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, rate;
-
-       WL_TRACE(("%s: SIOCGIWRATE\n", dev->name));
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate))))
-               return error;
-       rate = dtoh32(rate);
-       vwrq->value = rate * 500000;
-
-       return 0;
-}
-
-static int
-wl_iw_set_rts(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, rts;
-
-       WL_TRACE(("%s: SIOCSIWRTS\n", dev->name));
-
-       if (vwrq->disabled)
-               rts = DOT11_DEFAULT_RTS_LEN;
-       else if (vwrq->value < 0 || vwrq->value > DOT11_DEFAULT_RTS_LEN)
-               return -EINVAL;
-       else
-               rts = vwrq->value;
-
-       if ((error = dev_wlc_intvar_set(dev, "rtsthresh", rts)))
-               return error;
-
-       return 0;
-}
-
-static int
-wl_iw_get_rts(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, rts;
-
-       WL_TRACE(("%s: SIOCGIWRTS\n", dev->name));
-
-       if ((error = dev_wlc_intvar_get(dev, "rtsthresh", &rts)))
-               return error;
-
-       vwrq->value = rts;
-       vwrq->disabled = (rts >= DOT11_DEFAULT_RTS_LEN);
-       vwrq->fixed = 1;
-
-       return 0;
-}
-
-static int
-wl_iw_set_frag(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, frag;
-
-       WL_TRACE(("%s: SIOCSIWFRAG\n", dev->name));
-
-       if (vwrq->disabled)
-               frag = DOT11_DEFAULT_FRAG_LEN;
-       else if (vwrq->value < 0 || vwrq->value > DOT11_DEFAULT_FRAG_LEN)
-               return -EINVAL;
-       else
-               frag = vwrq->value;
-
-       if ((error = dev_wlc_intvar_set(dev, "fragthresh", frag)))
-               return error;
-
-       return 0;
-}
-
-static int
-wl_iw_get_frag(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, fragthreshold;
-
-       WL_TRACE(("%s: SIOCGIWFRAG\n", dev->name));
-
-       if ((error = dev_wlc_intvar_get(dev, "fragthresh", &fragthreshold)))
-               return error;
-
-       vwrq->value = fragthreshold;
-       vwrq->disabled = (fragthreshold >= DOT11_DEFAULT_FRAG_LEN);
-       vwrq->fixed = 1;
-
-       return 0;
-}
-
-static int
-wl_iw_set_txpow(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, disable;
-       uint16 txpwrmw;
-       WL_TRACE(("%s: SIOCSIWTXPOW\n", dev->name));
-
-       
-       disable = vwrq->disabled ? WL_RADIO_SW_DISABLE : 0;
-       disable += WL_RADIO_SW_DISABLE << 16;
-
-       disable = htod32(disable);
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_RADIO, &disable, sizeof(disable))))
-               return error;
-
-       
-       if (disable & WL_RADIO_SW_DISABLE)
-               return 0;
-
-       
-       if (!(vwrq->flags & IW_TXPOW_MWATT))
-               return -EINVAL;
-
-       
-       if (vwrq->value < 0)
-               return 0;
-
-       if (vwrq->value > 0xffff) txpwrmw = 0xffff;
-       else txpwrmw = (uint16)vwrq->value;
-
-
-       error = dev_wlc_intvar_set(dev, "qtxpower", (int)(bcm_mw_to_qdbm(txpwrmw)));
-       return error;
-}
-
-static int
-wl_iw_get_txpow(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, disable, txpwrdbm;
-       uint8 result;
-
-       WL_TRACE(("%s: SIOCGIWTXPOW\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_RADIO, &disable, sizeof(disable))) ||
-           (error = dev_wlc_intvar_get(dev, "qtxpower", &txpwrdbm)))
-               return error;
-
-       disable = dtoh32(disable);
-       result = (uint8)(txpwrdbm & ~WL_TXPWR_OVERRIDE);
-       vwrq->value = (int32)bcm_qdbm_to_mw(result);
-       vwrq->fixed = 0;
-       vwrq->disabled = (disable & (WL_RADIO_SW_DISABLE | WL_RADIO_HW_DISABLE)) ? 1 : 0;
-       vwrq->flags = IW_TXPOW_MWATT;
-
-       return 0;
-}
-
-#if WIRELESS_EXT > 10
-static int
-wl_iw_set_retry(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, lrl, srl;
-
-       WL_TRACE(("%s: SIOCSIWRETRY\n", dev->name));
-
-       
-       if (vwrq->disabled || (vwrq->flags & IW_RETRY_LIFETIME))
-               return -EINVAL;
-
-       
-       if (vwrq->flags & IW_RETRY_LIMIT) {
-
-               
-#if WIRELESS_EXT > 20
-       if ((vwrq->flags & IW_RETRY_LONG) ||(vwrq->flags & IW_RETRY_MAX) ||
-               !((vwrq->flags & IW_RETRY_SHORT) || (vwrq->flags & IW_RETRY_MIN))) {
-#else
-       if ((vwrq->flags & IW_RETRY_MAX) || !(vwrq->flags & IW_RETRY_MIN)) {
-#endif 
-                       lrl = htod32(vwrq->value);
-                       if ((error = dev_wlc_ioctl(dev, WLC_SET_LRL, &lrl, sizeof(lrl))))
-                               return error;
-               }
-
-               
-#if WIRELESS_EXT > 20
-       if ((vwrq->flags & IW_RETRY_SHORT) ||(vwrq->flags & IW_RETRY_MIN) ||
-               !((vwrq->flags & IW_RETRY_LONG) || (vwrq->flags & IW_RETRY_MAX))) {
-#else
-               if ((vwrq->flags & IW_RETRY_MIN) || !(vwrq->flags & IW_RETRY_MAX)) {
-#endif 
-                       srl = htod32(vwrq->value);
-                       if ((error = dev_wlc_ioctl(dev, WLC_SET_SRL, &srl, sizeof(srl))))
-                               return error;
-               }
-       }
-       return 0;
-}
-
-static int
-wl_iw_get_retry(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, lrl, srl;
-
-       WL_TRACE(("%s: SIOCGIWRETRY\n", dev->name));
-
-       vwrq->disabled = 0;      
-
-       
-       if ((vwrq->flags & IW_RETRY_TYPE) == IW_RETRY_LIFETIME)
-               return -EINVAL;
-
-       
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_LRL, &lrl, sizeof(lrl))) ||
-           (error = dev_wlc_ioctl(dev, WLC_GET_SRL, &srl, sizeof(srl))))
-               return error;
-
-       lrl = dtoh32(lrl);
-       srl = dtoh32(srl);
-
-       
-       if (vwrq->flags & IW_RETRY_MAX) {
-               vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
-               vwrq->value = lrl;
-       } else {
-               vwrq->flags = IW_RETRY_LIMIT;
-               vwrq->value = srl;
-               if (srl != lrl)
-                       vwrq->flags |= IW_RETRY_MIN;
-       }
-
-       return 0;
-}
-#endif 
-
-static int
-wl_iw_set_encode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_wsec_key_t key;
-       int error, val, wsec;
-
-       WL_TRACE(("%s: SIOCSIWENCODE\n", dev->name));
-
-       memset(&key, 0, sizeof(key));
-
-       if ((dwrq->flags & IW_ENCODE_INDEX) == 0) {
-               
-               for (key.index = 0; key.index < DOT11_MAX_DEFAULT_KEYS; key.index++) {
-                       val = htod32(key.index);
-                       if ((error = dev_wlc_ioctl(dev, WLC_GET_KEY_PRIMARY, &val, sizeof(val))))
-                               return error;
-                       val = dtoh32(val);
-                       if (val)
-                               break;
-               }
-               
-               if (key.index == DOT11_MAX_DEFAULT_KEYS)
-                       key.index = 0;
-       } else {
-               key.index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
-               if (key.index >= DOT11_MAX_DEFAULT_KEYS)
-                       return -EINVAL;
-       }
-
-       
-       if (!extra || !dwrq->length || (dwrq->flags & IW_ENCODE_NOKEY)) {
-               
-               val = htod32(key.index);
-               if ((error = dev_wlc_ioctl(dev, WLC_SET_KEY_PRIMARY, &val, sizeof(val))))
-                       return error;
-       } else {
-               key.len = dwrq->length;
-
-               if (dwrq->length > sizeof(key.data))
-                       return -EINVAL;
-
-               memcpy(key.data, extra, dwrq->length);
-
-               key.flags = WL_PRIMARY_KEY;
-               switch (key.len) {
-               case WEP1_KEY_SIZE:
-                       key.algo = CRYPTO_ALGO_WEP1;
-                       break;
-               case WEP128_KEY_SIZE:
-                       key.algo = CRYPTO_ALGO_WEP128;
-                       break;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-               case TKIP_KEY_SIZE:
-                       key.algo = CRYPTO_ALGO_TKIP;
-                       break;
-#endif
-               case AES_KEY_SIZE:
-                       key.algo = CRYPTO_ALGO_AES_CCM;
-                       break;
-               default:
-                       return -EINVAL;
-               }
-
-               
-               swap_key_from_BE(&key);
-               if ((error = dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key))))
-                       return error;
-       }
-
-       
-       val = (dwrq->flags & IW_ENCODE_DISABLED) ? 0 : WEP_ENABLED;
-
-       if ((error = dev_wlc_intvar_get(dev, "wsec", &wsec)))
-               return error;
-
-       wsec  &= ~(WEP_ENABLED);
-       wsec |= val;
-
-       if ((error = dev_wlc_intvar_set(dev, "wsec", wsec)))
-               return error;
-
-       
-       val = (dwrq->flags & IW_ENCODE_RESTRICTED) ? 1 : 0;
-       val = htod32(val);
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val))))
-               return error;
-
-       return 0;
-}
-
-static int
-wl_iw_get_encode(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_wsec_key_t key;
-       int error, val, wsec, auth;
-
-       WL_TRACE(("%s: SIOCGIWENCODE\n", dev->name));
-
-       
-       bzero(&key, sizeof(wl_wsec_key_t));
-
-       if ((dwrq->flags & IW_ENCODE_INDEX) == 0) {
-               
-               for (key.index = 0; key.index < DOT11_MAX_DEFAULT_KEYS; key.index++) {
-                       val = key.index;
-                       if ((error = dev_wlc_ioctl(dev, WLC_GET_KEY_PRIMARY, &val, sizeof(val))))
-                               return error;
-                       val = dtoh32(val);
-                       if (val)
-                               break;
-               }
-       } else
-               key.index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
-
-       if (key.index >= DOT11_MAX_DEFAULT_KEYS)
-               key.index = 0;
-
-       
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec))) ||
-           (error = dev_wlc_ioctl(dev, WLC_GET_AUTH, &auth, sizeof(auth))))
-               return error;
-
-       swap_key_to_BE(&key);
-
-       wsec = dtoh32(wsec);
-       auth = dtoh32(auth);
-       
-       dwrq->length = MIN(DOT11_MAX_KEY_SIZE, key.len);
-
-       
-       dwrq->flags = key.index + 1;
-       if (!(wsec & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED))) {
-               
-               dwrq->flags |= IW_ENCODE_DISABLED;
-       }
-       if (auth) {
-               
-               dwrq->flags |= IW_ENCODE_RESTRICTED;
-       }
-
-       
-       if (dwrq->length && extra)
-               memcpy(extra, key.data, dwrq->length);
-
-       return 0;
-}
-
-static int
-wl_iw_set_power(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, pm;
-
-       WL_TRACE(("%s: SIOCSIWPOWER\n", dev->name));
-
-       pm = vwrq->disabled ? PM_OFF : PM_MAX;
-
-       pm = htod32(pm);
-       if ((error = dev_wlc_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm))))
-               return error;
-
-       return 0;
-}
-
-static int
-wl_iw_get_power(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error, pm;
-
-       WL_TRACE(("%s: SIOCGIWPOWER\n", dev->name));
-
-       if ((error = dev_wlc_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm))))
-               return error;
-
-       pm = dtoh32(pm);
-       vwrq->disabled = pm ? 0 : 1;
-       vwrq->flags = IW_POWER_ALL_R;
-
-       return 0;
-}
-
-#if WIRELESS_EXT > 17
-static int
-wl_iw_set_wpaie(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *iwp,
-       char *extra
-)
-{
-       uchar buf[WLC_IOCTL_SMLEN] = {0};
-       uchar *p = buf;
-       int wapi_ie_size;
-
-       WL_TRACE(("%s: SIOCSIWGENIE\n", dev->name));
-
-       CHECK_EXTRA_FOR_NULL(extra);
-
-       if (extra[0] == DOT11_MNG_WAPI_ID)
-       {
-               wapi_ie_size = iwp->length;
-               memcpy(p, extra, iwp->length);
-               dev_wlc_bufvar_set(dev, "wapiie", buf, wapi_ie_size);
-       }
-       else
-               dev_wlc_bufvar_set(dev, "wpaie", extra, iwp->length);
-
-       return 0;
-}
-
-static int
-wl_iw_get_wpaie(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *iwp,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCGIWGENIE\n", dev->name));
-       iwp->length = 64;
-       dev_wlc_bufvar_get(dev, "wpaie", extra, iwp->length);
-       return 0;
-}
-
-static int
-wl_iw_set_encodeext(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *extra
-)
-{
-       wl_wsec_key_t key;
-       int error;
-       struct iw_encode_ext *iwe;
-
-       WL_TRACE(("%s: SIOCSIWENCODEEXT\n", dev->name));
-
-       CHECK_EXTRA_FOR_NULL(extra);
-
-       memset(&key, 0, sizeof(key));
-       iwe = (struct iw_encode_ext *)extra;
-
-       
-       if (dwrq->flags & IW_ENCODE_DISABLED) {
-
-       }
-
-       
-       key.index = 0;
-       if (dwrq->flags & IW_ENCODE_INDEX)
-               key.index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
-
-       key.len = iwe->key_len;
-
-       
-       if (!ETHER_ISMULTI(iwe->addr.sa_data))
-               bcopy((void *)&iwe->addr.sa_data, (char *)&key.ea, ETHER_ADDR_LEN);
-
-       
-       if (key.len == 0) {
-               if (iwe->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-                       WL_WSEC(("Changing the the primary Key to %d\n", key.index));
-                       
-                       key.index = htod32(key.index);
-                       error = dev_wlc_ioctl(dev, WLC_SET_KEY_PRIMARY,
-                               &key.index, sizeof(key.index));
-                       if (error)
-                               return error;
-               }
-               
-               else {
-                       swap_key_from_BE(&key);
-                       dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
-               }
-       }
-       else {
-               if (iwe->key_len > sizeof(key.data))
-                       return -EINVAL;
-
-               WL_WSEC(("Setting the key index %d\n", key.index));
-               if (iwe->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-                       WL_WSEC(("key is a Primary Key\n"));
-                       key.flags = WL_PRIMARY_KEY;
-               }
-
-               bcopy((void *)iwe->key, key.data, iwe->key_len);
-
-               if (iwe->alg == IW_ENCODE_ALG_TKIP) {
-                       uint8 keybuf[8];
-                       bcopy(&key.data[24], keybuf, sizeof(keybuf));
-                       bcopy(&key.data[16], &key.data[24], sizeof(keybuf));
-                       bcopy(keybuf, &key.data[16], sizeof(keybuf));
-               }
-
-               
-               if (iwe->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
-                       uchar *ivptr;
-                       ivptr = (uchar *)iwe->rx_seq;
-                       key.rxiv.hi = (ivptr[5] << 24) | (ivptr[4] << 16) |
-                               (ivptr[3] << 8) | ivptr[2];
-                       key.rxiv.lo = (ivptr[1] << 8) | ivptr[0];
-                       key.iv_initialized = TRUE;
-               }
-
-               switch (iwe->alg) {
-                       case IW_ENCODE_ALG_NONE:
-                               key.algo = CRYPTO_ALGO_OFF;
-                               break;
-                       case IW_ENCODE_ALG_WEP:
-                               if (iwe->key_len == WEP1_KEY_SIZE)
-                                       key.algo = CRYPTO_ALGO_WEP1;
-                               else
-                                       key.algo = CRYPTO_ALGO_WEP128;
-                               break;
-                       case IW_ENCODE_ALG_TKIP:
-                               key.algo = CRYPTO_ALGO_TKIP;
-                               break;
-                       case IW_ENCODE_ALG_CCMP:
-                               key.algo = CRYPTO_ALGO_AES_CCM;
-                               break;
-                       case IW_ENCODE_ALG_SM4:
-                               key.algo = CRYPTO_ALGO_SMS4;
-                               if (iwe->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
-                                       key.flags &= ~WL_PRIMARY_KEY;
-                               }
-                               break;
-                       default:
-                               break;
-               }
-               swap_key_from_BE(&key);
-
-               dhd_wait_pend8021x(dev);
-
-               error = dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
-               if (error)
-                       return error;
-       }
-       return 0;
-}
-
-#if WIRELESS_EXT > 17
-#ifdef BCMWPA2
-struct {
-       pmkid_list_t pmkids;
-       pmkid_t foo[MAXPMKID-1];
-} pmkid_list;
-
-static int
-wl_iw_set_pmksa(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       struct iw_pmksa *iwpmksa;
-       uint i;
-       int ret = 0;
-       char eabuf[ETHER_ADDR_STR_LEN];
-
-       WL_WSEC(("%s: SIOCSIWPMKSA\n", dev->name));
-
-       CHECK_EXTRA_FOR_NULL(extra);
-
-       iwpmksa = (struct iw_pmksa *)extra;
-       bzero((char *)eabuf, ETHER_ADDR_STR_LEN);
-
-       if (iwpmksa->cmd == IW_PMKSA_FLUSH) {
-               WL_WSEC(("wl_iw_set_pmksa - IW_PMKSA_FLUSH\n"));
-               bzero((char *)&pmkid_list, sizeof(pmkid_list));
-       }
-
-       else if (iwpmksa->cmd == IW_PMKSA_REMOVE) {
-               {
-                       pmkid_list_t pmkid, *pmkidptr;
-                       uint j;
-                       pmkidptr = &pmkid;
-
-                       bcopy(&iwpmksa->bssid.sa_data[0], &pmkidptr->pmkid[0].BSSID, \
-                               ETHER_ADDR_LEN);
-                       bcopy(&iwpmksa->pmkid[0], &pmkidptr->pmkid[0].PMKID, WPA2_PMKID_LEN);
-
-                       WL_WSEC(("wl_iw_set_pmksa,IW_PMKSA_REMOVE - PMKID: %s = ",
-                               bcm_ether_ntoa(&pmkidptr->pmkid[0].BSSID,
-                               eabuf)));
-                       for (j = 0; j < WPA2_PMKID_LEN; j++)
-                               WL_WSEC(("%02x ", pmkidptr->pmkid[0].PMKID[j]));
-                       WL_WSEC(("\n"));
-               }
-
-               for (i = 0; i < pmkid_list.pmkids.npmkid; i++)
-                       if (!bcmp(&iwpmksa->bssid.sa_data[0], &pmkid_list.pmkids.pmkid[i].BSSID,
-                               ETHER_ADDR_LEN))
-                               break;
-
-               if ((pmkid_list.pmkids.npmkid > 0) && (i < pmkid_list.pmkids.npmkid)) {
-                       bzero(&pmkid_list.pmkids.pmkid[i], sizeof(pmkid_t));
-                       for (; i < (pmkid_list.pmkids.npmkid - 1); i++) {
-                               bcopy(&pmkid_list.pmkids.pmkid[i+1].BSSID,
-                                       &pmkid_list.pmkids.pmkid[i].BSSID,
-                                       ETHER_ADDR_LEN);
-                               bcopy(&pmkid_list.pmkids.pmkid[i+1].PMKID,
-                                       &pmkid_list.pmkids.pmkid[i].PMKID,
-                                       WPA2_PMKID_LEN);
-                       }
-                       pmkid_list.pmkids.npmkid--;
-               }
-               else
-                       ret = -EINVAL;
-       }
-
-       else if (iwpmksa->cmd == IW_PMKSA_ADD) {
-               for (i = 0; i < pmkid_list.pmkids.npmkid; i++)
-                       if (!bcmp(&iwpmksa->bssid.sa_data[0], &pmkid_list.pmkids.pmkid[i].BSSID,
-                               ETHER_ADDR_LEN))
-                               break;
-               if (i < MAXPMKID) {
-                       bcopy(&iwpmksa->bssid.sa_data[0],
-                               &pmkid_list.pmkids.pmkid[i].BSSID,
-                               ETHER_ADDR_LEN);
-                       bcopy(&iwpmksa->pmkid[0], &pmkid_list.pmkids.pmkid[i].PMKID,
-                               WPA2_PMKID_LEN);
-                       if (i == pmkid_list.pmkids.npmkid)
-                               pmkid_list.pmkids.npmkid++;
-               }
-               else
-                       ret = -EINVAL;
-               {
-                       uint j;
-                       uint k;
-                       k = pmkid_list.pmkids.npmkid;
-                       WL_WSEC(("wl_iw_set_pmksa,IW_PMKSA_ADD - PMKID: %s = ",
-                               bcm_ether_ntoa(&pmkid_list.pmkids.pmkid[k].BSSID,
-                               eabuf)));
-                       for (j = 0; j < WPA2_PMKID_LEN; j++)
-                               WL_WSEC(("%02x ", pmkid_list.pmkids.pmkid[k].PMKID[j]));
-                       WL_WSEC(("\n"));
-               }
-       }
-       WL_WSEC(("PRINTING pmkid LIST - No of elements %d\n", pmkid_list.pmkids.npmkid));
-       for (i = 0; i < pmkid_list.pmkids.npmkid; i++) {
-               uint j;
-               WL_WSEC(("PMKID[%d]: %s = ", i,
-                       bcm_ether_ntoa(&pmkid_list.pmkids.pmkid[i].BSSID,
-                       eabuf)));
-               for (j = 0; j < WPA2_PMKID_LEN; j++)
-                       WL_WSEC(("%02x ", pmkid_list.pmkids.pmkid[i].PMKID[j]));
-               WL_WSEC(("\n"));
-       }
-       WL_WSEC(("\n"));
-
-       if (!ret)
-               ret = dev_wlc_bufvar_set(dev, "pmkid_info", (char *)&pmkid_list, \
-                       sizeof(pmkid_list));
-       return ret;
-}
-#endif 
-#endif 
-
-static int
-wl_iw_get_encodeext(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       WL_TRACE(("%s: SIOCGIWENCODEEXT\n", dev->name));
-       return 0;
-}
-
-static int
-wl_iw_set_wpaauth(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error = 0;
-       int paramid;
-       int paramval;
-       int val = 0;
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-
-       WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
-
-#if defined(SOFTAP)
-       if (ap_cfg_running) {
-               WL_TRACE(("%s: Not executed, reason -'SOFTAP is active'\n", __FUNCTION__));
-               return 0;
-       }
-#endif
-
-       paramid = vwrq->flags & IW_AUTH_INDEX;
-       paramval = vwrq->value;
-
-       WL_TRACE(("%s: SIOCSIWAUTH, paramid = 0x%0x, paramval = 0x%0x\n",
-               dev->name, paramid, paramval));
-
-       switch (paramid) {
-       case IW_AUTH_WPA_VERSION:
-               
-               if (paramval & IW_AUTH_WPA_VERSION_DISABLED)
-                       val = WPA_AUTH_DISABLED;
-               else if (paramval & (IW_AUTH_WPA_VERSION_WPA))
-                       val = WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED;
-#ifdef BCMWPA2
-               else if (paramval & IW_AUTH_WPA_VERSION_WPA2)
-                       val = WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED;
-#endif 
-               else if (paramval & IW_AUTH_WAPI_VERSION_1)
-                       val = WPA_AUTH_WAPI;
-               WL_INFORM(("%s: %d: setting wpa_auth to 0x%0x\n", __FUNCTION__, __LINE__, val));
-               if ((error = dev_wlc_intvar_set(dev, "wpa_auth", val)))
-                       return error;
-               break;
-       case IW_AUTH_CIPHER_PAIRWISE:
-       case IW_AUTH_CIPHER_GROUP:
-               
-               
-               if (paramval & (IW_AUTH_CIPHER_WEP40 | IW_AUTH_CIPHER_WEP104))
-                       val =   WEP_ENABLED;
-               if (paramval & IW_AUTH_CIPHER_TKIP)
-                       val = TKIP_ENABLED;
-               if (paramval & IW_AUTH_CIPHER_CCMP)
-                       val = AES_ENABLED;
-               if (paramval & IW_AUTH_CIPHER_SMS4)
-                       val = SMS4_ENABLED;
-
-               if (paramid == IW_AUTH_CIPHER_PAIRWISE) {
-                       iw->pwsec = val;
-                       val |= iw->gwsec;
-               }
-               else {
-                       iw->gwsec = val;
-                       val |= iw->pwsec;
-               }
-
-               if (iw->privacy_invoked && !val) {
-                       WL_WSEC(("%s: %s: 'Privacy invoked' TRUE but clearing wsec, assuming "
-                                "we're a WPS enrollee\n", dev->name, __FUNCTION__));
-                       if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", TRUE))) {
-                               WL_WSEC(("Failed to set iovar is_WPS_enrollee\n"));
-                               return error;
-                       }
-               } else if (val) {
-                       if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", FALSE))) {
-                               WL_WSEC(("Failed to clear iovar is_WPS_enrollee\n"));
-                               return error;
-                       }
-               }
-
-               if ((error = dev_wlc_intvar_set(dev, "wsec", val)))
-                       return error;
-
-               break;
-
-       case IW_AUTH_KEY_MGMT:
-               if ((error = dev_wlc_intvar_get(dev, "wpa_auth", &val)))
-                       return error;
-
-               if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED)) {
-                       if (paramval & IW_AUTH_KEY_MGMT_PSK)
-                               val = WPA_AUTH_PSK;
-                       else
-                               val = WPA_AUTH_UNSPECIFIED;
-               }
-#ifdef BCMWPA2
-               else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED)) {
-                       if (paramval & IW_AUTH_KEY_MGMT_PSK)
-                               val = WPA2_AUTH_PSK;
-                       else
-                               val = WPA2_AUTH_UNSPECIFIED;
-               }
-#endif 
-               if (paramval & (IW_AUTH_KEY_MGMT_WAPI_PSK | IW_AUTH_KEY_MGMT_WAPI_CERT))
-                       val = WPA_AUTH_WAPI;
-               WL_INFORM(("%s: %d: setting wpa_auth to %d\n", __FUNCTION__, __LINE__, val));
-               if ((error = dev_wlc_intvar_set(dev, "wpa_auth", val)))
-                       return error;
-
-               break;
-       case IW_AUTH_TKIP_COUNTERMEASURES:
-               dev_wlc_bufvar_set(dev, "tkip_countermeasures", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_80211_AUTH_ALG:
-               
-               WL_INFORM(("Setting the D11auth %d\n", paramval));
-               if (paramval == IW_AUTH_ALG_OPEN_SYSTEM)
-                       val = 0;
-               else if (paramval == IW_AUTH_ALG_SHARED_KEY)
-                       val = 1;
-               else if (paramval == (IW_AUTH_ALG_OPEN_SYSTEM | IW_AUTH_ALG_SHARED_KEY))
-                       val = 2;
-               else
-                       error = 1;
-               if (!error && (error = dev_wlc_intvar_set(dev, "auth", val)))
-                       return error;
-               break;
-
-       case IW_AUTH_WPA_ENABLED:
-               if (paramval == 0) {
-                       iw->pwsec = 0;
-                       iw->gwsec = 0;
-                       if ((error = dev_wlc_intvar_get(dev, "wsec", &val)))
-                               return error;
-                       if (val & (TKIP_ENABLED | AES_ENABLED)) {
-                               val &= ~(TKIP_ENABLED | AES_ENABLED);
-                               dev_wlc_intvar_set(dev, "wsec", val);
-                       }
-                       val = 0;
-               WL_INFORM(("%s: %d: setting wpa_auth to %d\n", __FUNCTION__, __LINE__, val));
-                       dev_wlc_intvar_set(dev, "wpa_auth", 0);
-                       return error;
-               }
-
-               
-               break;
-
-       case IW_AUTH_DROP_UNENCRYPTED:
-               dev_wlc_bufvar_set(dev, "wsec_restrict", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-               dev_wlc_bufvar_set(dev, "rx_unencrypted_eapol", (char *)&paramval, 1);
-               break;
-
-#if WIRELESS_EXT > 17
-       case IW_AUTH_ROAMING_CONTROL:
-               WL_INFORM(("%s: IW_AUTH_ROAMING_CONTROL\n", __FUNCTION__));
-               
-               break;
-       case IW_AUTH_PRIVACY_INVOKED: {
-               int wsec;
-
-               if (paramval == 0) {
-                       iw->privacy_invoked = FALSE;
-                       if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", FALSE))) {
-                               WL_WSEC(("Failed to clear iovar is_WPS_enrollee\n"));
-                               return error;
-                       }
-               } else {
-                       iw->privacy_invoked = TRUE;
-                       if ((error = dev_wlc_intvar_get(dev, "wsec", &wsec)))
-                               return error;
-
-                       if (!(IW_WSEC_ENABLED(wsec))) {
-                               
-
-                               if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", TRUE))) {
-                                       WL_WSEC(("Failed to set iovar is_WPS_enrollee\n"));
-                                       return error;
-                               }
-                       } else {
-                               if ((error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", FALSE))) {
-                                       WL_WSEC(("Failed to clear iovar is_WPS_enrollee\n"));
-                                       return error;
-                               }
-                       }
-               }
-               break;
-       }
-#endif 
-       case IW_AUTH_WAPI_ENABLED:
-               if ((error = dev_wlc_intvar_get(dev, "wsec", &val)))
-                       return error;
-               if (paramval) {
-                       val |= SMS4_ENABLED;
-                       if ((error = dev_wlc_intvar_set(dev, "wsec", val))) {
-                               WL_ERROR(("%s: setting wsec to 0x%0x returned error %d\n",
-                                       __FUNCTION__, val, error));
-                               return error;
-                       }
-                       if ((error = dev_wlc_intvar_set(dev, "wpa_auth", WPA_AUTH_WAPI))) {
-                               WL_ERROR(("%s: setting wpa_auth(WPA_AUTH_WAPI) returned %d\n",
-                                       __FUNCTION__, error));
-                               return error;
-                       }
-               }
-
-               break;
-       default:
-               break;
-       }
-       return 0;
-}
-#ifdef BCMWPA2
-#define VAL_PSK(_val) (((_val) & WPA_AUTH_PSK) || ((_val) & WPA2_AUTH_PSK))
-#else
-#define VAL_PSK(_val) (((_val) & WPA_AUTH_PSK))
-#endif 
-
-static int
-wl_iw_get_wpaauth(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_param *vwrq,
-       char *extra
-)
-{
-       int error;
-       int paramid;
-       int paramval = 0;
-       int val;
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-
-       WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
-
-       paramid = vwrq->flags & IW_AUTH_INDEX;
-
-       switch (paramid) {
-       case IW_AUTH_WPA_VERSION:
-               
-               if ((error = dev_wlc_intvar_get(dev, "wpa_auth", &val)))
-                       return error;
-               if (val & (WPA_AUTH_NONE | WPA_AUTH_DISABLED))
-                       paramval = IW_AUTH_WPA_VERSION_DISABLED;
-               else if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED))
-                       paramval = IW_AUTH_WPA_VERSION_WPA;
-#ifdef BCMWPA2
-               else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED))
-                       paramval = IW_AUTH_WPA_VERSION_WPA2;
-#endif 
-               break;
-       case IW_AUTH_CIPHER_PAIRWISE:
-       case IW_AUTH_CIPHER_GROUP:
-               if (paramid == IW_AUTH_CIPHER_PAIRWISE)
-                       val = iw->pwsec;
-               else
-                       val = iw->gwsec;
-
-               paramval = 0;
-               if (val) {
-                       if (val & WEP_ENABLED)
-                               paramval |= (IW_AUTH_CIPHER_WEP40 | IW_AUTH_CIPHER_WEP104);
-                       if (val & TKIP_ENABLED)
-                               paramval |= (IW_AUTH_CIPHER_TKIP);
-                       if (val & AES_ENABLED)
-                               paramval |= (IW_AUTH_CIPHER_CCMP);
-               }
-               else
-                       paramval = IW_AUTH_CIPHER_NONE;
-               break;
-       case IW_AUTH_KEY_MGMT:
-               
-               if ((error = dev_wlc_intvar_get(dev, "wpa_auth", &val)))
-                       return error;
-               if (VAL_PSK(val))
-                       paramval = IW_AUTH_KEY_MGMT_PSK;
-               else
-                       paramval = IW_AUTH_KEY_MGMT_802_1X;
-
-               break;
-       case IW_AUTH_TKIP_COUNTERMEASURES:
-               dev_wlc_bufvar_get(dev, "tkip_countermeasures", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_DROP_UNENCRYPTED:
-               dev_wlc_bufvar_get(dev, "wsec_restrict", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-               dev_wlc_bufvar_get(dev, "rx_unencrypted_eapol", (char *)&paramval, 1);
-               break;
-
-       case IW_AUTH_80211_AUTH_ALG:
-               
-               if ((error = dev_wlc_intvar_get(dev, "auth", &val)))
-                       return error;
-               if (!val)
-                       paramval = IW_AUTH_ALG_OPEN_SYSTEM;
-               else
-                       paramval = IW_AUTH_ALG_SHARED_KEY;
-               break;
-       case IW_AUTH_WPA_ENABLED:
-               if ((error = dev_wlc_intvar_get(dev, "wpa_auth", &val)))
-                       return error;
-               if (val)
-                       paramval = TRUE;
-               else
-                       paramval = FALSE;
-               break;
-#if WIRELESS_EXT > 17
-       case IW_AUTH_ROAMING_CONTROL:
-               WL_ERROR(("%s: IW_AUTH_ROAMING_CONTROL\n", __FUNCTION__));
-               
-               break;
-       case IW_AUTH_PRIVACY_INVOKED:
-               paramval = iw->privacy_invoked;
-               break;
-
-#endif 
-       }
-       vwrq->value = paramval;
-       return 0;
-}
-#endif 
-
-
-#ifdef SOFTAP
-
-static int ap_macmode = MACLIST_MODE_DISABLED;
-static struct mflist ap_black_list;
-static int
-wl_iw_parse_wep(char *keystr, wl_wsec_key_t *key)
-{
-       char hex[] = "XX";
-       unsigned char *data = key->data;
-
-       switch (strlen(keystr)) {
-       case 5:
-       case 13:
-       case 16:
-               key->len = strlen(keystr);
-               memcpy(data, keystr, key->len + 1);
-               break;
-       case 12:
-       case 28:
-       case 34:
-       case 66:
-               
-               if (!strnicmp(keystr, "0x", 2))
-                       keystr += 2;
-               else
-                       return -1;
-               
-       case 10:
-       case 26:
-       case 32:
-       case 64:
-               key->len = strlen(keystr) / 2;
-               while (*keystr) {
-                       strncpy(hex, keystr, 2);
-                       *data++ = (char) bcm_strtoul(hex, NULL, 16);
-                       keystr += 2;
-               }
-               break;
-       default:
-               return -1;
-       }
-
-       switch (key->len) {
-       case 5:
-               key->algo = CRYPTO_ALGO_WEP1;
-               break;
-       case 13:
-               key->algo = CRYPTO_ALGO_WEP128;
-               break;
-       case 16:
-               
-               key->algo = CRYPTO_ALGO_AES_CCM;
-               break;
-       case 32:
-               key->algo = CRYPTO_ALGO_TKIP;
-               break;
-       default:
-               return -1;
-       }
-
-       
-       key->flags |= WL_PRIMARY_KEY;
-
-       return 0;
-}
-
-#ifdef EXT_WPA_CRYPTO
-#define SHA1HashSize 20
-extern void pbkdf2_sha1(const char *passphrase, const char *ssid, size_t ssid_len, \
-                                               int iterations, u8 *buf, size_t buflen);
-
-#else
-
-#define SHA1HashSize 20
-int pbkdf2_sha1(const char *passphrase, const char *ssid, size_t ssid_len, \
-                                               int iterations, u8 *buf, size_t buflen)
-{
-       WL_ERROR(("WARNING: %s is not implemented !!!\n", __FUNCTION__));
-       return -1;
-}
-
-#endif 
-
-
-int dev_iw_write_cfg1_bss_var(struct net_device *dev, int val)
-{
-       struct {
-               int cfg;
-               int val;
-       } bss_setbuf;
-
-       int bss_set_res;
-       char smbuf[WLC_IOCTL_SMLEN];
-       memset(smbuf, 0, sizeof(smbuf));
-
-       bss_setbuf.cfg = 1;
-       bss_setbuf.val = val;
-
-       bss_set_res = dev_iw_iovar_setbuf(dev, "bss",
-               &bss_setbuf, sizeof(bss_setbuf), smbuf, sizeof(smbuf));
-       WL_TRACE(("%s: bss_set_result:%d set with %d\n", __FUNCTION__, bss_set_res, val));
-
-       return bss_set_res;
-}
-
-
-int dev_iw_read_cfg1_bss_var(struct net_device *dev, int *val)
-{
-       int bsscfg_idx = 1;
-       int bss_set_res;
-       char smbuf[WLC_IOCTL_SMLEN];
-       memset(smbuf, 0, sizeof(smbuf));
-
-       bss_set_res = dev_iw_iovar_getbuf(dev, "bss", \
-                &bsscfg_idx, sizeof(bsscfg_idx), smbuf, sizeof(smbuf));
-       *val = *(int*)smbuf;
-       *val = dtoh32(*val);
-       WL_TRACE(("%s: status=%d bss_get_result=%d\n", __FUNCTION__, bss_set_res, *val));
-       return bss_set_res;
-}
-
-
-
-#ifndef AP_ONLY
-static int wl_bssiovar_mkbuf(
-                       const char *iovar,
-                       int bssidx,
-                       void *param,
-                       int paramlen,
-                       void *bufptr,
-                       int buflen,
-                       int *perr)
-{
-       const char *prefix = "bsscfg:";
-       int8* p;
-       uint prefixlen;
-       uint namelen;
-       uint iolen;
-
-       prefixlen = strlen(prefix);     
-       namelen = strlen(iovar) + 1;    
-       iolen = prefixlen + namelen + sizeof(int) + paramlen;
-
-       
-       if (buflen < 0 || iolen > (uint)buflen) {
-               *perr = BCME_BUFTOOSHORT;
-               return 0;
-       }
-
-       p = (int8*)bufptr;
-
-       
-       memcpy(p, prefix, prefixlen);
-       p += prefixlen;
-
-       
-       memcpy(p, iovar, namelen);
-       p += namelen;
-
-       
-       bssidx = htod32(bssidx);
-       memcpy(p, &bssidx, sizeof(int32));
-       p += sizeof(int32);
-
-       
-       if (paramlen)
-               memcpy(p, param, paramlen);
-
-       *perr = 0;
-       return iolen;
-}
-#endif 
-
-
-
-
-int get_user_params(char *user_params, struct iw_point *dwrq)
-{
-       int ret = 0;
-
-       if (copy_from_user(user_params, dwrq->pointer, dwrq->length)) {
-               WL_ERROR(("\n%s: no user params: uptr:%p, ulen:%d\n",
-                       __FUNCTION__, dwrq->pointer, dwrq->length));
-               return -EFAULT;
-       }
-
-       WL_TRACE(("\n%s: iwpriv user params:%s\n", __FUNCTION__, user_params));
-
-       return ret;
-}
-
-
-#define strtoul(nptr, endptr, base) bcm_strtoul((nptr), (endptr), (base))
-
-#endif /* SOFTAP */
-
-
-#if defined(CSCAN)
-
-static int
-wl_iw_combined_scan_set(struct net_device *dev, wlc_ssid_t* ssids_local, int nssid, int nchan)
-{
-       int params_size = WL_SCAN_PARAMS_FIXED_SIZE + WL_NUMCHANNELS * sizeof(uint16);
-       int err = 0;
-       char *p;
-       int i;
-       iscan_info_t *iscan = g_iscan;
-
-       WL_TRACE(("%s nssid=%d nchan=%d\n", __FUNCTION__, nssid, nchan));
-
-       if ((!dev) && (!g_iscan) && (!iscan->iscan_ex_params_p)) {
-               WL_ERROR(("%s error exit\n", __FUNCTION__));
-               err = -1;
-       }
-
-       params_size += WL_SCAN_PARAMS_SSID_MAX * sizeof(wlc_ssid_t);
-
-       
-       if (nssid > 0) {
-               i = OFFSETOF(wl_scan_params_t, channel_list) + nchan * sizeof(uint16);
-               i = ROUNDUP(i, sizeof(uint32));
-               if (i + nssid * sizeof(wlc_ssid_t) > params_size) {
-                       printf("additional ssids exceed params_size\n");
-                       err = -1;
-                       goto exit;
-               }
-
-               p = ((char*)&iscan->iscan_ex_params_p->params) + i;
-               memcpy(p, ssids_local, nssid * sizeof(wlc_ssid_t));
-               p += nssid * sizeof(wlc_ssid_t);
-       } else {
-               p = (char*)iscan->iscan_ex_params_p->params.channel_list + nchan * sizeof(uint16);
-       }
-
-       
-       iscan->iscan_ex_params_p->params.channel_num = \
-               htod32((nssid << WL_SCAN_PARAMS_NSSID_SHIFT) | \
-                                       (nchan & WL_SCAN_PARAMS_COUNT_MASK));
-
-       nssid = \
-       (uint)((iscan->iscan_ex_params_p->params.channel_num >> WL_SCAN_PARAMS_NSSID_SHIFT) & \
-                              WL_SCAN_PARAMS_COUNT_MASK);
-
-       
-       params_size = (int) (p - (char*)iscan->iscan_ex_params_p + nssid * sizeof(wlc_ssid_t));
-       iscan->iscan_ex_param_size = params_size;
-
-       iscan->list_cur = iscan->list_hdr;
-       iscan->iscan_state = ISCAN_STATE_SCANING;
-       wl_iw_set_event_mask(dev);
-       mod_timer(&iscan->timer, jiffies + iscan->timer_ms*HZ/1000);
-
-       iscan->timer_on = 1;
-
-#ifdef SCAN_DUMP
-       {
-               int i;
-               WL_SCAN(("\n### List of SSIDs to scan ###\n"));
-               for (i = 0; i < nssid; i++) {
-                       if (!ssids_local[i].SSID_len)
-                               WL_SCAN(("%d: Broadcast scan\n", i));
-                       else
-                       WL_SCAN(("%d: scan  for  %s size =%d\n", i, \
-                               ssids_local[i].SSID, ssids_local[i].SSID_len));
-               }
-               WL_SCAN(("### List of channels to scan ###\n"));
-               for (i = 0; i < nchan; i++)
-               {
-                       WL_SCAN(("%d ", iscan->iscan_ex_params_p->params.channel_list[i]));
-               }
-               WL_SCAN(("\nnprobes=%d\n", iscan->iscan_ex_params_p->params.nprobes));
-               WL_SCAN(("active_time=%d\n", iscan->iscan_ex_params_p->params.active_time));
-               WL_SCAN(("passive_time=%d\n", iscan->iscan_ex_params_p->params.passive_time));
-               WL_SCAN(("home_time=%d\n", iscan->iscan_ex_params_p->params.home_time));
-               WL_SCAN(("scan_type=%d\n", iscan->iscan_ex_params_p->params.scan_type));
-               WL_SCAN(("\n###################\n"));
-       }
-#endif 
-
-       if (params_size > WLC_IOCTL_MEDLEN) {
-                       WL_ERROR(("Set ISCAN for %s due to params_size=%d  \n", \
-                               __FUNCTION__, params_size));
-                       err = -1;
-       }
-
-       if ((err = dev_iw_iovar_setbuf(dev, "iscan", iscan->iscan_ex_params_p, \
-                       iscan->iscan_ex_param_size, \
-                       iscan->ioctlbuf, sizeof(iscan->ioctlbuf)))) {
-                       WL_TRACE(("Set ISCAN for %s failed with %d\n", __FUNCTION__, err));
-                       err = -1;
-       }
-
-exit:
-
-       return err;
-}
-
-
-static int iwpriv_set_cscan(struct net_device *dev, struct iw_request_info *info, \
-                               union iwreq_data *wrqu, char *ext)
-{
-       int res = 0;
-       char  *extra = NULL;
-       iscan_info_t *iscan = g_iscan;
-       wlc_ssid_t ssids_local[WL_SCAN_PARAMS_SSID_MAX];
-       int nssid = 0;
-       int nchan = 0;
-
-       WL_TRACE(("\%s: info->cmd:%x, info->flags:%x, u.data=0x%p, u.len=%d\n",
-               __FUNCTION__, info->cmd, info->flags,
-               wrqu->data.pointer, wrqu->data.length));
-
-       if (g_onoff == G_WLAN_SET_OFF) {
-               WL_TRACE(("%s: driver is not up yet after START\n", __FUNCTION__));
-               return -1;
-       }
-
-       if (wrqu->data.length != 0) {
-
-               char *str_ptr;
-
-               if (!iscan->iscan_ex_params_p) {
-                       return -EFAULT;
-               }
-
-               if (!(extra = kmalloc(wrqu->data.length+1, GFP_KERNEL)))
-                       return -ENOMEM;
-
-               if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-
-               extra[wrqu->data.length] = 0;
-               WL_ERROR(("Got str param in iw_point:\n %s\n", extra));
-
-               str_ptr = extra;
-
-               
-               if (strncmp(str_ptr, GET_SSID, strlen(GET_SSID))) {
-                       WL_ERROR(("%s Error: extracting SSID='' string\n", __FUNCTION__));
-                       goto exit_proc;
-               }
-               str_ptr += strlen(GET_SSID);
-               nssid = wl_iw_parse_ssid_list(&str_ptr, ssids_local, nssid, \
-                                               WL_SCAN_PARAMS_SSID_MAX);
-               if (nssid == -1) {
-                       WL_ERROR(("%s wrong ssid list", __FUNCTION__));
-                       return -1;
-               }
-
-               memset(iscan->iscan_ex_params_p, 0, iscan->iscan_ex_param_size);
-               ASSERT(iscan->iscan_ex_param_size < WLC_IOCTL_MAXLEN);
-
-               
-               wl_iw_iscan_prep(&iscan->iscan_ex_params_p->params, NULL);
-               iscan->iscan_ex_params_p->version = htod32(ISCAN_REQ_VERSION);
-               iscan->iscan_ex_params_p->action = htod16(WL_SCAN_ACTION_START);
-               iscan->iscan_ex_params_p->scan_duration = htod16(0);
-
-               
-               if ((nchan = wl_iw_parse_channel_list(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.channel_list[0], \
-                                       WL_NUMCHANNELS)) == -1) {
-                       WL_ERROR(("%s missing channel list\n", __FUNCTION__));
-                       return -1;
-               }
-
-               
-               get_parmeter_from_string(&str_ptr, \
-                               GET_NPROBE, PTYPE_INTDEC, \
-                               &iscan->iscan_ex_params_p->params.nprobes, 2);
-
-               get_parmeter_from_string(&str_ptr, GET_ACTIVE_ASSOC_DWELL, PTYPE_INTDEC, \
-                                               &iscan->iscan_ex_params_p->params.active_time, 4);
-
-               get_parmeter_from_string(&str_ptr, GET_PASSIVE_ASSOC_DWELL, PTYPE_INTDEC, \
-                                               &iscan->iscan_ex_params_p->params.passive_time, 4);
-
-               get_parmeter_from_string(&str_ptr, GET_HOME_DWELL, PTYPE_INTDEC, \
-                                       &iscan->iscan_ex_params_p->params.home_time, 4);
-
-               get_parmeter_from_string(&str_ptr, GET_SCAN_TYPE, PTYPE_INTDEC, \
-                                       &iscan->iscan_ex_params_p->params.scan_type, 1);
-
-               
-               res = wl_iw_combined_scan_set(dev, ssids_local, nssid, nchan);
-
-       } else {
-                
-                 WL_ERROR(("IWPRIV argument len = 0 \n"));
-                 return -1;
-       }
-
-exit_proc:
-
-       kfree(extra);
-
-       return res;
-}
-
-
-static int
-wl_iw_set_cscan(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *extra
-)
-{
-       int res = -1;
-       iscan_info_t *iscan = g_iscan;
-       wlc_ssid_t ssids_local[WL_SCAN_PARAMS_SSID_MAX];
-       int nssid = 0;
-       int nchan = 0;
-       cscan_tlv_t *cscan_tlv_temp;
-       char type;
-       char *str_ptr;
-       int tlv_size_left;
-#ifdef TLV_DEBUG
-       int i;
-       char tlv_in_example[] = {                       'C', 'S', 'C', 'A', 'N', ' ', \
-                                                       0x53, 0x01, 0x00, 0x00,
-                                                       'S',      
-                                                       0x00, 
-                                                       'S',    
-                                                       0x04, 
-                                                       'B', 'R', 'C', 'M',
-                                                       'C',
-                                                       0x06, 
-                                                       'P', 
-                                                       0x94,
-                                                       0x11,
-                                                       'T',     
-                                                       0x01  
-                                                       };
-#endif 
-
-       WL_TRACE(("\n### %s: info->cmd:%x, info->flags:%x, u.data=0x%p, u.len=%d\n",
-               __FUNCTION__, info->cmd, info->flags,
-               wrqu->data.pointer, wrqu->data.length));
-
-       if (g_onoff == G_WLAN_SET_OFF) {
-               WL_TRACE(("%s: driver is not up yet after START\n", __FUNCTION__));
-               return -1;
-       }
-
-       if (wrqu->data.length < (strlen(CSCAN_COMMAND) + sizeof(cscan_tlv_t))) {
-               WL_ERROR(("%s aggument=%d  less %d\n", __FUNCTION__, \
-                       wrqu->data.length, strlen(CSCAN_COMMAND) + sizeof(cscan_tlv_t)));
-               return -1;
-       }
-
-#ifdef TLV_DEBUG
-       memcpy(extra, tlv_in_example, sizeof(tlv_in_example));
-       wrqu->data.length = sizeof(tlv_in_example);
-       for (i = 0; i < wrqu->data.length; i++)
-               printf("%02X ", extra[i]);
-       printf("\n");
-#endif 
-
-       str_ptr = extra;
-       str_ptr +=  strlen(CSCAN_COMMAND);
-       tlv_size_left = wrqu->data.length - strlen(CSCAN_COMMAND);
-
-       cscan_tlv_temp = (cscan_tlv_t *)str_ptr;
-       memset(ssids_local, 0, sizeof(ssids_local));
-       
-       if ((cscan_tlv_temp->prefix == CSCAN_TLV_PREFIX) && \
-               (cscan_tlv_temp->version == CSCAN_TLV_VERSION) && \
-               (cscan_tlv_temp->subver == CSCAN_TLV_SUBVERSION))
-       {
-               str_ptr += sizeof(cscan_tlv_t);
-               tlv_size_left  -= sizeof(cscan_tlv_t);
-
-               
-               if ((nssid = wl_iw_parse_ssid_list_tlv(&str_ptr, ssids_local, \
-                               WL_SCAN_PARAMS_SSID_MAX, &tlv_size_left)) <= 0) {
-                       WL_ERROR(("SSID is not presented or corrupted ret=%d\n", nssid));
-                       goto exit_proc;
-               }
-               else {
-                       
-                       memset(iscan->iscan_ex_params_p, 0, iscan->iscan_ex_param_size);
-
-                       
-                       wl_iw_iscan_prep(&iscan->iscan_ex_params_p->params, NULL);
-                       iscan->iscan_ex_params_p->version = htod32(ISCAN_REQ_VERSION);
-                       iscan->iscan_ex_params_p->action = htod16(WL_SCAN_ACTION_START);
-                       iscan->iscan_ex_params_p->scan_duration = htod16(0);
-
-                       
-                       while (tlv_size_left > 0)
-                       {
-                       type = str_ptr[0];
-                       switch (type) {
-                               case CSCAN_TLV_TYPE_CHANNEL_IE:
-                                       
-                                       if ((nchan = wl_iw_parse_channel_list_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.channel_list[0], \
-                                       WL_NUMCHANNELS, &tlv_size_left)) == -1) {
-                                       WL_ERROR(("%s missing channel list\n", \
-                                                __FUNCTION__));
-                                               goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_NPROBE_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                               &iscan->iscan_ex_params_p->params.nprobes, \
-                                               sizeof(iscan->iscan_ex_params_p->params.nprobes), \
-                                               type, sizeof(char), &tlv_size_left)) == -1) {
-                                               WL_ERROR(("%s return %d\n", \
-                                                       __FUNCTION__, res));
-                                                       goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_ACTIVE_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.active_time, \
-                                       sizeof(iscan->iscan_ex_params_p->params.active_time), \
-                                       type, sizeof(short), &tlv_size_left)) == -1) {
-                                               WL_ERROR(("%s return %d\n", \
-                                               __FUNCTION__, res));
-                                               goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_PASSIVE_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.passive_time, \
-                                       sizeof(iscan->iscan_ex_params_p->params.passive_time), \
-                                       type, sizeof(short), &tlv_size_left)) == -1) {
-                                               WL_ERROR(("%s return %d\n", \
-                                               __FUNCTION__, res));
-                                               goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_HOME_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.home_time, \
-                                       sizeof(iscan->iscan_ex_params_p->params.home_time), \
-                                       type, sizeof(short), &tlv_size_left)) == -1) {
-                                               WL_ERROR(("%s return %d\n", \
-                                               __FUNCTION__, res));
-                                               goto exit_proc;
-                                       }
-                               break;
-                               case CSCAN_TLV_TYPE_STYPE_IE:
-                                       if ((res = wl_iw_parse_data_tlv(&str_ptr, \
-                                       &iscan->iscan_ex_params_p->params.scan_type, \
-                                       sizeof(iscan->iscan_ex_params_p->params.scan_type), \
-                                       type, sizeof(char), &tlv_size_left)) == -1) {
-                                       WL_ERROR(("%s return %d\n", \
-                                               __FUNCTION__, res));
-                                               goto exit_proc;
-                                       }
-                               break;
-
-                               default :
-                                       WL_ERROR(("%s get unkwown type %X\n", \
-                                               __FUNCTION__, type));
-                                       goto exit_proc;
-                               break;
-                               }
-                       } 
-                       }
-               }
-               else {
-                       WL_ERROR(("%s get wrong TLV command\n", __FUNCTION__));
-                       goto exit_proc;
-               }
-
-               
-               res = wl_iw_combined_scan_set(dev, ssids_local, nssid, nchan);
-
-exit_proc:
-       return res;
-}
-
-#endif 
-
-
-
-#ifdef SOFTAP
-
-#ifndef AP_ONLY
-static int thr_wait_for_2nd_eth_dev(void *data)
-{
-       int ret = 0;
-
-       printk("==========> WARNING!!! we are in thr_wait_for_2nd_eth_dev!!!\n");
-
-       DAEMONIZE("wl0_eth_wthread");
-
-       WL_TRACE(("\n>%s threda started:, PID:%x\n", __FUNCTION__, current->pid));
-
-/*     if (down_timeout(&ap_eth_sema,  msecs_to_jiffies(5000)) != 0) {
-               WL_ERROR(("\n%s: sap_eth_sema timeout \n", __FUNCTION__));
-               ret = -1;
-               goto fail;
-       }
-*/
-       if (!ap_net_dev) {
-               WL_ERROR((" ap_net_dev is null !!!"));
-               ret = -1;
-               goto fail;
-       }
-
-       WL_TRACE(("\n>%s: Thread:'softap ethdev IF:%s is detected !!!'\n\n",
-               __FUNCTION__, ap_net_dev->name));
-
-       ap_cfg_running = TRUE;
-
-       bcm_mdelay(500); 
-
-       
-       wl_iw_send_priv_event(priv_dev, "AP_SET_CFG_OK");
-
-fail:
-
-       WL_TRACE(("\n>%s, thread completed\n", __FUNCTION__));
-
-       return ret;
-}
-#endif
-
-#ifndef AP_ONLY
-static int last_auto_channel = 6;
-#endif
-static int get_softap_auto_channel(struct net_device *dev, struct ap_profile *ap)
-{
-       int chosen = 0;
-       wl_uint32_list_t request;
-       int rescan = 0;
-       int retry = 0;
-       int updown = 0;
-       int ret = 0;
-       wlc_ssid_t null_ssid;
-       int res = 0;
-#ifndef AP_ONLY
-       int iolen = 0;
-       int mkvar_err = 0;
-       int bsscfg_index = 1;
-       char buf[WLC_IOCTL_SMLEN];
-#endif
-       WL_SOFTAP(("Enter %s\n", __FUNCTION__));
-
-#ifndef AP_ONLY
-       if (ap_cfg_running) {
-               ap->channel = last_auto_channel;
-               return res;
-       }
-#endif
-       memset(&null_ssid, 0, sizeof(wlc_ssid_t));
-       res |= dev_wlc_ioctl(dev, WLC_UP, &updown, sizeof(updown));
-#ifdef AP_ONLY
-       res |= dev_wlc_ioctl(dev, WLC_SET_SSID, &null_ssid, sizeof(null_ssid));
-#else
-       iolen = wl_bssiovar_mkbuf("ssid", bsscfg_index, (char *)(&null_ssid), \
-               null_ssid.SSID_len+4, buf, sizeof(buf), &mkvar_err);
-       ASSERT(iolen);
-       res |= dev_wlc_ioctl(dev, WLC_SET_VAR, buf, iolen);
-#endif
-       auto_channel_retry:
-                       request.count = htod32(0);
-                       ret = dev_wlc_ioctl(dev, WLC_START_CHANNEL_SEL, &request, sizeof(request));
-                       if (ret < 0) {
-                               WL_ERROR(("can't start auto channel scan\n"));
-                               goto fail;
-                       }
-
-       get_channel_retry:
-                       bcm_mdelay(500);
-
-                       ret = dev_wlc_ioctl(dev, WLC_GET_CHANNEL_SEL, &chosen, sizeof(chosen));
-                       if (ret < 0 || dtoh32(chosen) == 0) {
-                               if (retry++ < 3)
-                                       goto get_channel_retry;
-                               else {
-                                       WL_ERROR(("can't get auto channel sel, err = %d, \
-                                               chosen = %d\n", ret, chosen));
-                                       goto fail;
-                               }
-                       }
-                       if ((chosen == 1) && (!rescan++))
-                               goto auto_channel_retry;
-                       WL_SOFTAP(("Set auto channel = %d\n", chosen));
-                       ap->channel = chosen;
-                       if ((res = dev_wlc_ioctl(dev, WLC_DOWN, &updown, sizeof(updown))) < 0) {
-                               WL_ERROR(("%s fail to set up err =%d\n", __FUNCTION__, res));
-                               goto fail;
-                       }
-#ifndef AP_ONLY
-       if (!res)
-               last_auto_channel = ap->channel;
-#endif
-
-fail :
-       return res;
-} 
-
-
-static int set_ap_cfg(struct net_device *dev, struct ap_profile *ap)
-{
-       int updown = 0;
-       int channel = 0;
-
-       wlc_ssid_t ap_ssid;
-       int max_assoc = 8;
-
-       int res = 0;
-       int apsta_var = 0;
-#ifndef AP_ONLY
-       int mpc = 0;
-       int iolen = 0;
-       int mkvar_err = 0;
-       int bsscfg_index = 1;
-       char buf[WLC_IOCTL_SMLEN];
-#endif
-       wl_iw_t *iw;
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return -1;
-       }
-
-       WL_SOFTAP(("wl_iw: set ap profile:\n"));
-       WL_SOFTAP(("    ssid = '%s'\n", ap->ssid));
-       WL_SOFTAP(("    security = '%s'\n", ap->sec));
-       if (ap->key[0] != '\0')
-               WL_SOFTAP(("    key = '%s'\n", ap->key));
-       WL_SOFTAP(("    channel = %d\n", ap->channel));
-       WL_SOFTAP(("    max scb = %d\n", ap->max_scb));
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK_SOFTAP_SET(iw->pub);
-       WAKE_LOCK_INIT(iw->pub, WAKE_LOCK_SOFTAP_SET, "SoftAP_SET");
-       WAKE_LOCK(iw->pub, WAKE_LOCK_SOFTAP_SET);
-
-#ifdef AP_ONLY
-       if (ap_cfg_running) {
-               wl_iw_softap_deassoc_stations(dev);
-               ap_cfg_running = FALSE;
-       }
-#endif 
-
-       
-       if (ap_cfg_running == FALSE) {
-
-#ifndef AP_ONLY
-
-               
-               sema_init(&ap_eth_sema, 0);
-
-               mpc = 0;
-               if ((res = dev_wlc_intvar_set(dev, "mpc", mpc))) {
-                       WL_ERROR(("%s fail to set mpc\n", __FUNCTION__));
-                       goto fail;
-               }
-#endif
-
-               updown = 0;
-               if ((res = dev_wlc_ioctl(dev, WLC_DOWN, &updown, sizeof(updown)))) {
-                       WL_ERROR(("%s fail to set updown\n", __FUNCTION__));
-                       goto fail;
-               }
-
-#ifdef AP_ONLY
-               
-               apsta_var = 0;
-               if ((res = dev_wlc_ioctl(dev, WLC_SET_AP, &apsta_var, sizeof(apsta_var)))) {
-                       WL_ERROR(("%s fail to set apsta_var 0\n", __FUNCTION__));
-                       goto fail;
-               }
-               apsta_var = 1;
-               if ((res = dev_wlc_ioctl(dev, WLC_SET_AP, &apsta_var, sizeof(apsta_var)))) {
-                       WL_ERROR(("%s fail to set apsta_var 1\n", __FUNCTION__));
-                       goto fail;
-               }
-               res = dev_wlc_ioctl(dev, WLC_GET_AP, &apsta_var, sizeof(apsta_var));
-#else
-               
-               apsta_var = 1;
-               iolen = wl_bssiovar_mkbuf("apsta",
-                       bsscfg_index,  &apsta_var, sizeof(apsta_var)+4,
-                       buf, sizeof(buf), &mkvar_err);
-               ASSERT(iolen);
-               if ((res = dev_wlc_ioctl(dev, WLC_SET_VAR, buf, iolen)) < 0) {
-                       WL_ERROR(("%s fail to set apsta \n", __FUNCTION__));
-                       goto fail;
-               }
-               WL_TRACE(("\n>in %s: apsta set result: %d \n", __FUNCTION__, res));
-#endif 
-
-               updown = 1;
-               if ((res = dev_wlc_ioctl(dev, WLC_UP, &updown, sizeof(updown))) < 0) {
-                       WL_ERROR(("%s fail to set apsta \n", __FUNCTION__));
-                       goto fail;
-               }
-
-       } else {
-               
-               if (!ap_net_dev) {
-                       WL_ERROR(("%s: ap_net_dev is null\n", __FUNCTION__));
-                       goto fail;
-               }
-
-               res = wl_iw_softap_deassoc_stations(ap_net_dev);
-
-               
-               if ((res = dev_iw_write_cfg1_bss_var(dev, 0)) < 0) {
-                       WL_ERROR(("%s fail to set bss down\n", __FUNCTION__));
-                       goto fail;
-               }
-       }
-
-       
-       if ((ap->channel == 0) && (get_softap_auto_channel(dev, ap) < 0)) {
-               ap->channel = 1;
-               WL_ERROR(("%s auto channel failed, pick up channel=%d\n", \
-                       __FUNCTION__, ap->channel));
-
-       }
-
-       channel = ap->channel;
-       if ((res = dev_wlc_ioctl(dev, WLC_SET_CHANNEL, &channel, sizeof(channel)))) {
-                       WL_ERROR(("%s fail to set channel\n", __FUNCTION__));
-                       goto fail;
-       }
-
-       if (ap_cfg_running == FALSE) {
-               updown = 0;
-               if ((res = dev_wlc_ioctl(dev, WLC_UP, &updown, sizeof(updown)))) {
-                       WL_ERROR(("%s fail to set up\n", __FUNCTION__));
-                       goto fail;
-               }
-       }
-
-       max_assoc = ap->max_scb;
-       if ((res = dev_wlc_intvar_set(dev, "maxassoc", max_assoc))) {
-                       WL_ERROR(("%s fail to set maxassoc\n", __FUNCTION__));
-                       goto fail;
-       }
-
-       ap_ssid.SSID_len = strlen(ap->ssid);
-       strncpy(ap_ssid.SSID, ap->ssid, ap_ssid.SSID_len);
-
-       
-#ifdef AP_ONLY
-       if ((res = wl_iw_set_ap_security(dev, &my_ap)) != 0) {
-               WL_ERROR(("ERROR:%d in:%s, wl_iw_set_ap_security is skipped\n", \
-               res, __FUNCTION__));
-               goto fail;
-       }
-       wl_iw_send_priv_event(dev, "ASCII_CMD=AP_BSS_START");
-       ap_cfg_running = TRUE;
-#else
-
-       iolen = wl_bssiovar_mkbuf("ssid", bsscfg_index, (char *)(&ap_ssid),
-               ap_ssid.SSID_len+4, buf, sizeof(buf), &mkvar_err);
-       ASSERT(iolen);
-       if ((res = dev_wlc_ioctl(dev, WLC_SET_VAR, buf, iolen)) != 0) {
-               WL_ERROR(("ERROR:%d in:%s, Security & BSS reconfiguration is skipped\n", \
-               res, __FUNCTION__));
-               goto fail;
-       }
-       if (ap_cfg_running == FALSE) {
-               
-               kernel_thread(thr_wait_for_2nd_eth_dev, 0, 0);
-       } else {
-
-               
-               if (ap_net_dev == NULL) {
-                       WL_ERROR(("%s ERROR: ap_net_dev is NULL !!!\n", __FUNCTION__));
-                       goto fail;
-               }
-
-               WL_ERROR(("%s: %s Configure security & restart AP bss \n", \
-                        __FUNCTION__, ap_net_dev->name));
-
-               
-               if ((res = wl_iw_set_ap_security(ap_net_dev, &my_ap)) < 0) {
-                       WL_ERROR(("%s fail to set security : %d\n", __FUNCTION__, res));
-                       goto fail;
-               }
-
-               
-               if ((res = dev_iw_write_cfg1_bss_var(dev, 1)) < 0) {
-                       WL_ERROR(("%s fail to set bss up\n", __FUNCTION__));
-                       goto fail;
-               }
-       }
-#endif 
-fail:
-       WAKE_UNLOCK(iw->pub, WAKE_LOCK_SOFTAP_SET);
-       WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_SOFTAP_SET);
-       MUTEX_UNLOCK_SOFTAP_SET(iw->pub);
-
-       WL_SOFTAP(("%s exit with %d\n", __FUNCTION__, res));
-       return res;
-}
-
-
-static int wl_iw_set_ap_security(struct net_device *dev, struct ap_profile *ap)
-{
-       int wsec = 0;
-       int wpa_auth = 0;
-       int res = 0;
-       int i;
-       char *ptr;
-#ifdef AP_ONLY
-       int mpc = 0;
-       wlc_ssid_t ap_ssid;
-#endif
-       wl_wsec_key_t key;
-
-       WL_SOFTAP(("\nsetting SOFTAP security mode:\n"));
-       WL_SOFTAP(("wl_iw: set ap profile:\n"));
-       WL_SOFTAP(("    ssid = '%s'\n", ap->ssid));
-       WL_SOFTAP(("    security = '%s'\n", ap->sec));
-       if (ap->key[0] != '\0')
-               WL_SOFTAP(("    key = '%s'\n", ap->key));
-       WL_SOFTAP(("    channel = %d\n", ap->channel));
-       WL_SOFTAP(("    max scb = %d\n", ap->max_scb));
-
-
-       if (strnicmp(ap->sec, "open", strlen("open")) == 0) {
-
-          
-               wsec = 0;
-               res = dev_wlc_intvar_set(dev, "wsec", wsec);
-               wpa_auth = WPA_AUTH_DISABLED;
-               res |= dev_wlc_intvar_set(dev, "wpa_auth", wpa_auth);
-
-               WL_SOFTAP(("=====================\n"));
-               WL_SOFTAP((" wsec & wpa_auth set 'OPEN', result:&d %d\n", res));
-               WL_SOFTAP(("=====================\n"));
-
-       } else if (strnicmp(ap->sec, "wep", strlen("wep")) == 0) {
-
-          
-               memset(&key, 0, sizeof(key));
-
-               wsec = WEP_ENABLED;
-               res = dev_wlc_intvar_set(dev, "wsec", wsec);
-
-               key.index = 0;
-               if (wl_iw_parse_wep(ap->key, &key)) {
-                       WL_SOFTAP(("wep key parse err!\n"));
-                       return -1;
-               }
-
-               key.index = htod32(key.index);
-               key.len = htod32(key.len);
-               key.algo = htod32(key.algo);
-               key.flags = htod32(key.flags);
-
-               res |= dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
-
-               wpa_auth = WPA_AUTH_DISABLED;
-               res |= dev_wlc_intvar_set(dev, "wpa_auth", wpa_auth);
-
-               WL_SOFTAP(("=====================\n"));
-               WL_SOFTAP((" wsec & auth set 'WEP', result:&d %d\n", res));
-               WL_SOFTAP(("=====================\n"));
-
-       } else if (strnicmp(ap->sec, "wpa2-psk", strlen("wpa2-psk")) == 0) {
-
-          
-
-               wsec_pmk_t psk;
-               size_t key_len;
-
-               wsec = AES_ENABLED;
-               dev_wlc_intvar_set(dev, "wsec", wsec);
-
-               key_len = strlen(ap->key);
-               if (key_len < WSEC_MIN_PSK_LEN || key_len > WSEC_MAX_PSK_LEN) {
-                       WL_SOFTAP(("passphrase must be between %d and %d characters long\n",
-                       WSEC_MIN_PSK_LEN, WSEC_MAX_PSK_LEN));
-                       return -1;
-               }
-
-               
-               if (key_len < WSEC_MAX_PSK_LEN) {
-                       unsigned char output[2*SHA1HashSize];
-                       char key_str_buf[WSEC_MAX_PSK_LEN+1];
-
-                       
-                       memset(output, 0, sizeof(output));
-                       pbkdf2_sha1(ap->key, ap->ssid, strlen(ap->ssid), 4096, output, 32);
-                       
-                       ptr = key_str_buf;
-                       for (i = 0; i < (WSEC_MAX_PSK_LEN/8); i++) {
-                               
-                               sprintf(ptr, "%02x%02x%02x%02x", (uint)output[i*4], \
-                                        (uint)output[i*4+1], (uint)output[i*4+2], \
-                                        (uint)output[i*4+3]);
-                               ptr += 8;
-                       }
-                       WL_SOFTAP(("%s: passphase = %s\n", __FUNCTION__, key_str_buf));
-
-                       psk.key_len = htod16((ushort)WSEC_MAX_PSK_LEN);
-                       memcpy(psk.key, key_str_buf, psk.key_len);
-               } else {
-                       psk.key_len = htod16((ushort) key_len);
-                       memcpy(psk.key, ap->key, key_len);
-               }
-               psk.flags = htod16(WSEC_PASSPHRASE);
-               dev_wlc_ioctl(dev, WLC_SET_WSEC_PMK, &psk, sizeof(psk));
-
-               wpa_auth = WPA2_AUTH_PSK;
-               dev_wlc_intvar_set(dev, "wpa_auth", wpa_auth);
-
-       } else if (strnicmp(ap->sec, "wpa-psk", strlen("wpa-psk")) == 0) {
-
-               
-               wsec_pmk_t psk;
-               size_t key_len;
-
-               wsec = TKIP_ENABLED;
-               res = dev_wlc_intvar_set(dev, "wsec", wsec);
-
-               key_len = strlen(ap->key);
-               if (key_len < WSEC_MIN_PSK_LEN || key_len > WSEC_MAX_PSK_LEN) {
-                       WL_SOFTAP(("passphrase must be between %d and %d characters long\n",
-                       WSEC_MIN_PSK_LEN, WSEC_MAX_PSK_LEN));
-                       return -1;
-               }
-
-               
-               if (key_len < WSEC_MAX_PSK_LEN) {
-                       unsigned char output[2*SHA1HashSize];
-                       char key_str_buf[WSEC_MAX_PSK_LEN+1];
-
-                       WL_SOFTAP(("%s: do passhash...\n", __FUNCTION__));
-                       
-                       pbkdf2_sha1(ap->key, ap->ssid, strlen(ap->ssid), 4096, output, 32);
-                       
-                       ptr = key_str_buf;
-                       for (i = 0; i < (WSEC_MAX_PSK_LEN/8); i++) {
-                               WL_SOFTAP(("[%02d]: %08x\n", i, *((unsigned int*)&output[i*4])));
-                               
-                               sprintf(ptr, "%02x%02x%02x%02x", (uint)output[i*4], \
-                                       (uint)output[i*4+1], (uint)output[i*4+2], \
-                                        (uint)output[i*4+3]);
-                               ptr += 8;
-                       }
-                       printk("%s: passphase = %s\n", __FUNCTION__, key_str_buf);
-
-                       psk.key_len = htod16((ushort)WSEC_MAX_PSK_LEN);
-                       memcpy(psk.key, key_str_buf, psk.key_len);
-               } else {
-                       psk.key_len = htod16((ushort) key_len);
-                       memcpy(psk.key, ap->key, key_len);
-               }
-
-               psk.flags = htod16(WSEC_PASSPHRASE);
-               res |= dev_wlc_ioctl(dev, WLC_SET_WSEC_PMK, &psk, sizeof(psk));
-
-               wpa_auth = WPA_AUTH_PSK;
-               res |= dev_wlc_intvar_set(dev, "wpa_auth", wpa_auth);
-
-               WL_SOFTAP((" wsec & auth set 'wpa-psk' (TKIP), result:&d %d\n", res));
-       }
-
-#ifdef AP_ONLY
-               ap_ssid.SSID_len = strlen(ap->ssid);
-               strncpy(ap_ssid.SSID, ap->ssid, ap_ssid.SSID_len);
-               res |= dev_wlc_ioctl(dev, WLC_SET_SSID, &ap_ssid, sizeof(ap_ssid));
-               mpc = 0;
-               res |= dev_wlc_intvar_set(dev, "mpc", mpc);
-               if (strnicmp(ap->sec, "wep", strlen("wep")) == 0) {
-                       res |= dev_wlc_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
-               }
-#endif
-       return res;
-}
-
-
-static int wl_iw_softap_deassoc_stations(struct net_device *dev)
-{
-       int i;
-       int res = 0;
-
-       char mac_buf[128] = {0};
-       struct maclist *assoc_maclist = (struct maclist *) mac_buf;
-
-       memset(assoc_maclist, 0, sizeof(mac_buf));
-       assoc_maclist->count = 8; 
-
-       res = dev_wlc_ioctl(dev, WLC_GET_ASSOCLIST, assoc_maclist, 128);
-       if (res != 0) {
-
-               WL_SOFTAP((" Error:%d in :%s, Couldn't get ASSOC List\n", res, __FUNCTION__));
-               return res;
-       }
-
-               if (assoc_maclist->count)
-                       for (i = 0; i < assoc_maclist->count; i++) {
-                       scb_val_t scbval;
-                       scbval.val = htod32(1);
-                       
-                       bcopy(&assoc_maclist->ea[i], &scbval.ea, ETHER_ADDR_LEN);
-
-                       WL_SOFTAP(("deauth STA:%d \n", i));
-                       res |= dev_wlc_ioctl(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON,
-                               &scbval, sizeof(scb_val_t));
-
-               } else WL_SOFTAP((" STA ASSOC list is empty\n"));
-
-
-       if (res != 0)
-               WL_SOFTAP((" Error:%d in :%s\n", res, __FUNCTION__));
-       else if (assoc_maclist->count) {
-               
-               bcm_mdelay(200);
-       }
-       return res;
-}
-
-
-
-static int iwpriv_softap_stop(struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *ext)
-{
-       int res = 0;
-       wl_iw_t *iw;
-
-       WL_SOFTAP(("got iwpriv AP_BSS_STOP \n"));
-
-       if ((!dev) && (!ap_net_dev)) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return res;
-       }
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK_SOFTAP_SET(iw->pub);
-       WAKE_LOCK_INIT(iw->pub, WAKE_LOCK_SOFTAP_STOP, "SoftAP_STOP");
-       WAKE_LOCK(iw->pub, WAKE_LOCK_SOFTAP_STOP);
-
-       if  ((ap_cfg_running == TRUE)) {
-#ifdef AP_ONLY
-                wl_iw_softap_deassoc_stations(dev);
-#else
-                wl_iw_softap_deassoc_stations(ap_net_dev);
-
-               if ((res = dev_iw_write_cfg1_bss_var(dev, 2)) < 0)
-                       WL_ERROR(("%s failed to del BSS err = %d", __FUNCTION__, res));
-#endif
-
-               
-               bcm_mdelay(100);
-
-               wrqu->data.length = 0;
-               ap_cfg_running = FALSE;
-       }
-       else
-               WL_ERROR(("%s: was called when SoftAP is OFF : move on\n", __FUNCTION__));
-
-       WAKE_UNLOCK(iw->pub, WAKE_LOCK_SOFTAP_STOP);
-       WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_SOFTAP_STOP);
-       MUTEX_UNLOCK_SOFTAP_SET(iw->pub);
-
-       WL_SOFTAP(("%s Done with %d\n", __FUNCTION__, res));
-       return res;
-}
-
-
-
-static int iwpriv_fw_reload(struct net_device *dev,
-       struct iw_request_info *info,
-       union iwreq_data *wrqu,
-       char *ext)
-{
-
-       int ret = -1;
-       char extra[256];
-       char *fwstr = fw_path ; 
-
-       WL_SOFTAP(("current firmware_path[]=%s\n", fwstr));
-
-       WL_TRACE((">Got FW_RELOAD cmd:"
-                               "info->cmd:%x, info->flags:%x, u.data:%p, u.len:%d, \
-                               fw_path:%p, len:%d \n",
-                               info->cmd, info->flags,
-                               wrqu->data.pointer, wrqu->data.length, fwstr, strlen(fwstr)));
-
-
-       if ((wrqu->data.length > 4) && (wrqu->data.length < sizeof(extra))) {
-
-               char *str_ptr;
-
-               if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) {
-                       ret = -EFAULT;
-                       goto exit_proc;
-               }
-
-               
-               extra[wrqu->data.length] = 8;
-               str_ptr = extra;
-
-               if (get_parmeter_from_string(&str_ptr, "FW_PATH=", PTYPE_STRING, fwstr, 255) != 0) {
-                       WL_ERROR(("Error: extracting FW_PATH='' string\n"));
-                       goto exit_proc;
-               }
-
-               if  (strstr(fwstr, "apsta") != NULL) {
-                         WL_SOFTAP(("GOT APSTA FIRMWARE\n"));
-                         ap_fw_loaded = TRUE;
-               } else {
-                       WL_SOFTAP(("GOT STA FIRMWARE\n"));
-                       ap_fw_loaded = FALSE;
-               }
-
-               WL_SOFTAP(("SET firmware_path[]=%s , str_p:%p\n", fwstr, fwstr));
-               ret = 0;
-       } else {
-               WL_ERROR(("Error: ivalid param len:%d\n", wrqu->data.length));
-       }
-
-exit_proc:
-       return ret;
-}
-#ifdef SOFTAP
-
-static int iwpriv_wpasupp_loop_tst(struct net_device *dev,
-            struct iw_request_info *info,
-            union iwreq_data *wrqu,
-            char *ext)
-{
-       int res = 0;
-       char  *params = NULL;
-
-       WL_TRACE((">Got IWPRIV  wp_supp loopback cmd test:"
-                               "info->cmd:%x, info->flags:%x, u.data:%p, u.len:%d\n",
-                               info->cmd, info->flags,
-                               wrqu->data.pointer, wrqu->data.length));
-
-       if (wrqu->data.length != 0) {
-
-               if (!(params = kmalloc(wrqu->data.length+1, GFP_KERNEL)))
-                       return -ENOMEM;
-
-
-               if (copy_from_user(params, wrqu->data.pointer, wrqu->data.length)) {
-                       kfree(params);
-                       return -EFAULT;
-               }
-
-               params[wrqu->data.length] = 0;
-               WL_SOFTAP(("\n>> copied from user:\n %s\n", params));
-       } else {
-               WL_ERROR(("ERROR param length is 0\n"));
-               return -EFAULT;
-       }
-
-       
-       res = wl_iw_send_priv_event(dev, params);
-       kfree(params);
-
-       return res;
-}
-#endif 
-
-
-static int
-       iwpriv_en_ap_bss(
-               struct net_device *dev,
-               struct iw_request_info *info,
-               void *wrqu,
-               char *extra)
-{
-       int res = 0;
-       wl_iw_t *iw;
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return -1;
-       }
-
-       WL_TRACE(("%s: rcvd IWPRIV IOCTL:  for dev:%s\n", __FUNCTION__, dev->name));
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       MUTEX_LOCK_SOFTAP_SET(iw->pub);
-       WAKE_LOCK_INIT(iw->pub, WAKE_LOCK_SOFTAP_START, "SoftAP_START");
-       WAKE_LOCK(iw->pub, WAKE_LOCK_SOFTAP_START);
-
-       
-#ifndef AP_ONLY
-       if ((res = wl_iw_set_ap_security(dev, &my_ap)) != 0) {
-               WL_ERROR((" %s ERROR setting SOFTAP security in :%d\n", __FUNCTION__, res));
-       }
-       else {
-               
-               if ((res = dev_iw_write_cfg1_bss_var(dev, 1)) < 0)
-                       WL_ERROR(("%s fail to set bss up err=%d\n", __FUNCTION__, res));
-               else
-                       
-                       bcm_mdelay(100);
-       }
-
-#endif 
-
-       WL_SOFTAP(("%s done with res %d \n", __FUNCTION__, res));
-       WAKE_UNLOCK(iw->pub, WAKE_LOCK_SOFTAP_START);
-       WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_SOFTAP_START);
-       MUTEX_UNLOCK_SOFTAP_SET(iw->pub);
-       return res;
-}
-
-static int
-get_assoc_sta_list(struct net_device *dev, char *buf, int len)
-{
-       
-       WL_TRACE(("calling dev_wlc_ioctl(dev:%p, cmd:%d, buf:%p, len:%d)\n",
-               dev, WLC_GET_ASSOCLIST, buf, len));
-
-       dev_wlc_ioctl(dev, WLC_GET_ASSOCLIST, buf, len);
-
-       return 0;
-}
-
-
-static int
-set_ap_mac_list(struct net_device *dev, char *buf)
-{
-       struct mac_list_set *mac_list_set = (struct mac_list_set *)buf;
-       struct maclist *white_maclist = (struct maclist *)&mac_list_set->white_list;
-       struct maclist *black_maclist = (struct maclist *)&mac_list_set->black_list;
-       int mac_mode = mac_list_set->mode;
-       int length;
-       int i;
-
-       ap_macmode = mac_mode;
-       if (mac_mode == MACLIST_MODE_DISABLED) {
-               
-               bzero(&ap_black_list, sizeof(struct mflist));
-
-               
-               dev_wlc_ioctl(dev, WLC_SET_MACMODE, &mac_mode, sizeof(mac_mode));
-       } else {
-               scb_val_t scbval;
-               char mac_buf[256] = {0};
-               struct maclist *assoc_maclist = (struct maclist *) mac_buf;
-
-               mac_mode = MACLIST_MODE_ALLOW;
-               
-               dev_wlc_ioctl(dev, WLC_SET_MACMODE, &mac_mode, sizeof(mac_mode));
-
-               
-               length = sizeof(white_maclist->count)+white_maclist->count*ETHER_ADDR_LEN;
-               dev_wlc_ioctl(dev, WLC_SET_MACLIST, white_maclist, length);
-               WL_SOFTAP(("White List, length %d:\n", length));
-               for (i = 0; i < white_maclist->count; i++)
-                       WL_SOFTAP(("mac %d: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                               i, white_maclist->ea[i].octet[0], white_maclist->ea[i].octet[1], \
-                               white_maclist->ea[i].octet[2], \
-                               white_maclist->ea[i].octet[3], white_maclist->ea[i].octet[4], \
-                               white_maclist->ea[i].octet[5]));
-
-               
-               bcopy(black_maclist, &ap_black_list, sizeof(ap_black_list));
-
-               WL_SOFTAP(("Black List, size %d:\n", sizeof(ap_black_list)));
-               for (i = 0; i < ap_black_list.count; i++)
-                       WL_SOFTAP(("mac %d: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                               i, ap_black_list.ea[i].octet[0], ap_black_list.ea[i].octet[1], \
-                               ap_black_list.ea[i].octet[2], \
-                               ap_black_list.ea[i].octet[3], \
-                               ap_black_list.ea[i].octet[4], ap_black_list.ea[i].octet[5]));
-
-               
-               dev_wlc_ioctl(dev, WLC_GET_ASSOCLIST, assoc_maclist, 256);
-               if (assoc_maclist->count) {
-                       int j;
-                       for (i = 0; i < assoc_maclist->count; i++) {
-                               for (j = 0; j < white_maclist->count; j++) {
-                                       if (!bcmp(&assoc_maclist->ea[i], &white_maclist->ea[j], \
-                                               ETHER_ADDR_LEN)) {
-                                               WL_SOFTAP(("match allow, let it be\n"));
-                                               break;
-                                       }
-                               }
-                               if (j == white_maclist->count) {
-                                               WL_SOFTAP(("match black, deauth it\n"));
-                                               scbval.val = htod32(1);
-                                               bcopy(&assoc_maclist->ea[i], &scbval.ea, \
-                                               ETHER_ADDR_LEN);
-                                               dev_wlc_ioctl(dev, \
-                                                       WLC_SCB_DEAUTHENTICATE_FOR_REASON, &scbval,
-                                                       sizeof(scb_val_t));
-                               }
-                       }
-               }
-       }
-       return 0;
-}
-#endif /* SOFTAP */
-
-
-#ifdef SOFTAP
-int set_macfilt_from_string(struct mflist *pmflist, char **param_str)
-{
-       return 0;
-}
-#endif
-
-
-#ifdef SOFTAP
-#define PARAM_OFFSET PROFILE_OFFSET
-
-int wl_iw_process_private_ascii_cmd(
-                       struct net_device *dev,
-                       struct iw_request_info *info,
-                       union iwreq_data *dwrq,
-                       char *cmd_str)
-{
-       int ret = 0;
-       char *sub_cmd = cmd_str + PROFILE_OFFSET + strlen("ASCII_CMD=");
-
-       WL_SOFTAP(("\n %s: ASCII_CMD: offs_0:%s, offset_32:\n'%s'\n",
-               __FUNCTION__, cmd_str, cmd_str + PROFILE_OFFSET));
-
-       if (strnicmp(sub_cmd, "AP_CFG", strlen("AP_CFG")) == 0) {
-
-               WL_SOFTAP((" AP_CFG \n"));
-
-               
-               if (init_ap_profile_from_string(cmd_str+PROFILE_OFFSET, &my_ap) != 0) {
-                               WL_ERROR(("ERROR: SoftAP CFG prams !\n"));
-                               ret = -1;
-               } else {
-                       ret = set_ap_cfg(dev, &my_ap);
-               }
-
-       } else if (strnicmp(sub_cmd, "AP_BSS_START", strlen("AP_BSS_START")) == 0) {
-
-               WL_SOFTAP(("\n SOFTAP - ENABLE BSS \n"));
-
-               
-               WL_SOFTAP(("\n!!! got 'WL_AP_EN_BSS' from WPA supplicant, dev:%s\n", dev->name));
-
-#ifndef AP_ONLY
-               if (ap_net_dev == NULL) {
-                                printf("\n ERROR: SOFTAP net_dev* is NULL !!!\n");
-               } else {
-                         
-                       if ((ret = iwpriv_en_ap_bss(ap_net_dev, info, dwrq, cmd_str)) < 0)
-                               WL_ERROR(("%s line %d fail to set bss up\n", \
-                                       __FUNCTION__, __LINE__));
-               }
-#else
-               if ((ret = iwpriv_en_ap_bss(dev, info, dwrq, cmd_str)) < 0)
-                               WL_ERROR(("%s line %d fail to set bss up\n", \
-                                       __FUNCTION__, __LINE__));
-#endif
-       } else if (strnicmp(sub_cmd, "ASSOC_LST", strlen("ASSOC_LST")) == 0) {
-
-               
-
-       } else if (strnicmp(sub_cmd, "AP_BSS_STOP", strlen("AP_BSS_STOP")) == 0) {
-
-               WL_SOFTAP((" \n temp DOWN SOFTAP\n"));
-#ifndef AP_ONLY
-               if ((ret = dev_iw_write_cfg1_bss_var(dev, 0)) < 0) {
-                               WL_ERROR(("%s line %d fail to set bss down\n", \
-                                       __FUNCTION__, __LINE__));
-               }
-#endif
-       }
-
-       return ret;
-
-}
-#endif 
-static int wl_iw_set_priv(
-       struct net_device *dev,
-       struct iw_request_info *info,
-       struct iw_point *dwrq,
-       char *ext
-)
-{
-       int ret = 0;
-       char * extra;
-
-       wl_iw_t *iw = *(wl_iw_t **)netdev_priv(dev);
-       if (!(extra = kmalloc(dwrq->length, GFP_KERNEL)))
-           return -ENOMEM;
-
-       if (copy_from_user(extra, dwrq->pointer, dwrq->length)) {
-           kfree(extra);
-           return -EFAULT;
-       }
-
-       WL_TRACE(("%s: SIOCSIWPRIV request %s, info->cmd:%x, info->flags:%d\n dwrq->length:%d\n",
-               dev->name, extra, info->cmd, info->flags, dwrq->length));
-
-       
-       if (dwrq->length && extra) {
-               WAKE_LOCK_INIT(iw->pub, WAKE_LOCK_PRIV, "wl_iw_set_priv");
-               WAKE_LOCK(iw->pub, WAKE_LOCK_PRIV);
-
-               if (g_onoff == G_WLAN_SET_OFF) {
-                       if (strnicmp(extra, "START", strlen("START")) != 0) {
-                                       WL_ERROR(("%s First IOCTL after stop is NOT START \n", \
-                                                               __FUNCTION__));
-                               WAKE_UNLOCK(iw->pub, WAKE_LOCK_PRIV);
-                               WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_PRIV);
-                               kfree(extra);
-                               return -EFAULT;
-                       } else {
-                               wl_iw_control_wl_on(dev, info);
-                               WL_TRACE(("%s, Received regular START command\n", __FUNCTION__));
-                       }
-               }
-
-           if (strnicmp(extra, "SCAN-ACTIVE", strlen("SCAN-ACTIVE")) == 0) {
-#ifdef ENABLE_ACTIVE_PASSIVE_SCAN_SUPPRESS
-                       WL_TRACE(("%s: active scan setting suppressed\n", dev->name));
-#else
-                       ret = wl_iw_set_active_scan(dev, info, (union iwreq_data *)dwrq, extra);
-#endif 
-           }
-           else if (strnicmp(extra, "SCAN-PASSIVE", strlen("SCAN-PASSIVE")) == 0)
-#ifdef ENABLE_ACTIVE_PASSIVE_SCAN_SUPPRESS
-                       WL_TRACE(("%s: passive scan setting suppressed\n", dev->name));
-#else
-                       ret = wl_iw_set_passive_scan(dev, info, (union iwreq_data *)dwrq, extra);
-#endif 
-           else if (strnicmp(extra, "RSSI", strlen("RSSI")) == 0)
-                       ret = wl_iw_get_rssi(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "LINKSPEED", strlen("LINKSPEED")) == 0)
-                       ret = wl_iw_get_link_speed(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "MACADDR", strlen("MACADDR")) == 0)
-                       ret = wl_iw_get_macaddr(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "COUNTRY", strlen("COUNTRY")) == 0)
-                       ret = wl_iw_set_country(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "STOP", strlen("STOP")) == 0)
-                       ret = wl_iw_control_wl_off(dev, info);
-           else if (strnicmp(extra, BAND_GET_CMD, strlen(BAND_GET_CMD)) == 0)
-                       ret = wl_iw_get_band(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, BAND_SET_CMD, strlen(BAND_SET_CMD)) == 0)
-                       ret = wl_iw_set_band(dev, info, (union iwreq_data *)dwrq, extra);
-#if defined(CSCAN)
-           
-           else if (strnicmp(extra, CSCAN_COMMAND, strlen(CSCAN_COMMAND)) == 0)
-                       ret = wl_iw_set_cscan(dev, info, (union iwreq_data *)dwrq, extra);
-#endif 
-#ifdef CUSTOMER_HW2
-           else if (strnicmp(extra, "POWERMODE", strlen("POWERMODE")) == 0)
-                       ret = wl_iw_set_power_mode(dev, info, (union iwreq_data *)dwrq, extra);
-           else if (strnicmp(extra, "BTCOEXMODE", strlen("BTCOEXMODE")) == 0)
-                       ret = wl_iw_set_btcoex_dhcp(dev, info, (union iwreq_data *)dwrq, extra);
-#else
-           else if (strnicmp(extra, "POWERMODE", strlen("POWERMODE")) == 0)
-                       ret = wl_iw_set_btcoex_dhcp(dev, info, (union iwreq_data *)dwrq, extra);
-#endif
-#ifdef SOFTAP
-           else if (strnicmp(extra, "ASCII_CMD", strlen("ASCII_CMD")) == 0) {
-               
-                   wl_iw_process_private_ascii_cmd(dev, info, (union iwreq_data *)dwrq, extra);
-           }
-               else if (strnicmp(extra, "AP_MAC_LIST_SET", strlen("AP_MAC_LIST_SET")) == 0) {
-                       WL_SOFTAP(("penguin, set AP_MAC_LIST_SET\n"));
-                       set_ap_mac_list(dev, (extra + PROFILE_OFFSET));
-           }
-#endif 
-           else {
-                       WL_TRACE(("Unkown PRIVATE command %s\n", extra));
-                       snprintf(extra, MAX_WX_STRING, "OK");
-                       dwrq->length = strlen("OK") + 1;
-               }
-               WAKE_UNLOCK(iw->pub, WAKE_LOCK_PRIV);
-               WAKE_LOCK_DESTROY(iw->pub, WAKE_LOCK_PRIV);
-       }
-
-       if (extra) {
-           if (copy_to_user(dwrq->pointer, extra, dwrq->length)) {
-                       kfree(extra);
-                       return -EFAULT;
-           }
-
-           kfree(extra);
-       }
-
-       return ret;
-}
-
-static const iw_handler wl_iw_handler[] =
-{
-       (iw_handler) wl_iw_config_commit,       
-       (iw_handler) wl_iw_get_name,            
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_freq,            
-       (iw_handler) wl_iw_get_freq,            
-       (iw_handler) wl_iw_set_mode,            
-       (iw_handler) wl_iw_get_mode,            
-       (iw_handler) wl_iw_set_sens,
-       (iw_handler) wl_iw_get_sens,
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_get_range,           
-       (iw_handler) wl_iw_set_priv,            
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_spy,             
-       (iw_handler) wl_iw_get_spy,             
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_wap,             
-       (iw_handler) wl_iw_get_wap,             
-#if WIRELESS_EXT > 17
-       (iw_handler) wl_iw_mlme,                
-#else
-       (iw_handler) NULL,                      
-#endif
-#if defined(WL_IW_USE_ISCAN)
-       (iw_handler) wl_iw_iscan_get_aplist,    
-#else
-       (iw_handler) wl_iw_get_aplist,          
-#endif 
-#if WIRELESS_EXT > 13
-#if defined(WL_IW_USE_ISCAN)
-       (iw_handler) wl_iw_iscan_set_scan,      
-       (iw_handler) wl_iw_iscan_get_scan,      
-#else
-       (iw_handler) wl_iw_set_scan,            
-       (iw_handler) wl_iw_get_scan,            
-#endif
-#else  
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-#endif 
-       (iw_handler) wl_iw_set_essid,           
-       (iw_handler) wl_iw_get_essid,           
-       (iw_handler) wl_iw_set_nick,            
-       (iw_handler) wl_iw_get_nick,            
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_rate,            
-       (iw_handler) wl_iw_get_rate,            
-       (iw_handler) wl_iw_set_rts,             
-       (iw_handler) wl_iw_get_rts,             
-       (iw_handler) wl_iw_set_frag,            
-       (iw_handler) wl_iw_get_frag,            
-       (iw_handler) wl_iw_set_txpow,           
-       (iw_handler) wl_iw_get_txpow,           
-#if WIRELESS_EXT > 10
-       (iw_handler) wl_iw_set_retry,           
-       (iw_handler) wl_iw_get_retry,           
-#endif 
-       (iw_handler) wl_iw_set_encode,          
-       (iw_handler) wl_iw_get_encode,          
-       (iw_handler) wl_iw_set_power,           
-       (iw_handler) wl_iw_get_power,           
-#if WIRELESS_EXT > 17
-       (iw_handler) NULL,                      
-       (iw_handler) NULL,                      
-       (iw_handler) wl_iw_set_wpaie,           
-       (iw_handler) wl_iw_get_wpaie,           
-       (iw_handler) wl_iw_set_wpaauth,         
-       (iw_handler) wl_iw_get_wpaauth,         
-       (iw_handler) wl_iw_set_encodeext,       
-       (iw_handler) wl_iw_get_encodeext,       
-#ifdef BCMWPA2
-       (iw_handler) wl_iw_set_pmksa,                   
-#endif
-#endif 
-};
-
-#if WIRELESS_EXT > 12
-static const iw_handler wl_iw_priv_handler[] = {
-       NULL,
-       (iw_handler)wl_iw_set_active_scan,
-       NULL,
-       (iw_handler)wl_iw_get_rssi,
-       NULL,
-       (iw_handler)wl_iw_set_passive_scan,
-       NULL,
-       (iw_handler)wl_iw_get_link_speed,
-       NULL,
-       (iw_handler)wl_iw_get_macaddr,
-       NULL,
-       (iw_handler)wl_iw_control_wl_off,
-       NULL,
-       (iw_handler)wl_iw_control_wl_on,
-#ifdef SOFTAP       
-
-       
-       NULL,
-       (iw_handler)iwpriv_set_ap_config,
-
-       
-       
-       NULL,
-       (iw_handler)iwpriv_get_assoc_list,
-
-       
-       NULL,
-       (iw_handler)iwpriv_set_mac_filters,
-
-       
-       NULL,
-       (iw_handler)iwpriv_en_ap_bss,
-
-       
-       NULL,
-       (iw_handler)iwpriv_wpasupp_loop_tst,
-       
-       NULL,
-       (iw_handler)iwpriv_softap_stop,
-       
-       NULL,
-       (iw_handler)iwpriv_fw_reload,
-#endif 
-#if defined(CSCAN)
-       
-       NULL,
-       (iw_handler)iwpriv_set_cscan
-#endif         
-};
-
-static const struct iw_priv_args wl_iw_priv_args[] =
-{
-       {       
-               WL_IW_SET_ACTIVE_SCAN,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "SCAN-ACTIVE"
-       },
-       {
-               WL_IW_GET_RSSI,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "RSSI"
-       },
-       {
-               WL_IW_SET_PASSIVE_SCAN,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "SCAN-PASSIVE"
-       },
-       {
-               WL_IW_GET_LINK_SPEED,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "LINKSPEED"
-       },
-       {
-               WL_IW_GET_CURR_MACADDR,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "Macaddr"
-       },
-       {
-               WL_IW_SET_STOP,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "STOP"
-       },
-       {
-               WL_IW_SET_START,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "START"
-       },
-
-#ifdef SOFTAP
-       
-       
-       {
-               WL_SET_AP_CFG,
-               IW_PRIV_TYPE_CHAR |  256,      
-               0,
-               "AP_SET_CFG"
-       },
-
-       {
-               WL_AP_STA_LIST,
-               0,                     
-               IW_PRIV_TYPE_CHAR | 0, 
-               "AP_GET_STA_LIST"
-       },
-
-       {
-               WL_AP_MAC_FLTR,
-               IW_PRIV_TYPE_CHAR | 256,                      
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,    
-               "AP_SET_MAC_FLTR"
-       },
-
-       { 
-               WL_AP_BSS_START,
-               0,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-               "AP_BSS_START"
-       },
-
-       {
-               AP_LPB_CMD,
-               IW_PRIV_TYPE_CHAR | 256,   
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,    
-               "AP_LPB_CMD"
-       },
-
-       { 
-               WL_AP_STOP,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,   
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,   
-               "AP_BSS_STOP"
-       },
-       { 
-               WL_FW_RELOAD,
-               IW_PRIV_TYPE_CHAR | 256,
-               IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 0,
-               "WL_FW_RELOAD"
-       },
-#endif 
-#if defined(CSCAN)
-       { 
-               WL_COMBO_SCAN,
-               IW_PRIV_TYPE_CHAR | 1024,  
-               0,
-               "CSCAN"
-       },
-#endif 
-       };
-
-const struct iw_handler_def wl_iw_handler_def =
-{
-       .num_standard = ARRAYSIZE(wl_iw_handler),
-       .standard = (iw_handler *) wl_iw_handler,
-       .num_private = ARRAYSIZE(wl_iw_priv_handler),
-       .num_private_args = ARRAY_SIZE(wl_iw_priv_args),
-       .private = (iw_handler *)wl_iw_priv_handler,
-       .private_args = (void *) wl_iw_priv_args,
-
-#if WIRELESS_EXT >= 19
-       get_wireless_stats: dhd_get_wireless_stats,
-#endif 
-       };
-#endif 
-
-
-
-int wl_iw_ioctl(
-       struct net_device *dev,
-       struct ifreq *rq,
-       int cmd
-)
-{
-       struct iwreq *wrq = (struct iwreq *) rq;
-       struct iw_request_info info;
-       iw_handler handler;
-       char *extra = NULL;
-       int token_size = 1, max_tokens = 0, ret = 0;
-
-       WL_TRACE(("\n%s, cmd:%x alled via dhd->do_ioctl()entry point\n", __FUNCTION__, cmd));
-       if (cmd < SIOCIWFIRST ||
-               IW_IOCTL_IDX(cmd) >= ARRAYSIZE(wl_iw_handler) ||
-               !(handler = wl_iw_handler[IW_IOCTL_IDX(cmd)])) {
-                       WL_ERROR(("%s: error in cmd=%x : not supported\n", __FUNCTION__, cmd));
-                       return -EOPNOTSUPP;
-       }
-
-       switch (cmd) {
-
-       case SIOCSIWESSID:
-       case SIOCGIWESSID:
-       case SIOCSIWNICKN:
-       case SIOCGIWNICKN:
-               max_tokens = IW_ESSID_MAX_SIZE + 1;
-               break;
-
-       case SIOCSIWENCODE:
-       case SIOCGIWENCODE:
-#if WIRELESS_EXT > 17
-       case SIOCSIWENCODEEXT:
-       case SIOCGIWENCODEEXT:
-#endif
-               max_tokens = wrq->u.data.length;
-               break;
-
-       case SIOCGIWRANGE:
-               
-               max_tokens = sizeof(struct iw_range) + 500;
-               break;
-
-       case SIOCGIWAPLIST:
-               token_size = sizeof(struct sockaddr) + sizeof(struct iw_quality);
-               max_tokens = IW_MAX_AP;
-               break;
-
-#if WIRELESS_EXT > 13
-       case SIOCGIWSCAN:
-#if defined(WL_IW_USE_ISCAN)
-       if (g_iscan)
-               max_tokens = wrq->u.data.length;
-       else
-#endif
-               max_tokens = IW_SCAN_MAX_DATA;
-               break;
-#endif 
-
-       case SIOCSIWSPY:
-               token_size = sizeof(struct sockaddr);
-               max_tokens = IW_MAX_SPY;
-               break;
-
-       case SIOCGIWSPY:
-               token_size = sizeof(struct sockaddr) + sizeof(struct iw_quality);
-               max_tokens = IW_MAX_SPY;
-               break;
-
-#if WIRELESS_EXT > 17
-       case SIOCSIWPMKSA:
-       case SIOCSIWGENIE:
-#endif 
-       case SIOCSIWPRIV:
-               max_tokens = wrq->u.data.length;
-               break;
-       }
-
-       if (max_tokens && wrq->u.data.pointer) {
-               if (wrq->u.data.length > max_tokens) {
-                       WL_ERROR(("%s: error in cmd=%x wrq->u.data.length=%d  > max_tokens=%d\n", \
-                               __FUNCTION__, cmd, wrq->u.data.length, max_tokens));
-                       return -E2BIG;
-               }
-               if (!(extra = kmalloc(max_tokens * token_size, GFP_KERNEL)))
-                       return -ENOMEM;
-
-               if (copy_from_user(extra, wrq->u.data.pointer, wrq->u.data.length * token_size)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-       }
-
-       info.cmd = cmd;
-       info.flags = 0;
-
-       ret = handler(dev, &info, &wrq->u, extra);
-
-       if (extra) {
-               if (copy_to_user(wrq->u.data.pointer, extra, wrq->u.data.length * token_size)) {
-                       kfree(extra);
-                       return -EFAULT;
-               }
-
-               kfree(extra);
-       }
-
-       return ret;
-}
-
-
-bool
-wl_iw_conn_status_str(uint32 event_type, uint32 status, uint32 reason,
-       char* stringBuf, uint buflen)
-{
-       typedef struct conn_fail_event_map_t {
-               uint32 inEvent;                 
-               uint32 inStatus;                
-               uint32 inReason;                
-               const char* outName;    
-               const char* outCause;   
-       } conn_fail_event_map_t;
-
-       
-#      define WL_IW_DONT_CARE  9999
-       const conn_fail_event_map_t event_map [] = {
-               
-               
-               {WLC_E_SET_SSID,     WLC_E_STATUS_SUCCESS,   WL_IW_DONT_CARE,
-               "Conn", "Success"},
-               {WLC_E_SET_SSID,     WLC_E_STATUS_NO_NETWORKS, WL_IW_DONT_CARE,
-               "Conn", "NoNetworks"},
-               {WLC_E_SET_SSID,     WLC_E_STATUS_FAIL,      WL_IW_DONT_CARE,
-               "Conn", "ConfigMismatch"},
-               {WLC_E_PRUNE,        WL_IW_DONT_CARE,        WLC_E_PRUNE_ENCR_MISMATCH,
-               "Conn", "EncrypMismatch"},
-               {WLC_E_PRUNE,        WL_IW_DONT_CARE,        WLC_E_RSN_MISMATCH,
-               "Conn", "RsnMismatch"},
-               {WLC_E_AUTH,         WLC_E_STATUS_TIMEOUT,   WL_IW_DONT_CARE,
-               "Conn", "AuthTimeout"},
-               {WLC_E_AUTH,         WLC_E_STATUS_FAIL,      WL_IW_DONT_CARE,
-               "Conn", "AuthFail"},
-               {WLC_E_AUTH,         WLC_E_STATUS_NO_ACK,    WL_IW_DONT_CARE,
-               "Conn", "AuthNoAck"},
-               {WLC_E_REASSOC,      WLC_E_STATUS_FAIL,      WL_IW_DONT_CARE,
-               "Conn", "ReassocFail"},
-               {WLC_E_REASSOC,      WLC_E_STATUS_TIMEOUT,   WL_IW_DONT_CARE,
-               "Conn", "ReassocTimeout"},
-               {WLC_E_REASSOC,      WLC_E_STATUS_ABORT,     WL_IW_DONT_CARE,
-               "Conn", "ReassocAbort"},
-               {WLC_E_PSK_SUP,      WLC_SUP_KEYED,          WL_IW_DONT_CARE,
-               "Sup", "ConnSuccess"},
-               {WLC_E_PSK_SUP,      WL_IW_DONT_CARE,        WL_IW_DONT_CARE,
-               "Sup", "WpaHandshakeFail"},
-               {WLC_E_DEAUTH_IND,   WL_IW_DONT_CARE,        WL_IW_DONT_CARE,
-               "Conn", "Deauth"},
-               {WLC_E_DISASSOC_IND, WL_IW_DONT_CARE,        WL_IW_DONT_CARE,
-               "Conn", "DisassocInd"},
-               {WLC_E_DISASSOC,     WL_IW_DONT_CARE,        WL_IW_DONT_CARE,
-               "Conn", "Disassoc"}
-       };
-
-       const char* name = "";
-       const char* cause = NULL;
-       int i;
-
-       
-       for (i = 0;  i < sizeof(event_map)/sizeof(event_map[0]);  i++) {
-               const conn_fail_event_map_t* row = &event_map[i];
-               if (row->inEvent == event_type &&
-                   (row->inStatus == status || row->inStatus == WL_IW_DONT_CARE) &&
-                   (row->inReason == reason || row->inReason == WL_IW_DONT_CARE)) {
-                       name = row->outName;
-                       cause = row->outCause;
-                       break;
-               }
-       }
-
-       
-       if (cause) {
-               memset(stringBuf, 0, buflen);
-               snprintf(stringBuf, buflen, "%s %s %02d %02d",
-                       name, cause, status, reason);
-               WL_INFORM(("Connection status: %s\n", stringBuf));
-               return TRUE;
-       } else {
-               return FALSE;
-       }
-}
-
-#if WIRELESS_EXT > 14
-
-static bool
-wl_iw_check_conn_fail(wl_event_msg_t *e, char* stringBuf, uint buflen)
-{
-       uint32 event = ntoh32(e->event_type);
-       uint32 status =  ntoh32(e->status);
-       uint32 reason =  ntoh32(e->reason);
-
-       if (wl_iw_conn_status_str(event, status, reason, stringBuf, buflen)) {
-               return TRUE;
-       }
-       else
-               return FALSE;
-}
-#endif 
-
-#ifndef IW_CUSTOM_MAX
-#define IW_CUSTOM_MAX 256 
-#endif 
-
-void
-wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void* data)
-{
-#if WIRELESS_EXT > 13
-       union iwreq_data wrqu;
-       char extra[IW_CUSTOM_MAX + 1];
-       int cmd = 0;
-       uint32 event_type = ntoh32(e->event_type);
-       uint16 flags =  ntoh16(e->flags);
-       uint32 datalen = ntoh32(e->datalen);
-       uint32 status =  ntoh32(e->status);
-       wl_iw_t *iw;
-       uint32 toto;
-
-       memset(&wrqu, 0, sizeof(wrqu));
-       memset(extra, 0, sizeof(extra));
-       iw = 0;
-
-       if (!dev) {
-               WL_ERROR(("%s: dev is null\n", __FUNCTION__));
-               return;
-       }
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-
-       //WL_TRACE(("%s: dev=%s event=%d \n", __FUNCTION__, dev->name, event_type));
-
-       
-       switch (event_type) {
-#if defined(SOFTAP)
-       case WLC_E_PRUNE:
-               if (ap_cfg_running) {
-                       char *macaddr = (char *)&e->addr;
-                       WL_SOFTAP(("PRUNE received, %02X:%02X:%02X:%02X:%02X:%02X!\n",
-                               macaddr[0], macaddr[1], macaddr[2], macaddr[3], \
-                               macaddr[4], macaddr[5]));
-
-                       
-                       if (ap_macmode)
-                       {
-                               int i;
-                               for (i = 0; i < ap_black_list.count; i++) {
-                                       if (!bcmp(macaddr, &ap_black_list.ea[i], \
-                                               sizeof(struct ether_addr))) {
-                                               WL_SOFTAP(("mac in black list, ignore it\n"));
-                                               break;
-                                       }
-                               }
-
-                               if (i == ap_black_list.count) {
-                                       
-                                       char mac_buf[32] = {0};
-                                       sprintf(mac_buf, "STA_BLOCK %02X:%02X:%02X:%02X:%02X:%02X",
-                                               macaddr[0], macaddr[1], macaddr[2],
-                                               macaddr[3], macaddr[4], macaddr[5]);
-                                       wl_iw_send_priv_event(priv_dev, mac_buf);
-                               }
-                       }
-               }
-               break;
-#endif 
-       case WLC_E_TXFAIL:
-               cmd = IWEVTXDROP;
-               memcpy(wrqu.addr.sa_data, &e->addr, ETHER_ADDR_LEN);
-               wrqu.addr.sa_family = ARPHRD_ETHER;
-               break;
-#if WIRELESS_EXT > 14
-       case WLC_E_JOIN:
-       case WLC_E_ASSOC_IND:
-       case WLC_E_REASSOC_IND:
-#if defined(SOFTAP)
-               WL_SOFTAP(("STA connect received %d\n", event_type));
-               if (ap_cfg_running) {
-                       wl_iw_send_priv_event(priv_dev, "STA_JOIN");
-                       return;
-               }
-#endif 
-               memcpy(wrqu.addr.sa_data, &e->addr, ETHER_ADDR_LEN);
-               wrqu.addr.sa_family = ARPHRD_ETHER;
-               cmd = IWEVREGISTERED;
-               break;
-       case WLC_E_DEAUTH_IND:
-       case WLC_E_DISASSOC_IND:
-#if defined(SOFTAP)
-               WL_SOFTAP(("STA disconnect received %d\n", event_type));
-               if (ap_cfg_running) {
-                       wl_iw_send_priv_event(priv_dev, "STA_LEAVE");
-                       return;
-               }
-#endif 
-               cmd = SIOCGIWAP;
-               bzero(wrqu.addr.sa_data, ETHER_ADDR_LEN);
-               wrqu.addr.sa_family = ARPHRD_ETHER;
-               bzero(&extra, ETHER_ADDR_LEN);
-               break;
-       case WLC_E_LINK:
-       case WLC_E_NDIS_LINK:
-               cmd = SIOCGIWAP;
-               if (!(flags & WLC_EVENT_MSG_LINK)) {
-                       
-                       
-#ifdef SOFTAP
-#ifdef AP_ONLY
-               if (ap_cfg_running) {
-#else
-               if (ap_cfg_running && !strncmp(dev->name, "wl0.1", 5)) {
-#endif 
-                       
-                       WL_SOFTAP(("AP DOWN %d\n", event_type));
-                       wl_iw_send_priv_event(priv_dev, "AP_DOWN");
-               } else {
-                       WL_TRACE(("STA_Link Down\n"));
-                       g_ss_cache_ctrl.m_link_down = 1;
-               }
-#else          
-               g_ss_cache_ctrl.m_link_down = 1;
-#endif 
-                       WL_TRACE(("Link Down\n"));
-
-                       bzero(wrqu.addr.sa_data, ETHER_ADDR_LEN);
-                       bzero(&extra, ETHER_ADDR_LEN);
-                       WAKE_LOCK_TIMEOUT(iw->pub, WAKE_LOCK_LINK_DOWN_TMOUT, 20 * HZ);
-               }
-               else {
-                       
-                       memcpy(wrqu.addr.sa_data, &e->addr, ETHER_ADDR_LEN);
-                       g_ss_cache_ctrl.m_link_down = 0;
-                       
-                       memcpy(g_ss_cache_ctrl.m_active_bssid, &e->addr, ETHER_ADDR_LEN);
-#ifdef SOFTAP
-
-#ifdef AP_ONLY
-                       if (ap_cfg_running) {
-#else
-                       if (ap_cfg_running && !strncmp(dev->name, "wl0.1", 5)) {
-#endif
-                       
-                               WL_SOFTAP(("AP UP %d\n", event_type));
-                               wl_iw_send_priv_event(priv_dev, "AP_UP");
-                       } else {
-                               WL_TRACE(("STA_LINK_UP\n"));
-                       }
-#else
-#endif 
-                       WL_TRACE(("Link UP\n"));
-
-               }
-               wrqu.addr.sa_family = ARPHRD_ETHER;
-               break;
-       case WLC_E_ACTION_FRAME:
-               cmd = IWEVCUSTOM;
-               if (datalen + 1 <= sizeof(extra)) {
-                       wrqu.data.length = datalen + 1;
-                       extra[0] = WLC_E_ACTION_FRAME;
-                       memcpy(&extra[1], data, datalen);
-                       WL_TRACE(("WLC_E_ACTION_FRAME len %d \n", wrqu.data.length));
-               }
-               break;
-
-       case WLC_E_ACTION_FRAME_COMPLETE:
-               cmd = IWEVCUSTOM;
-               memcpy(&toto, data, 4);
-               if (sizeof(status) + 1 <= sizeof(extra)) {
-                       wrqu.data.length = sizeof(status) + 1;
-                       extra[0] = WLC_E_ACTION_FRAME_COMPLETE;
-                       memcpy(&extra[1], &status, sizeof(status));
-                       printf("wl_iw_event status %d PacketId %d \n", status, toto);
-                       printf("WLC_E_ACTION_FRAME_COMPLETE len %d \n", wrqu.data.length);
-               }
-               break;
-#endif 
-#if WIRELESS_EXT > 17
-       case WLC_E_MIC_ERROR: {
-               struct  iw_michaelmicfailure  *micerrevt = (struct  iw_michaelmicfailure  *)&extra;
-               cmd = IWEVMICHAELMICFAILURE;
-               wrqu.data.length = sizeof(struct iw_michaelmicfailure);
-               if (flags & WLC_EVENT_MSG_GROUP)
-                       micerrevt->flags |= IW_MICFAILURE_GROUP;
-               else
-                       micerrevt->flags |= IW_MICFAILURE_PAIRWISE;
-               memcpy(micerrevt->src_addr.sa_data, &e->addr, ETHER_ADDR_LEN);
-               micerrevt->src_addr.sa_family = ARPHRD_ETHER;
-
-               break;
-       }
-#ifdef BCMWPA2
-       case WLC_E_PMKID_CACHE: {
-               if (data)
-               {
-                       struct iw_pmkid_cand *iwpmkidcand = (struct iw_pmkid_cand *)&extra;
-                       pmkid_cand_list_t *pmkcandlist;
-                       pmkid_cand_t    *pmkidcand;
-                       int count;
-
-                       cmd = IWEVPMKIDCAND;
-                       pmkcandlist = data;
-                       count = ntoh32_ua((uint8 *)&pmkcandlist->npmkid_cand);
-                       ASSERT(count >= 0);
-                       wrqu.data.length = sizeof(struct iw_pmkid_cand);
-                       pmkidcand = pmkcandlist->pmkid_cand;
-                       while (count) {
-                               bzero(iwpmkidcand, sizeof(struct iw_pmkid_cand));
-                               if (pmkidcand->preauth)
-                                       iwpmkidcand->flags |= IW_PMKID_CAND_PREAUTH;
-                               bcopy(&pmkidcand->BSSID, &iwpmkidcand->bssid.sa_data,
-                                       ETHER_ADDR_LEN);
-#ifndef SANDGATE2G
-                               wireless_send_event(dev, cmd, &wrqu, extra);
-#endif
-                               pmkidcand++;
-                               count--;
-                       }
-               }
-               return;
-       }
-#endif 
-#endif 
-
-       case WLC_E_SCAN_COMPLETE:
-#if defined(WL_IW_USE_ISCAN)
-               if ((g_iscan) && (g_iscan->sysioc_pid >= 0) &&
-                       (g_iscan->iscan_state != ISCAN_STATE_IDLE))
-               {
-                       up(&g_iscan->sysioc_sem);
-               } else {
-                       cmd = SIOCGIWSCAN;
-                       wrqu.data.length = strlen(extra);
-                       WL_TRACE(("Event WLC_E_SCAN_COMPLETE from specific scan %d\n", \
-                               g_iscan->iscan_state));
-               }
-#else
-               cmd = SIOCGIWSCAN;
-               wrqu.data.length = strlen(extra);
-               WL_TRACE(("Event WLC_E_SCAN_COMPLETE\n"));
-#endif 
-       break;
-
-       default:
-               
-               WL_TRACE(("Unknown Event %d: ignoring\n", event_type));
-               break;
-       }
-#ifndef SANDGATE2G
-               if (cmd) {
-                       if (cmd == SIOCGIWSCAN)
-                               wireless_send_event(dev, cmd, &wrqu, NULL);
-                       else
-                               wireless_send_event(dev, cmd, &wrqu, extra);
-               }
-#endif
-
-#if WIRELESS_EXT > 14
-       
-       memset(extra, 0, sizeof(extra));
-       if (wl_iw_check_conn_fail(e, extra, sizeof(extra))) {
-               cmd = IWEVCUSTOM;
-               wrqu.data.length = strlen(extra);
-#ifndef SANDGATE2G
-               wireless_send_event(dev, cmd, &wrqu, extra);
-#endif
-       }
-#endif 
-
-#endif 
-}
-
-int wl_iw_get_wireless_stats(struct net_device *dev, struct iw_statistics *wstats)
-{
-       int res = 0;
-       wl_cnt_t cnt;
-       int phy_noise;
-       int rssi;
-       scb_val_t scb_val;
-
-       phy_noise = 0;
-       if ((res = dev_wlc_ioctl(dev, WLC_GET_PHY_NOISE, &phy_noise, sizeof(phy_noise))))
-               goto done;
-
-       phy_noise = dtoh32(phy_noise);
-       WL_TRACE(("wl_iw_get_wireless_stats phy noise=%d\n", phy_noise));
-
-       bzero(&scb_val, sizeof(scb_val_t));
-       if ((res = dev_wlc_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t))))
-               goto done;
-
-       rssi = dtoh32(scb_val.val);
-       WL_TRACE(("wl_iw_get_wireless_stats rssi=%d\n", rssi));
-       if (rssi <= WL_IW_RSSI_NO_SIGNAL)
-               wstats->qual.qual = 0;
-       else if (rssi <= WL_IW_RSSI_VERY_LOW)
-               wstats->qual.qual = 1;
-       else if (rssi <= WL_IW_RSSI_LOW)
-               wstats->qual.qual = 2;
-       else if (rssi <= WL_IW_RSSI_GOOD)
-               wstats->qual.qual = 3;
-       else if (rssi <= WL_IW_RSSI_VERY_GOOD)
-               wstats->qual.qual = 4;
-       else
-               wstats->qual.qual = 5;
-
-       
-       wstats->qual.level = 0x100 + rssi;
-       wstats->qual.noise = 0x100 + phy_noise;
-#if WIRELESS_EXT > 18
-       wstats->qual.updated |= (IW_QUAL_ALL_UPDATED | IW_QUAL_DBM);
-#else
-       wstats->qual.updated |= 7;
-#endif 
-
-#if WIRELESS_EXT > 11
-       WL_TRACE(("wl_iw_get_wireless_stats counters=%d\n", (int)sizeof(wl_cnt_t)));
-
-       memset(&cnt, 0, sizeof(wl_cnt_t));
-       res = dev_wlc_bufvar_get(dev, "counters", (char *)&cnt, sizeof(wl_cnt_t));
-       if (res)
-       {
-               WL_ERROR(("wl_iw_get_wireless_stats counters failed error=%d\n", res));
-               goto done;
-       }
-
-       cnt.version = dtoh16(cnt.version);
-       if (cnt.version != WL_CNT_T_VERSION) {
-               WL_TRACE(("\tIncorrect version of counters struct: expected %d; got %d\n",
-                       WL_CNT_T_VERSION, cnt.version));
-               goto done;
-       }
-
-       wstats->discard.nwid = 0;
-       wstats->discard.code = dtoh32(cnt.rxundec);
-       wstats->discard.fragment = dtoh32(cnt.rxfragerr);
-       wstats->discard.retries = dtoh32(cnt.txfail);
-       wstats->discard.misc = dtoh32(cnt.rxrunt) + dtoh32(cnt.rxgiant);
-       wstats->miss.beacon = 0;
-
-       WL_TRACE(("wl_iw_get_wireless_stats counters txframe=%d txbyte=%d\n",
-               dtoh32(cnt.txframe), dtoh32(cnt.txbyte)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxfrmtoolong=%d\n", dtoh32(cnt.rxfrmtoolong)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxbadplcp=%d\n", dtoh32(cnt.rxbadplcp)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxundec=%d\n", dtoh32(cnt.rxundec)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxfragerr=%d\n", dtoh32(cnt.rxfragerr)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters txfail=%d\n", dtoh32(cnt.txfail)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxrunt=%d\n", dtoh32(cnt.rxrunt)));
-       WL_TRACE(("wl_iw_get_wireless_stats counters rxgiant=%d\n", dtoh32(cnt.rxgiant)));
-
-#endif 
-
-done:
-       return res;
-}
-static void
-wl_iw_bt_flag_set(
-       struct net_device *dev,
-       bool set)
-{
-       char buf_flag7_dhcp_on[8] = { 7, 00, 00, 00, 0x1, 0x0, 0x00, 0x00 };
-       char buf_flag7_default[8]   = { 7, 00, 00, 00, 0x0, 0x00, 0x00, 0x00};
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       rtnl_lock();
-#endif
-
-       if (set == TRUE) {
-               
-               dev_wlc_bufvar_set(dev, "btc_flags", \
-                                       (char *)&buf_flag7_dhcp_on[0], sizeof(buf_flag7_dhcp_on));
-       }
-       else  {
-               
-               dev_wlc_bufvar_set(dev, "btc_flags", \
-                                       (char *)&buf_flag7_default[0], sizeof(buf_flag7_default));
-       }
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
-       rtnl_unlock();
-#endif
-}
-
-static void
-wl_iw_bt_timerfunc(ulong data)
-{
-       bt_info_t  *bt_local = (bt_info_t *)data;
-       bt_local->timer_on = 0;
-       WL_TRACE(("%s\n", __FUNCTION__));
-       
-       up(&bt_local->bt_sem);
-}
-
-static int
-_bt_dhcp_sysioc_thread(void *data)
-{
-       DAEMONIZE("dhcp_sysioc");
-
-       while (down_interruptible(&g_bt->bt_sem) == 0) {
-               if (g_bt->timer_on) {
-                       del_timer(&g_bt->timer);
-                       g_bt->timer_on = 0;
-               }
-
-               switch (g_bt->bt_state) {
-                       case BT_DHCP_START:
-                               
-                               g_bt->bt_state = BT_DHCP_OPPORTUNITY_WINDOW;
-                               mod_timer(&g_bt->timer, jiffies + \
-                                          BT_DHCP_OPPORTUNITY_WINDOW_TIEM*HZ/1000);
-                               g_bt->timer_on = 1;
-                               break;
-                       case BT_DHCP_OPPORTUNITY_WINDOW:
-                               
-                               WL_TRACE(("%s waiting for %d msec expired, force bt flag\n", \
-                                               __FUNCTION__, BT_DHCP_OPPORTUNITY_WINDOW_TIEM));
-                               if (g_bt->dev) wl_iw_bt_flag_set(g_bt->dev, TRUE);
-                               g_bt->bt_state = BT_DHCP_FLAG_FORCE_TIMEOUT;
-                               mod_timer(&g_bt->timer, jiffies + BT_DHCP_FLAG_FORCE_TIME*HZ/1000);
-                               g_bt->timer_on = 1;
-                               break;
-                       case BT_DHCP_FLAG_FORCE_TIMEOUT:
-                               
-                               WL_TRACE(("%s waiting for %d msec expired remove bt flag\n", \
-                                               __FUNCTION__, BT_DHCP_FLAG_FORCE_TIME));
-                               
-                               if (g_bt->dev)  wl_iw_bt_flag_set(g_bt->dev, FALSE);
-                               g_bt->bt_state = BT_DHCP_IDLE;
-                               g_bt->timer_on = 0;
-                               break;
-                       default:
-                               WL_ERROR(("%s error g_status=%d !!!\n", __FUNCTION__, \
-                                         g_bt->bt_state));
-                               if (g_bt->dev) wl_iw_bt_flag_set(g_bt->dev, FALSE);
-                               g_bt->bt_state = BT_DHCP_IDLE;
-                               g_bt->timer_on = 0;
-                               break;
-                }
-       }
-
-       if (g_bt->timer_on) {
-               del_timer(&g_bt->timer);
-               g_bt->timer_on = 0;
-       }
-       complete_and_exit(&g_bt->bt_exited, 0);
-}
-
-static void
-wl_iw_bt_release(void)
-{
-       bt_info_t *bt_local = g_bt;
-
-       if (!bt_local) {
-               return;
-       }
-
-       if (bt_local->bt_pid >= 0) {
-               KILL_PROC(bt_local->bt_pid, SIGTERM);
-               wait_for_completion(&bt_local->bt_exited);
-       }
-       kfree(bt_local);
-       g_bt = NULL;
-}
-
-static int
-wl_iw_bt_init(struct net_device *dev)
-{
-       bt_info_t *bt_dhcp = NULL;
-
-       bt_dhcp = kmalloc(sizeof(bt_info_t), GFP_KERNEL);
-       if (!bt_dhcp)
-               return -ENOMEM;
-
-       memset(bt_dhcp, 0, sizeof(bt_info_t));
-       bt_dhcp->bt_pid = -1;
-       g_bt = bt_dhcp;
-       bt_dhcp->dev = dev;
-       bt_dhcp->bt_state = BT_DHCP_IDLE;
-
-       
-       bt_dhcp->timer_ms    = 10;
-       init_timer(&bt_dhcp->timer);
-       bt_dhcp->timer.data = (ulong)bt_dhcp;
-       bt_dhcp->timer.function = wl_iw_bt_timerfunc;
-
-       sema_init(&bt_dhcp->bt_sem, 0);
-       init_completion(&bt_dhcp->bt_exited);
-       bt_dhcp->bt_pid = kernel_thread(_bt_dhcp_sysioc_thread, bt_dhcp, 0);
-       if (bt_dhcp->bt_pid < 0) {
-               WL_ERROR(("Failed in %s\n", __FUNCTION__));
-               return -ENOMEM;
-       }
-
-       return 0;
-}
-
-int wl_iw_attach(struct net_device *dev, void * dhdp)
-{
-       int params_size;
-       wl_iw_t *iw;
-#if defined(WL_IW_USE_ISCAN)
-       iscan_info_t *iscan = NULL;
-
-       if (!dev)
-               return 0;
-
-       
-#ifdef CSCAN
-       params_size = (WL_SCAN_PARAMS_FIXED_SIZE + OFFSETOF(wl_iscan_params_t, params)) +
-           (WL_NUMCHANNELS * sizeof(uint16)) + WL_SCAN_PARAMS_SSID_MAX * sizeof(wlc_ssid_t);
-#else
-       params_size = (WL_SCAN_PARAMS_FIXED_SIZE + OFFSETOF(wl_iscan_params_t, params));
-#endif 
-       iscan = kmalloc(sizeof(iscan_info_t), GFP_KERNEL);
-
-       if (!iscan)
-               return -ENOMEM;
-       memset(iscan, 0, sizeof(iscan_info_t));
-
-       
-       iscan->iscan_ex_params_p = (wl_iscan_params_t*)kmalloc(params_size, GFP_KERNEL);
-       if (!iscan->iscan_ex_params_p)
-               return -ENOMEM;
-       iscan->iscan_ex_param_size = params_size;
-       iscan->sysioc_pid = -1;
-       
-       g_iscan = iscan;
-       iscan->dev = dev;
-       iscan->iscan_state = ISCAN_STATE_IDLE;
-
-       g_first_broadcast_scan = BROADCAST_SCAN_FIRST_IDLE;
-       g_iscan->scan_flag = 0;
-
-       
-       iscan->timer_ms    = 3000;
-       init_timer(&iscan->timer);
-       iscan->timer.data = (ulong)iscan;
-       iscan->timer.function = wl_iw_timerfunc;
-
-       sema_init(&iscan->sysioc_sem, 0);
-       init_completion(&iscan->sysioc_exited);
-       iscan->sysioc_pid = kernel_thread(_iscan_sysioc_thread, iscan, 0);
-       if (iscan->sysioc_pid < 0)
-               return -ENOMEM;
-#endif 
-
-       iw = *(wl_iw_t **)netdev_priv(dev);
-       iw->pub = (dhd_pub_t *)dhdp;
-       MUTEX_LOCK_INIT(iw->pub);
-       MUTEX_LOCK_WL_SCAN_SET_INIT();
-#ifdef SOFTAP
-       priv_dev = dev;
-       MUTEX_LOCK_SOFTAP_SET_INIT(iw->pub);
-#endif 
-       g_scan = NULL;
-
-       
-       g_scan = (void *)kmalloc(G_SCAN_RESULTS, GFP_KERNEL);
-       if (!g_scan)
-               return -ENOMEM;
-
-       memset(g_scan, 0, G_SCAN_RESULTS);
-       g_scan_specified_ssid = 0;
-
-#if !defined(CSCAN)
-       
-       wl_iw_init_ss_cache_ctrl();
-#endif 
-       
-       wl_iw_bt_init(dev);
-
-
-       return 0;
-}
-
-void wl_iw_detach(void)
-{
-#if defined(WL_IW_USE_ISCAN)
-       iscan_buf_t  *buf;
-       iscan_info_t *iscan = g_iscan;
-
-       if (!iscan)
-               return;
-       if (iscan->sysioc_pid >= 0) {
-               KILL_PROC(iscan->sysioc_pid, SIGTERM);
-               wait_for_completion(&iscan->sysioc_exited);
-       }
-       MUTEX_LOCK_WL_SCAN_SET();
-       while (iscan->list_hdr) {
-               buf = iscan->list_hdr->next;
-               kfree(iscan->list_hdr);
-               iscan->list_hdr = buf;
-       }
-       MUTEX_UNLOCK_WL_SCAN_SET();
-       kfree(iscan->iscan_ex_params_p);
-       kfree(iscan);
-       g_iscan = NULL;
-#endif 
-
-       if (g_scan)
-               kfree(g_scan);
-
-       g_scan = NULL;
-#if !defined(CSCAN)
-       wl_iw_release_ss_cache_ctrl();
-#endif 
-       wl_iw_bt_release();
-
-#ifdef SOFTAP
-       if (ap_cfg_running) {
-               WL_TRACE(("\n%s AP is going down\n", __FUNCTION__));
-               
-               wl_iw_send_priv_event(priv_dev, "AP_DOWN");
-       }
-#endif
-
-}