staging: brcm80211: renamed files in brcmsmac and include directories
Roland Vossen [Wed, 1 Jun 2011 11:45:59 +0000 (13:45 +0200)]
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

72 files changed:
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
drivers/staging/brcm80211/brcmfmac/dhd_common.c
drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
drivers/staging/brcm80211/brcmfmac/wl_iw.c
drivers/staging/brcm80211/brcmsmac/Makefile
drivers/staging/brcm80211/brcmsmac/aiutils.c
drivers/staging/brcm80211/brcmsmac/alloc.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_alloc.c with 95% similarity]
drivers/staging/brcm80211/brcmsmac/alloc.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_alloc.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/ampdu.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/ampdu.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/antsel.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_antsel.c with 97% similarity]
drivers/staging/brcm80211/brcmsmac/antsel.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_antsel.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/bottom_mac.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_bmac.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/bottom_mac.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_bmac.h with 94% similarity]
drivers/staging/brcm80211/brcmsmac/bsscfg.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/cfg.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_cfg.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/channel.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_channel.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/channel.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_channel.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/dma.c
drivers/staging/brcm80211/brcmsmac/dma.h [moved from drivers/staging/brcm80211/brcmsmac/bcmdma.h with 99% similarity]
drivers/staging/brcm80211/brcmsmac/key.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_key.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/mac80211_if.c [moved from drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/mac80211_if.h [moved from drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/main.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_main.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/main.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_main.h with 99% similarity]
drivers/staging/brcm80211/brcmsmac/nicpci.c
drivers/staging/brcm80211/brcmsmac/otp.c [moved from drivers/staging/brcm80211/brcmsmac/bcmotp.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/otp.h [moved from drivers/staging/brcm80211/brcmsmac/bcmotp.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h with 99% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phy_int.h [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h with 99% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.h [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phy_n.c [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.h [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phy_radio.h [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phyreg_n.h [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.h [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h [moved from drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/phy_shim.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c with 93% similarity]
drivers/staging/brcm80211/brcmsmac/phy_shim.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/pmu.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_pmu.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/pmu.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_pmu.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/pub.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_pub.h with 99% similarity]
drivers/staging/brcm80211/brcmsmac/rate.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_rate.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/rate.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_rate.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/scb.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_scb.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/srom.c [moved from drivers/staging/brcm80211/brcmsmac/bcmsrom.c with 99% similarity]
drivers/staging/brcm80211/brcmsmac/stf.c [moved from drivers/staging/brcm80211/brcmsmac/wlc_stf.c with 97% similarity]
drivers/staging/brcm80211/brcmsmac/stf.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_stf.h with 100% similarity]
drivers/staging/brcm80211/brcmsmac/types.h [moved from drivers/staging/brcm80211/brcmsmac/wlc_types.h with 98% similarity]
drivers/staging/brcm80211/brcmsmac/ucode_loader.c
drivers/staging/brcm80211/brcmsmac/ucode_loader.h
drivers/staging/brcm80211/brcmutil/utils.c
drivers/staging/brcm80211/brcmutil/wifi.c
drivers/staging/brcm80211/include/aidmp.h
drivers/staging/brcm80211/include/brcm_hw_ids.h [moved from drivers/staging/brcm80211/include/bcmdevs.h with 100% similarity]
drivers/staging/brcm80211/include/chipcommon.h
drivers/staging/brcm80211/include/defs.h [moved from drivers/staging/brcm80211/include/bcmdefs.h with 100% similarity]
drivers/staging/brcm80211/include/sdio_host.h [moved from drivers/staging/brcm80211/include/bcmsdh.h with 100% similarity]
drivers/staging/brcm80211/include/soc.h [moved from drivers/staging/brcm80211/include/bcmsoc.h with 100% similarity]
drivers/staging/brcm80211/include/srom.h [moved from drivers/staging/brcm80211/include/bcmsrom.h with 100% similarity]

index 352ba4b..d6e90d7 100644 (file)
 #include <linux/netdevice.h>
 #include <linux/pci_ids.h>
 #include <linux/sched.h>
-#include <bcmdefs.h>
-#include <bcmdevs.h>
+#include <defs.h>
+#include <brcm_hw_ids.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
-#include <bcmsoc.h>
+#include <soc.h>
 
-#include <bcmsdh.h>            /* BRCM API for SDIO
+#include <sdio_host.h>         /* BRCM API for SDIO
                         clients (such as wl, dhd) */
 #include <bcmsdbus.h>          /* common SDIO/controller interface */
 #include <sbsdio.h>            /* BRCM sdio device core */
index 5812b5b..37cf61a 100644 (file)
 #include <linux/completion.h>
 #include <linux/sched.h>
 
-#include <bcmdefs.h>
-#include <bcmdevs.h>
+#include <defs.h>
+#include <brcm_hw_ids.h>
 #include <brcmu_utils.h>
-#include <bcmsdh.h>
+#include <sdio_host.h>
 #include <brcmu_wifi.h>
 
 #if defined(OOB_INTR_ONLY)
index 9abd620..03a5966 100644 (file)
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/mmc/sdio.h>
-#include <bcmdefs.h>
-#include <bcmdevs.h>
+#include <defs.h>
+#include <brcm_hw_ids.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
-#include <bcmsdh.h>
+#include <sdio_host.h>
 #include <bcmsdbus.h>          /* bcmsdh to/from specific controller APIs */
 #include <sdiovar.h>           /* ioctl/iovars */
 
index 2da07e2..85ed095 100644 (file)
 #include <linux/sched.h>       /* request_irq() */
 #include <linux/netdevice.h>
 #include <net/cfg80211.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
-#include <bcmsdh.h>
+#include <sdio_host.h>
 #include <bcmsdbus.h>          /* bcmsdh to/from specific controller APIs */
 #include <sdiovar.h>           /* to get msglevel bit values */
 
index dd872f4..2220941 100644 (file)
@@ -17,7 +17,7 @@
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
-#include <bcmdefs.h>
+#include <defs.h>
 
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
index a8504bb..73d8b02 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/sched.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_wifi.h>
 #include <linux/netdevice.h>
 #include <asm/unaligned.h>
index 831f324..6008888 100644 (file)
@@ -17,7 +17,7 @@
 #include <linux/netdevice.h>
 #include <linux/sched.h>
 #include <brcmu_utils.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_wifi.h>
 
 #include <dngl_stats.h>
index adcf82d..b48447c 100644 (file)
@@ -32,7 +32,7 @@
 #include <linux/fs.h>
 #include <linux/uaccess.h>
 #include <net/cfg80211.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
 
index 75bf17b..4f5ab69 100644 (file)
 #include <linux/sched.h>
 #include <linux/mmc/sdio.h>
 #include <asm/unaligned.h>
-#include <bcmdefs.h>
-#include <bcmsdh.h>
+#include <defs.h>
+#include <sdio_host.h>
 
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_wifi.h>
 #include <brcmu_utils.h>
-#include <bcmdevs.h>
+#include <brcm_hw_ids.h>
 
-#include <bcmsoc.h>
+#include <soc.h>
 
 /* register access macros */
 #ifndef __BIG_ENDIAN
index 38453cf..0a7a9b2 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/sched.h>
 
 #include <brcmu_utils.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_wifi.h>
 
 #include <asm/uaccess.h>
index f5725ec..c65affc 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <linux/kthread.h>
 #include <linux/semaphore.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
index 1b2afa9..ee5c3f0 100644 (file)
@@ -28,27 +28,27 @@ ccflags-y :=                                \
        -Idrivers/staging/brcm80211/include
 
 BRCMSMAC_OFILES := \
-       brcms_mac80211.o \
+       mac80211_if.o \
        ucode_loader.o \
-       wlc_alloc.o \
-       wlc_ampdu.o \
-       wlc_antsel.o \
-       wlc_bmac.o \
-       wlc_channel.o \
-       wlc_main.o \
-       wlc_phy_shim.o \
-       wlc_pmu.o \
-       wlc_rate.o \
-       wlc_stf.o \
+       alloc.o \
+       ampdu.o \
+       antsel.o \
+       bottom_mac.o \
+       channel.o \
+       main.o \
+       phy_shim.o \
+       pmu.o \
+       rate.o \
+       stf.o \
        aiutils.o \
-       phy/wlc_phy_cmn.o \
-       phy/wlc_phy_lcn.o \
-       phy/wlc_phy_n.o \
-       phy/wlc_phytbl_lcn.o \
-       phy/wlc_phytbl_n.o \
-       phy/wlc_phy_qmath.o \
-       bcmotp.o \
-       bcmsrom.o \
+       phy/phy_cmn.o \
+       phy/phy_lcn.o \
+       phy/phy_n.o \
+       phy/phytbl_lcn.o \
+       phy/phytbl_n.o \
+       phy/phy_qmath.o \
+       otp.o \
+       srom.o \
        dma.o \
        nicpci.o
 
index 7a8bab7..1f87b32 100644 (file)
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <bcmdefs.h>
-#include "wlc_types.h"
+#include <defs.h>
+#include "types.h"
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <brcmu_utils.h>
 #include <aiutils.h>
-#include <bcmsoc.h>
+#include <soc.h>
 #include <chipcommon.h>
-#include <bcmdevs.h>
+#include <brcm_hw_ids.h>
 
 /* ********** from siutils.c *********** */
 #include <nicpci.h>
-#include <bcmsrom.h>
-#include <wlc_pmu.h>
-#include <wlc_scb.h>
-#include <wlc_pub.h>
+#include <srom.h>
+#include <pmu.h>
+#include <scb.h>
+#include <pub.h>
 
 /* slow_clk_ctl */
 #define SCC_SS_MASK            0x00000007      /* slow clock source mask */
similarity index 95%
rename from drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
rename to drivers/staging/brcm80211/brcmsmac/alloc.c
index 77caf06..1758640 100644 (file)
 #include <linux/kernel.h>
 #include <linux/types.h>
 
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <aiutils.h>
-#include "bcmdma.h"
+#include "dma.h"
 
 #include "d11.h"
-#include "wlc_types.h"
-#include "wlc_cfg.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "wlc_key.h"
-#include "wlc_alloc.h"
-#include "wlc_rate.h"
-#include "wlc_bsscfg.h"
-#include "phy/wlc_phy_hal.h"
-#include "wlc_channel.h"
-#include "wlc_main.h"
+#include "types.h"
+#include "cfg.h"
+#include "scb.h"
+#include "pub.h"
+#include "key.h"
+#include "alloc.h"
+#include "rate.h"
+#include "bsscfg.h"
+#include "phy/phy_hal.h"
+#include "channel.h"
+#include "main.h"
 
 static struct wlc_bsscfg *wlc_bsscfg_malloc(uint unit);
 static void wlc_bsscfg_mfree(struct wlc_bsscfg *cfg);
similarity index 99%
rename from drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
rename to drivers/staging/brcm80211/brcmsmac/ampdu.c
index 3668451..ab6c496 100644 (file)
 #include <linux/kernel.h>
 #include <net/mac80211.h>
 
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <aiutils.h>
-#include "bcmdma.h"
-#include <bcmdma.h>
+#include "dma.h"
 #include <d11.h>
 
-#include "wlc_types.h"
-#include "wlc_cfg.h"
-#include "wlc_rate.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "wlc_key.h"
-#include "phy/wlc_phy_hal.h"
-#include "wlc_antsel.h"
-#include "wlc_channel.h"
-#include "wlc_main.h"
-#include "wlc_ampdu.h"
+#include "types.h"
+#include "cfg.h"
+#include "rate.h"
+#include "scb.h"
+#include "pub.h"
+#include "key.h"
+#include "phy/phy_hal.h"
+#include "antsel.h"
+#include "channel.h"
+#include "main.h"
+#include "ampdu.h"
 
 #define AMPDU_MAX_MPDU         32      /* max number of mpdus in an ampdu */
 #define AMPDU_NUM_MPDU_LEGACY  16      /* max number of mpdus in an ampdu to a legacy */
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <wlc_cfg.h>
+#include <cfg.h>
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <aiutils.h>
-#include <bcmdevs.h>
-#include "bcmdma.h"
+#include <brcm_hw_ids.h>
+#include "dma.h"
 
 #include "d11.h"
-#include "wlc_rate.h"
-#include "wlc_key.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "phy/wlc_phy_hal.h"
-#include "wlc_bmac.h"
-#include "wlc_channel.h"
-#include "wlc_main.h"
-#include "wlc_antsel.h"
+#include "rate.h"
+#include "key.h"
+#include "scb.h"
+#include "pub.h"
+#include "phy/phy_hal.h"
+#include "bottom_mac.h"
+#include "channel.h"
+#include "main.h"
+#include "antsel.h"
 
 #define ANT_SELCFG_AUTO                0x80    /* bit indicates antenna sel AUTO */
 #define ANT_SELCFG_MASK                0x33    /* antenna configuration mask */
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 
-#include <bcmdefs.h>
-#include <bcmdevs.h>
+#include <defs.h>
+#include <brcm_hw_ids.h>
 #include <brcmu_wifi.h>
 #include <aiutils.h>
-#include <bcmsrom.h>
-#include <bcmotp.h>
+#include <srom.h>
+#include "otp.h"
 #include <brcmu_utils.h>
 #include <chipcommon.h>
 #include <nicpci.h>
-#include <bcmdma.h>
+#include "dma.h"
 
-#include "wlc_types.h"
-#include "wlc_pmu.h"
+#include "types.h"
+#include "pmu.h"
 #include "d11.h"
-#include "wlc_cfg.h"
-#include "wlc_rate.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "wlc_key.h"
-#include "phy/wlc_phy_hal.h"
-#include "wlc_channel.h"
-#include "wlc_main.h"
+#include "cfg.h"
+#include "rate.h"
+#include "scb.h"
+#include "pub.h"
+#include "key.h"
+#include "phy/phy_hal.h"
+#include "channel.h"
+#include "main.h"
 #include "ucode_loader.h"
-#include "wlc_antsel.h"
-#include "wlc_alloc.h"
-#include "wlc_bmac.h"
-#include "brcms_mac80211.h"
+#include "antsel.h"
+#include "alloc.h"
+#include "bottom_mac.h"
+#include "mac80211_if.h"
 
 #define        TIMER_INTERVAL_WATCHDOG_BMAC    1000    /* watchdog timer, in unit of ms */
 
 #ifndef _BRCM_BOTTOM_MAC_H_
 #define _BRCM_BOTTOM_MAC_H_
 
-/* XXXXX this interface is under wlc.c by design
- * http://hwnbu-twiki.broadcom.com/bin/view/Mwgroup/WlBmacDesign
- *
- *        high driver files(e.g. wlc_ampdu.c etc)
- *             wlc.h/wlc.c
- *         wlc_bmac.h/wlc_bmac.c
- *
- *  So don't include this in files other than wlc.c, wlc_bmac* wl_rte.c(dongle port) and wl_phy.c
- *  create wrappers in wlc.c if needed
- */
-
 /* dup state between BMAC(struct wlc_hw_info) and HIGH(struct wlc_info)
    driver */
 typedef struct wlc_bmac_state {
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <aiutils.h>
-#include "bcmdma.h"
+#include "dma.h"
 
-#include "wlc_types.h"
+#include "types.h"
 #include "d11.h"
-#include "wlc_cfg.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "wlc_key.h"
-#include "phy/wlc_phy_hal.h"
-#include "wlc_bmac.h"
-#include "wlc_rate.h"
-#include "wlc_channel.h"
-#include "wlc_main.h"
-#include "wlc_stf.h"
+#include "cfg.h"
+#include "scb.h"
+#include "pub.h"
+#include "key.h"
+#include "phy/phy_hal.h"
+#include "bottom_mac.h"
+#include "rate.h"
+#include "channel.h"
+#include "main.h"
+#include "stf.h"
 
 #define        VALID_CHANNEL20_DB(wlc, val) wlc_valid_channel20_db((wlc)->cmi, val)
 #define        VALID_CHANNEL20_IN_BAND(wlc, bandunit, val) \
index 183baf8..ce02324 100644 (file)
 #include <linux/string.h>
 #include <linux/netdevice.h>
 #include <linux/pci.h>
-#include <bcmdefs.h>
-#include <bcmdevs.h>
-#include <bcmsoc.h>
+#include <defs.h>
+#include <brcm_hw_ids.h>
+#include <soc.h>
 #include <brcmu_utils.h>
 #include <aiutils.h>
 
-#include "wlc_types.h"
-#include "bcmdma.h"
-#include <bcmdma.h>
+#include "types.h"
+#include "dma.h"
 
 #if defined(__mips__)
 #include <asm/addrspace.h>
similarity index 99%
rename from drivers/staging/brcm80211/brcmsmac/bcmdma.h
rename to drivers/staging/brcm80211/brcmsmac/dma.h
index 0490803..70c9ad6 100644 (file)
@@ -17,7 +17,7 @@
 #ifndef        _BRCM_DMA_H_
 #define        _BRCM_DMA_H_
 
-#include "wlc_types.h"         /* forward structure declarations */
+#include "types.h"             /* forward structure declarations */
 
 #ifndef _dma_pub_
 #define _dma_pub_
 #include <linux/sched.h>
 #include <linux/firmware.h>
 #include <net/mac80211.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_wifi.h>
 #include <brcmu_utils.h>
 #include <nicpci.h>
-#include "bcmdma.h"
+#include "dma.h"
 
-#include "phy/wlc_phy_int.h"
+#include "phy/phy_int.h"
 #include "d11.h"
-#include "wlc_types.h"
-#include "wlc_cfg.h"
-#include "wlc_key.h"
-#include "wlc_channel.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
+#include "types.h"
+#include "cfg.h"
+#include "key.h"
+#include "channel.h"
+#include "scb.h"
+#include "pub.h"
 #include "ucode_loader.h"
-#include "brcms_mac80211.h"
+#include "mac80211_if.h"
 
 #define N_TX_QUEUES    4 /* #tx queues on mac80211<->driver interface */
 
similarity index 99%
rename from drivers/staging/brcm80211/brcmsmac/wlc_main.c
rename to drivers/staging/brcm80211/brcmsmac/main.c
index 7c86abc..759e68f 100644 (file)
 #include <linux/pci_ids.h>
 #include <net/mac80211.h>
 
-#include <bcmdefs.h>
-#include <bcmdevs.h>
+#include <defs.h>
+#include <brcm_hw_ids.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
 #include <aiutils.h>
-#include <bcmsrom.h>
-#include "bcmdma.h"
-#include <bcmdma.h>
+#include <srom.h>
+#include "dma.h"
 
-#include "wlc_pmu.h"
+#include "pmu.h"
 #include "d11.h"
-#include "wlc_types.h"
-#include "wlc_cfg.h"
-#include "wlc_rate.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "wlc_key.h"
-#include "wlc_bsscfg.h"
-#include "phy/wlc_phy_hal.h"
-#include "wlc_channel.h"
-#include "wlc_main.h"
-#include "wlc_bmac.h"
-#include "wlc_phy_hal.h"
-#include "wlc_antsel.h"
-#include "wlc_stf.h"
-#include "wlc_ampdu.h"
-#include "wlc_alloc.h"
-#include "brcms_mac80211.h"
+#include "types.h"
+#include "cfg.h"
+#include "rate.h"
+#include "scb.h"
+#include "pub.h"
+#include "key.h"
+#include "bsscfg.h"
+#include "phy/phy_hal.h"
+#include "channel.h"
+#include "main.h"
+#include "bottom_mac.h"
+#include "phy_hal.h"
+#include "antsel.h"
+#include "stf.h"
+#include "ampdu.h"
+#include "alloc.h"
+#include "mac80211_if.h"
 
 /*
  * WPA(2) definitions
similarity index 99%
rename from drivers/staging/brcm80211/brcmsmac/wlc_main.h
rename to drivers/staging/brcm80211/brcmsmac/main.h
index acba50b..f556faf 100644 (file)
@@ -166,7 +166,7 @@ extern const u8 prio2fifo[];
 #define        MAXTXFRAMEBURST         8       /* vanilla xpress mode: max frames/burst */
 #define        MAXFRAMEBURST_TXOP      10000   /* Frameburst TXOP in usec */
 
-/* Per-AC retry limit register definitions; uses bcmdefs.h bitfield macros */
+/* Per-AC retry limit register definitions; uses defs.h bitfield macros */
 #define EDCF_SHORT_S            0
 #define EDCF_SFB_S              4
 #define EDCF_LONG_S             8
index 3ffad2e..ca781c4 100644 (file)
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/pci.h>
-#include <bcmdefs.h>
-#include "wlc_types.h"
+#include <defs.h>
+#include "types.h"
 #include <brcmu_utils.h>
 #include <aiutils.h>
-#include <bcmsoc.h>
-#include <bcmdevs.h>
+#include <soc.h>
+#include <brcm_hw_ids.h>
 #include <chipcommon.h>
-#include <wlc_scb.h>
-#include <wlc_pub.h>
+#include <scb.h>
+#include <pub.h>
 #include <nicpci.h>
 
 /* SPROM offsets */
similarity index 99%
rename from drivers/staging/brcm80211/brcmsmac/bcmotp.c
rename to drivers/staging/brcm80211/brcmsmac/otp.c
index baed204..d21d6ca 100644 (file)
 #include <linux/pci.h>
 #include <linux/crc-ccitt.h>
 
-#include <bcmdefs.h>
-#include <bcmdevs.h>
-#include "wlc_types.h"
+#include <defs.h>
+#include <brcm_hw_ids.h>
+#include "types.h"
 #include <brcmu_utils.h>
 #include <aiutils.h>
-#include <bcmsoc.h>
+#include <soc.h>
 #include <chipcommon.h>
-#include <bcmotp.h>
+#include "otp.h"
 
 #define OTPS_GUP_MASK          0x00000f00
 #define OTPS_GUP_SHIFT         8
@@ -14,7 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <wlc_cfg.h>
+#include <cfg.h>
 
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include <bcmdefs.h>
+#include <defs.h>
 #include <chipcommon.h>
-#include <bcmdevs.h>
-#include "bcmdma.h"
-
-#include <wlc_types.h>
-#include <wlc_phy_int.h>
-#include <wlc_phyreg_n.h>
-#include <wlc_phy_radio.h>
-#include <wlc_phy_lcn.h>
+#include <brcm_hw_ids.h>
+#include <dma.h>
+
+#include <types.h>
+#include <phy_int.h>
+#include <phyreg_n.h>
+#include <phy_radio.h>
+#include <phy_lcn.h>
 
 u32 phyhal_msg_level = PHYHAL_ERROR;
 
@@ -23,7 +23,7 @@
 
 #include <aiutils.h>
 #include <d11.h>
-#include <wlc_phy_shim.h>
+#include <phy_shim.h>
 #include <net/mac80211.h>      /* struct wiphy */
 #include "brcmu_wifi.h"                /* chanspec_t */
 
 #define _BRCM_PHY_INT_H_
 
 #include <linux/kernel.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 
-#include <wlc_phy_hal.h>
+#include <phy_hal.h>
 
 #define        PHY_VERSION                     { 1, 82, 8, 0 }
 
 #include <linux/string.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
-#include <wlc_cfg.h>
+#include <cfg.h>
 #include <linux/pci.h>
 #include <brcmu_utils.h>
 #include <aiutils.h>
-#include <wlc_pmu.h>
-#include <wlc_scb.h>
-#include <wlc_pub.h>
-
-#include <bcmdevs.h>
-#include "bcmdma.h"
-
-#include "wlc_phy_radio.h"
-#include "wlc_phy_int.h"
-#include "wlc_phy_qmath.h"
-#include "wlc_phy_lcn.h"
-#include "wlc_phytbl_lcn.h"
+#include <pmu.h>
+#include <scb.h>
+#include <pub.h>
+
+#include <brcm_hw_ids.h>
+#include <dma.h>
+
+#include "phy_radio.h"
+#include "phy_int.h"
+#include "phy_qmath.h"
+#include "phy_lcn.h"
+#include "phytbl_lcn.h"
 
 #define PLL_2064_NDIV          90
 #define PLL_2064_LOW_END_VCO   3000
 
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <bcmdefs.h>
-#include <wlc_cfg.h>
+#include <defs.h>
+#include <cfg.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <aiutils.h>
 #include <chipcommon.h>
-#include <wlc_pmu.h>
+#include <pmu.h>
 
-#include <bcmdevs.h>
-#include "bcmdma.h"
+#include <brcm_hw_ids.h>
+#include <dma.h>
 
-#include <wlc_types.h>
-#include <wlc_phy_radio.h>
-#include <wlc_phy_int.h>
-#include <wlc_phyreg_n.h>
-#include <wlc_phytbl_n.h>
+#include <types.h>
+#include <phy_radio.h>
+#include <phy_int.h>
+#include <phyreg_n.h>
+#include <phytbl_n.h>
 
 #define        READ_RADIO_REG2(pi, radio_type, jspace, core, reg_name) \
        read_radio_reg(pi, radio_type##_##jspace##_##reg_name | \
@@ -16,7 +16,7 @@
 
 #include <linux/types.h>
 
-#include "wlc_phy_qmath.h"
+#include "phy_qmath.h"
 
 /*
 Description: This function make 16 bit unsigned multiplication. To fit the output into
@@ -15,9 +15,9 @@
  */
 
 #include <linux/types.h>
-#include "bcmdma.h"
-#include <wlc_phy_int.h>
-#include <wlc_phytbl_lcn.h>
+#include <dma.h>
+#include <phy_int.h>
+#include <phytbl_lcn.h>
 
 const u32 dot11lcn_gain_tbl_rev0[] = {
        0x00000000,
@@ -16,9 +16,9 @@
 
 #include <linux/kernel.h>
 
-#include "bcmdma.h"
-#include <wlc_phy_int.h>
-#include <wlc_phytbl_n.h>
+#include <dma.h>
+#include <phy_int.h>
+#include <phytbl_n.h>
 
 const u32 frame_struct_rev0[] = {
        0x08004a04,
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
 #include <aiutils.h>
 #include <chipcommon.h>
-#include "bcmdma.h"
-#include <wlc_pmu.h>
+#include "dma.h"
+#include <pmu.h>
 
-#include "wlc_types.h"
-#include "wlc_cfg.h"
+#include "types.h"
+#include "cfg.h"
 #include "d11.h"
-#include "wlc_rate.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "phy/wlc_phy_hal.h"
-#include "wlc_channel.h"
-#include "bcmsrom.h"
-#include "wlc_key.h"
-#include "wlc_bmac.h"
-#include "wlc_phy_hal.h"
-#include "wlc_main.h"
-#include "wlc_phy_shim.h"
-#include "brcms_mac80211.h"
+#include "rate.h"
+#include "scb.h"
+#include "pub.h"
+#include "phy/phy_hal.h"
+#include "channel.h"
+#include <srom.h>
+#include "key.h"
+#include "bottom_mac.h"
+#include "phy_hal.h"
+#include "main.h"
+#include "phy_shim.h"
+#include "mac80211_if.h"
 
 /* PHY SHIM module specific state */
 struct wlc_phy_shim_info {
similarity index 99%
rename from drivers/staging/brcm80211/brcmsmac/wlc_pmu.c
rename to drivers/staging/brcm80211/brcmsmac/pmu.c
index 720839b..b822d40 100644 (file)
 #include <linux/delay.h>
 #include <linux/io.h>
 
-#include <bcmdevs.h>
-#include "wlc_types.h"
+#include <brcm_hw_ids.h>
+#include "types.h"
 #include <chipcommon.h>
 #include <brcmu_utils.h>
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "wlc_pmu.h"
+#include "scb.h"
+#include "pub.h"
+#include "pmu.h"
 
 /*
  * d11 slow to fast clock transition time in slow clock cycles
similarity index 99%
rename from drivers/staging/brcm80211/brcmsmac/wlc_pub.h
rename to drivers/staging/brcm80211/brcmsmac/pub.h
index 20df964..e5f24b0 100644 (file)
@@ -17,7 +17,7 @@
 #ifndef _BRCM_PUB_H_
 #define _BRCM_PUB_H_
 
-#include "wlc_types.h"         /* forward structure declarations */
+#include "types.h"             /* forward structure declarations */
 #include "brcmu_wifi.h"                /* for chanspec_t */
 
 #define        WLC_NUMRATES    16      /* max # of rates in a rateset */
similarity index 99%
rename from drivers/staging/brcm80211/brcmsmac/wlc_rate.c
rename to drivers/staging/brcm80211/brcmsmac/rate.c
index 3625c72..807c0f6 100644 (file)
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <aiutils.h>
-#include "bcmdma.h"
+#include "dma.h"
 
-#include "wlc_types.h"
+#include "types.h"
 #include "d11.h"
-#include "wlc_cfg.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "wlc_rate.h"
+#include "cfg.h"
+#include "scb.h"
+#include "pub.h"
+#include "rate.h"
 
 /* Rate info per rate: It tells whether a rate is ofdm or not and its phy_rate value */
 const u8 rate_info[WLC_MAXRATE + 1] = {
similarity index 99%
rename from drivers/staging/brcm80211/brcmsmac/bcmsrom.c
rename to drivers/staging/brcm80211/brcmsmac/srom.c
index 8b22add..5a7b434 100644 (file)
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/etherdevice.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <stdarg.h>
-#include "wlc_types.h"
+#include "types.h"
 #include <brcmu_utils.h>
-#include <bcmsoc.h>
+#include <soc.h>
 #include <chipcommon.h>
-#include <bcmdevs.h>
+#include <brcm_hw_ids.h>
 #include <nicpci.h>
 #include <aiutils.h>
-#include <bcmsrom.h>
-#include <bcmotp.h>
+#include <srom.h>
+#include "otp.h"
 
 #define SROM_OFFSET(sih) ((sih->ccrev > 31) ? \
        (((sih->cccaps & CC_CAP_SROM) == 0) ? NULL : \
similarity index 97%
rename from drivers/staging/brcm80211/brcmsmac/wlc_stf.c
rename to drivers/staging/brcm80211/brcmsmac/stf.c
index 697da28..a0abef3 100644 (file)
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <aiutils.h>
 #include <brcmu_wifi.h>
-#include "bcmdma.h"
+#include "dma.h"
 
-#include "wlc_types.h"
+#include "types.h"
 #include "d11.h"
-#include "wlc_cfg.h"
-#include "wlc_rate.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "wlc_key.h"
-#include "phy/wlc_phy_hal.h"
-#include "wlc_channel.h"
-#include "wlc_main.h"
-#include "wlc_bmac.h"
-#include "wlc_stf.h"
+#include "cfg.h"
+#include "rate.h"
+#include "scb.h"
+#include "pub.h"
+#include "key.h"
+#include "phy/phy_hal.h"
+#include "channel.h"
+#include "main.h"
+#include "bottom_mac.h"
+#include "stf.h"
 
 #define MIN_SPATIAL_EXPANSION  0
 #define MAX_SPATIAL_EXPANSION  1
similarity index 98%
rename from drivers/staging/brcm80211/brcmsmac/wlc_types.h
rename to drivers/staging/brcm80211/brcmsmac/types.h
index fa8d129..d15860b 100644 (file)
@@ -151,7 +151,7 @@ struct wlc_bsscfg;
 struct brcmu_strbuf;
 struct si_pub;
 
-/* brcm_msg_level is a bit vector with defs in bcmdefs.h */
+/* brcm_msg_level is a bit vector with defs in defs.h */
 extern u32 brcm_msg_level;
 
 #endif                         /* _BRCM_TYPES_H_ */
index d38f124..32d5196 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include <linux/types.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <ucode_loader.h>
 
 enum {
index 4b90121..ca53dec 100644 (file)
@@ -14,7 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "wlc_types.h"         /* forward structure declarations */
+#include "types.h"             /* forward structure declarations */
 
 #define MIN_FW_SIZE 40000      /* minimum firmware file size in bytes */
 #define MAX_FW_SIZE 150000
index d259e26..ab11c4b 100644 (file)
 #include <linux/netdevice.h>
 #include <linux/sched.h>
 #include <linux/printk.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <stdarg.h>
 #include <brcmu_utils.h>
-#include <bcmdevs.h>
+#include <brcm_hw_ids.h>
 
 MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver utilities.");
index 2a3db0a..bacf345 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <bcmdefs.h>
+#include <defs.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
 
index 2c10177..d166af4 100644 (file)
@@ -17,7 +17,7 @@
 #ifndef        _AIDMP_H
 #define        _AIDMP_H
 
-#include "bcmdefs.h"           /* for PAD macro */
+#include "defs.h"              /* for PAD macro */
 
 /* Manufacturer Ids */
 #define        MFGID_ARM               0x43b
index ee1130f..296582a 100644 (file)
@@ -17,7 +17,7 @@
 #ifndef        _SBCHIPC_H
 #define        _SBCHIPC_H
 
-#include "bcmdefs.h"           /* for PAD macro */
+#include "defs.h"              /* for PAD macro */
 
 typedef volatile struct {
        u32 chipid;             /* 0x0 */