staging: brcm80211: removed wl_ (vendor specific acronym)
Replaced by brcms_, which is short hand for 'Broadcom softmac'. 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>
This commit is contained in:
Roland Vossen
Greg Kroah-Hartman
parent
b64f7a6675
commit
8817f75429
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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); \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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_ */
|
||||
|
|
|
|||
|
|
@ -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_ */
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -25,34 +25,34 @@
|
|||
* sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be
|
||||
* submitted to workqueue instead of being on kernel timer
|
||||
*/
|
||||
struct wl_timer {
|
||||
struct brcms_timer {
|
||||
struct timer_list timer;
|
||||
struct wl_info *wl;
|
||||
struct brcms_info *wl;
|
||||
void (*fn) (void *);
|
||||
void *arg; /* argument to fn */
|
||||
uint ms;
|
||||
bool periodic;
|
||||
bool set;
|
||||
struct wl_timer *next;
|
||||
struct brcms_timer *next;
|
||||
#ifdef BCMDBG
|
||||
char *name; /* Description of the timer */
|
||||
#endif
|
||||
};
|
||||
|
||||
struct wl_if {
|
||||
struct brcms_if {
|
||||
uint subunit; /* WDS/BSS unit */
|
||||
struct pci_dev *pci_dev;
|
||||
};
|
||||
|
||||
#define WL_MAX_FW 4
|
||||
struct wl_firmware {
|
||||
#define MAX_FW_IMAGES 4
|
||||
struct brcms_firmware {
|
||||
u32 fw_cnt;
|
||||
const struct firmware *fw_bin[WL_MAX_FW];
|
||||
const struct firmware *fw_hdr[WL_MAX_FW];
|
||||
u32 hdr_num_entries[WL_MAX_FW];
|
||||
const struct firmware *fw_bin[MAX_FW_IMAGES];
|
||||
const struct firmware *fw_hdr[MAX_FW_IMAGES];
|
||||
u32 hdr_num_entries[MAX_FW_IMAGES];
|
||||
};
|
||||
|
||||
struct wl_info {
|
||||
struct brcms_info {
|
||||
struct wlc_pub *pub; /* pointer to public wlc state */
|
||||
void *wlc; /* pointer to private common os-independent data */
|
||||
u32 magic;
|
||||
|
|
@ -62,32 +62,20 @@ struct wl_info {
|
|||
spinlock_t lock; /* per-device perimeter lock */
|
||||
spinlock_t isr_lock; /* per-device ISR synchronization lock */
|
||||
|
||||
/* bus type and regsva for unmap in wl_free() */
|
||||
/* bus type and regsva for unmap in brcms_free() */
|
||||
uint bcm_bustype; /* bus type */
|
||||
void *regsva; /* opaque chip registers virtual address */
|
||||
|
||||
/* timer related fields */
|
||||
atomic_t callbacks; /* # outstanding callback functions */
|
||||
struct wl_timer *timers; /* timer cleanup queue */
|
||||
struct brcms_timer *timers; /* timer cleanup queue */
|
||||
|
||||
struct tasklet_struct tasklet; /* dpc tasklet */
|
||||
bool resched; /* dpc needs to be and is rescheduled */
|
||||
#ifdef LINUXSTA_PS
|
||||
u32 pci_psstate[16]; /* pci ps-state save/restore */
|
||||
#endif
|
||||
struct wl_firmware fw;
|
||||
struct brcms_firmware fw;
|
||||
struct wiphy *wiphy;
|
||||
};
|
||||
|
||||
#define WL_LOCK(wl) spin_lock_bh(&(wl)->lock)
|
||||
#define WL_UNLOCK(wl) spin_unlock_bh(&(wl)->lock)
|
||||
|
||||
/* locking from inside wl_isr */
|
||||
#define WL_ISRLOCK(wl, flags) do {spin_lock(&(wl)->isr_lock); (void)(flags); } while (0)
|
||||
#define WL_ISRUNLOCK(wl, flags) do {spin_unlock(&(wl)->isr_lock); (void)(flags); } while (0)
|
||||
|
||||
/* locking under WL_LOCK() to synchronize with wl_isr */
|
||||
#define INT_LOCK(wl, flags) spin_lock_irqsave(&(wl)->isr_lock, flags)
|
||||
#define INT_UNLOCK(wl, flags) spin_unlock_irqrestore(&(wl)->isr_lock, flags)
|
||||
|
||||
#endif /* _wl_mac80211_h_ */
|
||||
|
|
|
|||
|
|
@ -41,11 +41,12 @@ extern u32 bcm43xx_16_mimosz;
|
|||
extern u32 *bcm43xx_24_lcn;
|
||||
extern u32 bcm43xx_24_lcnsz;
|
||||
|
||||
extern int wl_ucode_data_init(struct wl_info *wl);
|
||||
extern void wl_ucode_data_free(void);
|
||||
extern int brcms_ucode_data_init(struct brcms_info *wl);
|
||||
extern void brcms_ucode_data_free(void);
|
||||
|
||||
extern int wl_ucode_init_buf(struct wl_info *wl, void **pbuf, unsigned int idx);
|
||||
extern int wl_ucode_init_uint(struct wl_info *wl, unsigned *data,
|
||||
extern int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf,
|
||||
unsigned int idx);
|
||||
extern int brcms_ucode_init_uint(struct brcms_info *wl, unsigned *data,
|
||||
unsigned int idx);
|
||||
extern void wl_ucode_free_buf(void *);
|
||||
extern int wl_check_firmwares(struct wl_info *wl);
|
||||
extern void brcms_ucode_free_buf(void *);
|
||||
extern int brcms_check_firmwares(struct brcms_info *wl);
|
||||
|
|
|
|||
|
|
@ -53,59 +53,63 @@ u32 bcm43xx_24_lcnsz;
|
|||
u32 *bcm43xx_bommajor;
|
||||
u32 *bcm43xx_bomminor;
|
||||
|
||||
int wl_ucode_data_init(struct wl_info *wl)
|
||||
int brcms_ucode_data_init(struct brcms_info *wl)
|
||||
{
|
||||
int rc;
|
||||
rc = wl_check_firmwares(wl);
|
||||
rc = brcms_check_firmwares(wl);
|
||||
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&d11lcn0bsinitvals24,
|
||||
D11LCN0BSINITVALS24);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&d11lcn0initvals24,
|
||||
rc = rc < 0 ? rc :
|
||||
brcms_ucode_init_buf(wl, (void **)&d11lcn0bsinitvals24,
|
||||
D11LCN0BSINITVALS24);
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn0initvals24,
|
||||
D11LCN0INITVALS24);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&d11lcn1bsinitvals24,
|
||||
D11LCN1BSINITVALS24);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&d11lcn1initvals24,
|
||||
rc = rc < 0 ? rc :
|
||||
brcms_ucode_init_buf(wl, (void **)&d11lcn1bsinitvals24,
|
||||
D11LCN1BSINITVALS24);
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn1initvals24,
|
||||
D11LCN1INITVALS24);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&d11lcn2bsinitvals24,
|
||||
D11LCN2BSINITVALS24);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&d11lcn2initvals24,
|
||||
rc = rc < 0 ? rc :
|
||||
brcms_ucode_init_buf(wl, (void **)&d11lcn2bsinitvals24,
|
||||
D11LCN2BSINITVALS24);
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn2initvals24,
|
||||
D11LCN2INITVALS24);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&d11n0absinitvals16,
|
||||
D11N0ABSINITVALS16);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&d11n0bsinitvals16,
|
||||
rc = rc < 0 ? rc :
|
||||
brcms_ucode_init_buf(wl, (void **)&d11n0absinitvals16,
|
||||
D11N0ABSINITVALS16);
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11n0bsinitvals16,
|
||||
D11N0BSINITVALS16);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&d11n0initvals16,
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11n0initvals16,
|
||||
D11N0INITVALS16);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&bcm43xx_16_mimo,
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_16_mimo,
|
||||
D11UCODE_OVERSIGHT16_MIMO);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_uint(wl, &bcm43xx_16_mimosz,
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_uint(wl, &bcm43xx_16_mimosz,
|
||||
D11UCODE_OVERSIGHT16_MIMOSZ);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&bcm43xx_24_lcn,
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_24_lcn,
|
||||
D11UCODE_OVERSIGHT24_LCN);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_uint(wl, &bcm43xx_24_lcnsz,
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_uint(wl, &bcm43xx_24_lcnsz,
|
||||
D11UCODE_OVERSIGHT24_LCNSZ);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&bcm43xx_bommajor,
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_bommajor,
|
||||
D11UCODE_OVERSIGHT_BOMMAJOR);
|
||||
rc = rc < 0 ? rc : wl_ucode_init_buf(wl, (void **)&bcm43xx_bomminor,
|
||||
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_bomminor,
|
||||
D11UCODE_OVERSIGHT_BOMMINOR);
|
||||
return rc;
|
||||
}
|
||||
|
||||
void wl_ucode_data_free(void)
|
||||
void brcms_ucode_data_free(void)
|
||||
{
|
||||
wl_ucode_free_buf((void *)d11lcn0bsinitvals24);
|
||||
wl_ucode_free_buf((void *)d11lcn0initvals24);
|
||||
wl_ucode_free_buf((void *)d11lcn1bsinitvals24);
|
||||
wl_ucode_free_buf((void *)d11lcn1initvals24);
|
||||
wl_ucode_free_buf((void *)d11lcn2bsinitvals24);
|
||||
wl_ucode_free_buf((void *)d11lcn2initvals24);
|
||||
wl_ucode_free_buf((void *)d11n0absinitvals16);
|
||||
wl_ucode_free_buf((void *)d11n0bsinitvals16);
|
||||
wl_ucode_free_buf((void *)d11n0initvals16);
|
||||
wl_ucode_free_buf((void *)bcm43xx_16_mimo);
|
||||
wl_ucode_free_buf((void *)bcm43xx_24_lcn);
|
||||
wl_ucode_free_buf((void *)bcm43xx_bommajor);
|
||||
wl_ucode_free_buf((void *)bcm43xx_bomminor);
|
||||
brcms_ucode_free_buf((void *)d11lcn0bsinitvals24);
|
||||
brcms_ucode_free_buf((void *)d11lcn0initvals24);
|
||||
brcms_ucode_free_buf((void *)d11lcn1bsinitvals24);
|
||||
brcms_ucode_free_buf((void *)d11lcn1initvals24);
|
||||
brcms_ucode_free_buf((void *)d11lcn2bsinitvals24);
|
||||
brcms_ucode_free_buf((void *)d11lcn2initvals24);
|
||||
brcms_ucode_free_buf((void *)d11n0absinitvals16);
|
||||
brcms_ucode_free_buf((void *)d11n0bsinitvals16);
|
||||
brcms_ucode_free_buf((void *)d11n0initvals16);
|
||||
brcms_ucode_free_buf((void *)bcm43xx_16_mimo);
|
||||
brcms_ucode_free_buf((void *)bcm43xx_24_lcn);
|
||||
brcms_ucode_free_buf((void *)bcm43xx_bommajor);
|
||||
brcms_ucode_free_buf((void *)bcm43xx_bomminor);
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ static u32 WLBANDINITFN(wlc_setband_inact) (struct wlc_info *wlc, uint bandunit)
|
|||
WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0);
|
||||
|
||||
/* disable interrupts */
|
||||
macintmask = wl_intrsoff(wlc->wl);
|
||||
macintmask = brcms_intrsoff(wlc->wl);
|
||||
|
||||
/* radio off */
|
||||
wlc_phy_switch_radio(wlc_hw->band->pi, OFF);
|
||||
|
|
@ -315,7 +315,7 @@ bool wlc_dpc(struct wlc_info *wlc, bool bounded)
|
|||
if (DEVICEREMOVED(wlc)) {
|
||||
wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
|
||||
__func__);
|
||||
wl_down(wlc->wl);
|
||||
brcms_down(wlc->wl);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -386,7 +386,7 @@ bool wlc_dpc(struct wlc_info *wlc, bool bounded)
|
|||
__func__, wlc_hw->sih->chip,
|
||||
wlc_hw->sih->chiprev);
|
||||
/* big hammer */
|
||||
wl_init(wlc->wl);
|
||||
brcms_init(wlc->wl);
|
||||
}
|
||||
|
||||
/* gptimer timeout */
|
||||
|
|
@ -397,7 +397,7 @@ bool wlc_dpc(struct wlc_info *wlc, bool bounded)
|
|||
if (macintstatus & MI_RFDISABLE) {
|
||||
BCMMSG(wlc->wiphy, "wl%d: BMAC Detected a change on the"
|
||||
" RF Disable Input\n", wlc_hw->unit);
|
||||
wl_rfkill_set_hw_state(wlc->wl);
|
||||
brcms_rfkill_set_hw_state(wlc->wl);
|
||||
}
|
||||
|
||||
/* send any enq'd tx packets. Just makes sure to jump start tx */
|
||||
|
|
@ -408,7 +408,7 @@ bool wlc_dpc(struct wlc_info *wlc, bool bounded)
|
|||
return wlc->macintstatus != 0;
|
||||
|
||||
fatal:
|
||||
wl_init(wlc->wl);
|
||||
brcms_init(wlc->wl);
|
||||
return wlc->macintstatus != 0;
|
||||
}
|
||||
|
||||
|
|
@ -526,7 +526,7 @@ static bool wlc_bmac_attach_dmapio(struct wlc_info *wlc, uint j, bool wme)
|
|||
NULL), DMAREG(wlc_hw, DMA_RX, 0),
|
||||
(wme ? tune->ntxd : 0), tune->nrxd,
|
||||
tune->rxbufsz, -1, tune->nrxbufpost,
|
||||
WL_HWRXOFF, &wl_msg_level);
|
||||
WL_HWRXOFF, &brcm_msg_level);
|
||||
dma_attach_err |= (NULL == wlc_hw->di[0]);
|
||||
|
||||
/*
|
||||
|
|
@ -538,7 +538,7 @@ static bool wlc_bmac_attach_dmapio(struct wlc_info *wlc, uint j, bool wme)
|
|||
wlc_hw->di[1] = dma_attach(name, wlc_hw->sih,
|
||||
DMAREG(wlc_hw, DMA_TX, 1), NULL,
|
||||
tune->ntxd, 0, 0, -1, 0, 0,
|
||||
&wl_msg_level);
|
||||
&brcm_msg_level);
|
||||
dma_attach_err |= (NULL == wlc_hw->di[1]);
|
||||
|
||||
/*
|
||||
|
|
@ -549,7 +549,7 @@ static bool wlc_bmac_attach_dmapio(struct wlc_info *wlc, uint j, bool wme)
|
|||
wlc_hw->di[2] = dma_attach(name, wlc_hw->sih,
|
||||
DMAREG(wlc_hw, DMA_TX, 2), NULL,
|
||||
tune->ntxd, 0, 0, -1, 0, 0,
|
||||
&wl_msg_level);
|
||||
&brcm_msg_level);
|
||||
dma_attach_err |= (NULL == wlc_hw->di[2]);
|
||||
/*
|
||||
* FIFO 3
|
||||
|
|
@ -559,7 +559,7 @@ static bool wlc_bmac_attach_dmapio(struct wlc_info *wlc, uint j, bool wme)
|
|||
wlc_hw->di[3] = dma_attach(name, wlc_hw->sih,
|
||||
DMAREG(wlc_hw, DMA_TX, 3),
|
||||
NULL, tune->ntxd, 0, 0, -1,
|
||||
0, 0, &wl_msg_level);
|
||||
0, 0, &brcm_msg_level);
|
||||
dma_attach_err |= (NULL == wlc_hw->di[3]);
|
||||
/* Cleaner to leave this as if with AP defined */
|
||||
|
||||
|
|
@ -1050,7 +1050,7 @@ wlc_bmac_init(struct wlc_hw_info *wlc_hw, chanspec_t chanspec,
|
|||
wlc_clkctl_clk(wlc_hw, CLK_FAST);
|
||||
|
||||
/* disable interrupts */
|
||||
macintmask = wl_intrsoff(wlc->wl);
|
||||
macintmask = brcms_intrsoff(wlc->wl);
|
||||
|
||||
/* set up the specified band and chanspec */
|
||||
wlc_setxband(wlc_hw, CHSPEC_WLCBANDUNIT(chanspec));
|
||||
|
|
@ -1070,7 +1070,7 @@ wlc_bmac_init(struct wlc_hw_info *wlc_hw, chanspec_t chanspec,
|
|||
wlc_bmac_bsinit(wlc, chanspec);
|
||||
|
||||
/* restore macintmask */
|
||||
wl_intrsrestore(wlc->wl, macintmask);
|
||||
brcms_intrsrestore(wlc->wl, macintmask);
|
||||
|
||||
/* seed wake_override with WLC_WAKE_OVERRIDE_MACSUSPEND since the mac is suspended
|
||||
* and wlc_enable_mac() will clear this override bit.
|
||||
|
|
@ -1140,7 +1140,7 @@ int wlc_bmac_up_finish(struct wlc_hw_info *wlc_hw)
|
|||
|
||||
/* FULLY enable dynamic power control and d11 core interrupt */
|
||||
wlc_clkctl_clk(wlc_hw, CLK_DYNAMIC);
|
||||
wl_intrson(wlc_hw->wlc->wl);
|
||||
brcms_intrson(wlc_hw->wlc->wl);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1161,7 +1161,7 @@ int wlc_bmac_down_prep(struct wlc_hw_info *wlc_hw)
|
|||
wlc_hw->wlc->macintmask = 0;
|
||||
else {
|
||||
/* now disable interrupts */
|
||||
wl_intrsoff(wlc_hw->wlc->wl);
|
||||
brcms_intrsoff(wlc_hw->wlc->wl);
|
||||
|
||||
/* ensure we're running on the pll clock again */
|
||||
wlc_clkctl_clk(wlc_hw, CLK_FAST);
|
||||
|
|
@ -1201,7 +1201,7 @@ int wlc_bmac_down_finish(struct wlc_hw_info *wlc_hw)
|
|||
if (R_REG(&wlc_hw->regs->maccontrol) &
|
||||
MCTL_EN_MAC)
|
||||
wlc_suspend_mac_and_wait(wlc_hw->wlc);
|
||||
callbacks += wl_reset(wlc_hw->wlc->wl);
|
||||
callbacks += brcms_reset(wlc_hw->wlc->wl);
|
||||
wlc_coredisable(wlc_hw);
|
||||
}
|
||||
|
||||
|
|
@ -1885,7 +1885,7 @@ WLBANDINITFN(wlc_bmac_setband) (struct wlc_hw_info *wlc_hw, uint bandunit,
|
|||
wlc->macintstatus = MI_DMAINT;
|
||||
|
||||
/* restore macintmask */
|
||||
wl_intrsrestore(wlc->wl, macintmask);
|
||||
brcms_intrsrestore(wlc->wl, macintmask);
|
||||
|
||||
/* ucode should still be suspended.. */
|
||||
WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0);
|
||||
|
|
@ -2683,7 +2683,7 @@ static u32 wlc_wlintrsoff(struct wlc_info *wlc)
|
|||
if (!wlc->hw->up)
|
||||
return 0;
|
||||
|
||||
return wl_intrsoff(wlc->wl);
|
||||
return brcms_intrsoff(wlc->wl);
|
||||
}
|
||||
|
||||
static void wlc_wlintrsrestore(struct wlc_info *wlc, u32 macintmask)
|
||||
|
|
@ -2691,7 +2691,7 @@ static void wlc_wlintrsrestore(struct wlc_info *wlc, u32 macintmask)
|
|||
if (!wlc->hw->up)
|
||||
return;
|
||||
|
||||
wl_intrsrestore(wlc->wl, macintmask);
|
||||
brcms_intrsrestore(wlc->wl, macintmask);
|
||||
}
|
||||
|
||||
u32 wlc_intrsoff(struct wlc_info *wlc)
|
||||
|
|
@ -3065,7 +3065,7 @@ void wlc_suspend_mac_and_wait(struct wlc_info *wlc)
|
|||
if (mc == 0xffffffff) {
|
||||
wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
|
||||
__func__);
|
||||
wl_down(wlc->wl);
|
||||
brcms_down(wlc->wl);
|
||||
return;
|
||||
}
|
||||
WARN_ON(mc & MCTL_PSM_JMP_0);
|
||||
|
|
@ -3076,7 +3076,7 @@ void wlc_suspend_mac_and_wait(struct wlc_info *wlc)
|
|||
if (mi == 0xffffffff) {
|
||||
wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
|
||||
__func__);
|
||||
wl_down(wlc->wl);
|
||||
brcms_down(wlc->wl);
|
||||
return;
|
||||
}
|
||||
WARN_ON(mi & MI_MACSSPNDD);
|
||||
|
|
@ -3101,7 +3101,7 @@ void wlc_suspend_mac_and_wait(struct wlc_info *wlc)
|
|||
if (mc == 0xffffffff) {
|
||||
wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
|
||||
__func__);
|
||||
wl_down(wlc->wl);
|
||||
brcms_down(wlc->wl);
|
||||
return;
|
||||
}
|
||||
WARN_ON(mc & MCTL_PSM_JMP_0);
|
||||
|
|
|
|||
|
|
@ -191,11 +191,11 @@
|
|||
(!AP_ENAB(wlc->pub)) && (wlc->war16165))
|
||||
|
||||
/* debug/trace */
|
||||
uint wl_msg_level =
|
||||
uint brcm_msg_level =
|
||||
#if defined(BCMDBG)
|
||||
WL_ERROR_VAL;
|
||||
LOG_ERROR_VAL;
|
||||
#else
|
||||
0;
|
||||
0;
|
||||
#endif /* BCMDBG */
|
||||
|
||||
/* Find basic rate for a given rate */
|
||||
|
|
@ -415,7 +415,7 @@ void wlc_fatal_error(struct wlc_info *wlc)
|
|||
{
|
||||
wiphy_err(wlc->wiphy, "wl%d: fatal error, reinitializing\n",
|
||||
wlc->pub->unit);
|
||||
wl_init(wlc->wl);
|
||||
brcms_init(wlc->wl);
|
||||
}
|
||||
|
||||
/* Return the channel the driver should initialize during wlc_init.
|
||||
|
|
@ -1188,7 +1188,7 @@ void wlc_edcf_setparams(struct wlc_info *wlc, bool suspend)
|
|||
|
||||
bool wlc_timers_init(struct wlc_info *wlc, int unit)
|
||||
{
|
||||
wlc->wdtimer = wl_init_timer(wlc->wl, wlc_watchdog_by_timer,
|
||||
wlc->wdtimer = brcms_init_timer(wlc->wl, wlc_watchdog_by_timer,
|
||||
wlc, "watchdog");
|
||||
if (!wlc->wdtimer) {
|
||||
wiphy_err(wlc->wiphy, "wl%d: wl_init_timer for wdtimer "
|
||||
|
|
@ -1196,7 +1196,7 @@ bool wlc_timers_init(struct wlc_info *wlc, int unit)
|
|||
goto fail;
|
||||
}
|
||||
|
||||
wlc->radio_timer = wl_init_timer(wlc->wl, wlc_radio_timer,
|
||||
wlc->radio_timer = brcms_init_timer(wlc->wl, wlc_radio_timer,
|
||||
wlc, "radio");
|
||||
if (!wlc->radio_timer) {
|
||||
wiphy_err(wlc->wiphy, "wl%d: wl_init_timer for radio_timer "
|
||||
|
|
@ -1339,7 +1339,7 @@ struct wlc_pub *wlc_pub(void *wlc)
|
|||
/*
|
||||
* The common driver entry routine. Error codes should be unique
|
||||
*/
|
||||
void *wlc_attach(struct wl_info *wl, u16 vendor, u16 device, uint unit,
|
||||
void *wlc_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,
|
||||
bool piomode, void *regsva, uint bustype, void *btparam,
|
||||
uint *perr)
|
||||
{
|
||||
|
|
@ -1669,11 +1669,11 @@ static void wlc_timers_deinit(struct wlc_info *wlc)
|
|||
{
|
||||
/* free timer state */
|
||||
if (wlc->wdtimer) {
|
||||
wl_free_timer(wlc->wl, wlc->wdtimer);
|
||||
brcms_free_timer(wlc->wl, wlc->wdtimer);
|
||||
wlc->wdtimer = NULL;
|
||||
}
|
||||
if (wlc->radio_timer) {
|
||||
wl_free_timer(wlc->wl, wlc->radio_timer);
|
||||
brcms_free_timer(wlc->wl, wlc->radio_timer);
|
||||
wlc->radio_timer = NULL;
|
||||
}
|
||||
}
|
||||
|
|
@ -1859,7 +1859,7 @@ void wlc_radio_disable(struct wlc_info *wlc)
|
|||
}
|
||||
|
||||
wlc_radio_monitor_start(wlc);
|
||||
wl_down(wlc->wl);
|
||||
brcms_down(wlc->wl);
|
||||
}
|
||||
|
||||
static void wlc_radio_enable(struct wlc_info *wlc)
|
||||
|
|
@ -1870,7 +1870,7 @@ static void wlc_radio_enable(struct wlc_info *wlc)
|
|||
if (DEVICEREMOVED(wlc))
|
||||
return;
|
||||
|
||||
wl_up(wlc->wl);
|
||||
brcms_up(wlc->wl);
|
||||
}
|
||||
|
||||
/* periodical query hw radio button while driver is "down" */
|
||||
|
|
@ -1881,7 +1881,7 @@ static void wlc_radio_timer(void *arg)
|
|||
if (DEVICEREMOVED(wlc)) {
|
||||
wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit,
|
||||
__func__);
|
||||
wl_down(wlc->wl);
|
||||
brcms_down(wlc->wl);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1901,7 +1901,8 @@ static bool wlc_radio_monitor_start(struct wlc_info *wlc)
|
|||
|
||||
wlc->radio_monitor = true;
|
||||
wlc_pllreq(wlc, true, WLC_PLLREQ_RADIO_MON);
|
||||
wl_add_timer(wlc->wl, wlc->radio_timer, TIMER_INTERVAL_RADIOCHK, true);
|
||||
brcms_add_timer(wlc->wl, wlc->radio_timer, TIMER_INTERVAL_RADIOCHK,
|
||||
true);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -1912,7 +1913,7 @@ bool wlc_radio_monitor_stop(struct wlc_info *wlc)
|
|||
|
||||
wlc->radio_monitor = false;
|
||||
wlc_pllreq(wlc, false, WLC_PLLREQ_RADIO_MON);
|
||||
return wl_del_timer(wlc->wl, wlc->radio_timer);
|
||||
return brcms_del_timer(wlc->wl, wlc->radio_timer);
|
||||
}
|
||||
|
||||
static void wlc_watchdog_by_timer(void *arg)
|
||||
|
|
@ -1935,7 +1936,7 @@ static void wlc_watchdog(void *arg)
|
|||
if (DEVICEREMOVED(wlc)) {
|
||||
wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit,
|
||||
__func__);
|
||||
wl_down(wlc->wl);
|
||||
brcms_down(wlc->wl);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -2070,7 +2071,7 @@ int wlc_up(struct wlc_info *wlc)
|
|||
wlc_mhf(wlc, MHF2, MHF2_PCISLOWCLKWAR, MHF2_PCISLOWCLKWAR,
|
||||
WLC_BAND_ALL);
|
||||
|
||||
wl_init(wlc->wl);
|
||||
brcms_init(wlc->wl);
|
||||
wlc->pub->up = true;
|
||||
|
||||
if (wlc->bandinit_pending) {
|
||||
|
|
@ -2090,7 +2091,7 @@ int wlc_up(struct wlc_info *wlc)
|
|||
wlc_wme_retries_write(wlc);
|
||||
|
||||
/* start one second watchdog timer */
|
||||
wl_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG, true);
|
||||
brcms_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG, true);
|
||||
wlc->WDarmed = true;
|
||||
|
||||
/* ensure antenna config is up to date */
|
||||
|
|
@ -2168,7 +2169,7 @@ uint wlc_down(struct wlc_info *wlc)
|
|||
|
||||
/* cancel the watchdog timer */
|
||||
if (wlc->WDarmed) {
|
||||
if (!wl_del_timer(wlc->wl, wlc->wdtimer))
|
||||
if (!brcms_del_timer(wlc->wl, wlc->wdtimer))
|
||||
callbacks++;
|
||||
wlc->WDarmed = false;
|
||||
}
|
||||
|
|
@ -2528,7 +2529,7 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
|
|||
if (!wlc->pub->hw_off && DEVICEREMOVED(wlc)) {
|
||||
wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit,
|
||||
__func__);
|
||||
wl_down(wlc->wl);
|
||||
brcms_down(wlc->wl);
|
||||
return -EBADE;
|
||||
}
|
||||
|
||||
|
|
@ -5817,7 +5818,7 @@ wlc_txflowcontrol_signal(struct wlc_info *wlc, struct wlc_txq_info *qi, bool on,
|
|||
|
||||
for (wlcif = wlc->wlcif_list; wlcif != NULL; wlcif = wlcif->next) {
|
||||
if (wlcif->qi == qi && wlcif->flags & WLC_IF_LINKED)
|
||||
wl_txflowcontrol(wlc->wl, wlcif->wlif, on, prio);
|
||||
brcms_txflowcontrol(wlc->wl, wlcif->wlif, on, prio);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -5923,7 +5924,7 @@ void wlc_wait_for_tx_completion(struct wlc_info *wlc, bool drop)
|
|||
/* wait for queue and DMA fifos to run dry */
|
||||
while (!pktq_empty(&wlc->pkt_queue->q) ||
|
||||
TXPKTPENDTOT(wlc) > 0) {
|
||||
wl_msleep(wlc->wl, 1);
|
||||
brcms_msleep(wlc->wl, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -401,7 +401,7 @@ struct wlc_if {
|
|||
* AID2PVBMAP(scb).
|
||||
*/
|
||||
u8 flags; /* flags for the interface */
|
||||
struct wl_if *wlif; /* pointer to wlif */
|
||||
struct brcms_if *wlif; /* pointer to wlif */
|
||||
struct wlc_txq_info *qi; /* pointer to associated tx queue */
|
||||
union {
|
||||
struct scb *scb; /* pointer to scb if WLC_IFTYPE_WDS */
|
||||
|
|
@ -409,8 +409,8 @@ struct wlc_if {
|
|||
} u;
|
||||
};
|
||||
|
||||
/* flags for the interface */
|
||||
#define WLC_IF_LINKED 0x02 /* this interface is linked to a wl_if */
|
||||
/* flags for the interface, this interface is linked to a brcms_if */
|
||||
#define WLC_IF_LINKED 0x02
|
||||
|
||||
struct wlc_hwband {
|
||||
int bandtype; /* WLC_BAND_2G, WLC_BAND_5G */
|
||||
|
|
@ -521,7 +521,7 @@ struct wlc_txq_info {
|
|||
*/
|
||||
struct wlc_info {
|
||||
struct wlc_pub *pub; /* pointer to wlc public state */
|
||||
struct wl_info *wl; /* pointer to os-specific private state */
|
||||
struct brcms_info *wl; /* pointer to os-specific private state */
|
||||
d11regs_t *regs; /* pointer to device registers */
|
||||
|
||||
struct wlc_hw_info *hw; /* HW related state used primarily by BMAC */
|
||||
|
|
@ -587,9 +587,10 @@ struct wlc_info {
|
|||
u8 mpc_delay_off; /* delay radio disable by # of watchdog cnt */
|
||||
u8 prev_non_delay_mpc; /* prev state wlc_is_non_delay_mpc */
|
||||
|
||||
/* timer */
|
||||
struct wl_timer *wdtimer; /* timer for watchdog routine */
|
||||
struct wl_timer *radio_timer; /* timer for hw radio button monitor routine */
|
||||
/* timer for watchdog routine */
|
||||
struct brcms_timer *wdtimer;
|
||||
/* timer for hw radio button monitor routine */
|
||||
struct brcms_timer *radio_timer;
|
||||
|
||||
/* promiscuous */
|
||||
bool monitor; /* monitor (MPDU sniffing) mode */
|
||||
|
|
|
|||
|
|
@ -83,39 +83,40 @@ struct wlapi_timer *wlapi_init_timer(wlc_phy_shim_info_t *physhim,
|
|||
void (*fn) (void *arg), void *arg,
|
||||
const char *name)
|
||||
{
|
||||
return (struct wlapi_timer *)wl_init_timer(physhim->wl, fn, arg, name);
|
||||
return (struct wlapi_timer *)
|
||||
brcms_init_timer(physhim->wl, fn, arg, name);
|
||||
}
|
||||
|
||||
void wlapi_free_timer(wlc_phy_shim_info_t *physhim, struct wlapi_timer *t)
|
||||
{
|
||||
wl_free_timer(physhim->wl, (struct wl_timer *)t);
|
||||
brcms_free_timer(physhim->wl, (struct brcms_timer *)t);
|
||||
}
|
||||
|
||||
void
|
||||
wlapi_add_timer(wlc_phy_shim_info_t *physhim, struct wlapi_timer *t, uint ms,
|
||||
int periodic)
|
||||
{
|
||||
wl_add_timer(physhim->wl, (struct wl_timer *)t, ms, periodic);
|
||||
brcms_add_timer(physhim->wl, (struct brcms_timer *)t, ms, periodic);
|
||||
}
|
||||
|
||||
bool wlapi_del_timer(wlc_phy_shim_info_t *physhim, struct wlapi_timer *t)
|
||||
{
|
||||
return wl_del_timer(physhim->wl, (struct wl_timer *)t);
|
||||
return brcms_del_timer(physhim->wl, (struct brcms_timer *)t);
|
||||
}
|
||||
|
||||
void wlapi_intrson(wlc_phy_shim_info_t *physhim)
|
||||
{
|
||||
wl_intrson(physhim->wl);
|
||||
brcms_intrson(physhim->wl);
|
||||
}
|
||||
|
||||
u32 wlapi_intrsoff(wlc_phy_shim_info_t *physhim)
|
||||
{
|
||||
return wl_intrsoff(physhim->wl);
|
||||
return brcms_intrsoff(physhim->wl);
|
||||
}
|
||||
|
||||
void wlapi_intrsrestore(wlc_phy_shim_info_t *physhim, u32 macintmask)
|
||||
{
|
||||
wl_intrsrestore(physhim->wl, macintmask);
|
||||
brcms_intrsrestore(physhim->wl, macintmask);
|
||||
}
|
||||
|
||||
void wlapi_bmac_write_shm(wlc_phy_shim_info_t *physhim, uint offset, u16 v)
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@ typedef struct wl_rxsts {
|
|||
uint preamble; /* Unknown, short, long */
|
||||
uint encoding; /* Unknown, CCK, PBCC, OFDM */
|
||||
uint nfrmtype; /* special 802.11n frames(AMPDU, AMSDU) */
|
||||
struct wl_if *wlif; /* wl interface */
|
||||
struct brcms_if *wlif; /* wl interface */
|
||||
} wl_rxsts_t;
|
||||
|
||||
/* status per error RX pkt */
|
||||
|
|
@ -591,9 +591,9 @@ typedef struct {
|
|||
} wlc_antselcfg_t;
|
||||
|
||||
/* common functions for every port */
|
||||
extern void *wlc_attach(struct wl_info *wl, u16 vendor, u16 device, uint unit,
|
||||
bool piomode, void *regsva, uint bustype, void *btparam,
|
||||
uint *perr);
|
||||
extern void *wlc_attach(struct brcms_info *wl, u16 vendor, u16 device,
|
||||
uint unit, bool piomode, void *regsva, uint bustype,
|
||||
void *btparam, uint *perr);
|
||||
extern uint wlc_detach(struct wlc_info *wlc);
|
||||
extern int wlc_up(struct wlc_info *wlc);
|
||||
extern uint wlc_down(struct wlc_info *wlc);
|
||||
|
|
|
|||
|
|
@ -35,11 +35,11 @@
|
|||
|
||||
/* forward declarations */
|
||||
struct sk_buff;
|
||||
struct wl_info;
|
||||
struct brcms_info;
|
||||
struct wlc_info;
|
||||
struct wlc_hw_info;
|
||||
struct wlc_if;
|
||||
struct wl_if;
|
||||
struct brcms_if;
|
||||
struct ampdu_info;
|
||||
struct antsel_info;
|
||||
struct bmac_pmq;
|
||||
|
|
|
|||
|
|
@ -88,8 +88,8 @@ typedef struct wl_rateset {
|
|||
#define PM_MAX 1
|
||||
|
||||
/* Message levels */
|
||||
#define WL_ERROR_VAL 0x00000001
|
||||
#define WL_TRACE_VAL 0x00000002
|
||||
#define LOG_ERROR_VAL 0x00000001
|
||||
#define LOG_TRACE_VAL 0x00000002
|
||||
|
||||
#define PM_OFF 0
|
||||
#define PM_MAX 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue