Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8817f754 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed wl_ (vendor specific acronym) 



Replaced by brcms_, which is short hand for 'Broadcom softmac'.

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b64f7a66

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct sdio_func *cfg80211_sdio_func; 
static struct wl_dev *wl_cfg80211_dev;

static const u8 ether_bcast[ETH_ALEN] = {255, 255, 255, 255, 255, 255};



u32 wl_dbg_level = WL_DBG_ERR;

u32 brcmf_dbg_level = WL_DBG_ERR;



#define WL_4329_FW_FILE "brcm/bcm4329-fullmac-4.bin"

#define WL_4329_NVRAM_FILE "brcm/bcm4329-fullmac-4.txt"

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h

+5 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct wl_ibss; 


#define	WL_ERR(fmt, args...)					\

do {								\

	if (wl_dbg_level & WL_DBG_ERR) {			\

	if (brcmf_dbg_level & WL_DBG_ERR) {			\

		if (net_ratelimit()) {				\

			printk(KERN_ERR "ERROR @%s : " fmt,	\

				__func__, ##args);		\
@@ -45,7 +45,7 @@ do { \ 
#if (defined BCMDBG)

#define	WL_INFO(fmt, args...)					\

do {								\

	if (wl_dbg_level & WL_DBG_INFO) {			\

	if (brcmf_dbg_level & WL_DBG_INFO) {			\

		if (net_ratelimit()) {				\

			printk(KERN_ERR "INFO @%s : " fmt,	\

				__func__, ##args);		\
@@ -55,7 +55,7 @@ do { \ 


#define	WL_TRACE(fmt, args...)					\

do {								\

	if (wl_dbg_level & WL_DBG_TRACE) {			\

	if (brcmf_dbg_level & WL_DBG_TRACE) {			\

		if (net_ratelimit()) {				\

			printk(KERN_ERR "TRACE @%s : " fmt,	\

				__func__, ##args);		\
@@ -65,7 +65,7 @@ do { \ 


#define	WL_SCAN(fmt, args...)					\

do {								\

	if (wl_dbg_level & WL_DBG_SCAN) {			\

	if (brcmf_dbg_level & WL_DBG_SCAN) {			\

		if (net_ratelimit()) {				\

			printk(KERN_ERR "SCAN @%s : " fmt,	\

				__func__, ##args);		\
@@ -75,7 +75,7 @@ do { \ 


#define	WL_CONN(fmt, args...)					\

do {								\

	if (wl_dbg_level & WL_DBG_CONN) {			\

	if (brcmf_dbg_level & WL_DBG_CONN) {			\

		if (net_ratelimit()) {				\

			printk(KERN_ERR "CONN @%s : " fmt,	\

				__func__, ##args);		\

drivers/staging/brcm80211/brcmfmac/wl_iw.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ wl_iw_extra_params_t g_wl_iw_params; 
extern bool wl_iw_conn_status_str(u32 event_type, u32 status,

				  u32 reason, char *stringBuf, uint buflen);



uint wl_msg_level = WL_ERROR_VAL;

uint brcm_msg_level = LOG_ERROR_VAL;



#define MAX_WLIW_IOCTL_LEN 1024

drivers/staging/brcm80211/brcmsmac/wl_dbg.h

+4 −63
Original line number Diff line number Diff line
@@ -19,74 +19,15 @@ 


#include <linux/device.h>			/* dev_err() */



/* wl_msg_level is a bit vector with defs in bcmdefs.h */

extern u32 wl_msg_level;

/* brcm_msg_level is a bit vector with defs in bcmdefs.h */

extern u32 brcm_msg_level;



#define BCMMSG(dev, fmt, args...)		\

do {						\

	if (wl_msg_level & WL_TRACE_VAL)	\

	if (brcm_msg_level & LOG_TRACE_VAL)	\

		wiphy_err(dev, "%s: " fmt, __func__, ##args);	\

} while (0)



#ifdef BCMDBG





/* Extra message control for AMPDU debugging */

#define   WL_AMPDU_UPDN_VAL	0x00000001	/* Config up/down related  */

#define   WL_AMPDU_ERR_VAL	0x00000002	/* Calls to beaocn update  */

#define   WL_AMPDU_TX_VAL	0x00000004	/* Transmit data path */

#define   WL_AMPDU_RX_VAL	0x00000008	/* Receive data path  */

#define   WL_AMPDU_CTL_VAL	0x00000010	/* TSF-related items  */

#define   WL_AMPDU_HW_VAL       0x00000020	/* AMPDU_HW */

#define   WL_AMPDU_HWTXS_VAL    0x00000040	/* AMPDU_HWTXS */

#define   WL_AMPDU_HWDBG_VAL    0x00000080	/* AMPDU_DBG */



extern u32 wl_ampdu_dbg;



#define WL_AMPDU_PRINT(level, fmt, args...)	\

do {						\

	if (wl_ampdu_dbg & level) {		\

		WL_AMPDU(fmt, ##args);		\

	}					\

} while (0)



#define WL_AMPDU_UPDN(fmt, args...)			\

	WL_AMPDU_PRINT(WL_AMPDU_UPDN_VAL, fmt, ##args)

#define WL_AMPDU_RX(fmt, args...)			\

	WL_AMPDU_PRINT(WL_AMPDU_RX_VAL, fmt, ##args)

#define WL_AMPDU_ERR(fmt, args...)			\

	WL_AMPDU_PRINT(WL_AMPDU_ERR_VAL, fmt, ##args)

#define WL_AMPDU_TX(fmt, args...)			\

	WL_AMPDU_PRINT(WL_AMPDU_TX_VAL, fmt, ##args)

#define WL_AMPDU_CTL(fmt, args...)			\

	WL_AMPDU_PRINT(WL_AMPDU_CTL_VAL, fmt, ##args)

#define WL_AMPDU_HW(fmt, args...)			\

	WL_AMPDU_PRINT(WL_AMPDU_HW_VAL, fmt, ##args)

#define WL_AMPDU_HWTXS(fmt, args...)			\

	WL_AMPDU_PRINT(WL_AMPDU_HWTXS_VAL, fmt, ##args)

#define WL_AMPDU_HWDBG(fmt, args...)			\

	WL_AMPDU_PRINT(WL_AMPDU_HWDBG_VAL, fmt, ##args)

#define WL_AMPDU_ERR_ON() (wl_ampdu_dbg & WL_AMPDU_ERR_VAL)

#define WL_AMPDU_HW_ON() (wl_ampdu_dbg & WL_AMPDU_HW_VAL)

#define WL_AMPDU_HWTXS_ON() (wl_ampdu_dbg & WL_AMPDU_HWTXS_VAL)



#else				/* BCMDBG */





#define WL_AMPDU_UPDN(fmt, args...)	no_printk(fmt, ##args)

#define WL_AMPDU_RX(fmt, args...)	no_printk(fmt, ##args)

#define WL_AMPDU_ERR(fmt, args...)	no_printk(fmt, ##args)

#define WL_AMPDU_TX(fmt, args...)	no_printk(fmt, ##args)

#define WL_AMPDU_CTL(fmt, args...)	no_printk(fmt, ##args)

#define WL_AMPDU_HW(fmt, args...)	no_printk(fmt, ##args)

#define WL_AMPDU_HWTXS(fmt, args...)	no_printk(fmt, ##args)

#define WL_AMPDU_HWDBG(fmt, args...)	no_printk(fmt, ##args)

#define WL_AMPDU_ERR_ON()       0

#define WL_AMPDU_HW_ON()        0

#define WL_AMPDU_HWTXS_ON()     0



#endif				/* BCMDBG */



#define WL_ERROR_ON()		(wl_msg_level & WL_ERROR_VAL)

#define WL_ERROR_ON()		(brcm_msg_level & LOG_ERROR_VAL)



#endif				/* _wl_dbg_h_ */

drivers/staging/brcm80211/brcmsmac/wl_export.h

+20 −20
Original line number Diff line number Diff line
@@ -18,30 +18,30 @@ 
#define _wl_export_h_



/* misc callbacks */

struct wl_info;

struct wl_if;

struct brcms_info;

struct brcms_if;

struct wlc_if;

extern void wl_init(struct wl_info *wl);

extern uint wl_reset(struct wl_info *wl);

extern void wl_intrson(struct wl_info *wl);

extern u32 wl_intrsoff(struct wl_info *wl);

extern void wl_intrsrestore(struct wl_info *wl, u32 macintmask);

extern int wl_up(struct wl_info *wl);

extern void wl_down(struct wl_info *wl);

extern void wl_txflowcontrol(struct wl_info *wl, struct wl_if *wlif, bool state,

			     int prio);

extern bool wl_alloc_dma_resources(struct wl_info *wl, uint dmaddrwidth);

extern bool wl_rfkill_set_hw_state(struct wl_info *wl);

extern void brcms_init(struct brcms_info *wl);

extern uint brcms_reset(struct brcms_info *wl);

extern void brcms_intrson(struct brcms_info *wl);

extern u32 brcms_intrsoff(struct brcms_info *wl);

extern void brcms_intrsrestore(struct brcms_info *wl, u32 macintmask);

extern int brcms_up(struct brcms_info *wl);

extern void brcms_down(struct brcms_info *wl);

extern void brcms_txflowcontrol(struct brcms_info *wl, struct brcms_if *wlif,

				bool state, int prio);

extern bool wl_alloc_dma_resources(struct brcms_info *wl, uint dmaddrwidth);

extern bool brcms_rfkill_set_hw_state(struct brcms_info *wl);



/* timer functions */

struct wl_timer;

extern struct wl_timer *wl_init_timer(struct wl_info *wl,

struct brcms_timer;

extern struct brcms_timer *brcms_init_timer(struct brcms_info *wl,

				      void (*fn) (void *arg), void *arg,

				      const char *name);

extern void wl_free_timer(struct wl_info *wl, struct wl_timer *timer);

extern void wl_add_timer(struct wl_info *wl, struct wl_timer *timer, uint ms,

			 int periodic);

extern bool wl_del_timer(struct wl_info *wl, struct wl_timer *timer);

extern void wl_msleep(struct wl_info *wl, uint ms);

extern void brcms_free_timer(struct brcms_info *wl, struct brcms_timer *timer);

extern void brcms_add_timer(struct brcms_info *wl, struct brcms_timer *timer,

			    uint ms, int periodic);

extern bool brcms_del_timer(struct brcms_info *wl, struct brcms_timer *timer);

extern void brcms_msleep(struct brcms_info *wl, uint ms);



#endif				/* _wl_export_h_ */