mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 19:51:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: brcm80211: #include reduction

Browse Source 
Code cleanup. Number of includes has been reduced by only including what
is necessary.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roland Vossen
2011-06-09 16:44:43 +02:00
committed by Greg Kroah-Hartman
parent f99f8a7299
commit 3bec7bb935
48 changed files with 139 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/brcm80211/brcmsmac/aiutils.c
View File

@@ -13,26 +13,19 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <defs.h>
#include "types.h"
#include <linux/module.h>
#include <linux/pci.h>
#include <brcmu_utils.h>
#include <aiutils.h>
#include <soc.h>
#include <chipcommon.h>
#include <brcm_hw_ids.h>
/* ********** from siutils.c *********** */
#include <nicpci.h>
#include <defs.h>
#include <chipcommon.h>
#include <brcmu_utils.h>
#include <brcm_hw_ids.h>
#include "types.h"
#include "pub.h"
#include "pmu.h"
#include "srom.h"
#include <pmu.h>
#include <scb.h>
#include <pub.h>
#include "nicpci.h"
#include "aiutils.h"
/* slow_clk_ctl */
#define SCC_SS_MASK 0x00000007 /* slow clock source mask */

13
drivers/staging/brcm80211/brcmsmac/alloc.c
View File

@@ -13,23 +13,12 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/types.h>
#include <defs.h>
#include <brcmu_utils.h>
#include <aiutils.h>
#include "dma.h"
#include "d11.h"
#include "types.h"
#include "scb.h"
#include "pub.h"
#include "alloc.h"
#include "rate.h"
#include "phy/phy_hal.h"
#include "channel.h"
#include "main.h"
#include "alloc.h"
static struct wlc_bsscfg *wlc_bsscfg_malloc(uint unit);
static void wlc_bsscfg_mfree(struct wlc_bsscfg *cfg);

10
drivers/staging/brcm80211/brcmsmac/ampdu.c
View File

@@ -13,22 +13,12 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <net/mac80211.h>
#include <defs.h>
#include <brcmu_utils.h>
#include <aiutils.h>
#include "dma.h"
#include <d11.h>
#include "types.h"
#include "rate.h"
#include "scb.h"
#include "pub.h"
#include "phy/phy_hal.h"
#include "antsel.h"
#include "channel.h"
#include "main.h"
#include "ampdu.h"

19
drivers/staging/brcm80211/brcmsmac/antsel.c
View File

@@ -14,24 +14,13 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <net/mac80211.h>
#include <defs.h>
#include <brcmu_utils.h>
#include <aiutils.h>
#include <brcm_hw_ids.h>
#include "dma.h"
#include "d11.h"
#include "rate.h"
#include "scb.h"
#include "pub.h"
#include "phy/phy_hal.h"
#include "types.h"
#include "bmac.h"
#include "channel.h"
#include "main.h"
#include "phy_shim.h"
#include "antsel.h"
#define ANT_SELCFG_AUTO 0x80 /* bit indicates antenna sel AUTO */

29
drivers/staging/brcm80211/brcmsmac/bmac.c
View File

@@ -13,39 +13,20 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <defs.h>
#include <brcm_hw_ids.h>
#include <brcmu_wifi.h>
#include <aiutils.h>
#include "srom.h"
#include "otp.h"
#include <brcmu_utils.h>
#include <chipcommon.h>
#include <nicpci.h>
#include "dma.h"
#include <net/mac80211.h>
#include "types.h"
#include "pmu.h"
#include "d11.h"
#include <brcm_hw_ids.h>
#include <aiutils.h>
#include <chipcommon.h>
#include "rate.h"
#include "scb.h"
#include "pub.h"
#include "phy/phy_hal.h"
#include "channel.h"
#include "main.h"
#include "ucode_loader.h"
#include "antsel.h"
#include "alloc.h"
#include "bmac.h"
#include "mac80211_if.h"
#include "bmac.h"
#define TIMER_INTERVAL_WATCHDOG_BMAC 1000 /* watchdog timer, in unit of ms */

3
drivers/staging/brcm80211/brcmsmac/bmac.h
View File

@@ -16,6 +16,9 @@
#ifndef _BRCM_BOTTOM_MAC_H_
#define _BRCM_BOTTOM_MAC_H_
#include <brcmu_wifi.h>
#include "types.h"
/* dup state between BMAC(struct wlc_hw_info) and HIGH(struct wlc_info)
driver */
struct wlc_bmac_state {

14
drivers/staging/brcm80211/brcmsmac/channel.c
View File

@@ -14,26 +14,16 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <net/mac80211.h>
#include <defs.h>
#include <brcmu_utils.h>
#include <aiutils.h>
#include "dma.h"
#include "types.h"
#include "d11.h"
#include "scb.h"
#include "pub.h"
#include "phy/phy_hal.h"
#include "bmac.h"
#include "rate.h"
#include "channel.h"
#include "main.h"
#include "stf.h"
#include "channel.h"
#define VALID_CHANNEL20_DB(wlc, val) wlc_valid_channel20_db((wlc)->cmi, val)
#define VALID_CHANNEL20_IN_BAND(wlc, bandunit, val) \

4
drivers/staging/brcm80211/brcmsmac/d11.h
View File

@@ -19,6 +19,10 @@
#include <linux/ieee80211.h>
#include <defs.h>
#include "pub.h"
#include "dma.h"
#define BCN_TMPL_LEN 512 /* length of the BCN template area */
/* RX FIFO numbers */

12
drivers/staging/brcm80211/brcmsmac/dma.c
View File

@@ -13,17 +13,13 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/netdevice.h>
#include <linux/slab.h>
#include <linux/skbuff.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <defs.h>
#include <brcm_hw_ids.h>
#include <soc.h>
#include <brcmu_utils.h>
#include <aiutils.h>
#include "types.h"
#include "dma.h"

5
drivers/staging/brcm80211/brcmsmac/dma.h
View File

@@ -19,11 +19,6 @@
#include "types.h" /* forward structure declarations */
#ifndef _dma_pub_
#define _dma_pub_
struct dma_pub;
#endif /* _dma_pub_ */
/* DMA structure:
* support two DMA engines: 32 bits address or 64 bit addressing
* basic DMA register set is per channel(transmit or receive)

11
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
View File

@@ -16,24 +16,15 @@
#define __UNDEF_NO_VERSION__
#include <linux/kernel.h>
#include <linux/etherdevice.h>
#include <linux/types.h>
#include <linux/pci_ids.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/firmware.h>
#include <net/mac80211.h>
#include <defs.h>
#include <brcmu_wifi.h>
#include <brcmu_utils.h>
#include <nicpci.h>
#include "dma.h"
#include "nicpci.h"
#include "phy/phy_int.h"
#include "d11.h"
#include "types.h"
#include "channel.h"
#include "scb.h"
#include "pub.h"

3
drivers/staging/brcm80211/brcmsmac/mac80211_if.h
View File

@@ -17,6 +17,9 @@
#ifndef _BRCM_MAC80211_IF_H_
#define _BRCM_MAC80211_IF_H_
#include <linux/timer.h>
#include <linux/interrupt.h>
/* softmac ioctl definitions */
#define WLC_SET_SHORTSLOT_OVERRIDE 146

17
drivers/staging/brcm80211/brcmsmac/main.c
View File

@@ -13,36 +13,23 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/ctype.h>
#include <linux/etherdevice.h>
#include <linux/pci_ids.h>
#include <net/mac80211.h>
#include <defs.h>
#include <brcm_hw_ids.h>
#include <brcmu_utils.h>
#include <brcmu_wifi.h>
#include <aiutils.h>
#include "srom.h"
#include "dma.h"
#include "pmu.h"
#include "d11.h"
#include "types.h"
#include "rate.h"
#include "scb.h"
#include "pub.h"
#include "phy/phy_hal.h"
#include "channel.h"
#include "main.h"
#include "bmac.h"
#include "phy_hal.h"
#include "antsel.h"
#include "stf.h"
#include "ampdu.h"
#include "alloc.h"
#include "mac80211_if.h"
#include "main.h"
/*
* WPA(2) definitions

6
drivers/staging/brcm80211/brcmsmac/main.h
View File

@@ -17,6 +17,12 @@
#ifndef _BRCM_MAIN_H_
#define _BRCM_MAIN_H_
#include <linux/etherdevice.h>
#include <brcmu_utils.h>
#include "types.h"
#include "d11.h"
#define MA_WINDOW_SZ 8 /* moving average window size */
#define WL_HWRXOFF 38 /* chip rx buffer offset */
#define INVCHANNEL 255 /* invalid channel */

13
drivers/staging/brcm80211/brcmsmac/nicpci.c
View File

@@ -14,19 +14,16 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/pci.h>
#include <defs.h>
#include "types.h"
#include <brcmu_utils.h>
#include <aiutils.h>
#include <soc.h>
#include <brcm_hw_ids.h>
#include <chipcommon.h>
#include <scb.h>
#include <pub.h>
#include <nicpci.h>
#include "aiutils.h"
#include "pub.h"
#include "nicpci.h"
/* SPROM offsets */
#define SRSH_ASPM_OFFSET 4 /* word 4 */

2
drivers/staging/brcm80211/brcmsmac/nicpci.h
View File

@@ -17,6 +17,8 @@
#ifndef _BRCM_NICPCI_H_
#define _BRCM_NICPCI_H_
#include "types.h"
/* PCI configuration address space size */
#define PCI_SZPCR 256

14
drivers/staging/brcm80211/brcmsmac/otp.c
View File

@@ -14,19 +14,11 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/crc-ccitt.h>
#include <linux/io.h>
#include <linux/errno.h>
#include <defs.h>
#include <brcm_hw_ids.h>
#include "types.h"
#include <brcmu_utils.h>
#include <aiutils.h>
#include <soc.h>
#include "aiutils.h"
#include <chipcommon.h>
#include "otp.h"

2
drivers/staging/brcm80211/brcmsmac/otp.h
View File

@@ -17,6 +17,8 @@
#ifndef _BRCM_OTP_H_
#define _BRCM_OTP_H_
#include "types.h"
/* OTP regions */
#define OTP_HW_RGN 1
#define OTP_SW_RGN 2

23
drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
View File

@@ -14,23 +14,18 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <defs.h>
#include <chipcommon.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>
#include <chipcommon.h>
#include <aiutils.h>
#include <d11.h>
#include <phy_shim.h>
#include "phy_hal.h"
#include "phy_int.h"
#include "phy_radio.h"
#include "phy_lcn.h"
#include "phyreg_n.h"
u32 phyhal_msg_level = PHYHAL_ERROR;

6
drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h
View File

@@ -21,11 +21,9 @@
#ifndef _BRCM_PHY_HAL_H_
#define _BRCM_PHY_HAL_H_
#include <aiutils.h>
#include <d11.h>
#include <brcmu_utils.h>
#include <brcmu_wifi.h>
#include <phy_shim.h>
#include <net/mac80211.h> /* struct wiphy */
#include "brcmu_wifi.h" /* chanspec_t */
#define IDCODE_VER_MASK 0x0000000f
#define IDCODE_VER_SHIFT 0

6
drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
View File

@@ -17,11 +17,9 @@
#ifndef _BRCM_PHY_INT_H_
#define _BRCM_PHY_INT_H_
#include <linux/kernel.h>
#include <defs.h>
#include <types.h>
#include <brcmu_utils.h>
#include <phy_hal.h>
#include <brcmu_wifi.h>
#define PHY_VERSION { 1, 82, 8, 0 }

21
drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c
View File

@@ -14,25 +14,16 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <brcmu_utils.h>
#include <aiutils.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 <d11.h>
#include <phy_shim.h>
#include "phy_qmath.h"
#include "phy_lcn.h"
#include "phy_hal.h"
#include "phy_radio.h"
#include "phytbl_lcn.h"
#include "phy_lcn.h"
#define PLL_2064_NDIV 90
#define PLL_2064_LOW_END_VCO 3000

2
drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.h
View File

@@ -17,6 +17,8 @@
#ifndef _BRCM_PHY_LCN_H_
#define _BRCM_PHY_LCN_H_
#include <types.h>
struct phy_info_lcnphy {
int lcnphy_txrf_sp_9_override;
u8 lcnphy_full_cal_channel;

22
drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
View File

@@ -14,23 +14,19 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/string.h>
#include <defs.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <brcm_hw_ids.h>
#include <aiutils.h>
#include <chipcommon.h>
#include <pmu.h>
#include <brcm_hw_ids.h>
#include <dma.h>
#include <types.h>
#include <phy_radio.h>
#include <phy_int.h>
#include <phyreg_n.h>
#include <phytbl_n.h>
#include <d11.h>
#include <phy_shim.h>
#include "phy_int.h"
#include "phy_hal.h"
#include "phy_radio.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 | \

2
drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c
View File

@@ -14,8 +14,6 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/types.h>
#include "phy_qmath.h"
/*

2
drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.h
View File

@@ -17,6 +17,8 @@
#ifndef _BRCM_QMATH_H_
#define _BRCM_QMATH_H_
#include <types.h>
u16 qm_mulu16(u16 op1, u16 op2);
s16 qm_muls16(s16 op1, s16 op2);

6
drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c
View File

@@ -14,10 +14,8 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/types.h>
#include <dma.h>
#include <phy_int.h>
#include <phytbl_lcn.h>
#include <types.h>
#include "phytbl_lcn.h"
const u32 dot11lcn_gain_tbl_rev0[] = {
0x00000000,

3
drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.h
View File

@@ -14,6 +14,9 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <types.h>
#include "phy_int.h"
extern const dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_rev0[];
extern const u32 dot11lcnphytbl_rx_gain_info_sz_rev0;
extern const dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313;

7
drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c
View File

@@ -14,11 +14,8 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <dma.h>
#include <phy_int.h>
#include <phytbl_n.h>
#include <types.h>
#include "phytbl_n.h"
const u32 frame_struct_rev0[] = {
0x08004a04,

3
drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h
View File

@@ -16,6 +16,9 @@
#define ANT_SWCTRL_TBL_REV3_IDX (0)
#include <types.h>
#include "phy_int.h"
extern const mimophytbl_info_t mimophytbl_info_rev0[],
mimophytbl_info_rev0_volatile[];
extern const u32 mimophytbl_info_sz_rev0, mimophytbl_info_sz_rev0_volatile;

24
drivers/staging/brcm80211/brcmsmac/phy_shim.c
View File

@@ -20,31 +20,13 @@
* On the PHY->WL driver direction, all calls go through this layer since PHY doesn't have the
* access to wlc_hw pointer.
*/
#include <linux/slab.h>
#include <net/mac80211.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <defs.h>
#include <brcmu_utils.h>
#include <brcmu_wifi.h>
#include <aiutils.h>
#include <chipcommon.h>
#include "dma.h"
#include <pmu.h>
#include "types.h"
#include "d11.h"
#include "rate.h"
#include "scb.h"
#include "pub.h"
#include "phy/phy_hal.h"
#include "channel.h"
#include "srom.h"
#include "bmac.h"
#include "phy_hal.h"
#include "main.h"
#include "phy_shim.h"
#include "mac80211_if.h"
#include "phy_shim.h"
/* PHY SHIM module specific state */
struct wlc_phy_shim_info {

2
drivers/staging/brcm80211/brcmsmac/phy_shim.h
View File

@@ -21,6 +21,8 @@
#ifndef _BRCM_PHY_SHIM_H_
#define _BRCM_PHY_SHIM_H_
#include "types.h"
#define RADAR_TYPE_NONE 0 /* Radar type None */
#define RADAR_TYPE_ETSI_1 1 /* ETSI 1 Radar type */
#define RADAR_TYPE_ETSI_2 2 /* ETSI 2 Radar type */

6
drivers/staging/brcm80211/brcmsmac/pmu.c
View File

@@ -13,17 +13,15 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <brcm_hw_ids.h>
#include "types.h"
#include <chipcommon.h>
#include <brcmu_utils.h>
#include "scb.h"
#include "pub.h"
#include "aiutils.h"
#include "pmu.h"
/*

5
drivers/staging/brcm80211/brcmsmac/pmu.h
View File

@@ -18,10 +18,7 @@
#ifndef _BRCM_PMU_H_
#define _BRCM_PMU_H_
#include <linux/types.h>
#include <aiutils.h>
#include "types.h"
/*
* LDO selections used in si_pmu_set_ldo_voltage
*/

5
drivers/staging/brcm80211/brcmsmac/pub.h
View File

@@ -17,8 +17,9 @@
#ifndef _BRCM_PUB_H_
#define _BRCM_PUB_H_
#include "types.h" /* forward structure declarations */
#include "brcmu_wifi.h" /* for chanspec_t */
#include <brcmu_wifi.h>
#include "types.h"
#include "defs.h"
#define WLC_NUMRATES 16 /* max # of rates in a rateset */
#define MAXMULTILIST 32 /* max # multicast addresses */

8
drivers/staging/brcm80211/brcmsmac/rate.c
View File

@@ -13,17 +13,11 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <defs.h>
#include <brcmu_wifi.h>
#include <brcmu_utils.h>
#include <aiutils.h>
#include "dma.h"
#include "types.h"
#include "d11.h"
#include "scb.h"
#include "pub.h"
#include "rate.h"

2
drivers/staging/brcm80211/brcmsmac/rate.h
View File

@@ -17,6 +17,8 @@
#ifndef _WLC_RATE_H_
#define _WLC_RATE_H_
#include "types.h"
extern const u8 rate_info[];
extern const struct wlc_rateset cck_ofdm_mimo_rates;
extern const struct wlc_rateset ofdm_mimo_rates;

4
drivers/staging/brcm80211/brcmsmac/scb.h
View File

@@ -17,8 +17,10 @@
#ifndef _BRCM_SCB_H_
#define _BRCM_SCB_H_
#include <linux/if_ether.h> /* for ETH_ALEN */
#include <linux/if_ether.h>
#include <brcmu_utils.h>
#include <defs.h>
#include "types.h"
#define AMPDU_TX_BA_MAX_WSIZE 64 /* max Tx ba window size (in pdu) */
/* structure to store per-tid state for the ampdu initiator */

17
drivers/staging/brcm80211/brcmsmac/srom.c
View File

@@ -13,22 +13,19 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/io.h>
#include <linux/etherdevice.h>
#include <defs.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <stdarg.h>
#include "types.h"
#include <brcmu_utils.h>
#include <soc.h>
#include <chipcommon.h>
#include <brcm_hw_ids.h>
#include <nicpci.h>
#include <aiutils.h>
#include "srom.h"
#include <brcmu_utils.h>
#include "nicpci.h"
#include "aiutils.h"
#include "otp.h"
#include "srom.h"
#define SROM_OFFSET(sih) ((sih->ccrev > 31) ? \
(((sih->cccaps & CC_CAP_SROM) == 0) ? NULL : \

2
drivers/staging/brcm80211/brcmsmac/srom.h
View File

@@ -17,6 +17,8 @@
#ifndef _BRCM_SROM_H_
#define _BRCM_SROM_H_
#include "types.h"
/* Prototypes */
extern int srom_var_init(struct si_pub *sih, uint bus, void *curmap,
char **vars, uint *count);

12
drivers/staging/brcm80211/brcmsmac/stf.c
View File

@@ -14,20 +14,12 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <defs.h>
#include <brcmu_utils.h>
#include <aiutils.h>
#include <brcmu_wifi.h>
#include "dma.h"
#include <net/mac80211.h>
#include "types.h"
#include "d11.h"
#include "rate.h"
#include "scb.h"
#include "pub.h"
#include "phy/phy_hal.h"
#include "channel.h"
#include "main.h"

2
drivers/staging/brcm80211/brcmsmac/stf.h
View File

@@ -17,6 +17,8 @@
#ifndef _BRCM_STF_H_
#define _BRCM_STF_H_
#include "types.h"
extern int wlc_stf_attach(struct wlc_info *wlc);
extern void wlc_stf_detach(struct wlc_info *wlc);

6
drivers/staging/brcm80211/brcmsmac/types.h
View File

@@ -17,6 +17,8 @@
#ifndef _BRCM_TYPES_H_
#define _BRCM_TYPES_H_
#include <linux/types.h>
/* Bus types */
#define SI_BUS 0 /* SOC Interconnect */
#define PCI_BUS 1 /* PCI target */
@@ -365,6 +367,10 @@ struct dma_pub;
struct wlc_bsscfg;
struct brcmu_strbuf;
struct si_pub;
struct wiphy;
struct brcmu_iovar;
struct wlc_txq_info;
struct wlcband;
typedef struct gpioh_item gpioh_item_t;
typedef struct si_info si_info_t;

2
drivers/staging/brcm80211/brcmsmac/ucode_loader.c
View File

@@ -14,8 +14,8 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/types.h>
#include <defs.h>
#include "types.h"
#include <ucode_loader.h>
enum {

10
drivers/staging/brcm80211/brcmutil/utils.c
View File

@@ -14,18 +14,8 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/ctype.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/netdevice.h>
#include <linux/sched.h>
#include <linux/printk.h>
#include <defs.h>
#include <stdarg.h>
#include <brcmu_utils.h>
#include <brcm_hw_ids.h>
MODULE_AUTHOR("Broadcom Corporation");
MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver utilities.");

5
drivers/staging/brcm80211/brcmutil/wifi.c
View File

@@ -13,11 +13,6 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/ctype.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <defs.h>
#include <brcmu_utils.h>
#include <brcmu_wifi.h>
/*

2
drivers/staging/brcm80211/include/brcmu_utils.h
View File

@@ -17,6 +17,8 @@
#ifndef _BRCMU_UTILS_H_
#define _BRCMU_UTILS_H_
#include <linux/skbuff.h>
/* Buffer structure for collecting string-formatted data
* using brcmu_bprintf() API.
* Use brcmu_binit() to initialize before use

2
drivers/staging/brcm80211/include/defs.h
View File

@@ -17,6 +17,8 @@
#ifndef _BRCM_DEFS_H_
#define _BRCM_DEFS_H_
#include <linux/types.h>
#define SI_BUS 0
#define PCI_BUS 1
#define PCMCIA_BUS 2