diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:05:47 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:05:47 -0700 |
commit | 66cbd3ab35d35580ddf98304c280a6231685aa41 (patch) | |
tree | 64a55ec99419a0cd9a1114588964d15a5c1ad3a1 /drivers/staging/brcm80211/sys | |
parent | 370adc7cb052a29531b8177d3be770ae9e631bd2 (diff) | |
download | op-kernel-dev-66cbd3ab35d35580ddf98304c280a6231685aa41.zip op-kernel-dev-66cbd3ab35d35580ddf98304c280a6231685aa41.tar.gz |
Staging: brcm80211: s/uint32/u32/
Use the kernel types, don't invent your own.
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
23 files changed, 287 insertions, 287 deletions
diff --git a/drivers/staging/brcm80211/sys/wl_dbg.h b/drivers/staging/brcm80211/sys/wl_dbg.h index d83244c..e63b27e 100644 --- a/drivers/staging/brcm80211/sys/wl_dbg.h +++ b/drivers/staging/brcm80211/sys/wl_dbg.h @@ -18,7 +18,7 @@ #define _wl_dbg_h_ /* wl_msg_level is a bit vector with defs in wlioctl.h */ -extern uint32 wl_msg_level; +extern u32 wl_msg_level; #define WL_PRINT(args) printf args #define WL_NONE(args) @@ -42,7 +42,7 @@ extern uint32 wl_msg_level; #define WL_AMPDU_HWTXS_VAL 0x00000040 /* AMPDU_HWTXS */ #define WL_AMPDU_HWDBG_VAL 0x00000080 /* AMPDU_DBG */ -extern uint32 wl_ampdu_dbg; +extern u32 wl_ampdu_dbg; #define WL_AMPDU_UPDN(args) do {if (wl_ampdu_dbg & WL_AMPDU_UPDN_VAL) {WL_AMPDU(args); } } while (0) #define WL_AMPDU_RX(args) do {if (wl_ampdu_dbg & WL_AMPDU_RX_VAL) {WL_AMPDU(args); } } while (0) diff --git a/drivers/staging/brcm80211/sys/wl_export.h b/drivers/staging/brcm80211/sys/wl_export.h index 836fb83..f382ee9 100644 --- a/drivers/staging/brcm80211/sys/wl_export.h +++ b/drivers/staging/brcm80211/sys/wl_export.h @@ -24,11 +24,11 @@ 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 uint32 wl_intrsoff(struct wl_info *wl); -extern void wl_intrsrestore(struct wl_info *wl, uint32 macintmask); +extern u32 wl_intrsoff(struct wl_info *wl); +extern void wl_intrsrestore(struct wl_info *wl, u32 macintmask); extern void wl_event(struct wl_info *wl, char *ifname, wlc_event_t *e); extern void wl_event_sendup(struct wl_info *wl, const wlc_event_t *e, - u8 *data, uint32 len); + u8 *data, u32 len); 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, diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index d7094e0..0e32209 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -475,7 +475,7 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw, } if (changed & BSS_CHANGED_BASIC_RATES) { WL_NONE(("Need to change Basic Rates:\t0x%x! Implement me\n", - (uint32) info->basic_rates)); + (u32) info->basic_rates)); /* Basic rateset changed */ } if (changed & BSS_CHANGED_BEACON_INT) { @@ -982,8 +982,8 @@ fail1: } #ifdef WLC_HIGH_ONLY -static void *wl_dbus_probe_cb(void *arg, const char *desc, uint32 bustype, - uint32 hdrlen) +static void *wl_dbus_probe_cb(void *arg, const char *desc, u32 bustype, + u32 hdrlen) { wl_info_t *wl; WL_ERROR(("%s:\n", __func__)); @@ -1305,7 +1305,7 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) int rc; wl_info_t *wl; struct ieee80211_hw *hw; - uint32 val; + u32 val; ASSERT(pdev); @@ -1388,7 +1388,7 @@ static int wl_resume(struct pci_dev *pdev) wl_info_t *wl; struct ieee80211_hw *hw; int err = 0; - uint32 val; + u32 val; WL_TRACE(("wl: wl_resume\n")); hw = pci_get_drvdata(pdev); @@ -1485,7 +1485,7 @@ static int __init wl_module_init(void) } #ifndef WLC_HIGH_ONLY { - extern uint32 phyhal_msg_level; + extern u32 phyhal_msg_level; if (phymsglevel != 0xdeadbeef) phyhal_msg_level = phymsglevel; @@ -1727,11 +1727,11 @@ bool wl_alloc_dma_resources(wl_info_t *wl, uint addrwidth) return TRUE; } -uint32 BCMFASTPATH wl_intrsoff(wl_info_t *wl) +u32 BCMFASTPATH wl_intrsoff(wl_info_t *wl) { #if defined(WLC_LOW) unsigned long flags; - uint32 status; + u32 status; INT_LOCK(wl, flags); status = wlc_intrsoff(wl->wlc); @@ -1742,7 +1742,7 @@ uint32 BCMFASTPATH wl_intrsoff(wl_info_t *wl) #endif /* WLC_LOW */ } -void wl_intrsrestore(wl_info_t *wl, uint32 macintmask) +void wl_intrsrestore(wl_info_t *wl, u32 macintmask) { #if defined(WLC_LOW) unsigned long flags; @@ -2052,9 +2052,9 @@ static int wl_linux_watchdog(void *ctx) } struct wl_fw_hdr { - uint32 offset; - uint32 len; - uint32 idx; + u32 offset; + u32 len; + u32 idx; }; #ifdef WLC_HIGH_ONLY @@ -2249,7 +2249,7 @@ static void wl_rpc_dispatch_schedule(void *ctx, struct rpc_buf *buf) bcm_xdr_buf_init(&b, bcm_rpc_buf_data(wl->rpc_th, buf), bcm_rpc_buf_len_get(wl->rpc_th, buf)); - err = bcm_xdr_unpack_uint32(&b, &rpc_id); + err = bcm_xdr_unpack_u32(&b, &rpc_id); ASSERT(!err); WL_TRACE(("%s: Dispatch id %s\n", __func__, WLC_RPC_ID_LOOKUP(rpc_name_tbl, rpc_id))); @@ -2283,7 +2283,7 @@ char *wl_firmwares[WL_MAX_FW] = { }; #ifdef WLC_LOW -int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, uint32 idx) +int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, u32 idx) { int i, entry; const u8 *pdata; @@ -2309,7 +2309,7 @@ int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, uint32 idx) return -1; } -int wl_ucode_init_uint(wl_info_t *wl, uint32 *data, uint32 idx) +int wl_ucode_init_uint(wl_info_t *wl, u32 *data, u32 idx) { int i, entry; const u8 *pdata; @@ -2321,7 +2321,7 @@ int wl_ucode_init_uint(wl_info_t *wl, uint32 *data, uint32 idx) if (hdr->idx == idx) { pdata = wl->fw.fw_bin[i]->data + hdr->offset; ASSERT(hdr->len == 4); - *data = *((uint32 *) pdata); + *data = *((u32 *) pdata); return 0; } } diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.h b/drivers/staging/brcm80211/sys/wl_mac80211.h index 1618e91..78cee44 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.h +++ b/drivers/staging/brcm80211/sys/wl_mac80211.h @@ -53,17 +53,17 @@ struct wl_if { #define WL_MAX_FW 4 struct wl_firmware { - uint32 fw_cnt; + u32 fw_cnt; const struct firmware *fw_bin[WL_MAX_FW]; const struct firmware *fw_hdr[WL_MAX_FW]; - uint32 hdr_num_entries[WL_MAX_FW]; + u32 hdr_num_entries[WL_MAX_FW]; }; struct wl_info { wlc_pub_t *pub; /* pointer to public wlc state */ void *wlc; /* pointer to private common os-independent data */ osl_t *osh; /* pointer to os handler */ - uint32 magic; + u32 magic; int irq; @@ -85,7 +85,7 @@ struct wl_info { #endif /* BCMSDIO */ bool resched; /* dpc needs to be and is rescheduled */ #ifdef LINUXSTA_PS - uint32 pci_psstate[16]; /* pci ps-state save/restore */ + u32 pci_psstate[16]; /* pci ps-state save/restore */ #endif /* RPC, handle, lock, txq, workitem */ #ifdef WLC_HIGH_ONLY @@ -154,8 +154,8 @@ extern int wl_ucode_data_init(wl_info_t *wl); extern void wl_ucode_data_free(void); #ifdef WLC_LOW extern void wl_ucode_free_buf(void *); -extern int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, uint32 idx); -extern int wl_ucode_init_uint(wl_info_t *wl, uint32 *data, uint32 idx); +extern int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, u32 idx); +extern int wl_ucode_init_uint(wl_info_t *wl, u32 *data, u32 idx); #endif /* WLC_LOW */ #endif /* _wl_mac80211_h_ */ diff --git a/drivers/staging/brcm80211/sys/wl_ucode.h b/drivers/staging/brcm80211/sys/wl_ucode.h index 7499cf5..3254f5a 100644 --- a/drivers/staging/brcm80211/sys/wl_ucode.h +++ b/drivers/staging/brcm80211/sys/wl_ucode.h @@ -18,7 +18,7 @@ typedef struct d11init { u16 addr; u16 size; - uint32 value; + u32 value; } d11init_t; extern d11init_t *d11lcn0bsinitvals24; @@ -30,9 +30,9 @@ extern d11init_t *d11lcn2initvals24; extern d11init_t *d11n0absinitvals16; extern d11init_t *d11n0bsinitvals16; extern d11init_t *d11n0initvals16; -extern uint32 *bcm43xx_16_mimo; -extern uint32 bcm43xx_16_mimosz; -extern uint32 *bcm43xx_24_lcn; -extern uint32 bcm43xx_24_lcnsz; -extern uint32 *bcm43xx_bommajor; -extern uint32 *bcm43xx_bomminor; +extern u32 *bcm43xx_16_mimo; +extern u32 bcm43xx_16_mimosz; +extern u32 *bcm43xx_24_lcn; +extern u32 bcm43xx_24_lcnsz; +extern u32 *bcm43xx_bommajor; +extern u32 *bcm43xx_bomminor; diff --git a/drivers/staging/brcm80211/sys/wl_ucode_loader.c b/drivers/staging/brcm80211/sys/wl_ucode_loader.c index f99c042..93a3a01 100644 --- a/drivers/staging/brcm80211/sys/wl_ucode_loader.c +++ b/drivers/staging/brcm80211/sys/wl_ucode_loader.c @@ -34,12 +34,12 @@ d11init_t *d11lcn2initvals24; d11init_t *d11n0absinitvals16; d11init_t *d11n0bsinitvals16; d11init_t *d11n0initvals16; -uint32 *bcm43xx_16_mimo; -uint32 bcm43xx_16_mimosz; -uint32 *bcm43xx_24_lcn; -uint32 bcm43xx_24_lcnsz; -uint32 *bcm43xx_bommajor; -uint32 *bcm43xx_bomminor; +u32 *bcm43xx_16_mimo; +u32 bcm43xx_16_mimosz; +u32 *bcm43xx_24_lcn; +u32 bcm43xx_24_lcnsz; +u32 *bcm43xx_bommajor; +u32 *bcm43xx_bomminor; int wl_ucode_data_init(wl_info_t *wl) { diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c index 7fd7a0a..a888484 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c @@ -74,7 +74,7 @@ + DOT11_A4_HDR_LEN + DOT11_QOS_LEN + DOT11_IV_MAX_LEN) #ifdef BCMDBG -uint32 wl_ampdu_dbg = +u32 wl_ampdu_dbg = WL_AMPDU_UPDN_VAL | WL_AMPDU_ERR_VAL | WL_AMPDU_TX_VAL | @@ -93,10 +93,10 @@ typedef struct wlc_fifo_info { u16 ampdu_pld_size; /* number of bytes to be pre-loaded */ u8 mcs2ampdu_table[FFPLD_MAX_MCS + 1]; /* per-mcs max # of mpdus in an ampdu */ u16 prev_txfunfl; /* num of underflows last read from the HW macstats counter */ - uint32 accum_txfunfl; /* num of underflows since we modified pld params */ - uint32 accum_txampdu; /* num of tx ampdu since we modified pld params */ - uint32 prev_txampdu; /* previous reading of tx ampdu */ - uint32 dmaxferrate; /* estimated dma avg xfer rate in kbits/sec */ + u32 accum_txfunfl; /* num of underflows since we modified pld params */ + u32 accum_txampdu; /* num of tx ampdu since we modified pld params */ + u32 prev_txampdu; /* previous reading of tx ampdu */ + u32 dmaxferrate; /* estimated dma avg xfer rate in kbits/sec */ } wlc_fifo_info_t; /* AMPDU module specific state */ @@ -116,11 +116,11 @@ struct ampdu_info { u8 dur; /* max duration of an ampdu (in msec) */ u8 txpkt_weight; /* weight of ampdu in txfifo; reduces rate lag */ u8 rx_factor; /* maximum rx ampdu factor (0-3) ==> 2^(13+x) bytes */ - uint32 ffpld_rsvd; /* number of bytes to reserve for preload */ - uint32 max_txlen[MCS_TABLE_SIZE][2][2]; /* max size of ampdu per mcs, bw and sgi */ + u32 ffpld_rsvd; /* number of bytes to reserve for preload */ + u32 max_txlen[MCS_TABLE_SIZE][2][2]; /* max size of ampdu per mcs, bw and sgi */ void *ini_free[AMPDU_INI_FREE]; /* array of ini's to be freed on detach */ bool mfbr; /* enable multiple fallback rate */ - uint32 tx_max_funl; /* underflows should be kept such that + u32 tx_max_funl; /* underflows should be kept such that * (tx_max_funfl*underflows) < tx frames */ wlc_fifo_info_t fifo_tb[NUM_FFPLD_FIFO]; /* table of fifo infos */ @@ -155,8 +155,8 @@ static void scb_ampdu_update_config_all(ampdu_info_t *ampdu); static void wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p, tx_status_t *txs, - uint32 frmtxstatus, - uint32 frmtxstatus2); + u32 frmtxstatus, + u32 frmtxstatus2); static inline u16 pkt_txh_seqnum(wlc_info_t *wlc, void *p) { @@ -335,12 +335,12 @@ static void wlc_ffpld_init(ampdu_info_t *ampdu) static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid) { ampdu_info_t *ampdu = wlc->ampdu; - uint32 phy_rate = MCS_RATE(FFPLD_MAX_MCS, TRUE, FALSE); - uint32 txunfl_ratio; + u32 phy_rate = MCS_RATE(FFPLD_MAX_MCS, TRUE, FALSE); + u32 txunfl_ratio; u8 max_mpdu; - uint32 current_ampdu_cnt = 0; + u32 current_ampdu_cnt = 0; u16 max_pld_size; - uint32 new_txunfl; + u32 new_txunfl; wlc_fifo_info_t *fifo = (ampdu->fifo_tb + fid); uint xmtfifo_sz; u16 cur_txunfl; @@ -365,7 +365,7 @@ static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid) return -1; } - if ((TXFIFO_SIZE_UNIT * (uint32) xmtfifo_sz) <= ampdu->ffpld_rsvd) + if ((TXFIFO_SIZE_UNIT * (u32) xmtfifo_sz) <= ampdu->ffpld_rsvd) return 1; max_pld_size = TXFIFO_SIZE_UNIT * xmtfifo_sz - ampdu->ffpld_rsvd; @@ -455,7 +455,7 @@ static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid) static void wlc_ffpld_calc_mcs2ampdu_table(ampdu_info_t *ampdu, int f) { int i; - uint32 phy_rate, dma_rate, tmp; + u32 phy_rate, dma_rate, tmp; u8 max_mpdu; wlc_fifo_info_t *fifo = (ampdu->fifo_tb + f); @@ -517,7 +517,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) bool rr = TRUE, fbr = FALSE; uint i, count = 0, fifo, seg_cnt = 0; u16 plen, len, seq = 0, mcl, mch, index, frameid, dma_len = 0; - uint32 ampdu_len, maxlen = 0; + u32 ampdu_len, maxlen = 0; d11txh_t *txh = NULL; u8 *plcp; struct dot11_header *h; @@ -914,7 +914,7 @@ wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p, scb_ampdu_t *scb_ampdu; wlc_info_t *wlc = ampdu->wlc; scb_ampdu_tid_ini_t *ini; - uint32 s1 = 0, s2 = 0; + u32 s1 = 0, s2 = 0; struct ieee80211_tx_info *tx_info; tx_info = IEEE80211_SKB_CB(p); @@ -969,7 +969,7 @@ wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p, } #ifdef WLC_HIGH_ONLY -void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, uint32 s1, uint32 s2) +void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, u32 s1, u32 s2) { WL_AMPDU_TX(("wl%d: wlc_ampdu_txstatus_complete: High Recvd 0x%x 0x%x p:%p\n", ampdu->wlc->pub->unit, s1, s2, ampdu->p)); @@ -1017,7 +1017,7 @@ extern void wlc_txq_enq(wlc_info_t *wlc, struct scb *scb, void *sdu, static void BCMFASTPATH wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p, - tx_status_t *txs, uint32 s1, uint32 s2) + tx_status_t *txs, u32 s1, u32 s2) { scb_ampdu_t *scb_ampdu; wlc_info_t *wlc = ampdu->wlc; @@ -1325,7 +1325,7 @@ bool wlc_ampdu_cap(ampdu_info_t *ampdu) static void ampdu_update_max_txlen(ampdu_info_t *ampdu, u8 dur) { - uint32 rate, mcs; + u32 rate, mcs; for (mcs = 0; mcs < MCS_TABLE_SIZE; mcs++) { /* rate is in Kbps; dur is in msec ==> len = (rate * dur) / 8 */ diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.h b/drivers/staging/brcm80211/sys/wlc_ampdu.h index 9965e27..c721b16 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.h +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.h @@ -33,8 +33,8 @@ extern u8 wlc_ampdu_null_delim_cnt(ampdu_info_t *ampdu, struct scb *scb, ratespec_t rspec, int phylen); extern void scb_ampdu_cleanup(ampdu_info_t *ampdu, struct scb *scb); #ifdef WLC_HIGH_ONLY -extern void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, uint32 s1, - uint32 s2); +extern void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, u32 s1, + u32 s2); #endif #endif /* _wlc_ampdu_h_ */ diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index 53ac604..5e77896 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -119,14 +119,14 @@ static void wlc_coreinit(wlc_info_t *wlc); /* used by wlc_wakeucode_init() */ static void wlc_write_inits(wlc_hw_info_t *wlc_hw, const d11init_t *inits); -static void wlc_ucode_write(wlc_hw_info_t *wlc_hw, const uint32 ucode[], +static void wlc_ucode_write(wlc_hw_info_t *wlc_hw, const u32 ucode[], const uint nbytes); static void wlc_ucode_download(wlc_hw_info_t *wlc); static void wlc_ucode_txant_set(wlc_hw_info_t *wlc_hw); /* used by wlc_dpc() */ static bool wlc_bmac_dotxstatus(wlc_hw_info_t *wlc, tx_status_t *txs, - uint32 s2); + u32 s2); static bool wlc_bmac_txstatus_corerev4(wlc_hw_info_t *wlc); static bool wlc_bmac_txstatus(wlc_hw_info_t *wlc, bool bound, bool *fatal); static bool wlc_bmac_recv(wlc_hw_info_t *wlc_hw, uint fifo, bool bound); @@ -140,9 +140,9 @@ static void wlc_corerev_fifofixup(wlc_hw_info_t *wlc_hw); /* Low Level Prototypes */ static u16 wlc_bmac_read_objmem(wlc_hw_info_t *wlc_hw, uint offset, - uint32 sel); + u32 sel); static void wlc_bmac_write_objmem(wlc_hw_info_t *wlc_hw, uint offset, u16 v, - uint32 sel); + u32 sel); static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme); static void wlc_bmac_detach_dmapio(wlc_hw_info_t *wlc_hw); static void wlc_ucode_bsinit(wlc_hw_info_t *wlc_hw); @@ -153,15 +153,15 @@ static void wlc_mhfdef(wlc_info_t *wlc, u16 *mhfs, u16 mhf2_init); static void wlc_mctrl_write(wlc_hw_info_t *wlc_hw); static void wlc_ucode_mute_override_set(wlc_hw_info_t *wlc_hw); static void wlc_ucode_mute_override_clear(wlc_hw_info_t *wlc_hw); -static uint32 wlc_wlintrsoff(wlc_info_t *wlc); -static void wlc_wlintrsrestore(wlc_info_t *wlc, uint32 macintmask); +static u32 wlc_wlintrsoff(wlc_info_t *wlc); +static void wlc_wlintrsrestore(wlc_info_t *wlc, u32 macintmask); static void wlc_gpio_init(wlc_info_t *wlc); static void wlc_write_hw_bcntemplate0(wlc_hw_info_t *wlc_hw, void *bcn, int len); static void wlc_write_hw_bcntemplate1(wlc_hw_info_t *wlc_hw, void *bcn, int len); static void wlc_bmac_bsinit(wlc_info_t *wlc, chanspec_t chanspec); -static uint32 wlc_setband_inact(wlc_info_t *wlc, uint bandunit); +static u32 wlc_setband_inact(wlc_info_t *wlc, uint bandunit); static void wlc_bmac_setband(wlc_hw_info_t *wlc_hw, uint bandunit, chanspec_t chanspec); static void wlc_bmac_update_slot_timing(wlc_hw_info_t *wlc_hw, bool shortslot); @@ -233,11 +233,11 @@ static void WLBANDINITFN(wlc_ucode_bsinit) (wlc_hw_info_t *wlc_hw) } /* switch to new band but leave it inactive */ -static uint32 WLBANDINITFN(wlc_setband_inact) (wlc_info_t *wlc, uint bandunit) +static u32 WLBANDINITFN(wlc_setband_inact) (wlc_info_t *wlc, uint bandunit) { wlc_hw_info_t *wlc_hw = wlc->hw; - uint32 macintmask; - uint32 tmp; + u32 macintmask; + u32 tmp; WL_TRACE(("wl%d: wlc_setband_inact\n", wlc_hw->unit)); @@ -277,7 +277,7 @@ wlc_bmac_recv(wlc_hw_info_t *wlc_hw, uint fifo, bool bound) void *tail = NULL; uint n = 0; uint bound_limit = bound ? wlc_hw->wlc->pub->tunables->rxbnd : -1; - uint32 tsf_h, tsf_l; + u32 tsf_h, tsf_l; wlc_d11rxhdr_t *wlc_rxhdr = NULL; WL_TRACE(("wl%d: %s\n", wlc_hw->unit, __func__)); @@ -326,7 +326,7 @@ wlc_bmac_recv(wlc_hw_info_t *wlc_hw, uint fifo, bool bound) */ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded) { - uint32 macintstatus; + u32 macintstatus; wlc_hw_info_t *wlc_hw = wlc->hw; d11regs_t *regs = wlc_hw->regs; bool fatal = FALSE; @@ -425,7 +425,7 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded) if (macintstatus & MI_RFDISABLE) { #if defined(BCMDBG) - uint32 rfd = R_REG(wlc_hw->osh, ®s->phydebug) & PDBG_RFD; + u32 rfd = R_REG(wlc_hw->osh, ®s->phydebug) & PDBG_RFD; #endif WL_ERROR(("wl%d: MAC Detected a change on the RF Disable Input 0x%x\n", wlc_hw->unit, rfd)); @@ -829,8 +829,8 @@ BCMATTACHFN(wlc_bmac_attach) (wlc_info_t *wlc, u16 vendor, u16 device, goto fail; } wlc_hw->sromrev = (u8) getintvar(vars, "sromrev"); - wlc_hw->boardflags = (uint32) getintvar(vars, "boardflags"); - wlc_hw->boardflags2 = (uint32) getintvar(vars, "boardflags2"); + wlc_hw->boardflags = (u32) getintvar(vars, "boardflags"); + wlc_hw->boardflags2 = (u32) getintvar(vars, "boardflags2"); if (D11REV_LE(wlc_hw->corerev, 4) || (wlc_hw->boardflags & BFL_NOPLLDOWN)) @@ -1140,7 +1140,7 @@ void BCMINITFN(wlc_bmac_reset) (wlc_hw_info_t *wlc_hw) void BCMINITFN(wlc_bmac_init) (wlc_hw_info_t *wlc_hw, chanspec_t chanspec, bool mute) { - uint32 macintmask; + u32 macintmask; bool fastclk; wlc_info_t *wlc = wlc_hw->wlc; @@ -1597,10 +1597,10 @@ static void wlc_mctrl_reset(wlc_hw_info_t *wlc_hw) } /* set or clear maccontrol bits */ -void wlc_bmac_mctrl(wlc_hw_info_t *wlc_hw, uint32 mask, uint32 val) +void wlc_bmac_mctrl(wlc_hw_info_t *wlc_hw, u32 mask, u32 val) { - uint32 maccontrol; - uint32 new_maccontrol; + u32 maccontrol; + u32 new_maccontrol; ASSERT((val & ~mask) == 0); @@ -1621,7 +1621,7 @@ void wlc_bmac_mctrl(wlc_hw_info_t *wlc_hw, uint32 mask, uint32 val) /* write the software state of maccontrol and overrides to the maccontrol register */ static void wlc_mctrl_write(wlc_hw_info_t *wlc_hw) { - uint32 maccontrol = wlc_hw->maccontrol; + u32 maccontrol = wlc_hw->maccontrol; /* OR in the wake bit if overridden */ if (wlc_hw->wake_override) @@ -1636,7 +1636,7 @@ static void wlc_mctrl_write(wlc_hw_info_t *wlc_hw) W_REG(wlc_hw->osh, &wlc_hw->regs->maccontrol, maccontrol); } -void wlc_ucode_wake_override_set(wlc_hw_info_t *wlc_hw, uint32 override_bit) +void wlc_ucode_wake_override_set(wlc_hw_info_t *wlc_hw, u32 override_bit) { ASSERT((wlc_hw->wake_override & override_bit) == 0); @@ -1653,7 +1653,7 @@ void wlc_ucode_wake_override_set(wlc_hw_info_t *wlc_hw, uint32 override_bit) return; } -void wlc_ucode_wake_override_clear(wlc_hw_info_t *wlc_hw, uint32 override_bit) +void wlc_ucode_wake_override_clear(wlc_hw_info_t *wlc_hw, u32 override_bit) { ASSERT(wlc_hw->wake_override & override_bit); @@ -1716,7 +1716,7 @@ wlc_bmac_set_rcmta(wlc_hw_info_t *wlc_hw, int idx, d11regs_t *regs = wlc_hw->regs; volatile u16 *objdata16 = (volatile u16 *)(uintptr) & regs->objdata; - uint32 mac_hm; + u32 mac_hm; u16 mac_l; osl_t *osh; @@ -1777,7 +1777,7 @@ wlc_bmac_write_template_ram(wlc_hw_info_t *wlc_hw, int offset, int len, void *buf) { d11regs_t *regs; - uint32 word; + u32 word; bool be_bit; #ifdef IL_BIGENDIAN volatile u16 *dptr = NULL; @@ -1789,8 +1789,8 @@ wlc_bmac_write_template_ram(wlc_hw_info_t *wlc_hw, int offset, int len, regs = wlc_hw->regs; osh = wlc_hw->osh; - ASSERT(ISALIGNED(offset, sizeof(uint32))); - ASSERT(ISALIGNED(len, sizeof(uint32))); + ASSERT(ISALIGNED(offset, sizeof(u32))); + ASSERT(ISALIGNED(len, sizeof(u32))); ASSERT((offset & ~0xffff) == 0); W_REG(osh, ®s->tplatewrptr, offset); @@ -1802,7 +1802,7 @@ wlc_bmac_write_template_ram(wlc_hw_info_t *wlc_hw, int offset, int len, be_bit = (R_REG(osh, ®s->maccontrol) & MCTL_BIGEND) != 0; while (len > 0) { - bcopy((u8 *) buf, &word, sizeof(uint32)); + bcopy((u8 *) buf, &word, sizeof(u32)); if (be_bit) word = hton32(word); @@ -1811,8 +1811,8 @@ wlc_bmac_write_template_ram(wlc_hw_info_t *wlc_hw, int offset, int len, W_REG(osh, ®s->tplatewrdata, word); - buf = (u8 *) buf + sizeof(uint32); - len -= sizeof(uint32); + buf = (u8 *) buf + sizeof(u32); + len -= sizeof(u32); } } @@ -1843,7 +1843,7 @@ void wlc_bmac_set_cwmax(wlc_hw_info_t *wlc_hw, u16 newmax) void wlc_bmac_bw_set(wlc_hw_info_t *wlc_hw, u16 bw) { bool fastclk; - uint32 tmp; + u32 tmp; /* request FAST clock if not on */ fastclk = wlc_hw->forcefastclk; @@ -2043,7 +2043,7 @@ void wlc_bmac_macphyclk_set(wlc_hw_info_t *wlc_hw, bool clk) void wlc_bmac_phy_reset(wlc_hw_info_t *wlc_hw) { wlc_phy_t *pih = wlc_hw->band->pi; - uint32 phy_bw_clkbits; + u32 phy_bw_clkbits; bool phy_in_reset = FALSE; WL_TRACE(("wl%d: wlc_bmac_phy_reset\n", wlc_hw->unit)); @@ -2087,7 +2087,7 @@ static void WLBANDINITFN(wlc_bmac_setband) (wlc_hw_info_t *wlc_hw, uint bandunit, chanspec_t chanspec) { wlc_info_t *wlc = wlc_hw->wlc; - uint32 macintmask; + u32 macintmask; ASSERT(NBANDS_HW(wlc_hw) > 1); ASSERT(bandunit != wlc_hw->band->bandunit); @@ -2210,7 +2210,7 @@ static char *BCMINITFN(wlc_get_macaddr) (wlc_hw_info_t *wlc_hw) bool wlc_bmac_radio_read_hwdisabled(wlc_hw_info_t *wlc_hw) { bool v, clk, xtal; - uint32 resetbits = 0, flags = 0; + u32 resetbits = 0, flags = 0; xtal = wlc_hw->sbclk; if (!xtal) @@ -2328,12 +2328,12 @@ static bool wlc_dma_rxreset(wlc_hw_info_t *wlc_hw, uint fifo) * clear software macintstatus for fresh new start * one testing hack wlc_hw->noreset will bypass the d11/phy reset */ -void BCMINITFN(wlc_bmac_corereset) (wlc_hw_info_t *wlc_hw, uint32 flags) +void BCMINITFN(wlc_bmac_corereset) (wlc_hw_info_t *wlc_hw, u32 flags) { d11regs_t *regs; uint i; bool fastclk; - uint32 resetbits = 0; + u32 resetbits = 0; if (flags == WLC_USE_COREFLAGS) flags = (wlc_hw->band->pi ? wlc_hw->band->core_flags : 0); @@ -2481,7 +2481,7 @@ static void BCMINITFN(wlc_coreinit) (wlc_info_t *wlc) { wlc_hw_info_t *wlc_hw = wlc->hw; d11regs_t *regs; - uint32 sflags; + u32 sflags; uint bcnint_us; uint i = 0; bool fifosz_fixup = FALSE; @@ -2723,7 +2723,7 @@ static void BCMINITFN(wlc_gpio_init) (wlc_info_t *wlc) { wlc_hw_info_t *wlc_hw = wlc->hw; d11regs_t *regs; - uint32 gc, gm; + u32 gc, gm; osl_t *osh; regs = wlc_hw->regs; @@ -2813,7 +2813,7 @@ static void BCMATTACHFN(wlc_ucode_download) (wlc_hw_info_t *wlc_hw) } static void -BCMATTACHFN(wlc_ucode_write) (wlc_hw_info_t *wlc_hw, const uint32 ucode[], +BCMATTACHFN(wlc_ucode_write) (wlc_hw_info_t *wlc_hw, const u32 ucode[], const uint nbytes) { osl_t *osh; d11regs_t *regs = wlc_hw->regs; @@ -2824,9 +2824,9 @@ BCMATTACHFN(wlc_ucode_write) (wlc_hw_info_t *wlc_hw, const uint32 ucode[], WL_TRACE(("wl%d: wlc_ucode_write\n", wlc_hw->unit)); - ASSERT(ISALIGNED(nbytes, sizeof(uint32))); + ASSERT(ISALIGNED(nbytes, sizeof(u32))); - count = (nbytes / sizeof(uint32)); + count = (nbytes / sizeof(u32)); W_REG(osh, ®s->objaddr, (OBJADDR_AUTO_INC | OBJADDR_UCM_SEL)); (void)R_REG(osh, ®s->objaddr); @@ -2852,7 +2852,7 @@ static void wlc_write_inits(wlc_hw_info_t *wlc_hw, const d11init_t *inits) W_REG(osh, (u16 *) (uintptr) (base + inits[i].addr), inits[i].value); else if (inits[i].size == 4) - W_REG(osh, (uint32 *) (uintptr) (base + inits[i].addr), + W_REG(osh, (u32 *) (uintptr) (base + inits[i].addr), inits[i].value); } } @@ -2980,7 +2980,7 @@ void wlc_intrson(wlc_info_t *wlc) * but also because per-port code may require sync with valid interrupt. */ -static uint32 wlc_wlintrsoff(wlc_info_t *wlc) +static u32 wlc_wlintrsoff(wlc_info_t *wlc) { if (!wlc->hw->up) return 0; @@ -2988,7 +2988,7 @@ static uint32 wlc_wlintrsoff(wlc_info_t *wlc) return wl_intrsoff(wlc->wl); } -static void wlc_wlintrsrestore(wlc_info_t *wlc, uint32 macintmask) +static void wlc_wlintrsrestore(wlc_info_t *wlc, u32 macintmask) { if (!wlc->hw->up) return; @@ -2996,10 +2996,10 @@ static void wlc_wlintrsrestore(wlc_info_t *wlc, uint32 macintmask) wl_intrsrestore(wlc->wl, macintmask); } -uint32 wlc_intrsoff(wlc_info_t *wlc) +u32 wlc_intrsoff(wlc_info_t *wlc) { wlc_hw_info_t *wlc_hw = wlc->hw; - uint32 macintmask; + u32 macintmask; if (!wlc_hw->clk) return 0; @@ -3015,7 +3015,7 @@ uint32 wlc_intrsoff(wlc_info_t *wlc) return wlc->macintstatus ? 0 : macintmask; } -void wlc_intrsrestore(wlc_info_t *wlc, uint32 macintmask) +void wlc_intrsrestore(wlc_info_t *wlc, u32 macintmask) { wlc_hw_info_t *wlc_hw = wlc->hw; if (!wlc_hw->clk) @@ -3174,12 +3174,12 @@ void wlc_bmac_tx_fifo_resume(wlc_hw_info_t *wlc_hw, uint tx_fifo) * 0 if the interrupt is not for us, or we are in some special cases; * device interrupt status bits otherwise. */ -static inline uint32 wlc_intstatus(wlc_info_t *wlc, bool in_isr) +static inline u32 wlc_intstatus(wlc_info_t *wlc, bool in_isr) { wlc_hw_info_t *wlc_hw = wlc->hw; d11regs_t *regs = wlc_hw->regs; - uint32 macintstatus; - uint32 intstatus_rxfifo, intstatus_txsfifo; + u32 macintstatus; + u32 intstatus_rxfifo, intstatus_txsfifo; osl_t *osh; osh = wlc_hw->osh; @@ -3268,7 +3268,7 @@ static inline uint32 wlc_intstatus(wlc_info_t *wlc, bool in_isr) /* Return TRUE if they are updated successfully. FALSE otherwise */ bool wlc_intrsupd(wlc_info_t *wlc) { - uint32 macintstatus; + u32 macintstatus; ASSERT(wlc->macintstatus != 0); @@ -3294,7 +3294,7 @@ bool wlc_intrsupd(wlc_info_t *wlc) bool BCMFASTPATH wlc_isr(wlc_info_t *wlc, bool *wantdpc) { wlc_hw_info_t *wlc_hw = wlc->hw; - uint32 macintstatus; + u32 macintstatus; *wantdpc = FALSE; @@ -3358,7 +3358,7 @@ static bool wlc_bmac_txstatus_corerev4(wlc_hw_info_t *wlc_hw) } static bool BCMFASTPATH -wlc_bmac_dotxstatus(wlc_hw_info_t *wlc_hw, tx_status_t *txs, uint32 s2) +wlc_bmac_dotxstatus(wlc_hw_info_t *wlc_hw, tx_status_t *txs, u32 s2) { /* discard intermediate indications for ucode with one legitimate case: * e.g. if "useRTS" is set. ucode did a successful rts/cts exchange, but the subsequent @@ -3395,7 +3395,7 @@ wlc_bmac_txstatus(wlc_hw_info_t *wlc_hw, bool bound, bool *fatal) d11regs_t *regs; osl_t *osh; tx_status_t txstatus, *txs; - uint32 s1, s2; + u32 s1, s2; uint n = 0; /* Param 'max_tx_num' indicates max. # tx status to process before break out. */ uint max_tx_num = bound ? wlc->pub->tunables->txsbnd : -1; @@ -3445,7 +3445,7 @@ void wlc_suspend_mac_and_wait(wlc_info_t *wlc) { wlc_hw_info_t *wlc_hw = wlc->hw; d11regs_t *regs = wlc_hw->regs; - uint32 mc, mi; + u32 mc, mi; osl_t *osh; WL_TRACE(("wl%d: wlc_suspend_mac_and_wait: bandunit %d\n", wlc_hw->unit, @@ -3509,7 +3509,7 @@ void wlc_enable_mac(wlc_info_t *wlc) { wlc_hw_info_t *wlc_hw = wlc->hw; d11regs_t *regs = wlc_hw->regs; - uint32 mc, mi; + u32 mc, mi; osl_t *osh; WL_TRACE(("wl%d: wlc_enable_mac: bandunit %d\n", wlc_hw->unit, @@ -3656,8 +3656,8 @@ void wlc_bmac_band_stf_ss_set(wlc_hw_info_t *wlc_hw, u8 stf_mode) } void BCMFASTPATH -wlc_bmac_read_tsf(wlc_hw_info_t *wlc_hw, uint32 *tsf_l_ptr, - uint32 *tsf_h_ptr) +wlc_bmac_read_tsf(wlc_hw_info_t *wlc_hw, u32 *tsf_l_ptr, + u32 *tsf_h_ptr) { d11regs_t *regs = wlc_hw->regs; @@ -3671,7 +3671,7 @@ wlc_bmac_read_tsf(wlc_hw_info_t *wlc_hw, uint32 *tsf_l_ptr, bool BCMATTACHFN(wlc_bmac_validate_chip_access) (wlc_hw_info_t *wlc_hw) { d11regs_t *regs; - uint32 w, val; + u32 w, val; volatile u16 *reg16; osl_t *osh; @@ -3689,24 +3689,24 @@ bool BCMATTACHFN(wlc_bmac_validate_chip_access) (wlc_hw_info_t *wlc_hw) /* Can we write and read back a 32bit register? */ W_REG(osh, ®s->objaddr, OBJADDR_SHM_SEL | 0); (void)R_REG(osh, ®s->objaddr); - W_REG(osh, ®s->objdata, (uint32) 0xaa5555aa); + W_REG(osh, ®s->objdata, (u32) 0xaa5555aa); W_REG(osh, ®s->objaddr, OBJADDR_SHM_SEL | 0); (void)R_REG(osh, ®s->objaddr); val = R_REG(osh, ®s->objdata); - if (val != (uint32) 0xaa5555aa) { + if (val != (u32) 0xaa5555aa) { WL_ERROR(("wl%d: validate_chip_access: SHM = 0x%x, expected 0xaa5555aa\n", wlc_hw->unit, val)); return FALSE; } W_REG(osh, ®s->objaddr, OBJADDR_SHM_SEL | 0); (void)R_REG(osh, ®s->objaddr); - W_REG(osh, ®s->objdata, (uint32) 0x55aaaa55); + W_REG(osh, ®s->objdata, (u32) 0x55aaaa55); W_REG(osh, ®s->objaddr, OBJADDR_SHM_SEL | 0); (void)R_REG(osh, ®s->objaddr); val = R_REG(osh, ®s->objdata); - if (val != (uint32) 0x55aaaa55) { + if (val != (u32) 0x55aaaa55) { WL_ERROR(("wl%d: validate_chip_access: SHM = 0x%x, expected 0x55aaaa55\n", wlc_hw->unit, val)); return FALSE; } @@ -3767,7 +3767,7 @@ void wlc_bmac_core_phypll_ctl(wlc_hw_info_t *wlc_hw, bool on) { d11regs_t *regs; osl_t *osh; - uint32 tmp; + u32 tmp; WL_TRACE(("wl%d: wlc_bmac_core_phypll_ctl\n", wlc_hw->unit)); @@ -3934,7 +3934,7 @@ void wlc_bmac_set_shm(wlc_hw_info_t *wlc_hw, uint offset, u16 v, int len) } static u16 -wlc_bmac_read_objmem(wlc_hw_info_t *wlc_hw, uint offset, uint32 sel) +wlc_bmac_read_objmem(wlc_hw_info_t *wlc_hw, uint offset, u32 sel) { d11regs_t *regs = wlc_hw->regs; volatile u16 *objdata_lo = @@ -3956,7 +3956,7 @@ wlc_bmac_read_objmem(wlc_hw_info_t *wlc_hw, uint offset, uint32 sel) } static void -wlc_bmac_write_objmem(wlc_hw_info_t *wlc_hw, uint offset, u16 v, uint32 sel) +wlc_bmac_write_objmem(wlc_hw_info_t *wlc_hw, uint offset, u16 v, u32 sel) { d11regs_t *regs = wlc_hw->regs; volatile u16 *objdata_lo = @@ -3981,7 +3981,7 @@ wlc_bmac_write_objmem(wlc_hw_info_t *wlc_hw, uint offset, u16 v, uint32 sel) */ void wlc_bmac_copyto_objmem(wlc_hw_info_t *wlc_hw, uint offset, const void *buf, - int len, uint32 sel) + int len, u32 sel) { u16 v; const u8 *p = (const u8 *)buf; @@ -4007,7 +4007,7 @@ wlc_bmac_copyto_objmem(wlc_hw_info_t *wlc_hw, uint offset, const void *buf, */ void wlc_bmac_copyfrom_objmem(wlc_hw_info_t *wlc_hw, uint offset, void *buf, - int len, uint32 sel) + int len, u32 sel) { u16 v; u8 *p = (u8 *) buf; @@ -4207,7 +4207,7 @@ void wlc_bmac_set_txpwr_percent(wlc_hw_info_t *wlc_hw, u8 val) wlc_phy_txpwr_percent_set(wlc_hw->band->pi, val); } -void wlc_bmac_antsel_set(wlc_hw_info_t *wlc_hw, uint32 antsel_avail) +void wlc_bmac_antsel_set(wlc_hw_info_t *wlc_hw, u32 antsel_avail) { wlc_hw->antsel_avail = antsel_avail; } diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.h b/drivers/staging/brcm80211/sys/wlc_bmac.h index 056d2e4..872bc8d 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.h +++ b/drivers/staging/brcm80211/sys/wlc_bmac.h @@ -41,7 +41,7 @@ typedef struct wlc_bmac_revinfo { uint bustype; /* SB_BUS, PCI_BUS */ uint buscoretype; /* PCI_CORE_ID, PCIE_CORE_ID, PCMCIA_CORE_ID */ uint buscorerev; /* buscore rev */ - uint32 issim; /* chip is in simulation or emulation */ + u32 issim; /* chip is in simulation or emulation */ uint nbands; @@ -59,8 +59,8 @@ typedef struct wlc_bmac_revinfo { /* dup state between BMAC(wlc_hw_info_t) and HIGH(wlc_info_t) driver */ typedef struct wlc_bmac_state { - uint32 machwcap; /* mac hw capibility */ - uint32 preamble_ovr; /* preamble override */ + u32 machwcap; /* mac hw capibility */ + u32 preamble_ovr; /* preamble override */ } wlc_bmac_state_t; enum { @@ -144,9 +144,9 @@ extern void wlc_bmac_xtal(wlc_hw_info_t *wlc_hw, bool want); extern void wlc_bmac_copyto_objmem(wlc_hw_info_t *wlc_hw, uint offset, const void *buf, int len, - uint32 sel); + u32 sel); extern void wlc_bmac_copyfrom_objmem(wlc_hw_info_t *wlc_hw, uint offset, - void *buf, int len, uint32 sel); + void *buf, int len, u32 sel); #define wlc_bmac_copyfrom_shm(wlc_hw, offset, buf, len) \ wlc_bmac_copyfrom_objmem(wlc_hw, offset, buf, len, OBJADDR_SHM_SEL) #define wlc_bmac_copyto_shm(wlc_hw, offset, buf, len) \ @@ -158,7 +158,7 @@ extern void wlc_bmac_core_phypll_ctl(wlc_hw_info_t *wlc_hw, bool on); extern void wlc_bmac_phyclk_fgc(wlc_hw_info_t *wlc_hw, bool clk); extern void wlc_bmac_macphyclk_set(wlc_hw_info_t *wlc_hw, bool clk); extern void wlc_bmac_phy_reset(wlc_hw_info_t *wlc_hw); -extern void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, uint32 flags); +extern void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags); extern void wlc_bmac_reset(wlc_hw_info_t *wlc_hw); extern void wlc_bmac_init(wlc_hw_info_t *wlc_hw, chanspec_t chanspec, bool mute); @@ -166,7 +166,7 @@ extern int wlc_bmac_up_prep(wlc_hw_info_t *wlc_hw); extern int wlc_bmac_up_finish(wlc_hw_info_t *wlc_hw); extern int wlc_bmac_down_prep(wlc_hw_info_t *wlc_hw); extern int wlc_bmac_down_finish(wlc_hw_info_t *wlc_hw); -extern void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, uint32 flags); +extern void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags); extern void wlc_bmac_switch_macfreq(wlc_hw_info_t *wlc_hw, u8 spurmode); /* chanspec, ucode interface */ @@ -180,7 +180,7 @@ extern int wlc_bmac_xmtfifo_sz_get(wlc_hw_info_t *wlc_hw, uint fifo, uint *blocks); extern void wlc_bmac_mhf(wlc_hw_info_t *wlc_hw, u8 idx, u16 mask, u16 val, int bands); -extern void wlc_bmac_mctrl(wlc_hw_info_t *wlc_hw, uint32 mask, uint32 val); +extern void wlc_bmac_mctrl(wlc_hw_info_t *wlc_hw, u32 mask, u32 val); extern u16 wlc_bmac_mhf_get(wlc_hw_info_t *wlc_hw, u8 idx, int bands); extern int wlc_bmac_xmtfifo_sz_set(wlc_hw_info_t *wlc_hw, uint fifo, uint blocks); @@ -219,9 +219,9 @@ extern void wlc_bmac_tx_fifo_suspend(wlc_hw_info_t *wlc_hw, uint tx_fifo); extern void wlc_bmac_tx_fifo_resume(wlc_hw_info_t *wlc_hw, uint tx_fifo); extern void wlc_ucode_wake_override_set(wlc_hw_info_t *wlc_hw, - uint32 override_bit); + u32 override_bit); extern void wlc_ucode_wake_override_clear(wlc_hw_info_t *wlc_hw, - uint32 override_bit); + u32 override_bit); extern void wlc_bmac_set_rcmta(wlc_hw_info_t *wlc_hw, int idx, const struct ether_addr *addr); @@ -230,8 +230,8 @@ extern void wlc_bmac_set_addrmatch(wlc_hw_info_t *wlc_hw, int match_reg_offset, extern void wlc_bmac_write_hw_bcntemplates(wlc_hw_info_t *wlc_hw, void *bcn, int len, bool both); -extern void wlc_bmac_read_tsf(wlc_hw_info_t *wlc_hw, uint32 *tsf_l_ptr, - uint32 *tsf_h_ptr); +extern void wlc_bmac_read_tsf(wlc_hw_info_t *wlc_hw, u32 *tsf_l_ptr, + u32 *tsf_h_ptr); extern void wlc_bmac_set_cwmin(wlc_hw_info_t *wlc_hw, u16 newmin); extern void wlc_bmac_set_cwmax(wlc_hw_info_t *wlc_hw, u16 newmax); extern void wlc_bmac_set_noreset(wlc_hw_info_t *wlc, bool noreset_flag); @@ -246,10 +246,10 @@ extern void wlc_bmac_fifoerrors(wlc_hw_info_t *wlc_hw); extern void wlc_bmac_dngl_reboot(rpc_info_t *); extern void wlc_bmac_dngl_rpc_agg(rpc_info_t *, u16 agg); extern void wlc_bmac_dngl_rpc_msglevel(rpc_info_t *, u16 level); -extern void wlc_bmac_dngl_rpc_txq_wm_set(rpc_info_t *rpc, uint32 wm); -extern void wlc_bmac_dngl_rpc_txq_wm_get(rpc_info_t *rpc, uint32 *wm); -extern void wlc_bmac_dngl_rpc_agg_limit_set(rpc_info_t *rpc, uint32 val); -extern void wlc_bmac_dngl_rpc_agg_limit_get(rpc_info_t *rpc, uint32 *pval); +extern void wlc_bmac_dngl_rpc_txq_wm_set(rpc_info_t *rpc, u32 wm); +extern void wlc_bmac_dngl_rpc_txq_wm_get(rpc_info_t *rpc, u32 *wm); +extern void wlc_bmac_dngl_rpc_agg_limit_set(rpc_info_t *rpc, u32 val); +extern void wlc_bmac_dngl_rpc_agg_limit_get(rpc_info_t *rpc, u32 *pval); extern int wlc_bmac_debug_template(wlc_hw_info_t *wlc_hw); #endif @@ -268,10 +268,10 @@ extern void wlc_gpio_fast_deinit(wlc_hw_info_t *wlc_hw); extern bool wlc_bmac_radio_hw(wlc_hw_info_t *wlc_hw, bool enable); extern u16 wlc_bmac_rate_shm_offset(wlc_hw_info_t *wlc_hw, u8 rate); -extern void wlc_bmac_assert_type_set(wlc_hw_info_t *wlc_hw, uint32 type); +extern void wlc_bmac_assert_type_set(wlc_hw_info_t *wlc_hw, u32 type); extern void wlc_bmac_set_txpwr_percent(wlc_hw_info_t *wlc_hw, u8 val); -extern void wlc_bmac_blink_sync(wlc_hw_info_t *wlc_hw, uint32 led_pins); +extern void wlc_bmac_blink_sync(wlc_hw_info_t *wlc_hw, u32 led_pins); extern void wlc_bmac_ifsctl_edcrs_set(wlc_hw_info_t *wlc_hw, bool abie, bool isht); -extern void wlc_bmac_antsel_set(wlc_hw_info_t *wlc_hw, uint32 antsel_avail); +extern void wlc_bmac_antsel_set(wlc_hw_info_t *wlc_hw, u32 antsel_avail); diff --git a/drivers/staging/brcm80211/sys/wlc_bsscfg.h b/drivers/staging/brcm80211/sys/wlc_bsscfg.h index 54e3543..a821ff6 100644 --- a/drivers/staging/brcm80211/sys/wlc_bsscfg.h +++ b/drivers/staging/brcm80211/sys/wlc_bsscfg.h @@ -73,7 +73,7 @@ struct wlc_bsscfg { struct ether_addr *maclist; /* list of source MAC addrs to match */ /* security */ - uint32 wsec; /* wireless security bitvec */ + u32 wsec; /* wireless security bitvec */ s16 auth; /* 802.11 authentication: Open, Shared Key, WPA */ s16 openshared; /* try Open auth first, then Shared Key */ bool wsec_restrict; /* drop unencrypted packets if wsec is enabled */ @@ -87,9 +87,9 @@ struct wlc_bsscfg { /* TKIP countermeasures */ bool tkip_countermeasures; /* flags TKIP no-assoc period */ - uint32 tk_cm_dt; /* detect timer */ - uint32 tk_cm_bt; /* blocking timer */ - uint32 tk_cm_bt_tmstmp; /* Timestamp when TKIP BT is activated */ + u32 tk_cm_dt; /* detect timer */ + u32 tk_cm_bt; /* blocking timer */ + u32 tk_cm_bt_tmstmp; /* Timestamp when TKIP BT is activated */ bool tk_cm_activate; /* activate countermeasures after EAPOL-Key sent */ struct ether_addr BSSID; /* BSSID (associated) */ @@ -97,7 +97,7 @@ struct wlc_bsscfg { u16 bcmc_fid; /* the last BCMC FID queued to TX_BCMC_FIFO */ u16 bcmc_fid_shm; /* the last BCMC FID written to shared mem */ - uint32 flags; /* WLC_BSSCFG flags; see below */ + u32 flags; /* WLC_BSSCFG flags; see below */ u8 *bcn; /* AP beacon */ uint bcn_len; /* AP beacon length */ diff --git a/drivers/staging/brcm80211/sys/wlc_channel.h b/drivers/staging/brcm80211/sys/wlc_channel.h index e4fc1b8..1f170af 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.h +++ b/drivers/staging/brcm80211/sys/wlc_channel.h @@ -54,7 +54,7 @@ struct wlc_info; /* locale channel and power info. */ typedef struct { - uint32 valid_channels; + u32 valid_channels; u8 radar_channels; /* List of radar sensitive channels */ u8 restricted_channels; /* List of channels used only if APs are detected */ s8 maxpwr[WLC_MAXPWR_TBL_SIZE]; /* Max tx pwr in qdBm for each sub-band */ diff --git a/drivers/staging/brcm80211/sys/wlc_event.h b/drivers/staging/brcm80211/sys/wlc_event.h index 5921bba..e443dae 100644 --- a/drivers/staging/brcm80211/sys/wlc_event.h +++ b/drivers/staging/brcm80211/sys/wlc_event.h @@ -40,7 +40,7 @@ extern int wlc_eventq_set_ind(wlc_eventq_t *eq, uint et, bool on); extern void wlc_eventq_flush(wlc_eventq_t *eq); extern void wlc_assign_event_msg(wlc_info_t *wlc, wl_event_msg_t *msg, const wlc_event_t *e, u8 *data, - uint32 len); + u32 len); #ifdef MSGTRACE extern void wlc_event_sendup_trace(struct wlc_info *wlc, hndrte_dev_t *bus, diff --git a/drivers/staging/brcm80211/sys/wlc_key.h b/drivers/staging/brcm80211/sys/wlc_key.h index ce251c0..61dd5e4 100644 --- a/drivers/staging/brcm80211/sys/wlc_key.h +++ b/drivers/staging/brcm80211/sys/wlc_key.h @@ -80,7 +80,7 @@ struct wlc_bsscfg; #define WSEC_BSS_STA_KEY_GROUP_SIZE 5 typedef struct wsec_iv { - uint32 hi; /* upper 32 bits of IV */ + u32 hi; /* upper 32 bits of IV */ u16 lo; /* lower 16 bits of IV */ } wsec_iv_t; @@ -97,7 +97,7 @@ typedef struct wsec_key { u8 aes_mode; /* cache for hw register */ s8 iv_len; /* IV length */ s8 icv_len; /* ICV length */ - uint32 len; /* key length..don't move this var */ + u32 len; /* key length..don't move this var */ /* data is 4byte aligned */ u8 data[DOT11_MAX_KEY_SIZE]; /* key data */ wsec_iv_t rxiv[WLC_NUMRXIVS]; /* Rx IV (one per TID) */ diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index 15d84cb..f632f35 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -262,12 +262,12 @@ void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg, bool suspend); static void wlc_bss_default_init(wlc_info_t *wlc); static void wlc_ucode_mac_upd(wlc_info_t *wlc); static ratespec_t mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, - uint32 int_val); + u32 int_val); static void wlc_tx_prec_map_init(wlc_info_t *wlc); static void wlc_watchdog(void *arg); static void wlc_watchdog_by_timer(void *arg); static int wlc_set_rateset(wlc_info_t *wlc, wlc_rateset_t *rs_arg); -static int wlc_iovar_rangecheck(wlc_info_t *wlc, uint32 val, +static int wlc_iovar_rangecheck(wlc_info_t *wlc, u32 val, const bcm_iovar_t *vi); static u8 wlc_local_constraint_qdbm(wlc_info_t *wlc); @@ -330,7 +330,7 @@ static int _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, void wlc_get_rcmta(wlc_info_t *wlc, int idx, struct ether_addr *addr) { d11regs_t *regs = wlc->regs; - uint32 v32; + u32 v32; osl_t *osh; WL_TRACE(("wl%d: %s\n", WLCWLUNIT(wlc), __func__)); @@ -506,7 +506,7 @@ void BCMINITFN(wlc_init) (wlc_info_t *wlc) if (wlc->pub->associated) { FOREACH_BSS(wlc, i, bsscfg) { if (bsscfg->up) { - uint32 bi; + u32 bi; /* get beacon period from bsscfg and convert to uS */ bi = bsscfg->current_bss->beacon_period << 10; @@ -612,7 +612,7 @@ void wlc_mac_bcn_promisc(wlc_info_t *wlc) /* set or clear maccontrol bits MCTL_PROMISC and MCTL_KEEPCONTROL */ void wlc_mac_promisc(wlc_info_t *wlc) { - uint32 promisc_bits = 0; + u32 promisc_bits = 0; /* promiscuous mode just sets MCTL_PROMISC * Note: APs get all BSS traffic without the need to set the MCTL_PROMISC bit @@ -639,7 +639,7 @@ bool wlc_ps_check(wlc_info_t *wlc) bool wake_ok; if (!AP_ACTIVE(wlc)) { - volatile uint32 tmp; + volatile u32 tmp; tmp = R_REG(wlc->osh, &wlc->regs->maccontrol); /* If deviceremoved is detected, then don't take any action as this can be called @@ -692,7 +692,7 @@ bool wlc_ps_check(wlc_info_t *wlc) /* push sw hps and wake state through hardware */ void wlc_set_ps_ctrl(wlc_info_t *wlc) { - uint32 v1, v2; + u32 v1, v2; bool hps, wake; bool awake_before; @@ -1075,9 +1075,9 @@ static int wlc_get_current_txpwr(wlc_info_t *wlc, void *pwr, uint len) } #endif /* defined(BCMDBG) */ -static uint32 wlc_watchdog_backup_bi(wlc_info_t *wlc) +static u32 wlc_watchdog_backup_bi(wlc_info_t *wlc) { - uint32 bi; + u32 bi; bi = 2 * wlc->cfg->current_bss->dtim_period * wlc->cfg->current_bss->beacon_period; if (wlc->bcn_li_dtim) @@ -1793,7 +1793,7 @@ void *BCMATTACHFN(wlc_attach) (void *wl, u16 vendor, u16 device, ASSERT(sizeof(ht_cap_ie_t) == HT_CAP_IE_LEN); ASSERT(OFFSETOF(wl_scan_params_t, channel_list) == WL_SCAN_PARAMS_FIXED_SIZE); - ASSERT(ISALIGNED(OFFSETOF(wsec_key_t, data), sizeof(uint32))); + ASSERT(ISALIGNED(OFFSETOF(wsec_key_t, data), sizeof(u32))); ASSERT(ISPOWEROF2(MA_WINDOW_SZ)); ASSERT(sizeof(wlc_d11rxhdr_t) <= WL_HWRXOFF); @@ -3304,7 +3304,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) pval = arg ? (int *)arg:NULL; /* This will prevent the misaligned access */ - if (pval && (uint32) len >= sizeof(val)) + if (pval && (u32) len >= sizeof(val)) bcopy(pval, &val, sizeof(val)); else val = 0; @@ -3524,10 +3524,10 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) bcmerror = BCME_BADADDR; break; } - if (r->size == sizeof(uint32)) + if (r->size == sizeof(u32)) r->val = R_REG(osh, - (uint32 *) ((unsigned char *) (uintptr) regs + + (u32 *) ((unsigned char *) (uintptr) regs + r->byteoff)); else if (r->size == sizeof(u16)) r->val = @@ -3560,9 +3560,9 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) bcmerror = BCME_BADADDR; break; } - if (r->size == sizeof(uint32)) + if (r->size == sizeof(u32)) W_REG(osh, - (uint32 *) ((unsigned char *) (uintptr) regs + + (u32 *) ((unsigned char *) (uintptr) regs + r->byteoff), r->val); else if (r->size == sizeof(u16)) W_REG(osh, @@ -3846,7 +3846,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) (key != NULL)) { u8 seq[DOT11_WPA_KEY_RSC_LEN]; u16 lo; - uint32 hi; + u32 hi; /* group keys in WPA-NONE (IBSS only, AES and TKIP) use a global TXIV */ if ((bsscfg->WPA_auth & WPA_AUTH_NONE) && ETHER_ISNULLADDR(&key->ea)) { @@ -4043,7 +4043,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) break; case WLC_SET_ATIM: - wlc->default_bss->atim_window = (uint32) val; + wlc->default_bss->atim_window = (u32) val; break; case WLC_GET_PKTCNTS:{ @@ -4603,7 +4603,7 @@ wlc_iovar_op(wlc_info_t *wlc, const char *name, int err = 0; int val_size; const bcm_iovar_t *vi = NULL; - uint32 actionid; + u32 actionid; int i; ASSERT(name != NULL); @@ -4739,7 +4739,7 @@ wlc_iovar_check(wlc_pub_t *pub, const bcm_iovar_t *vi, void *arg, int len, * Please use params for additional qualifying parameters. */ int -wlc_doiovar(void *hdl, const bcm_iovar_t *vi, uint32 actionid, +wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid, const char *name, void *params, uint p_len, void *arg, int len, int val_size, struct wlc_if *wlcif) { @@ -4848,11 +4848,11 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, uint32 actionid, } static int -wlc_iovar_rangecheck(wlc_info_t *wlc, uint32 val, const bcm_iovar_t *vi) +wlc_iovar_rangecheck(wlc_info_t *wlc, u32 val, const bcm_iovar_t *vi) { int err = 0; - uint32 min_val = 0; - uint32 max_val = 0; + u32 min_val = 0; + u32 max_val = 0; /* Only ranged integers are checked */ switch (vi->type) { @@ -5577,10 +5577,10 @@ static void wlc_compute_mimo_plcp(ratespec_t rspec, uint length, u8 *plcp) /* Rate: 802.11 rate code, length: PSDU length in octets */ static void BCMFASTPATH -wlc_compute_ofdm_plcp(ratespec_t rspec, uint32 length, u8 *plcp) +wlc_compute_ofdm_plcp(ratespec_t rspec, u32 length, u8 *plcp) { u8 rate_signal; - uint32 tmp = 0; + u32 tmp = 0; int rate = RSPEC2RATE(rspec); ASSERT(IS_OFDM(rspec)); @@ -5902,7 +5902,7 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw, struct dot11_rts_frame *rts = NULL; bool qos; uint ac; - uint32 rate_val[2]; + u32 rate_val[2]; bool hwtkmic = FALSE; u16 mimo_ctlchbw = PHY_TXC1_BW_20MHZ; #ifdef WLANTSEL @@ -6559,7 +6559,7 @@ void wlc_tbtt(wlc_info_t *wlc, d11regs_t *regs) if (BSSCFG_STA(cfg)) { /* run watchdog here if the watchdog timer is not armed */ if (WLC_WATCHDOG_TBTT(wlc)) { - uint32 cur, delta; + u32 cur, delta; if (wlc->WDarmed) { wl_del_timer(wlc->wl, wlc->wdtimer); wlc->WDarmed = FALSE; @@ -6567,7 +6567,7 @@ void wlc_tbtt(wlc_info_t *wlc, d11regs_t *regs) cur = OSL_SYSUPTIME(); delta = cur > wlc->WDlast ? cur - wlc->WDlast : - (uint32) ~0 - wlc->WDlast + cur + 1; + (u32) ~0 - wlc->WDlast + cur + 1; if (delta >= TIMER_INTERVAL_WATCHDOG) { wlc_watchdog((void *)wlc); wlc->WDlast = cur; @@ -6611,7 +6611,7 @@ static void wlc_hwtimer_gptimer_cb(wlc_info_t *wlc) * POLICY: no macinstatus change, no bounding loop. * All dpc bounding should be handled in BMAC dpc, like txstatus and rxint */ -void wlc_high_dpc(wlc_info_t *wlc, uint32 macintstatus) +void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus) { d11regs_t *regs = wlc->regs; #ifdef BCMDBG @@ -6752,7 +6752,7 @@ static void wlc_war16165(wlc_info_t *wlc, bool tx) /* process an individual tx_status_t */ /* WLC_HIGH_API */ bool BCMFASTPATH -wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, uint32 frm_tx2) +wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2) { void *p; uint queue; @@ -6953,9 +6953,9 @@ wlc_txfifo_complete(wlc_info_t *wlc, uint fifo, s8 txpktpend) /* Given the beacon interval in kus, and a 64 bit TSF in us, * return the offset (in us) of the TSF from the last TBTT */ -uint32 wlc_calc_tbtt_offset(uint32 bp, uint32 tsf_h, uint32 tsf_l) +u32 wlc_calc_tbtt_offset(u32 bp, u32 tsf_h, u32 tsf_l) { - uint32 k, btklo, btkhi, offset; + u32 k, btklo, btkhi, offset; /* TBTT is always an even multiple of the beacon_interval, * so the TBTT less than or equal to the beacon timestamp is @@ -6970,7 +6970,7 @@ uint32 wlc_calc_tbtt_offset(uint32 bp, uint32 tsf_h, uint32 tsf_l) * BP = beacon interval (Kusec, 16bits) * BIu = BP * 2^10 = beacon interval (usec, 26bits) * - * To keep the calculations in uint32s, the modulo operation + * To keep the calculations in u32s, the modulo operation * on the high part of BT needs to be done in parts using the * relations: * X*Y mod Z = ((X mod Z) * (Y mod Z)) mod Z @@ -7003,8 +7003,8 @@ uint32 wlc_calc_tbtt_offset(uint32 bp, uint32 tsf_h, uint32 tsf_l) offset = btklo % bp; /* K[2] = ((2^16 % BP) * 2^16) % BP */ - k = (uint32) (1 << 16) % bp; - k = (uint32) (k * 1 << 16) % (uint32) bp; + k = (u32) (1 << 16) % bp; + k = (u32) (k * 1 << 16) % (u32) bp; /* offset += (BTk[2] * K[2]) % BP */ offset += ((btkhi & 0xffff) * k) % bp; @@ -7046,7 +7046,7 @@ static void prep_mac80211_status(wlc_info_t *wlc, d11rxhdr_t *rxh, void *p, struct ieee80211_rx_status *rx_status) { - uint32 tsf_l, tsf_h; + u32 tsf_l, tsf_h; wlc_d11rxhdr_t *wlc_rxh = (wlc_d11rxhdr_t *) rxh; int preamble; int channel; @@ -7922,7 +7922,7 @@ void wlc_bss_update_beacon(wlc_info_t *wlc, wlc_bsscfg_t *cfg) if (MBSS_BCN_ENAB(cfg)) { /* Optimize: Some of if/else could be combined */ } else if (HWBCN_ENAB(cfg)) { /* Hardware beaconing for this config */ u16 bcn[BCN_TMPL_LEN / 2]; - uint32 both_valid = MCMD_BCN0VLD | MCMD_BCN1VLD; + u32 both_valid = MCMD_BCN0VLD | MCMD_BCN1VLD; d11regs_t *regs = wlc->regs; osl_t *osh = NULL; @@ -8198,7 +8198,7 @@ static void wlc_process_eventq(void *arg) } void -wlc_uint64_sub(uint32 *a_high, uint32 *a_low, uint32 b_high, uint32 b_low) +wlc_uint64_sub(u32 *a_high, u32 *a_low, u32 b_high, u32 b_low) { if (b_low > *a_low) { /* low half needs a carry */ @@ -8209,7 +8209,7 @@ wlc_uint64_sub(uint32 *a_high, uint32 *a_low, uint32 b_high, uint32 b_low) } static ratespec_t -mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, uint32 int_val) +mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, u32 int_val) { u8 stf = (int_val & NRATE_STF_MASK) >> NRATE_STF_SHIFT; u8 rate = int_val & NRATE_RATE_MASK; @@ -8351,7 +8351,7 @@ wlc_duty_cycle_set(wlc_info_t *wlc, int duty_cycle, bool isOFDM, void wlc_pktengtx(wlc_info_t *wlc, wl_pkteng_t *pkteng, u8 rate, - struct ether_addr *sa, uint32 wait_delay) + struct ether_addr *sa, u32 wait_delay) { bool suspend; u16 val = M_PKTENG_MODE_TX; @@ -8474,12 +8474,12 @@ void wlc_copyfrom_shm(wlc_info_t *wlc, uint offset, void *buf, int len) } /* wrapper BMAC functions to for HIGH driver access */ -void wlc_mctrl(wlc_info_t *wlc, uint32 mask, uint32 val) +void wlc_mctrl(wlc_info_t *wlc, u32 mask, u32 val) { wlc_bmac_mctrl(wlc->hw, mask, val); } -void wlc_corereset(wlc_info_t *wlc, uint32 flags) +void wlc_corereset(wlc_info_t *wlc, u32 flags) { wlc_bmac_corereset(wlc->hw, flags); } @@ -8521,7 +8521,7 @@ void wlc_set_rcmta(wlc_info_t *wlc, int idx, const struct ether_addr *addr) wlc_bmac_set_rcmta(wlc->hw, idx, addr); } -void wlc_read_tsf(wlc_info_t *wlc, uint32 *tsf_l_ptr, uint32 *tsf_h_ptr) +void wlc_read_tsf(wlc_info_t *wlc, u32 *tsf_l_ptr, u32 *tsf_h_ptr) { wlc_bmac_read_tsf(wlc->hw, tsf_l_ptr, tsf_h_ptr); } diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h index d06546c..5b5375d 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.h +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.h @@ -420,7 +420,7 @@ typedef struct wlc_hwband { u8 bandhw_stf_ss_mode; /* HW configured STF type, 0:siso; 1:cdd */ u16 CWmin; u16 CWmax; - uint32 core_flags; + u32 core_flags; u16 phytype; /* phytype */ u16 phyrev; @@ -451,10 +451,10 @@ struct wlc_hw_info { uint corerev; /* core revision */ u8 sromrev; /* version # of the srom */ u16 boardrev; /* version # of particular board */ - uint32 boardflags; /* Board specific flags from srom */ - uint32 boardflags2; /* More board flags if sromrev >= 4 */ - uint32 machwcap; /* MAC capabilities (corerev >= 13) */ - uint32 machwcap_backup; /* backup of machwcap (corerev >= 13) */ + u32 boardflags; /* Board specific flags from srom */ + u32 boardflags2; /* More board flags if sromrev >= 4 */ + u32 machwcap; /* MAC capabilities (corerev >= 13) */ + u32 machwcap_backup; /* backup of machwcap (corerev >= 13) */ u16 ucode_dbgsel; /* dbgsel for ucode debug(config gpio) */ si_t *sih; /* SB handle (cookie for siutils calls) */ @@ -483,12 +483,12 @@ struct wlc_hw_info { mbool pllreq; /* pll requests to keep PLL on */ u8 suspended_fifos; /* Which TX fifo to remain awake for */ - uint32 maccontrol; /* Cached value of maccontrol */ + u32 maccontrol; /* Cached value of maccontrol */ uint mac_suspend_depth; /* current depth of mac_suspend levels */ - uint32 wake_override; /* Various conditions to force MAC to WAKE mode */ - uint32 mute_override; /* Prevent ucode from sending beacons */ + u32 wake_override; /* Various conditions to force MAC to WAKE mode */ + u32 mute_override; /* Prevent ucode from sending beacons */ struct ether_addr etheraddr; /* currently configured ethernet address */ - uint32 led_gpio_mask; /* LED GPIO Mask */ + u32 led_gpio_mask; /* LED GPIO Mask */ bool noreset; /* true= do not reset hw, used by WLC_OUT */ bool forcefastclk; /* true if the h/w is forcing the use of fast clk */ bool clk; /* core is out of reset and has clock */ @@ -506,9 +506,9 @@ struct wlc_hw_info { struct wl_timer *wdtimer; /* timer for watchdog routine */ struct ether_addr orig_etheraddr; /* original hw ethernet address */ u16 rpc_dngl_agg; /* rpc agg control for dongle */ - uint32 mem_required_def; /* memory required to replenish RX DMA ring */ - uint32 mem_required_lower; /* memory required with lower RX bound */ - uint32 mem_required_least; /* minimum memory requirement to handle RX */ + u32 mem_required_def; /* memory required to replenish RX DMA ring */ + u32 mem_required_lower; /* memory required with lower RX bound */ + u32 mem_required_least; /* minimum memory requirement to handle RX */ #endif /* WLC_LOW_ONLY */ @@ -516,7 +516,7 @@ struct wlc_hw_info { u8 antsel_type; /* Type of boardlevel mimo antenna switch-logic * 0 = N/A, 1 = 2x4 board, 2 = 2x3 CB2 board */ - uint32 antsel_avail; /* put antsel_info_t here if more info is needed */ + u32 antsel_avail; /* put antsel_info_t here if more info is needed */ #endif /* WLC_LOW */ }; @@ -552,9 +552,9 @@ struct wlc_info { u16 fastpwrup_dly; /* time in us needed to bring up d11 fast clock */ /* interrupt */ - uint32 macintstatus; /* bit channel between isr and dpc */ - uint32 macintmask; /* sw runtime master macintmask value */ - uint32 defmacintmask; /* default "on" macintmask value */ + u32 macintstatus; /* bit channel between isr and dpc */ + u32 macintmask; /* sw runtime master macintmask value */ + u32 defmacintmask; /* default "on" macintmask value */ /* up and down */ bool device_present; /* (removable) device is present */ @@ -583,8 +583,8 @@ struct wlc_info { #ifdef WLC_HIGH_ONLY rpctx_info_t *rpctx; /* RPC TX module */ bool reset_bmac_pending; /* bmac reset is in progressing */ - uint32 rpc_agg; /* host agg: bit 16-31, bmac agg: bit 0-15 */ - uint32 rpc_msglevel; /* host rpc: bit 16-31, bmac rpc: bit 0-15 */ + u32 rpc_agg; /* host agg: bit 16-31, bmac agg: bit 0-15 */ + u32 rpc_msglevel; /* host rpc: bit 16-31, bmac rpc: bit 0-15 */ #endif ampdu_info_t *ampdu; /* ampdu module handler */ @@ -599,7 +599,7 @@ struct wlc_info { u16 deviceid; /* PCI device id */ uint ucode_rev; /* microcode revision */ - uint32 machwcap; /* MAC capabilities, BMAC shadow */ + u32 machwcap; /* MAC capabilities, BMAC shadow */ struct ether_addr perm_etheraddr; /* original sprom local ethernet address */ @@ -661,7 +661,7 @@ struct wlc_info { u8 bcn_li_dtim; /* beacon listen interval in # dtims */ bool WDarmed; /* watchdog timer is armed */ - uint32 WDlast; /* last time wlc_watchdog() was called */ + u32 WDlast; /* last time wlc_watchdog() was called */ /* WME */ ac_bitmap_t wme_dp; /* Discard (oldest first) policy per AC */ @@ -776,13 +776,13 @@ struct wlc_info { pkt_cb_t *pkt_callback; /* tx completion callback handlers */ - uint32 txretried; /* tx retried number in one msdu */ + u32 txretried; /* tx retried number in one msdu */ ratespec_t bcn_rspec; /* save bcn ratespec purpose */ bool apsd_sta_usp; /* Unscheduled Service Period in progress on STA */ struct wl_timer *apsd_trigger_timer; /* timer for wme apsd trigger frames */ - uint32 apsd_trigger_timeout; /* timeout value for apsd_trigger_timer (in ms) + u32 apsd_trigger_timeout; /* timeout value for apsd_trigger_timer (in ms) * 0 == disable */ ac_bitmap_t apsd_trigger_ac; /* Permissible Acess Category in which APSD Null @@ -809,10 +809,10 @@ struct wlc_info { wlc_if_t *wlcif_list; /* linked list of wlc_if structs */ wlc_txq_info_t *active_queue; /* txq for the currently active transmit context */ - uint32 mpc_dur; /* total time (ms) in mpc mode except for the + u32 mpc_dur; /* total time (ms) in mpc mode except for the * portion since radio is turned off last time */ - uint32 mpc_laston_ts; /* timestamp (ms) when radio is turned off last + u32 mpc_laston_ts; /* timestamp (ms) when radio is turned off last * time */ bool pr80838_war; @@ -870,11 +870,11 @@ struct antsel_info { ((len1 == len2) && !bcmp(ssid1, ssid2, len1)) /* API shared by both WLC_HIGH and WLC_LOW driver */ -extern void wlc_high_dpc(wlc_info_t *wlc, uint32 macintstatus); +extern void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus); extern void wlc_fatal_error(wlc_info_t *wlc); extern void wlc_bmac_rpc_watchdog(wlc_info_t *wlc); extern void wlc_recv(wlc_info_t *wlc, void *p); -extern bool wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, uint32 frm_tx2); +extern bool wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2); extern void wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit, s8 txpktpend); extern void wlc_txfifo_complete(wlc_info_t *wlc, uint fifo, s8 txpktpend); @@ -892,8 +892,8 @@ extern void wlc_set_rcmta(wlc_info_t *wlc, int idx, const struct ether_addr *addr); extern void wlc_set_addrmatch(wlc_info_t *wlc, int match_reg_offset, const struct ether_addr *addr); -extern void wlc_read_tsf(wlc_info_t *wlc, uint32 *tsf_l_ptr, - uint32 *tsf_h_ptr); +extern void wlc_read_tsf(wlc_info_t *wlc, u32 *tsf_l_ptr, + u32 *tsf_h_ptr); extern void wlc_set_cwmin(wlc_info_t *wlc, u16 newmin); extern void wlc_set_cwmax(wlc_info_t *wlc, u16 newmax); extern void wlc_fifoerrors(wlc_info_t *wlc); @@ -903,7 +903,7 @@ extern void wlc_protection_upd(wlc_info_t *wlc, uint idx, int val); extern void wlc_hwtimer_gptimer_set(wlc_info_t *wlc, uint us); extern void wlc_hwtimer_gptimer_abort(wlc_info_t *wlc); extern void wlc_pktengtx(wlc_info_t *wlc, wl_pkteng_t *pkteng, u8 rate, - struct ether_addr *sa, uint32 wait_delay); + struct ether_addr *sa, u32 wait_delay); #if defined(BCMDBG) extern void wlc_print_rxh(d11rxhdr_t *rxh); @@ -959,9 +959,9 @@ extern void wlc_dump_ie(wlc_info_t *wlc, bcm_tlv_t *ie, struct bcmstrbuf *b); extern bool wlc_ps_check(wlc_info_t *wlc); extern void wlc_reprate_init(wlc_info_t *wlc); extern void wlc_bsscfg_reprate_init(wlc_bsscfg_t *bsscfg); -extern void wlc_uint64_sub(uint32 *a_high, uint32 *a_low, uint32 b_high, - uint32 b_low); -extern uint32 wlc_calc_tbtt_offset(uint32 bi, uint32 tsf_h, uint32 tsf_l); +extern void wlc_uint64_sub(u32 *a_high, u32 *a_low, u32 b_high, + u32 b_low); +extern u32 wlc_calc_tbtt_offset(u32 bi, u32 tsf_h, u32 tsf_l); /* Shared memory access */ extern void wlc_write_shm(wlc_info_t *wlc, uint offset, u16 v); @@ -996,7 +996,7 @@ extern bool wlc_timers_init(wlc_info_t *wlc, int unit); extern const bcm_iovar_t wlc_iovars[]; -extern int wlc_doiovar(void *hdl, const bcm_iovar_t *vi, uint32 actionid, +extern int wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid, const char *name, void *params, uint p_len, void *arg, int len, int val_size, wlc_if_t *wlcif); diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/sys/wlc_phy_shim.c index d7bc4c8..b6f0f1e 100644 --- a/drivers/staging/brcm80211/sys/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/sys/wlc_phy_shim.c @@ -117,12 +117,12 @@ void wlapi_intrson(wlc_phy_shim_info_t *physhim) wl_intrson(physhim->wl); } -uint32 wlapi_intrsoff(wlc_phy_shim_info_t *physhim) +u32 wlapi_intrsoff(wlc_phy_shim_info_t *physhim) { return wl_intrsoff(physhim->wl); } -void wlapi_intrsrestore(wlc_phy_shim_info_t *physhim, uint32 macintmask) +void wlapi_intrsrestore(wlc_phy_shim_info_t *physhim, u32 macintmask) { wl_intrsrestore(physhim->wl, macintmask); } @@ -144,7 +144,7 @@ wlapi_bmac_mhf(wlc_phy_shim_info_t *physhim, u8 idx, u16 mask, wlc_bmac_mhf(physhim->wlc_hw, idx, mask, val, bands); } -void wlapi_bmac_corereset(wlc_phy_shim_info_t *physhim, uint32 flags) +void wlapi_bmac_corereset(wlc_phy_shim_info_t *physhim, u32 flags) { wlc_bmac_corereset(physhim->wlc_hw, flags); } @@ -164,7 +164,7 @@ void wlapi_enable_mac(wlc_phy_shim_info_t *physhim) wlc_enable_mac(physhim->wlc); } -void wlapi_bmac_mctrl(wlc_phy_shim_info_t *physhim, uint32 mask, uint32 val) +void wlapi_bmac_mctrl(wlc_phy_shim_info_t *physhim, u32 mask, u32 val) { wlc_bmac_mctrl(physhim->wlc_hw, mask, val); } @@ -233,21 +233,21 @@ void wlapi_ucode_sample_init(wlc_phy_shim_info_t *physhim) void wlapi_copyfrom_objmem(wlc_phy_shim_info_t *physhim, uint offset, void *buf, - int len, uint32 sel) + int len, u32 sel) { wlc_bmac_copyfrom_objmem(physhim->wlc_hw, offset, buf, len, sel); } void wlapi_copyto_objmem(wlc_phy_shim_info_t *physhim, uint offset, const void *buf, - int l, uint32 sel) + int l, u32 sel) { wlc_bmac_copyto_objmem(physhim->wlc_hw, offset, buf, l, sel); } void wlapi_bmac_pktengtx(wlc_phy_shim_info_t *physhim, wl_pkteng_t *pkteng, - u8 rate, struct ether_addr *sa, uint32 wait_delay) + u8 rate, struct ether_addr *sa, u32 wait_delay) { wlc_pktengtx(physhim->wlc, pkteng, rate, sa, wait_delay); } diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.h b/drivers/staging/brcm80211/sys/wlc_phy_shim.h index e573fbf..c5d9119 100644 --- a/drivers/staging/brcm80211/sys/wlc_phy_shim.h +++ b/drivers/staging/brcm80211/sys/wlc_phy_shim.h @@ -71,21 +71,21 @@ extern void wlapi_add_timer(wlc_phy_shim_info_t *physhim, extern bool wlapi_del_timer(wlc_phy_shim_info_t *physhim, struct wlapi_timer *t); extern void wlapi_intrson(wlc_phy_shim_info_t *physhim); -extern uint32 wlapi_intrsoff(wlc_phy_shim_info_t *physhim); +extern u32 wlapi_intrsoff(wlc_phy_shim_info_t *physhim); extern void wlapi_intrsrestore(wlc_phy_shim_info_t *physhim, - uint32 macintmask); + u32 macintmask); extern void wlapi_bmac_write_shm(wlc_phy_shim_info_t *physhim, uint offset, u16 v); extern u16 wlapi_bmac_read_shm(wlc_phy_shim_info_t *physhim, uint offset); extern void wlapi_bmac_mhf(wlc_phy_shim_info_t *physhim, u8 idx, u16 mask, u16 val, int bands); -extern void wlapi_bmac_corereset(wlc_phy_shim_info_t *physhim, uint32 flags); +extern void wlapi_bmac_corereset(wlc_phy_shim_info_t *physhim, u32 flags); extern void wlapi_suspend_mac_and_wait(wlc_phy_shim_info_t *physhim); extern void wlapi_switch_macfreq(wlc_phy_shim_info_t *physhim, u8 spurmode); extern void wlapi_enable_mac(wlc_phy_shim_info_t *physhim); -extern void wlapi_bmac_mctrl(wlc_phy_shim_info_t *physhim, uint32 mask, - uint32 val); +extern void wlapi_bmac_mctrl(wlc_phy_shim_info_t *physhim, u32 mask, + u32 val); extern void wlapi_bmac_phy_reset(wlc_phy_shim_info_t *physhim); extern void wlapi_bmac_bw_set(wlc_phy_shim_info_t *physhim, u16 bw); extern void wlapi_bmac_phyclk_fgc(wlc_phy_shim_info_t *physhim, bool clk); @@ -102,14 +102,14 @@ extern u16 wlapi_bmac_rate_shm_offset(wlc_phy_shim_info_t *physhim, u8 rate); extern void wlapi_ucode_sample_init(wlc_phy_shim_info_t *physhim); extern void wlapi_copyfrom_objmem(wlc_phy_shim_info_t *physhim, uint, - void *buf, int, uint32 sel); + void *buf, int, u32 sel); extern void wlapi_copyto_objmem(wlc_phy_shim_info_t *physhim, uint, - const void *buf, int, uint32); + const void *buf, int, u32); extern void wlapi_high_update_phy_mode(wlc_phy_shim_info_t *physhim, - uint32 phy_mode); + u32 phy_mode); extern void wlapi_bmac_pktengtx(wlc_phy_shim_info_t *physhim, wl_pkteng_t *pkteng, u8 rate, - struct ether_addr *sa, uint32 wait_delay); + struct ether_addr *sa, u32 wait_delay); extern u16 wlapi_bmac_get_txant(wlc_phy_shim_info_t *physhim); #endif /* _wlc_phy_shim_h_ */ diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h index 94338c4..a573555 100644 --- a/drivers/staging/brcm80211/sys/wlc_pub.h +++ b/drivers/staging/brcm80211/sys/wlc_pub.h @@ -240,7 +240,7 @@ typedef int (*dump_fn_t) (void *handle, struct bcmstrbuf *b); * All pointers may point into the same buffer. */ typedef int (*iovar_fn_t) (void *handle, const bcm_iovar_t *vi, - uint32 actionid, const char *name, void *params, + u32 actionid, const char *name, void *params, uint plen, void *arg, int alen, int vsize, struct wlc_if *wlcif); @@ -296,13 +296,13 @@ typedef struct wlc_pub { struct ether_addr *multicast; /* ptr to list of multicast addresses */ uint nmulticast; /* # enabled multicast addresses */ - uint32 wlfeatureflag; /* Flags to control sw features from registry */ + u32 wlfeatureflag; /* Flags to control sw features from registry */ int psq_pkts_total; /* total num of ps pkts */ u16 txmaxpkts; /* max number of large pkts allowed to be pending */ /* s/w decryption counters */ - uint32 swdecrypt; /* s/w decrypt attempts */ + u32 swdecrypt; /* s/w decrypt attempts */ int bcmerror; /* last bcm error */ @@ -325,8 +325,8 @@ typedef struct wlc_pub { u16 boardrev; /* version # of particular board */ u8 sromrev; /* version # of the srom */ char srom_ccode[WLC_CNTRY_BUF_SZ]; /* Country Code in SROM */ - uint32 boardflags; /* Board specific flags from srom */ - uint32 boardflags2; /* More board flags if sromrev >= 4 */ + u32 boardflags; /* Board specific flags from srom */ + u32 boardflags2; /* More board flags if sromrev >= 4 */ bool tempsense_disable; /* disable periodic tempsense check */ bool _lmac; /* lmac module included and enabled */ @@ -343,7 +343,7 @@ typedef struct wl_rxsts { uint datarate; /* rate in 500kbps */ uint antenna; /* antenna pkts received on */ uint pktlength; /* pkt length minus bcm phy hdr */ - uint32 mactime; /* time stamp from mac, count per 1us */ + u32 mactime; /* time stamp from mac, count per 1us */ uint sq; /* signal quality */ int32 signal; /* in dbm */ int32 noise; /* in dbm */ @@ -512,8 +512,8 @@ extern void wlc_init(struct wlc_info *wlc); extern void wlc_reset(struct wlc_info *wlc); extern void wlc_intrson(struct wlc_info *wlc); -extern uint32 wlc_intrsoff(struct wlc_info *wlc); -extern void wlc_intrsrestore(struct wlc_info *wlc, uint32 macintmask); +extern u32 wlc_intrsoff(struct wlc_info *wlc); +extern void wlc_intrsrestore(struct wlc_info *wlc, u32 macintmask); extern bool wlc_intrsupd(struct wlc_info *wlc); extern bool wlc_isr(struct wlc_info *wlc, bool *wantdpc); extern bool wlc_dpc(struct wlc_info *wlc, bool bounded); @@ -536,19 +536,19 @@ extern int wlc_bmac_up_finish(struct wlc_hw_info *wlc_hw); extern int wlc_bmac_down_prep(struct wlc_hw_info *wlc_hw); extern int wlc_bmac_down_finish(struct wlc_hw_info *wlc_hw); -extern uint32 wlc_reg_read(struct wlc_info *wlc, void *r, uint size); -extern void wlc_reg_write(struct wlc_info *wlc, void *r, uint32 v, uint size); -extern void wlc_corereset(struct wlc_info *wlc, uint32 flags); +extern u32 wlc_reg_read(struct wlc_info *wlc, void *r, uint size); +extern void wlc_reg_write(struct wlc_info *wlc, void *r, u32 v, uint size); +extern void wlc_corereset(struct wlc_info *wlc, u32 flags); extern void wlc_mhf(struct wlc_info *wlc, u8 idx, u16 mask, u16 val, int bands); extern u16 wlc_mhf_get(struct wlc_info *wlc, u8 idx, int bands); -extern uint32 wlc_delta_txfunfl(struct wlc_info *wlc, int fifo); +extern u32 wlc_delta_txfunfl(struct wlc_info *wlc, int fifo); extern void wlc_rate_lookup_init(struct wlc_info *wlc, wlc_rateset_t *rateset); extern void wlc_default_rateset(struct wlc_info *wlc, wlc_rateset_t *rs); /* wlc_phy.c helper functions */ extern void wlc_set_ps_ctrl(struct wlc_info *wlc); -extern void wlc_mctrl(struct wlc_info *wlc, uint32 mask, uint32 val); +extern void wlc_mctrl(struct wlc_info *wlc, u32 mask, u32 val); extern void wlc_scb_ratesel_init_all(struct wlc_info *wlc); /* ioctl */ @@ -566,8 +566,8 @@ extern void wlc_event_if(struct wlc_info *wlc, struct wlc_bsscfg *cfg, extern void wlc_suspend_mac_and_wait(struct wlc_info *wlc); extern void wlc_enable_mac(struct wlc_info *wlc); extern u16 wlc_rate_shm_offset(struct wlc_info *wlc, u8 rate); -extern uint32 wlc_get_rspec_history(struct wlc_bsscfg *cfg); -extern uint32 wlc_get_current_highest_rate(struct wlc_bsscfg *cfg); +extern u32 wlc_get_rspec_history(struct wlc_bsscfg *cfg); +extern u32 wlc_get_current_highest_rate(struct wlc_bsscfg *cfg); static inline int wlc_iovar_getuint(struct wlc_info *wlc, const char *name, uint *arg) @@ -621,7 +621,7 @@ extern void wlc_pmkid_event(struct wlc_bsscfg *cfg); void wlc_device_removed(void *arg); #endif -/* BMAC RPC: 7 uint32 params: pkttotlen, fifo, commit, fid, txpktpend, pktflag, rpc_id */ +/* BMAC RPC: 7 u32 params: pkttotlen, fifo, commit, fid, txpktpend, pktflag, rpc_id */ #define WLC_RPCTX_PARAMS 32 #endif /* _wlc_pub_h_ */ diff --git a/drivers/staging/brcm80211/sys/wlc_rate.c b/drivers/staging/brcm80211/sys/wlc_rate.c index 346f650..64134d0 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.c +++ b/drivers/staging/brcm80211/sys/wlc_rate.c @@ -153,7 +153,7 @@ const mcs_info_t mcs_table[MCS_TABLE_SIZE] = { * other fields: refer to table 78 of section 17.3.2.2 of the original .11a standard */ typedef struct legacy_phycfg { - uint32 rate_ofdm; /* ofdm mac rate */ + u32 rate_ofdm; /* ofdm mac rate */ u8 tx_phy_ctl3; /* phy ctl byte 3, code rate, modulation type, # of streams */ } legacy_phycfg_t; diff --git a/drivers/staging/brcm80211/sys/wlc_rate.h b/drivers/staging/brcm80211/sys/wlc_rate.h index 4135953..25ba2a4 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.h +++ b/drivers/staging/brcm80211/sys/wlc_rate.h @@ -28,10 +28,10 @@ extern const struct wlc_rateset wlc_lrs_rates; extern const struct wlc_rateset rate_limit_1_2; typedef struct mcs_info { - uint32 phy_rate_20; /* phy rate in kbps [20Mhz] */ - uint32 phy_rate_40; /* phy rate in kbps [40Mhz] */ - uint32 phy_rate_20_sgi; /* phy rate in kbps [20Mhz] with SGI */ - uint32 phy_rate_40_sgi; /* phy rate in kbps [40Mhz] with SGI */ + u32 phy_rate_20; /* phy rate in kbps [20Mhz] */ + u32 phy_rate_40; /* phy rate in kbps [40Mhz] */ + u32 phy_rate_20_sgi; /* phy rate in kbps [20Mhz] with SGI */ + u32 phy_rate_40_sgi; /* phy rate in kbps [40Mhz] with SGI */ u8 tx_phy_ctl3; /* phy ctl byte 3, code rate, modulation type, # of streams */ u8 leg_ofdm; /* matching legacy ofdm rate in 500bkps */ } mcs_info_t; @@ -65,7 +65,7 @@ extern const mcs_info_t mcs_table[]; /* rate spec : holds rate and mode specific information required to generate a tx frame. */ /* Legacy CCK and OFDM information is held in the same manner as was done in the past */ /* (in the lower byte) the upper 3 bytes primarily hold MIMO specific information */ -typedef uint32 ratespec_t; +typedef u32 ratespec_t; /* rate spec bit fields */ #define RSPEC_RATE_MASK 0x0000007F /* Either 500Kbps units or MIMO MCS idx */ diff --git a/drivers/staging/brcm80211/sys/wlc_rpc.h b/drivers/staging/brcm80211/sys/wlc_rpc.h index 21ed335..5c09b38 100644 --- a/drivers/staging/brcm80211/sys/wlc_rpc.h +++ b/drivers/staging/brcm80211/sys/wlc_rpc.h @@ -425,15 +425,15 @@ static inline rpc_buf_t *wlc_rpc_buf_alloc(rpc_info_t *rpc, bcm_xdr_buf_t *b, { rpc_buf_t *rpc_buf; - rpc_buf = bcm_rpc_buf_alloc(rpc, len + sizeof(uint32)); + rpc_buf = bcm_rpc_buf_alloc(rpc, len + sizeof(u32)); if (!rpc_buf) return NULL; bcm_xdr_buf_init(b, bcm_rpc_buf_data(bcm_rpc_tp_get(rpc), rpc_buf), - len + sizeof(uint32)); + len + sizeof(u32)); - bcm_xdr_pack_uint32(b, rpc_id); + bcm_xdr_pack_u32(b, rpc_id); return rpc_buf; } @@ -446,9 +446,9 @@ wlc_rpc_id_get(struct rpc_info *rpc, rpc_buf_t *buf) bcm_xdr_buf_t b; bcm_xdr_buf_init(&b, bcm_rpc_buf_data(bcm_rpc_tp_get(rpc), buf), - sizeof(uint32)); + sizeof(u32)); - bcm_xdr_unpack_uint32(&b, (uint32 *) ((uintptr) & rpc_id)); + bcm_xdr_unpack_u32(&b, (u32 *) ((uintptr) & rpc_id)); return rpc_id; } #endif @@ -488,12 +488,12 @@ extern void wlc_rpc_bmac_dump_txfifohist(wlc_hw_info_t *wlc_hw, extern void wlc_rpc_high_dispatch(wlc_rpc_ctx_t *ctx, struct rpc_buf *buf); #endif -/* Packed structure for ease of transport across RPC bus along uint32 boundary */ +/* Packed structure for ease of transport across RPC bus along u32 boundary */ typedef struct wlc_rpc_txstatus { - uint32 PAD_framelen; - uint32 status_frameid; - uint32 sequence_lasttxtime; - uint32 ackphyrxsh_phyerr; + u32 PAD_framelen; + u32 status_frameid; + u32 sequence_lasttxtime; + u32 ackphyrxsh_phyerr; } wlc_rpc_txstatus_t; static inline diff --git a/drivers/staging/brcm80211/sys/wlc_scb.h b/drivers/staging/brcm80211/sys/wlc_scb.h index 388fff4..a496778 100644 --- a/drivers/staging/brcm80211/sys/wlc_scb.h +++ b/drivers/staging/brcm80211/sys/wlc_scb.h @@ -24,7 +24,7 @@ extern bool wlc_aggregatable(wlc_info_t *wlc, u8 tid); #define AMPDU_TX_BA_MAX_WSIZE 64 /* max Tx ba window size (in pdu) */ /* structure to store per-tid state for the ampdu initiator */ typedef struct scb_ampdu_tid_ini { - uint32 magic; + u32 magic; u8 tx_in_transit; /* number of pending mpdus in transit in driver */ u8 tid; /* initiator tid for easy lookup */ u8 txretry[AMPDU_TX_BA_MAX_WSIZE]; /* tx retry count; indexed by seq modulo */ @@ -39,7 +39,7 @@ typedef struct scb_ampdu { u8 max_pdu; /* max pdus allowed in ampdu */ u8 release; /* # of mpdus released at a time */ u16 min_len; /* min mpdu len to support the density */ - uint32 max_rxlen; /* max ampdu rcv length; 8k, 16k, 32k, 64k */ + u32 max_rxlen; /* max ampdu rcv length; 8k, 16k, 32k, 64k */ struct pktq txq; /* sdu transmit queue pending aggregation */ /* This could easily be a ini[] pointer and we keep this info in wl itself instead @@ -54,9 +54,9 @@ typedef struct scb_ampdu { /* station control block - one per remote MAC address */ struct scb { - uint32 magic; - uint32 flags; /* various bit flags as defined below */ - uint32 flags2; /* various bit flags2 as defined below */ + u32 magic; + u32 flags; /* various bit flags as defined below */ + u32 flags2; /* various bit flags2 as defined below */ u8 state; /* current state bitfield of auth/assoc process */ struct ether_addr ea; /* station address */ void *fragbuf[NUMPRIO]; /* defragmentation buffer per prio */ |