diff options
author | Roland Vossen <rvossen@broadcom.com> | 2011-06-01 13:45:59 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 12:49:30 -0700 |
commit | cc3cea5ae091532bf8ed0976499129fe53a589ac (patch) | |
tree | ceab3b0b72d27430dfb3f07571f256bcd1ac0629 /drivers/staging/brcm80211 | |
parent | f855796549c0a0531c9c7521baec97793d7a6fc4 (diff) |
staging: brcm80211: renamed files in brcmsmac and include directories
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>
Diffstat (limited to 'drivers/staging/brcm80211')
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 8 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 10 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/Makefile | 38 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/aiutils.c | 16 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/alloc.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_alloc.c) | 26 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/alloc.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_alloc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/ampdu.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c) | 27 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/ampdu.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/antsel.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_antsel.c) | 26 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/antsel.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_antsel.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bottom_mac.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_bmac.c) | 38 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bottom_mac.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_bmac.h) | 11 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bsscfg.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/cfg.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_cfg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/channel.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_channel.c) | 26 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/channel.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_channel.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/dma.c | 11 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/dma.h (renamed from drivers/staging/brcm80211/brcmsmac/bcmdma.h) | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/key.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_key.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/mac80211_if.c (renamed from drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c) | 20 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/mac80211_if.h (renamed from drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/main.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_main.c) | 45 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/main.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_main.h) | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/nicpci.c | 12 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/otp.c (renamed from drivers/staging/brcm80211/brcmsmac/bcmotp.c) | 10 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/otp.h (renamed from drivers/staging/brcm80211/brcmsmac/bcmotp.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c) | 20 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h) | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_int.h (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h) | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c) | 26 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.h (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_n.c (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c) | 20 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c) | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.h (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_radio.h (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phyreg_n.h (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c) | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.h (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c) | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h (renamed from drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy_shim.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c) | 34 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy_shim.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/pmu.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_pmu.c) | 10 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/pmu.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_pmu.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/pub.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_pub.h) | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/rate.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_rate.c) | 14 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/rate.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_rate.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/scb.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_scb.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/srom.c (renamed from drivers/staging/brcm80211/brcmsmac/bcmsrom.c) | 12 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/stf.c (renamed from drivers/staging/brcm80211/brcmsmac/wlc_stf.c) | 26 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/stf.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_stf.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/types.h (renamed from drivers/staging/brcm80211/brcmsmac/wlc_types.h) | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/ucode_loader.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/ucode_loader.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmutil/utils.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmutil/wifi.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/aidmp.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/brcm_hw_ids.h (renamed from drivers/staging/brcm80211/include/bcmdevs.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/chipcommon.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/defs.h (renamed from drivers/staging/brcm80211/include/bcmdefs.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/sdio_host.h (renamed from drivers/staging/brcm80211/include/bcmsdh.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/soc.h (renamed from drivers/staging/brcm80211/include/bcmsoc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/srom.h (renamed from drivers/staging/brcm80211/include/bcmsrom.h) | 0 |
72 files changed, 271 insertions, 285 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 352ba4bafda..d6e90d70eb8 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -19,13 +19,13 @@ #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 */ diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index 5812b5befcb..37cf61aca6c 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -25,10 +25,10 @@ #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) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 9abd6207c19..03a5966fc30 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -16,11 +16,11 @@ #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 */ diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c index 2da07e2ff5f..85ed0958b9c 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c @@ -17,10 +17,10 @@ #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 */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c index dd872f4d1b0..2220941a100 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c @@ -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> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index a8504bb2a51..73d8b0229de 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -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> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c index 831f32447e3..60088886260 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c @@ -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> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index adcf82daee9..b48447c8005 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -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> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 75bf17b48c2..4f5ab69ec7f 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -22,15 +22,15 @@ #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 diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 38453cfa42a..0a7a9b2944f 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -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> diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index f5725ec7842..c65affc0a12 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -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> diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile index 1b2afa9a883..ee5c3f034a6 100644 --- a/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/drivers/staging/brcm80211/brcmsmac/Makefile @@ -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 diff --git a/drivers/staging/brcm80211/brcmsmac/aiutils.c b/drivers/staging/brcm80211/brcmsmac/aiutils.c index 7a8bab728b7..1f87b32c11d 100644 --- a/drivers/staging/brcm80211/brcmsmac/aiutils.c +++ b/drivers/staging/brcm80211/brcmsmac/aiutils.c @@ -17,22 +17,22 @@ #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 */ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/alloc.c index 77caf067df4..17586403a4d 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c +++ b/drivers/staging/brcm80211/brcmsmac/alloc.c @@ -16,23 +16,23 @@ #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); diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.h b/drivers/staging/brcm80211/brcmsmac/alloc.h index 95f951eb2b2..95f951eb2b2 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.h +++ b/drivers/staging/brcm80211/brcmsmac/alloc.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/ampdu.c index 36684512fe9..ab6c496faaf 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/ampdu.c @@ -16,24 +16,23 @@ #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 */ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h b/drivers/staging/brcm80211/brcmsmac/ampdu.h index df7d7d96934..df7d7d96934 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h +++ b/drivers/staging/brcm80211/brcmsmac/ampdu.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/antsel.c index 275369ab813..31bc7c4817c 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c +++ b/drivers/staging/brcm80211/brcmsmac/antsel.c @@ -14,28 +14,28 @@ * 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 */ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.h b/drivers/staging/brcm80211/brcmsmac/antsel.h index c1b9cef980c..c1b9cef980c 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.h +++ b/drivers/staging/brcm80211/brcmsmac/antsel.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/bottom_mac.c index 06d03b6fcc2..365cae06537 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/bottom_mac.c @@ -21,33 +21,33 @@ #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 */ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.h b/drivers/staging/brcm80211/brcmsmac/bottom_mac.h index 8a582d1f227..af8af69fc1e 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.h +++ b/drivers/staging/brcm80211/brcmsmac/bottom_mac.h @@ -16,17 +16,6 @@ #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 { diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h b/drivers/staging/brcm80211/brcmsmac/bsscfg.h index 49c30cd93d9..49c30cd93d9 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h +++ b/drivers/staging/brcm80211/brcmsmac/bsscfg.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_cfg.h b/drivers/staging/brcm80211/brcmsmac/cfg.h index 534c536c1f7..534c536c1f7 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_cfg.h +++ b/drivers/staging/brcm80211/brcmsmac/cfg.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/channel.c index 98971234acc..5dce2679b92 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c +++ b/drivers/staging/brcm80211/brcmsmac/channel.c @@ -19,23 +19,23 @@ #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) \ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.h b/drivers/staging/brcm80211/brcmsmac/channel.h index f50a66ec22c..f50a66ec22c 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.h +++ b/drivers/staging/brcm80211/brcmsmac/channel.h diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c index 183baf88b05..ce023249dd7 100644 --- a/drivers/staging/brcm80211/brcmsmac/dma.c +++ b/drivers/staging/brcm80211/brcmsmac/dma.c @@ -18,15 +18,14 @@ #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> diff --git a/drivers/staging/brcm80211/brcmsmac/bcmdma.h b/drivers/staging/brcm80211/brcmsmac/dma.h index 049080335d2..70c9ad6c495 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmdma.h +++ b/drivers/staging/brcm80211/brcmsmac/dma.h @@ -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_ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_key.h b/drivers/staging/brcm80211/brcmsmac/key.h index ecfe969ace6..ecfe969ace6 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_key.h +++ b/drivers/staging/brcm80211/brcmsmac/key.h diff --git a/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c index 6449743d589..1029392dc63 100644 --- a/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c @@ -25,22 +25,22 @@ #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 */ diff --git a/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h index c56707a45ac..c56707a45ac 100644 --- a/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h +++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/main.c index 7c86abc1e04..759e68fa0a2 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c +++ b/drivers/staging/brcm80211/brcmsmac/main.c @@ -19,34 +19,33 @@ #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 diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.h b/drivers/staging/brcm80211/brcmsmac/main.h index acba50bbc7d..f556faf6796 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_main.h +++ b/drivers/staging/brcm80211/brcmsmac/main.h @@ -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 diff --git a/drivers/staging/brcm80211/brcmsmac/nicpci.c b/drivers/staging/brcm80211/brcmsmac/nicpci.c index 3ffad2e63de..ca781c445a8 100644 --- a/drivers/staging/brcm80211/brcmsmac/nicpci.c +++ b/drivers/staging/brcm80211/brcmsmac/nicpci.c @@ -17,15 +17,15 @@ #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 */ diff --git a/drivers/staging/brcm80211/brcmsmac/bcmotp.c b/drivers/staging/brcm80211/brcmsmac/otp.c index baed204ea4c..d21d6cadb9d 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmotp.c +++ b/drivers/staging/brcm80211/brcmsmac/otp.c @@ -21,14 +21,14 @@ #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 diff --git a/drivers/staging/brcm80211/brcmsmac/bcmotp.h b/drivers/staging/brcm80211/brcmsmac/otp.h index c1eb3477bab..c1eb3477bab 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmotp.h +++ b/drivers/staging/brcm80211/brcmsmac/otp.h diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index b2866de47e9..c67bf8b6a64 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c @@ -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> @@ -23,16 +23,16 @@ #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; diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h index 4d0393342c5..8bd0d139a37 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h @@ -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 */ diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h index ce417e67e60..f3fddfcf604 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h @@ -18,10 +18,10 @@ #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 } diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c index a3655caa561..de301aadba8 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c @@ -18,22 +18,22 @@ #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 diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.h index efa8c903360..efa8c903360 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.h diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c index da2afbbe22e..0dc614a7ea6 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c @@ -16,22 +16,22 @@ #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 | \ diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c index c98176fd0aa..801c7c0d555 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c @@ -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 diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.h index 49f57f4e847..49f57f4e847 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.h diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_radio.h index c3a675455ff..c3a675455ff 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_radio.h diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h b/drivers/staging/brcm80211/brcmsmac/phy/phyreg_n.h index 211bc3a842a..211bc3a842a 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phyreg_n.h diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c index 679002e5ef1..4dcc6916935 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c @@ -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, diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.h index 5a64a988d10..5a64a988d10 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.h diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c index ad41a19dfa0..1dd613ac5e6 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c @@ -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, diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h index 396122f5e50..396122f5e50 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/phy_shim.c index 2745743b5e8..330001504c0 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/phy_shim.c @@ -24,29 +24,29 @@ #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 { diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h b/drivers/staging/brcm80211/brcmsmac/phy_shim.h index 1677df218a5..1677df218a5 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h +++ b/drivers/staging/brcm80211/brcmsmac/phy_shim.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c b/drivers/staging/brcm80211/brcmsmac/pmu.c index 720839bf96a..b822d403fe5 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c +++ b/drivers/staging/brcm80211/brcmsmac/pmu.c @@ -18,13 +18,13 @@ #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 diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_pmu.h b/drivers/staging/brcm80211/brcmsmac/pmu.h index eff8d5b0503..eff8d5b0503 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_pmu.h +++ b/drivers/staging/brcm80211/brcmsmac/pmu.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h b/drivers/staging/brcm80211/brcmsmac/pub.h index 20df96407b9..e5f24b051ab 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h +++ b/drivers/staging/brcm80211/brcmsmac/pub.h @@ -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 */ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/rate.c index 3625c72b25d..807c0f61549 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c +++ b/drivers/staging/brcm80211/brcmsmac/rate.c @@ -16,17 +16,17 @@ #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] = { diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.h b/drivers/staging/brcm80211/brcmsmac/rate.h index 5575e83bdc6..5575e83bdc6 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.h +++ b/drivers/staging/brcm80211/brcmsmac/rate.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_scb.h b/drivers/staging/brcm80211/brcmsmac/scb.h index dcad9d0f422..dcad9d0f422 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_scb.h +++ b/drivers/staging/brcm80211/brcmsmac/scb.h diff --git a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c b/drivers/staging/brcm80211/brcmsmac/srom.c index 8b22adda67c..5a7b4348c77 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c +++ b/drivers/staging/brcm80211/brcmsmac/srom.c @@ -16,19 +16,19 @@ #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 : \ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/stf.c index 697da285dab..a0abef38694 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c +++ b/drivers/staging/brcm80211/brcmsmac/stf.c @@ -17,24 +17,24 @@ #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 diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.h b/drivers/staging/brcm80211/brcmsmac/stf.h index 75e8205a2c4..75e8205a2c4 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.h +++ b/drivers/staging/brcm80211/brcmsmac/stf.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_types.h b/drivers/staging/brcm80211/brcmsmac/types.h index fa8d12977ab..d15860b1ec7 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_types.h +++ b/drivers/staging/brcm80211/brcmsmac/types.h @@ -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_ */ diff --git a/drivers/staging/brcm80211/brcmsmac/ucode_loader.c b/drivers/staging/brcm80211/brcmsmac/ucode_loader.c index d38f1242bd9..32d5196d649 100644 --- a/drivers/staging/brcm80211/brcmsmac/ucode_loader.c +++ b/drivers/staging/brcm80211/brcmsmac/ucode_loader.c @@ -15,7 +15,7 @@ */ #include <linux/types.h> -#include <bcmdefs.h> +#include <defs.h> #include <ucode_loader.h> enum { diff --git a/drivers/staging/brcm80211/brcmsmac/ucode_loader.h b/drivers/staging/brcm80211/brcmsmac/ucode_loader.h index 4b90121a3bd..ca53deced7b 100644 --- a/drivers/staging/brcm80211/brcmsmac/ucode_loader.h +++ b/drivers/staging/brcm80211/brcmsmac/ucode_loader.h @@ -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 diff --git a/drivers/staging/brcm80211/brcmutil/utils.c b/drivers/staging/brcm80211/brcmutil/utils.c index d259e265352..ab11c4bf4f1 100644 --- a/drivers/staging/brcm80211/brcmutil/utils.c +++ b/drivers/staging/brcm80211/brcmutil/utils.c @@ -22,10 +22,10 @@ #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."); diff --git a/drivers/staging/brcm80211/brcmutil/wifi.c b/drivers/staging/brcm80211/brcmutil/wifi.c index 2a3db0a008d..bacf3450206 100644 --- a/drivers/staging/brcm80211/brcmutil/wifi.c +++ b/drivers/staging/brcm80211/brcmutil/wifi.c @@ -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> diff --git a/drivers/staging/brcm80211/include/aidmp.h b/drivers/staging/brcm80211/include/aidmp.h index 2c10177151a..d166af4b2d5 100644 --- a/drivers/staging/brcm80211/include/aidmp.h +++ b/drivers/staging/brcm80211/include/aidmp.h @@ -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 diff --git a/drivers/staging/brcm80211/include/bcmdevs.h b/drivers/staging/brcm80211/include/brcm_hw_ids.h index b7aedac38e3..b7aedac38e3 100644 --- a/drivers/staging/brcm80211/include/bcmdevs.h +++ b/drivers/staging/brcm80211/include/brcm_hw_ids.h diff --git a/drivers/staging/brcm80211/include/chipcommon.h b/drivers/staging/brcm80211/include/chipcommon.h index ee1130fcb20..296582aced6 100644 --- a/drivers/staging/brcm80211/include/chipcommon.h +++ b/drivers/staging/brcm80211/include/chipcommon.h @@ -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 */ diff --git a/drivers/staging/brcm80211/include/bcmdefs.h b/drivers/staging/brcm80211/include/defs.h index 768df8dfe28..768df8dfe28 100644 --- a/drivers/staging/brcm80211/include/bcmdefs.h +++ b/drivers/staging/brcm80211/include/defs.h diff --git a/drivers/staging/brcm80211/include/bcmsdh.h b/drivers/staging/brcm80211/include/sdio_host.h index db19533a5c0..db19533a5c0 100644 --- a/drivers/staging/brcm80211/include/bcmsdh.h +++ b/drivers/staging/brcm80211/include/sdio_host.h diff --git a/drivers/staging/brcm80211/include/bcmsoc.h b/drivers/staging/brcm80211/include/soc.h index 89e6719f66e..89e6719f66e 100644 --- a/drivers/staging/brcm80211/include/bcmsoc.h +++ b/drivers/staging/brcm80211/include/soc.h diff --git a/drivers/staging/brcm80211/include/bcmsrom.h b/drivers/staging/brcm80211/include/srom.h index ee4f8801e7c..ee4f8801e7c 100644 --- a/drivers/staging/brcm80211/include/bcmsrom.h +++ b/drivers/staging/brcm80211/include/srom.h |