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/brcmfmac | |
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/brcmfmac')
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 44 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 54 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmutils.c | 20 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd.h | 10 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 8 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 28 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 26 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 86 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 150 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 40 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.c | 42 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.h | 4 |
13 files changed, 258 insertions, 258 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 8086b62..fb05120 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -36,11 +36,11 @@ const uint bcmsdh_msglevel = BCMSDH_ERROR_VAL; struct bcmsdh_info { bool init_success; /* underlying driver successfully attached */ void *sdioh; /* handler for sdioh */ - uint32 vendevid; /* Target Vendor and Device ID on SD bus */ + u32 vendevid; /* Target Vendor and Device ID on SD bus */ osl_t *osh; bool regfail; /* Save status of last reg_read/reg_write call */ - uint32 sbwad; /* Save backplane window address */ + u32 sbwad; /* Save backplane window address */ }; /* local copy of bcm sd handler */ bcmsdh_info_t *l_bcmsdh; @@ -78,7 +78,7 @@ bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq) bcmsdh->osh = osh; bcmsdh->init_success = TRUE; - *regsva = (uint32 *) SI_ENUM_BASE; + *regsva = (u32 *) SI_ENUM_BASE; /* Report the BAR, to fix if needed */ bcmsdh->sbwad = SI_ENUM_BASE; @@ -181,7 +181,7 @@ int bcmsdh_devremove_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh) return BCME_UNSUPPORTED; } -u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, uint32 addr, int *err) +u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, u32 addr, int *err) { bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; SDIOH_API_RC status; @@ -217,7 +217,7 @@ u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, uint32 addr, int *err) } void -bcmsdh_cfg_write(void *sdh, uint fnc_num, uint32 addr, u8 data, int *err) +bcmsdh_cfg_write(void *sdh, uint fnc_num, u32 addr, u8 data, int *err) { bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; SDIOH_API_RC status; @@ -249,11 +249,11 @@ bcmsdh_cfg_write(void *sdh, uint fnc_num, uint32 addr, u8 data, int *err) __func__, fnc_num, addr, data)); } -uint32 bcmsdh_cfg_read_word(void *sdh, uint fnc_num, uint32 addr, int *err) +u32 bcmsdh_cfg_read_word(void *sdh, uint fnc_num, u32 addr, int *err) { bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; SDIOH_API_RC status; - uint32 data = 0; + u32 data = 0; if (!bcmsdh) bcmsdh = l_bcmsdh; @@ -267,14 +267,14 @@ uint32 bcmsdh_cfg_read_word(void *sdh, uint fnc_num, uint32 addr, int *err) if (err) *err = (SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR); - BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint32data = 0x%x\n", + BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n", __func__, fnc_num, addr, data)); return data; } void -bcmsdh_cfg_write_word(void *sdh, uint fnc_num, uint32 addr, uint32 data, +bcmsdh_cfg_write_word(void *sdh, uint fnc_num, u32 addr, u32 data, int *err) { bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; @@ -292,7 +292,7 @@ bcmsdh_cfg_write_word(void *sdh, uint fnc_num, uint32 addr, uint32 data, if (err) *err = (SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR); - BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint32data = 0x%x\n", + BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n", __func__, fnc_num, addr, data)); } @@ -336,7 +336,7 @@ int bcmsdh_cis_read(void *sdh, uint func, u8 * cis, uint length) return SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR; } -static int bcmsdhsdio_set_sbaddr_window(void *sdh, uint32 address) +static int bcmsdhsdio_set_sbaddr_window(void *sdh, u32 address) { int err = 0; bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; @@ -353,11 +353,11 @@ static int bcmsdhsdio_set_sbaddr_window(void *sdh, uint32 address) return err; } -uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size) +u32 bcmsdh_reg_read(void *sdh, u32 addr, uint size) { bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; SDIOH_API_RC status; - uint32 word = 0; + u32 word = 0; uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; BCMSDH_INFO(("%s:fun = 1, addr = 0x%x, ", __func__, addr)); @@ -383,7 +383,7 @@ uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size) bcmsdh->regfail = !(SDIOH_API_SUCCESS(status)); - BCMSDH_INFO(("uint32data = 0x%x\n", word)); + BCMSDH_INFO(("u32data = 0x%x\n", word)); /* if ok, return appropriately masked word */ if (SDIOH_API_SUCCESS(status)) { @@ -392,7 +392,7 @@ uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size) return word & 0xff; case sizeof(u16): return word & 0xffff; - case sizeof(uint32): + case sizeof(u32): return word; default: bcmsdh->regfail = TRUE; @@ -406,7 +406,7 @@ uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size) return 0xFFFFFFFF; } -uint32 bcmsdh_reg_write(void *sdh, uint32 addr, uint size, uint32 data) +u32 bcmsdh_reg_write(void *sdh, u32 addr, uint size, u32 data) { bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; SDIOH_API_RC status; @@ -451,7 +451,7 @@ bool bcmsdh_regfail(void *sdh) } int -bcmsdh_recv_buf(void *sdh, uint32 addr, uint fn, uint flags, +bcmsdh_recv_buf(void *sdh, u32 addr, uint fn, uint flags, u8 *buf, uint nbytes, void *pkt, bcmsdh_cmplt_fn_t complete, void *handle) { @@ -496,7 +496,7 @@ bcmsdh_recv_buf(void *sdh, uint32 addr, uint fn, uint flags, } int -bcmsdh_send_buf(void *sdh, uint32 addr, uint fn, uint flags, +bcmsdh_send_buf(void *sdh, u32 addr, uint fn, uint flags, u8 *buf, uint nbytes, void *pkt, bcmsdh_cmplt_fn_t complete, void *handle) { @@ -540,7 +540,7 @@ bcmsdh_send_buf(void *sdh, uint32 addr, uint fn, uint flags, return SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR; } -int bcmsdh_rwdata(void *sdh, uint rw, uint32 addr, u8 *buf, uint nbytes) +int bcmsdh_rwdata(void *sdh, uint rw, u32 addr, u8 *buf, uint nbytes) { bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; SDIOH_API_RC status; @@ -612,12 +612,12 @@ void *bcmsdh_get_sdioh(bcmsdh_info_t *sdh) } /* Function to pass device-status bits to DHD. */ -uint32 bcmsdh_get_dstatus(void *sdh) +u32 bcmsdh_get_dstatus(void *sdh) { return 0; } -uint32 bcmsdh_cur_sbwad(void *sdh) +u32 bcmsdh_cur_sbwad(void *sdh) { bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; @@ -627,7 +627,7 @@ uint32 bcmsdh_cur_sbwad(void *sdh) return bcmsdh->sbwad; } -void bcmsdh_chipinfo(void *sdh, uint32 chip, uint32 chiprev) +void bcmsdh_chipinfo(void *sdh, u32 chip, u32 chiprev) { return; } diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index 8e7be0d..d923d54 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -164,7 +164,7 @@ int bcmsdh_probe(struct device *dev) struct resource *r; #endif /* BCMLXSDMMC */ int irq = 0; - uint32 vendevid; + u32 vendevid; unsigned long irq_flags = 0; #if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS) @@ -384,7 +384,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if ((pdev->vendor == VENDOR_TI) && ((pdev->device == PCIXX21_FLASHMEDIA_ID) || (pdev->device == PCIXX21_FLASHMEDIA0_ID))) { - uint32 config_reg; + u32 config_reg; SDLX_MSG(("%s: Disabling TI FlashMedia Controller.\n", __func__)); diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index c1b9ade..4761784 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -44,7 +44,7 @@ extern void sdio_function_cleanup(void); static void IRQHandler(struct sdio_func *func); static void IRQHandlerF2(struct sdio_func *func); #endif /* !defined(OOB_INTR_ONLY) */ -static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr); +static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, u32 regaddr); extern int sdio_reset_comm(struct mmc_card *card); extern PBCMSDH_SDMMC_INSTANCE gInstance; @@ -66,13 +66,13 @@ DHD_PM_RESUME_WAIT_INIT(sdioh_request_buffer_wait); #define DMA_ALIGN_MASK 0x03 -int sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, uint32 regaddr, - int regsize, uint32 *data); +int sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, u32 regaddr, + int regsize, u32 *data); static int sdioh_sdmmc_card_enablefuncs(sdioh_info_t *sd) { int err_ret; - uint32 fbraddr; + u32 fbraddr; u8 func; sd_trace(("%s\n", __func__)); @@ -406,7 +406,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, int val_size; int32 int_val = 0; bool bool_val; - uint32 actionid; + u32 actionid; ASSERT(name); ASSERT(len >= 0); @@ -468,7 +468,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, break; case IOV_GVAL(IOV_BLOCKSIZE): - if ((uint32) int_val > si->num_funcs) { + if ((u32) int_val > si->num_funcs) { bcmerror = BCME_BADARG; break; } @@ -478,7 +478,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, case IOV_SVAL(IOV_BLOCKSIZE): { - uint func = ((uint32) int_val >> 16); + uint func = ((u32) int_val >> 16); uint blksize = (u16) int_val; uint maxsize; @@ -542,7 +542,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, break; case IOV_GVAL(IOV_DIVISOR): - int_val = (uint32) sd_divisor; + int_val = (u32) sd_divisor; bcopy(&int_val, arg, val_size); break; @@ -551,7 +551,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, break; case IOV_GVAL(IOV_POWER): - int_val = (uint32) sd_power; + int_val = (u32) sd_power; bcopy(&int_val, arg, val_size); break; @@ -560,7 +560,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, break; case IOV_GVAL(IOV_CLOCK): - int_val = (uint32) sd_clock; + int_val = (u32) sd_clock; bcopy(&int_val, arg, val_size); break; @@ -569,7 +569,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, break; case IOV_GVAL(IOV_SDMODE): - int_val = (uint32) sd_sdmode; + int_val = (u32) sd_sdmode; bcopy(&int_val, arg, val_size); break; @@ -578,7 +578,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, break; case IOV_GVAL(IOV_HISPEED): - int_val = (uint32) sd_hiok; + int_val = (u32) sd_hiok; bcopy(&int_val, arg, val_size); break; @@ -703,7 +703,7 @@ SDIOH_API_RC sdioh_enable_hw_oob_intr(sdioh_info_t *sd, bool enable) #endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */ extern SDIOH_API_RC -sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data) +sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, u32 addr, u8 *data) { SDIOH_API_RC status; /* No lock needed since sdioh_request_byte does locking */ @@ -712,7 +712,7 @@ sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data) } extern SDIOH_API_RC -sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data) +sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, u32 addr, u8 *data) { /* No lock needed since sdioh_request_byte does locking */ SDIOH_API_RC status; @@ -720,11 +720,11 @@ sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data) return status; } -static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr) +static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, u32 regaddr) { /* read 24 bits and return valid 17 bit addr */ int i; - uint32 scratch, regdata; + u32 scratch, regdata; u8 *ptr = (u8 *)&scratch; for (i = 0; i < 3; i++) { if ((sdioh_sdmmc_card_regread(sd, 0, regaddr, 1, ®data)) != @@ -742,11 +742,11 @@ static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr) } extern SDIOH_API_RC -sdioh_cis_read(sdioh_info_t *sd, uint func, u8 *cisd, uint32 length) +sdioh_cis_read(sdioh_info_t *sd, uint func, u8 *cisd, u32 length) { - uint32 count; + u32 count; int offset; - uint32 foo; + u32 foo; u8 *cis = cisd; sd_trace(("%s: Func = %d\n", __func__, func)); @@ -876,7 +876,7 @@ sdioh_request_byte(sdioh_info_t *sd, uint rw, uint func, uint regaddr, extern SDIOH_API_RC sdioh_request_word(sdioh_info_t *sd, uint cmd_type, uint rw, uint func, - uint addr, uint32 *word, uint nbytes) + uint addr, u32 *word, uint nbytes) { int err_ret = SDIOH_API_RC_FAIL; @@ -932,7 +932,7 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func, uint addr, void *pkt) { bool fifo = (fix_inc == SDIOH_DATA_FIX); - uint32 SGCount = 0; + u32 SGCount = 0; int err_ret = 0; void *pnext; @@ -963,7 +963,7 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func, * is supposed to give * us something we can work with. */ - ASSERT(((uint32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) == 0); + ASSERT(((u32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) == 0); if ((write) && (!fifo)) { err_ret = sdio_memcpy_toio(gInstance->func[func], addr, @@ -1067,7 +1067,7 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, #else PKTFREE(sd->osh, mypkt, write ? TRUE : FALSE); #endif /* DHD_USE_STATIC_BUF */ - } else if (((uint32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) != 0) { + } else if (((u32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) != 0) { /* Case 2: We have a packet, but it is unaligned. */ /* In this case, we cannot have a chain. */ @@ -1156,8 +1156,8 @@ void sdioh_sdmmc_devintr_on(sdioh_info_t *sd) /* Read client card reg */ int -sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, uint32 regaddr, - int regsize, uint32 *data) +sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, u32 regaddr, + int regsize, u32 *data) { if ((func == 0) || (regsize == 1)) { @@ -1222,8 +1222,8 @@ static void IRQHandlerF2(struct sdio_func *func) #ifdef NOTUSED /* Write client card reg */ static int -sdioh_sdmmc_card_regwrite(sdioh_info_t *sd, int func, uint32 regaddr, - int regsize, uint32 data) +sdioh_sdmmc_card_regwrite(sdioh_info_t *sd, int func, u32 regaddr, + int regsize, u32 data) { if ((func == 0) || (regsize == 1)) { diff --git a/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/drivers/staging/brcm80211/brcmfmac/bcmutils.c index 3eff4fe..4db3acc 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmutils.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmutils.c @@ -1170,7 +1170,7 @@ u16 hndcrc16(u8 *pdata, /* pointer to array of data to process */ return crc; } -static const uint32 crc32_table[256] = { +static const u32 crc32_table[256] = { 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, @@ -1237,9 +1237,9 @@ static const uint32 crc32_table[256] = { 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D }; -uint32 hndcrc32(u8 *pdata, /* pointer to array of data to process */ +u32 hndcrc32(u8 *pdata, /* pointer to array of data to process */ uint nbytes, /* number of input data bytes to process */ - uint32 crc /* either CRC32_INIT_VALUE or previous + u32 crc /* either CRC32_INIT_VALUE or previous return value */ ) { @@ -1288,8 +1288,8 @@ void testcrc32(void) uint j, k, l; u8 *buf; uint len[CNBUFS]; - uint32 crcr; - uint32 crc32tv[CNBUFS] = { + u32 crcr; + u32 crc32tv[CNBUFS] = { 0xd2cb1faa, 0xd385c8fa, 0xf5b4f3f3, 0x55789e20, 0x00343110}; ASSERT((buf = MALLOC(CBUFSIZ * CNBUFS)) != NULL); @@ -1408,13 +1408,13 @@ bcm_tlv_t *bcm_parse_ordered_tlvs(void *buf, int buflen, uint key) #if defined(WLMSG_PRHDRS) || defined(WLMSG_PRPKT) || defined(WLMSG_ASSOC) || \ defined(DHD_DEBUG) int -bcm_format_flags(const bcm_bit_desc_t *bd, uint32 flags, char *buf, int len) +bcm_format_flags(const bcm_bit_desc_t *bd, u32 flags, char *buf, int len) { int i; char *p = buf; char hexstr[16]; int slen = 0; - uint32 bit; + u32 bit; const char *name; if (len < 2 || !buf) @@ -1500,7 +1500,7 @@ void prhex(const char *msg, unsigned char *buf, uint nbytes) #endif /* defined(WLMSG_PRHDRS) || defined(WLMSG_PRPKT) */ /* Produce a human-readable string for boardrev */ -char *bcm_brev_str(uint32 brev, char *buf) +char *bcm_brev_str(u32 brev, char *buf) { if (brev < 0x100) snprintf(buf, 8, "%d.%d", (brev & 0xf0) >> 4, brev & 0xf); @@ -1540,7 +1540,7 @@ void printbig(char *buf) /* routine to dump fields in a fileddesc structure */ uint bcmdumpfields(bcmutl_rdreg_rtn read_rtn, void *arg0, uint arg1, - struct fielddesc *fielddesc_array, char *buf, uint32 bufsize) + struct fielddesc *fielddesc_array, char *buf, u32 bufsize) { uint filled_len; int len; @@ -1555,7 +1555,7 @@ bcmdumpfields(bcmutl_rdreg_rtn read_rtn, void *arg0, uint arg1, len = snprintf(buf, bufsize, cur_ptr->nameandfmt, read_rtn(arg0, arg1, cur_ptr->offset)); /* check for snprintf overflow or error */ - if (len < 0 || (uint32) len >= bufsize) + if (len < 0 || (u32) len >= bufsize) len = bufsize - 1; buf += len; bufsize -= len; diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index bcbb2f1..332e99e 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -359,10 +359,10 @@ extern void dhd_os_sdtxunlock(dhd_pub_t *pub); int setScheduler(struct task_struct *p, int policy, struct sched_param *param); typedef struct { - uint32 limit; /* Expiration time (usec) */ - uint32 increment; /* Current expiration increment (usec) */ - uint32 elapsed; /* Current elapsed time (usec) */ - uint32 tick; /* O/S tick time (usec) */ + u32 limit; /* Expiration time (usec) */ + u32 increment; /* Current expiration increment (usec) */ + u32 elapsed; /* Current elapsed time (usec) */ + u32 tick; /* O/S tick time (usec) */ } dhd_timeout_t; extern void dhd_timeout_start(dhd_timeout_t *tmo, uint usec); @@ -377,7 +377,7 @@ extern void wl_event_to_host_order(wl_event_msg_t *evt); extern void dhd_common_init(void); extern int dhd_add_if(struct dhd_info *dhd, int ifidx, void *handle, - char *name, u8 *mac_addr, uint32 flags, u8 bssidx); + char *name, u8 *mac_addr, u32 flags, u8 bssidx); extern void dhd_del_if(struct dhd_info *dhd, int ifidx); extern void dhd_vif_add(struct dhd_info *dhd, int ifidx, char *name); diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c index 492138f..71047ca 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c @@ -54,7 +54,7 @@ extern int dhd_preinit_ioctls(dhd_pub_t *dhd); typedef struct dhd_prot { u16 reqid; u8 pending; - uint32 lastcmd; + u32 lastcmd; u8 bus_header[BUS_HEADER_LEN]; cdc_ioctl_t msg; unsigned char buf[WLC_IOCTL_MAXLEN + ROUND_UP_MARGIN]; @@ -78,7 +78,7 @@ static int dhdcdc_msg(dhd_pub_t *dhd) return dhd_bus_txctl(dhd->bus, (unsigned char *)&prot->msg, len); } -static int dhdcdc_cmplt(dhd_pub_t *dhd, uint32 id, uint32 len) +static int dhdcdc_cmplt(dhd_pub_t *dhd, u32 id, u32 len) { int ret; dhd_prot_t *prot = dhd->prot; @@ -103,7 +103,7 @@ dhdcdc_query_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len) cdc_ioctl_t *msg = &prot->msg; void *info; int ret = 0, retries = 0; - uint32 id, flags = 0; + u32 id, flags = 0; DHD_TRACE(("%s: Enter\n", __func__)); DHD_CTL(("%s: cmd %d len %d\n", __func__, cmd, len)); @@ -182,7 +182,7 @@ int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len) dhd_prot_t *prot = dhd->prot; cdc_ioctl_t *msg = &prot->msg; int ret = 0; - uint32 flags, id; + u32 flags, id; DHD_TRACE(("%s: Enter\n", __func__)); DHD_CTL(("%s: cmd %d len %d\n", __func__, cmd, len)); diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 9087997..1085431 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -30,9 +30,9 @@ char fw_path[MOD_PARAM_PATHLEN]; char nv_path[MOD_PARAM_PATHLEN]; /* Last connection success/failure status */ -uint32 dhd_conn_event; -uint32 dhd_conn_status; -uint32 dhd_conn_reason; +u32 dhd_conn_event; +u32 dhd_conn_status; +u32 dhd_conn_reason; #define htod32(i) i #define htod16(i) i @@ -200,7 +200,7 @@ static int dhd_dump(dhd_pub_t *dhdp, char *buf, int buflen) } static int -dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, uint32 actionid, +dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, u32 actionid, const char *name, void *params, int plen, void *arg, int len, int val_size) { @@ -313,7 +313,7 @@ exit: } /* Store the status of a connection attempt for later retrieval by an iovar */ -void dhd_store_conn_status(uint32 event, uint32 status, uint32 reason) +void dhd_store_conn_status(u32 event, u32 status, u32 reason) { /* Do not overwrite a WLC_E_PRUNE with a WLC_E_SET_SSID * because an encryption/rsn mismatch results in both events, and @@ -387,7 +387,7 @@ dhd_iovar_op(dhd_pub_t *dhd_pub, const char *name, int bcmerror = 0; int val_size; const bcm_iovar_t *vi = NULL; - uint32 actionid; + u32 actionid; DHD_TRACE(("%s: Enter\n", __func__)); @@ -750,9 +750,9 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data) case WLC_E_TRACE: { - static uint32 seqnum_prev; + static u32 seqnum_prev; msgtrace_hdr_t hdr; - uint32 nblost; + u32 nblost; char *s, *p; buf = (unsigned char *) event_data; @@ -835,7 +835,7 @@ wl_host_event(struct dhd_info *dhd, int *ifidx, void *pktdata, /* check whether packet is a BRCM event pkt */ bcm_event_t *pvt_data = (bcm_event_t *) pktdata; char *event_data; - uint32 type, status; + u32 type, status; u16 flags; int evlen; @@ -912,7 +912,7 @@ wl_host_event(struct dhd_info *dhd, int *ifidx, void *pktdata, /* put it back to WLC_E_NDIS_LINK */ if (type == WLC_E_NDIS_LINK) { - uint32 temp; + u32 temp; temp = ntoh32_ua((void *)&event->event_type); DHD_TRACE(("Converted to WLC_E_LINK type %d\n", temp)); @@ -1072,8 +1072,8 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) int buf_len; int str_len; int rc; - uint32 mask_size; - uint32 pattern_size; + u32 mask_size; + u32 pattern_size; char *argv[8], *buf = 0; int i = 0; char *arg_save = 0, *arg_org = 0; @@ -1242,8 +1242,8 @@ int dhd_preinit_ioctls(dhd_pub_t *dhd) uint up = 0; char buf[128], *ptr; uint power_mode = PM_FAST; - uint32 dongle_align = DHD_SDALIGN; - uint32 glom = 0; + u32 dongle_align = DHD_SDALIGN; + u32 glom = 0; uint bcn_timeout = 3; int scan_assoc_time = 40; int scan_unassoc_time = 40; diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 72eed5b..79138d0 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -425,8 +425,8 @@ extern int dhd_wait_pend8021x(struct net_device *dev); #ifndef BDC #error TOE requires BDC #endif /* !BDC */ -static int dhd_toe_get(dhd_info_t *dhd, int idx, uint32 *toe_ol); -static int dhd_toe_set(dhd_info_t *dhd, int idx, uint32 toe_ol); +static int dhd_toe_get(dhd_info_t *dhd, int idx, u32 *toe_ol); +static int dhd_toe_set(dhd_info_t *dhd, int idx, u32 toe_ol); #endif /* TOE */ static int dhd_wl_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata, @@ -712,7 +712,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) { struct net_device *dev; struct netdev_hw_addr *ha; - uint32 allmulti, cnt; + u32 allmulti, cnt; wl_ioctl_t ioc; char *buf, *bufp; @@ -1434,7 +1434,7 @@ void dhd_sched_dpc(dhd_pub_t *dhdp) #ifdef TOE /* Retrieve current toe component enables, which are kept as a bitmap in toe_ol iovar */ -static int dhd_toe_get(dhd_info_t *dhd, int ifidx, uint32 *toe_ol) +static int dhd_toe_get(dhd_info_t *dhd, int ifidx, u32 *toe_ol) { wl_ioctl_t ioc; char buf[32]; @@ -1462,13 +1462,13 @@ static int dhd_toe_get(dhd_info_t *dhd, int ifidx, uint32 *toe_ol) return ret; } - memcpy(toe_ol, buf, sizeof(uint32)); + memcpy(toe_ol, buf, sizeof(u32)); return 0; } /* Set current toe component enables in toe_ol iovar, and set toe global enable iovar */ -static int dhd_toe_set(dhd_info_t *dhd, int ifidx, uint32 toe_ol) +static int dhd_toe_set(dhd_info_t *dhd, int ifidx, u32 toe_ol) { wl_ioctl_t ioc; char buf[32]; @@ -1484,7 +1484,7 @@ static int dhd_toe_set(dhd_info_t *dhd, int ifidx, uint32 toe_ol) /* Set toe_ol as requested */ strcpy(buf, "toe_ol"); - memcpy(&buf[sizeof("toe_ol")], &toe_ol, sizeof(uint32)); + memcpy(&buf[sizeof("toe_ol")], &toe_ol, sizeof(u32)); ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len); if (ret < 0) { @@ -1498,7 +1498,7 @@ static int dhd_toe_set(dhd_info_t *dhd, int ifidx, uint32 toe_ol) toe = (toe_ol != 0); strcpy(buf, "toe"); - memcpy(&buf[sizeof("toe")], &toe, sizeof(uint32)); + memcpy(&buf[sizeof("toe")], &toe, sizeof(u32)); ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len); if (ret < 0) { @@ -1530,17 +1530,17 @@ static int dhd_ethtool(dhd_info_t *dhd, void *uaddr) { struct ethtool_drvinfo info; char drvname[sizeof(info.driver)]; - uint32 cmd; + u32 cmd; #ifdef TOE struct ethtool_value edata; - uint32 toe_cmpnt, csum_dir; + u32 toe_cmpnt, csum_dir; int ret; #endif DHD_TRACE(("%s: Enter\n", __func__)); /* all ethtool calls start with a cmd word */ - if (copy_from_user(&cmd, uaddr, sizeof(uint32))) + if (copy_from_user(&cmd, uaddr, sizeof(u32))) return -EFAULT; switch (cmd) { @@ -1794,7 +1794,7 @@ static int dhd_open(struct net_device *net) { dhd_info_t *dhd = *(dhd_info_t **) netdev_priv(net); #ifdef TOE - uint32 toe_ol; + u32 toe_ol; #endif int ifidx = dhd_net2idx(dhd, net); int32 ret = 0; @@ -1854,7 +1854,7 @@ void dhd_osl_detach(osl_t *osh) int dhd_add_if(dhd_info_t *dhd, int ifidx, void *handle, char *name, - u8 *mac_addr, uint32 flags, u8 bssidx) + u8 *mac_addr, u32 flags, u8 bssidx) { dhd_if_t *ifp; diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index fb5e4b6..5fbb2a54 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -167,18 +167,18 @@ typedef struct dhd_bus { si_t *sih; /* Handle for SI calls */ char *vars; /* Variables (from CIS and/or other) */ uint varsz; /* Size of variables buffer */ - uint32 sbaddr; /* Current SB window pointer (-1, invalid) */ + u32 sbaddr; /* Current SB window pointer (-1, invalid) */ sdpcmd_regs_t *regs; /* Registers for SDIO core */ uint sdpcmrev; /* SDIO core revision */ uint armrev; /* CPU core revision */ uint ramrev; /* SOCRAM core revision */ - uint32 ramsize; /* Size of RAM in SOCRAM (bytes) */ - uint32 orig_ramsize; /* Size of RAM in SOCRAM (bytes) */ + u32 ramsize; /* Size of RAM in SOCRAM (bytes) */ + u32 orig_ramsize; /* Size of RAM in SOCRAM (bytes) */ - uint32 bus; /* gSPI or SDIO bus */ - uint32 hostintmask; /* Copy of Host Interrupt Mask */ - uint32 intstatus; /* Intstatus bits (events) pending */ + u32 bus; /* gSPI or SDIO bus */ + u32 hostintmask; /* Copy of Host Interrupt Mask */ + u32 intstatus; /* Intstatus bits (events) pending */ bool dpc_sched; /* Indicates DPC schedule (intrpt rcvd) */ bool fcstate; /* State of dongle flow-control */ @@ -295,7 +295,7 @@ typedef struct dhd_bus { uint f1regdata; /* Number of f1 register accesses */ u8 *ctrl_frame_buf; - uint32 ctrl_frame_len; + u32 ctrl_frame_len; bool ctrl_frame_stat; } dhd_bus_t; @@ -442,10 +442,10 @@ static void dhdsdio_release_dongle(dhd_bus_t *bus, osl_t * osh); static uint process_nvram_vars(char *varbuf, uint len); static void dhd_dongle_setmemsize(struct dhd_bus *bus, int mem_size); -static int dhd_bcmsdh_recv_buf(dhd_bus_t *bus, uint32 addr, uint fn, +static int dhd_bcmsdh_recv_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags, u8 *buf, uint nbytes, void *pkt, bcmsdh_cmplt_fn_t complete, void *handle); -static int dhd_bcmsdh_send_buf(dhd_bus_t *bus, uint32 addr, uint fn, +static int dhd_bcmsdh_send_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags, u8 *buf, uint nbytes, void *pkt, bcmsdh_cmplt_fn_t complete, void *handle); @@ -470,7 +470,7 @@ static void dhd_dongle_setmemsize(struct dhd_bus *bus, int mem_size) bus->ramsize = dhd_dongle_memsize; } -static int dhdsdio_set_siaddr_window(dhd_bus_t *bus, uint32 address) +static int dhdsdio_set_siaddr_window(dhd_bus_t *bus, u32 address) { int err = 0; bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW, @@ -519,7 +519,7 @@ static int dhdsdio_htclk(dhd_bus_t *bus, bool on, bool pendok) if (pendok && ((bus->sih->buscoretype == PCMCIA_CORE_ID) && (bus->sih->buscorerev == 9))) { - uint32 dummy, retries; + u32 dummy, retries; R_SDREG(dummy, &bus->regs->clockctlstatus, retries); } @@ -905,7 +905,7 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt) osl_t *osh; u8 *frame; u16 len, pad = 0; - uint32 swheader; + u32 swheader; uint retries = 0; bcmsdh_info_t *sdh; void *new; @@ -1162,7 +1162,7 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt) static uint dhdsdio_sendfromq(dhd_bus_t *bus, uint maxframes) { void *pkt; - uint32 intstatus = 0; + u32 intstatus = 0; uint retries = 0; int ret = 0, prec_out; uint cnt = 0; @@ -1223,7 +1223,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) { u8 *frame; u16 len; - uint32 swheader; + u32 swheader; uint retries = 0; bcmsdh_info_t *sdh = bus->sdh; u8 doff = 0; @@ -1692,11 +1692,11 @@ static int dhdsdio_pktgen_set(dhd_bus_t *bus, u8 *arg) #endif /* SDTEST */ static int -dhdsdio_membytes(dhd_bus_t *bus, bool write, uint32 address, u8 *data, +dhdsdio_membytes(dhd_bus_t *bus, bool write, u32 address, u8 *data, uint size) { int bcmerror = 0; - uint32 sdaddr; + u32 sdaddr; uint dsize; /* Determine initial transfer parameters */ @@ -1754,7 +1754,7 @@ xfer_done: #ifdef DHD_DEBUG static int dhdsdio_readshared(dhd_bus_t *bus, sdpcm_shared_t *sh) { - uint32 addr; + u32 addr; int rv; /* Read last word in memory to determine address of @@ -1987,7 +1987,7 @@ static int dhdsdio_readconsole(dhd_bus_t *bus) { dhd_console_t *c = &bus->console; u8 line[CONSOLE_LINE_MAX], ch; - uint32 n, idx, addr; + u32 n, idx, addr; int rv; /* Don't do anything until FWREADY updates console address */ @@ -2095,7 +2095,7 @@ err: } static int -dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, uint32 actionid, +dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid, const char *name, void *params, int plen, void *arg, int len, int val_size) { @@ -2208,7 +2208,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, uint32 actionid, case IOV_SVAL(IOV_MEMBYTES): case IOV_GVAL(IOV_MEMBYTES): { - uint32 address; + u32 address; uint size, dsize; u8 *data; @@ -2216,7 +2216,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, uint32 actionid, ASSERT(plen >= 2 * sizeof(int)); - address = (uint32) int_val; + address = (u32) int_val; bcopy((char *)params + sizeof(int_val), &int_val, sizeof(int_val)); size = (uint) int_val; @@ -2332,7 +2332,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, uint32 actionid, case IOV_GVAL(IOV_SDREG): { sdreg_t *sd_ptr; - uint32 addr, size; + u32 addr, size; sd_ptr = (sdreg_t *) params; @@ -2348,7 +2348,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, uint32 actionid, case IOV_SVAL(IOV_SDREG): { sdreg_t *sd_ptr; - uint32 addr, size; + u32 addr, size; sd_ptr = (sdreg_t *) params; @@ -2365,7 +2365,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, uint32 actionid, case IOV_GVAL(IOV_SBREG): { sdreg_t sdreg; - uint32 addr, size; + u32 addr, size; bcopy(params, &sdreg, sizeof(sdreg)); @@ -2381,7 +2381,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, uint32 actionid, case IOV_SVAL(IOV_SBREG): { sdreg_t sdreg; - uint32 addr, size; + u32 addr, size; bcopy(params, &sdreg, sizeof(sdreg)); @@ -2512,10 +2512,10 @@ exit: static int dhdsdio_write_vars(dhd_bus_t *bus) { int bcmerror = 0; - uint32 varsize; - uint32 varaddr; + u32 varsize; + u32 varaddr; u8 *vbuffer; - uint32 varsizew; + u32 varsizew; #ifdef DHD_DEBUG char *nvram_ularray; #endif /* DHD_DEBUG */ @@ -2639,7 +2639,7 @@ static int dhdsdio_download_state(dhd_bus_t *bus, bool enter) /* Clear the top bit of memory */ if (bus->ramsize) { - uint32 zeros = 0; + u32 zeros = 0; dhdsdio_membytes(bus, TRUE, bus->ramsize - 4, (u8 *)&zeros, 4); } @@ -2710,7 +2710,7 @@ dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name, const bcm_iovar_t *vi = NULL; int bcmerror = 0; int val_size; - uint32 actionid; + u32 actionid; DHD_TRACE(("%s: Enter\n", __func__)); @@ -2823,7 +2823,7 @@ exit: void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex) { osl_t *osh = bus->dhd->osh; - uint32 local_hostintmask; + u32 local_hostintmask; u8 saveclk; uint retries; int err; @@ -4208,11 +4208,11 @@ deliver: return rxcount; } -static uint32 dhdsdio_hostmail(dhd_bus_t *bus) +static u32 dhdsdio_hostmail(dhd_bus_t *bus) { sdpcmd_regs_t *regs = bus->regs; - uint32 intstatus = 0; - uint32 hmb_data; + u32 intstatus = 0; + u32 hmb_data; u8 fcbits; uint retries = 0; @@ -4286,7 +4286,7 @@ bool dhdsdio_dpc(dhd_bus_t *bus) { bcmsdh_info_t *sdh = bus->sdh; sdpcmd_regs_t *regs = bus->regs; - uint32 intstatus, newstatus = 0; + u32 intstatus, newstatus = 0; uint retries = 0; uint rxlimit = dhd_rxbound; /* Rx frames to read before resched */ uint txlimit = dhd_txbound; /* Tx frames to send before resched */ @@ -4460,7 +4460,7 @@ clkwait: ret = dhd_bcmsdh_send_buf(bus, bcmsdh_cur_sbwad(sdh), SDIO_FUNC_2, F2SYNC, (u8 *) bus->ctrl_frame_buf, - (uint32) bus->ctrl_frame_len, NULL, + (u32) bus->ctrl_frame_len, NULL, NULL, NULL); ASSERT(ret != BCME_PENDING); @@ -4875,7 +4875,7 @@ extern bool dhd_bus_watchdog(dhd_pub_t *dhdp) /* Poll period: check device if appropriate. */ if (bus->poll && (++bus->polltick >= bus->pollrate)) { - uint32 intstatus = 0; + u32 intstatus = 0; /* Reset poll tick */ bus->polltick = 0; @@ -4957,7 +4957,7 @@ extern bool dhd_bus_watchdog(dhd_pub_t *dhdp) extern int dhd_bus_console_in(dhd_pub_t *dhdp, unsigned char *msg, uint msglen) { dhd_bus_t *bus = dhdp->bus; - uint32 addr, val; + u32 addr, val; int rv; void *pkt; @@ -5765,9 +5765,9 @@ static int dhdsdio_download_code_file(struct dhd_bus *bus, char *fw_path) __func__, MEMBLOCK)); goto err; } - if ((uint32) (uintptr) memblock % DHD_SDALIGN) + if ((u32) (uintptr) memblock % DHD_SDALIGN) memptr += - (DHD_SDALIGN - ((uint32) (uintptr) memblock % DHD_SDALIGN)); + (DHD_SDALIGN - ((u32) (uintptr) memblock % DHD_SDALIGN)); /* Download image */ while ((len = @@ -6010,7 +6010,7 @@ err: } static int -dhd_bcmsdh_recv_buf(dhd_bus_t *bus, uint32 addr, uint fn, uint flags, +dhd_bcmsdh_recv_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags, u8 *buf, uint nbytes, void *pkt, bcmsdh_cmplt_fn_t complete, void *handle) { @@ -6024,7 +6024,7 @@ dhd_bcmsdh_recv_buf(dhd_bus_t *bus, uint32 addr, uint fn, uint flags, } static int -dhd_bcmsdh_send_buf(dhd_bus_t *bus, uint32 addr, uint fn, uint flags, +dhd_bcmsdh_send_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags, u8 *buf, uint nbytes, void *pkt, bcmsdh_cmplt_fn_t complete, void *handle) { @@ -6091,7 +6091,7 @@ int dhd_bus_devreset(dhd_pub_t *dhdp, u8 flag) /* Attempt to re-attach & download */ if (dhdsdio_probe_attach(bus, bus->dhd->osh, bus->sdh, - (uint32 *) SI_ENUM_BASE, + (u32 *) SI_ENUM_BASE, bus->cl_devid)) { /* Attempt to download binary to the dongle */ if (dhdsdio_probe_init diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 1c3b0d8..46f841f 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -50,7 +50,7 @@ static struct sdio_func *cfg80211_sdio_func; static struct wl_dev *wl_cfg80211_dev; -uint32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO; +u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO; #define WL_4329_FW_FILE "brcm/bcm4329-fullmac-4-218-248-5.bin" #define WL_4329_NVRAM_FILE "brcm/bcm4329-fullmac-4-218-248-5.txt" @@ -60,14 +60,14 @@ uint32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO; */ static int32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, - enum nl80211_iftype type, uint32 *flags, + enum nl80211_iftype type, u32 *flags, struct vif_params *params); static int32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid); static int32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_scan_request *request); -static int32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, uint32 changed); +static int32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed); static int32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_ibss_params *params); static int32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, @@ -129,7 +129,7 @@ static void wl_unlock_eq(struct wl_priv *wl); static void wl_init_eq_lock(struct wl_priv *wl); static void wl_init_eloop_handler(struct wl_event_loop *el); static struct wl_event_q *wl_deq_event(struct wl_priv *wl); -static int32 wl_enq_event(struct wl_priv *wl, uint32 type, +static int32 wl_enq_event(struct wl_priv *wl, u32 type, const wl_event_msg_t *msg, void *data); static void wl_put_event(struct wl_event_q *e); static void wl_wakeup_event(struct wl_priv *wl); @@ -165,15 +165,15 @@ static __used int32 wl_dev_bufvar_set(struct net_device *dev, s8 *name, static int32 wl_dev_intvar_set(struct net_device *dev, s8 *name, int32 val); static int32 wl_dev_intvar_get(struct net_device *dev, s8 *name, int32 *retval); -static int32 wl_dev_ioctl(struct net_device *dev, uint32 cmd, void *arg, - uint32 len); +static int32 wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, + u32 len); /* ** cfg80211 set_wiphy_params utilities */ -static int32 wl_set_frag(struct net_device *dev, uint32 frag_threshold); -static int32 wl_set_rts(struct net_device *dev, uint32 frag_threshold); -static int32 wl_set_retry(struct net_device *dev, uint32 retry, bool l); +static int32 wl_set_frag(struct net_device *dev, u32 frag_threshold); +static int32 wl_set_rts(struct net_device *dev, u32 frag_threshold); +static int32 wl_set_retry(struct net_device *dev, u32 retry, bool l); /* ** wl profile utilities @@ -205,7 +205,7 @@ static void wl_rst_ie(struct wl_priv *wl); static int32 wl_add_ie(struct wl_priv *wl, u8 t, u8 l, u8 *v); static int32 wl_mrg_ie(struct wl_priv *wl, u8 *ie_stream, u16 ie_size); static int32 wl_cp_ie(struct wl_priv *wl, u8 *dst, u16 dst_size); -static uint32 wl_get_ielen(struct wl_priv *wl); +static u32 wl_get_ielen(struct wl_priv *wl); static int32 wl_mode_to_nl80211_iftype(int32 mode); @@ -233,7 +233,7 @@ static void swap_key_to_BE(struct wl_wsec_key *key); static int32 wl_init_priv_mem(struct wl_priv *wl); static void wl_deinit_priv_mem(struct wl_priv *wl); -static void wl_delay(uint32 ms); +static void wl_delay(u32 ms); /* ** store/restore cfg80211 instance data @@ -267,19 +267,19 @@ static void wl_init_conf(struct wl_conf *conf); #ifndef EMBEDDED_PLATFORM static int32 wl_dongle_mode(struct net_device *ndev, int32 iftype); static int32 wl_dongle_country(struct net_device *ndev, u8 ccode); -static int32 wl_dongle_up(struct net_device *ndev, uint32 up); -static int32 wl_dongle_power(struct net_device *ndev, uint32 power_mode); -static int32 wl_dongle_glom(struct net_device *ndev, uint32 glom, - uint32 dongle_align); -static int32 wl_dongle_roam(struct net_device *ndev, uint32 roamvar, - uint32 bcn_timeout); +static int32 wl_dongle_up(struct net_device *ndev, u32 up); +static int32 wl_dongle_power(struct net_device *ndev, u32 power_mode); +static int32 wl_dongle_glom(struct net_device *ndev, u32 glom, + u32 dongle_align); +static int32 wl_dongle_roam(struct net_device *ndev, u32 roamvar, + u32 bcn_timeout); static int32 wl_dongle_eventmsg(struct net_device *ndev); static int32 wl_dongle_scantime(struct net_device *ndev, int32 scan_assoc_time, int32 scan_unassoc_time); static int32 wl_dongle_offload(struct net_device *ndev, int32 arpoe, int32 arp_ol); static int32 wl_pattern_atoh(s8 *src, s8 *dst); -static int32 wl_dongle_filter(struct net_device *ndev, uint32 filter_mode); +static int32 wl_dongle_filter(struct net_device *ndev, u32 filter_mode); static int32 wl_update_wiphybands(struct wl_priv *wl); #endif /* !EMBEDDED_PLATFORM */ static int32 wl_config_dongle(struct wl_priv *wl, bool need_lock); @@ -302,7 +302,7 @@ static int32 wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, static int32 wl_do_iscan(struct wl_priv *wl); static int32 wl_wakeup_iscan(struct wl_iscan_ctrl *iscan); static int32 wl_invoke_iscan(struct wl_priv *wl); -static int32 wl_get_iscan_results(struct wl_iscan_ctrl *iscan, uint32 *status, +static int32 wl_get_iscan_results(struct wl_iscan_ctrl *iscan, u32 *status, struct wl_scan_results **bss_list); static void wl_notify_iscan_complete(struct wl_iscan_ctrl *iscan, bool aborted); static void wl_init_iscan_eloop(struct wl_iscan_eloop *el); @@ -319,7 +319,7 @@ static void wl_init_fw(struct wl_fw_ctrl *fw); /* * find most significant bit set */ -static __used uint32 wl_find_msb(u16 bit16); +static __used u32 wl_find_msb(u16 bit16); /* * update pmklist to dongle @@ -540,7 +540,7 @@ static struct ieee80211_supported_band __wl_band_5ghz_n = { .n_bitrates = wl_a_rates_size, }; -static const uint32 __wl_cipher_suites[] = { +static const u32 __wl_cipher_suites[] = { WLAN_CIPHER_SUITE_WEP40, WLAN_CIPHER_SUITE_WEP104, WLAN_CIPHER_SUITE_TKIP, @@ -571,7 +571,7 @@ static void swap_key_to_BE(struct wl_wsec_key *key) } static int32 -wl_dev_ioctl(struct net_device *dev, uint32 cmd, void *arg, uint32 len) +wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) { struct ifreq ifr; struct wl_ioctl ioc; @@ -595,7 +595,7 @@ wl_dev_ioctl(struct net_device *dev, uint32 cmd, void *arg, uint32 len) static int32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, - enum nl80211_iftype type, uint32 *flags, + enum nl80211_iftype type, u32 *flags, struct vif_params *params) { struct wl_priv *wl = wiphy_to_wl(wiphy); @@ -866,7 +866,7 @@ wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, static int32 wl_dev_intvar_set(struct net_device *dev, s8 *name, int32 val) { s8 buf[WLC_IOCTL_SMLEN]; - uint32 len; + u32 len; int32 err = 0; val = htod32(val); @@ -888,8 +888,8 @@ wl_dev_intvar_get(struct net_device *dev, s8 *name, int32 *retval) s8 buf[WLC_IOCTL_SMLEN]; int32 val; } var; - uint32 len; - uint32 data_null; + u32 len; + u32 data_null; int32 err = 0; len = @@ -905,7 +905,7 @@ wl_dev_intvar_get(struct net_device *dev, s8 *name, int32 *retval) return err; } -static int32 wl_set_rts(struct net_device *dev, uint32 rts_threshold) +static int32 wl_set_rts(struct net_device *dev, u32 rts_threshold) { int32 err = 0; @@ -917,7 +917,7 @@ static int32 wl_set_rts(struct net_device *dev, uint32 rts_threshold) return err; } -static int32 wl_set_frag(struct net_device *dev, uint32 frag_threshold) +static int32 wl_set_frag(struct net_device *dev, u32 frag_threshold) { int32 err = 0; @@ -929,10 +929,10 @@ static int32 wl_set_frag(struct net_device *dev, uint32 frag_threshold) return err; } -static int32 wl_set_retry(struct net_device *dev, uint32 retry, bool l) +static int32 wl_set_retry(struct net_device *dev, u32 retry, bool l) { int32 err = 0; - uint32 cmd = (l ? WLC_SET_LRL : WLC_SET_SRL); + u32 cmd = (l ? WLC_SET_LRL : WLC_SET_SRL); retry = htod32(retry); err = wl_dev_ioctl(dev, cmd, &retry, sizeof(retry)); @@ -943,7 +943,7 @@ static int32 wl_set_retry(struct net_device *dev, uint32 retry, bool l) return err; } -static int32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, uint32 changed) +static int32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) { struct wl_priv *wl = wiphy_to_wl(wiphy); struct net_device *ndev = wl_to_ndev(wl); @@ -1270,8 +1270,8 @@ wl_set_set_sharedkey(struct net_device *dev, && (sec->cipher_pairwise & (WLAN_CIPHER_SUITE_WEP40 | WLAN_CIPHER_SUITE_WEP104))) { memset(&key, 0, sizeof(key)); - key.len = (uint32) sme->key_len; - key.index = (uint32) sme->key_idx; + key.len = (u32) sme->key_len; + key.index = (u32) sme->key_idx; if (unlikely(key.len > sizeof(key.data))) { WL_ERR(("Too long key length (%u)\n", key.len)); return -EINVAL; @@ -1481,7 +1481,7 @@ static int32 wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx) { - uint32 index; + u32 index; int32 wsec; int32 err = 0; @@ -1496,7 +1496,7 @@ wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev, wsec = dtoh32(wsec); if (wsec & WEP_ENABLED) { /* Just select a new current key */ - index = (uint32) key_idx; + index = (u32) key_idx; index = htod32(index); err = wl_dev_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index)); @@ -1515,12 +1515,12 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev, int32 err = 0; memset(&key, 0, sizeof(key)); - key.index = (uint32) key_idx; + key.index = (u32) key_idx; /* Instead of bcast for ea address for default wep keys, driver needs it to be Null */ if (!ETHER_ISMULTI(mac_addr)) memcpy((char *)&key.ea, (void *)mac_addr, ETHER_ADDR_LEN); - key.len = (uint32) params->key_len; + key.len = (u32) params->key_len; /* check for key index change */ if (key.len == 0) { /* key delete */ @@ -1611,8 +1611,8 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, return wl_add_keyext(wiphy, dev, key_idx, mac_addr, params); memset(&key, 0, sizeof(key)); - key.len = (uint32) params->key_len; - key.index = (uint32) key_idx; + key.len = (u32) params->key_len; + key.index = (u32) key_idx; if (unlikely(key.len > sizeof(key.data))) { WL_ERR(("Too long key length (%u)\n", key.len)); @@ -1691,7 +1691,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, CHECK_SYS_UP(); memset(&key, 0, sizeof(key)); - key.index = (uint32) key_idx; + key.index = (u32) key_idx; key.flags = WL_PRIMARY_KEY; key.algo = CRYPTO_ALGO_OFF; @@ -1867,9 +1867,9 @@ wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, return err; } -static __used uint32 wl_find_msb(u16 bit16) +static __used u32 wl_find_msb(u16 bit16) { - uint32 ret = 0; + u32 ret = 0; if (bit16 & 0xff00) { ret += 8; @@ -1904,7 +1904,7 @@ wl_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev, int32 val; int32 err_bg; int32 err_a; - uint32 legacy; + u32 legacy; int32 err = 0; CHECK_SYS_UP(); @@ -2252,8 +2252,8 @@ static int32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi) struct ieee80211_supported_band *band; struct wl_cfg80211_bss_info *notif_bss_info; struct wl_scan_req *sr = wl_to_sr(wl); - uint32 signal; - uint32 freq; + u32 signal; + u32 freq; int32 err = 0; if (unlikely(dtoh32(bi->length) > WL_BSS_INFO_MAX)) { @@ -2316,7 +2316,7 @@ static int32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi) static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e) { - uint32 event = ntoh32(e->event_type); + u32 event = ntoh32(e->event_type); u16 flags = ntoh16(e->flags); if (event == WLC_E_JOIN || event == WLC_E_ASSOC_IND @@ -2338,7 +2338,7 @@ static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e) static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e) { - uint32 event = ntoh32(e->event_type); + u32 event = ntoh32(e->event_type); u16 flags = ntoh16(e->flags); if (event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) { @@ -2353,8 +2353,8 @@ static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e) static bool wl_is_nonetwork(struct wl_priv *wl, const wl_event_msg_t *e) { - uint32 event = ntoh32(e->event_type); - uint32 status = ntoh32(e->status); + u32 event = ntoh32(e->event_type); + u32 status = ntoh32(e->status); if (event == WLC_E_SET_SSID || event == WLC_E_LINK) { if (status == WLC_E_STATUS_NO_NETWORKS) @@ -2415,7 +2415,7 @@ static __used int32 wl_dev_bufvar_set(struct net_device *dev, s8 *name, s8 *buf, int32 len) { struct wl_priv *wl = ndev_to_wl(dev); - uint32 buflen; + u32 buflen; buflen = bcm_mkiovar(name, buf, len, wl->ioctl_buf, WL_IOCTL_LEN_MAX); BUG_ON(unlikely(!buflen)); @@ -2428,7 +2428,7 @@ wl_dev_bufvar_get(struct net_device *dev, s8 *name, s8 *buf, int32 buf_len) { struct wl_priv *wl = ndev_to_wl(dev); - uint32 len; + u32 len; int32 err = 0; len = bcm_mkiovar(name, NULL, 0, wl->ioctl_buf, WL_IOCTL_LEN_MAX); @@ -2449,8 +2449,8 @@ static int32 wl_get_assoc_ies(struct wl_priv *wl) struct net_device *ndev = wl_to_ndev(wl); struct wl_assoc_ielen *assoc_info; struct wl_connect_info *conn_info = wl_to_conn(wl); - uint32 req_len; - uint32 resp_len; + u32 req_len; + u32 resp_len; int32 err = 0; err = wl_dev_bufvar_get(ndev, "assoc_info", wl->extra_buf, @@ -2515,7 +2515,7 @@ static int32 wl_update_bss_info(struct wl_priv *wl) rtnl_lock(); if (unlikely(!bss)) { WL_DBG(("Could not find the AP\n")); - *(uint32 *) wl->extra_buf = htod32(WL_EXTRA_BUF_MAX); + *(u32 *) wl->extra_buf = htod32(WL_EXTRA_BUF_MAX); err = wl_dev_ioctl(wl_to_ndev(wl), WLC_GET_BSS_INFO, wl->extra_buf, WL_EXTRA_BUF_MAX); if (unlikely(err)) { @@ -2624,7 +2624,7 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev, { struct channel_info channel_inform; struct wl_scan_results *bss_list; - uint32 len = WL_SCAN_BUF_MAX; + u32 len = WL_SCAN_BUF_MAX; int32 err = 0; if (wl->iscan_on && wl->iscan_kickstart) @@ -2678,11 +2678,11 @@ scan_done_out: static void wl_init_conf(struct wl_conf *conf) { - conf->mode = (uint32)-1; - conf->frag_threshold = (uint32)-1; - conf->rts_threshold = (uint32)-1; - conf->retry_short = (uint32)-1; - conf->retry_long = (uint32)-1; + conf->mode = (u32)-1; + conf->frag_threshold = (u32)-1; + conf->rts_threshold = (u32)-1; + conf->retry_short = (u32)-1; + conf->retry_long = (u32)-1; conf->tx_power = -1; } @@ -2852,7 +2852,7 @@ static int32 wl_wakeup_iscan(struct wl_iscan_ctrl *iscan) } static int32 -wl_get_iscan_results(struct wl_iscan_ctrl *iscan, uint32 *status, +wl_get_iscan_results(struct wl_iscan_ctrl *iscan, u32 *status, struct wl_scan_results **bss_list) { struct wl_iscan_results list; @@ -2948,7 +2948,7 @@ static int32 wl_iscan_thread(void *data) struct wl_iscan_ctrl *iscan = (struct wl_iscan_ctrl *)data; struct wl_priv *wl = iscan_to_wl(iscan); struct wl_iscan_eloop *el = &iscan->el; - uint32 status; + u32 status; int err = 0; sched_setscheduler(current, SCHED_FIFO, ¶m); @@ -3192,7 +3192,7 @@ static int32 wl_event_handler(void *data) void wl_cfg80211_event(struct net_device *ndev, const wl_event_msg_t * e, void *data) { - uint32 event_type = ntoh32(e->event_type); + u32 event_type = ntoh32(e->event_type); struct wl_priv *wl = ndev_to_wl(ndev); #if (WL_DBG_LEVEL > 0) s8 *estr = (event_type <= sizeof(wl_dbg_estr) / WL_DBG_ESTR_MAX - 1) ? @@ -3245,7 +3245,7 @@ static struct wl_event_q *wl_deq_event(struct wl_priv *wl) */ static int32 -wl_enq_event(struct wl_priv *wl, uint32 event, const wl_event_msg_t *msg, +wl_enq_event(struct wl_priv *wl, u32 event, const wl_event_msg_t *msg, void *data) { struct wl_event_q *e; @@ -3337,7 +3337,7 @@ static int32 wl_dongle_country(struct net_device *ndev, u8 ccode) return err; } -static int32 wl_dongle_up(struct net_device *ndev, uint32 up) +static int32 wl_dongle_up(struct net_device *ndev, u32 up) { int32 err = 0; @@ -3348,7 +3348,7 @@ static int32 wl_dongle_up(struct net_device *ndev, uint32 up) return err; } -static int32 wl_dongle_power(struct net_device *ndev, uint32 power_mode) +static int32 wl_dongle_power(struct net_device *ndev, u32 power_mode) { int32 err = 0; @@ -3360,7 +3360,7 @@ static int32 wl_dongle_power(struct net_device *ndev, uint32 power_mode) } static int32 -wl_dongle_glom(struct net_device *ndev, uint32 glom, uint32 dongle_align) +wl_dongle_glom(struct net_device *ndev, u32 glom, u32 dongle_align) { s8 iovbuf[WL_EVENTING_MASK_LEN + 12]; /* Room for "event_msgs" + '\0' + bitvec */ @@ -3386,7 +3386,7 @@ dongle_glom_out: } static int32 -wl_dongle_roam(struct net_device *ndev, uint32 roamvar, uint32 bcn_timeout) +wl_dongle_roam(struct net_device *ndev, u32 roamvar, u32 bcn_timeout) { s8 iovbuf[WL_EVENTING_MASK_LEN + 12]; /* Room for "event_msgs" + '\0' + bitvec */ @@ -3551,7 +3551,7 @@ static int32 wl_pattern_atoh(s8 *src, s8 *dst) return i; } -static int32 wl_dongle_filter(struct net_device *ndev, uint32 filter_mode) +static int32 wl_dongle_filter(struct net_device *ndev, u32 filter_mode) { s8 iovbuf[WL_EVENTING_MASK_LEN + 12]; /* Room for "event_msgs" + '\0' + bitvec */ @@ -3560,8 +3560,8 @@ static int32 wl_dongle_filter(struct net_device *ndev, uint32 filter_mode) struct wl_pkt_filter *pkt_filterp; int32 buf_len; int32 str_len; - uint32 mask_size; - uint32 pattern_size; + u32 mask_size; + u32 pattern_size; s8 buf[256]; int32 err = 0; @@ -3852,7 +3852,7 @@ wl_update_prof(struct wl_priv *wl, const wl_event_msg_t *e, void *data, return err; } -void wl_cfg80211_dbg_level(uint32 level) +void wl_cfg80211_dbg_level(u32 level) { /* * prohibit to change debug level @@ -3926,7 +3926,7 @@ static int32 wl_cp_ie(struct wl_priv *wl, u8 *dst, u16 dst_size) return err; } -static uint32 wl_get_ielen(struct wl_priv *wl) +static u32 wl_get_ielen(struct wl_priv *wl) { struct wl_ie *ie = wl_to_ie(wl); @@ -3966,7 +3966,7 @@ static void wl_init_eq_lock(struct wl_priv *wl) spin_lock_init(&wl->eq_lock); } -static void wl_delay(uint32 ms) +static void wl_delay(u32 ms) { if (ms < 1000 / HZ) { cond_resched(); @@ -3986,7 +3986,7 @@ static void *wl_get_drvdata(struct wl_dev *dev) return dev->driver_data; } -int32 wl_cfg80211_read_fw(s8 *buf, uint32 size) +int32 wl_cfg80211_read_fw(s8 *buf, u32 size) { const struct firmware *fw_entry; struct wl_priv *wl; diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h index 3843f75..1b0566e 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h @@ -153,11 +153,11 @@ enum wl_fw_status { /* dongle configuration */ struct wl_conf { - uint32 mode; /* adhoc , infrastructure or ap */ - uint32 frag_threshold; - uint32 rts_threshold; - uint32 retry_short; - uint32 retry_long; + u32 mode; /* adhoc , infrastructure or ap */ + u32 frag_threshold; + u32 rts_threshold; + u32 retry_short; + u32 retry_long; int32 tx_power; struct ieee80211_channel channel; }; @@ -201,18 +201,18 @@ struct wl_ie { /* event queue for cfg80211 main event */ struct wl_event_q { struct list_head eq_list; - uint32 etype; + u32 etype; wl_event_msg_t emsg; s8 edata[1]; }; /* security information with currently associated ap */ struct wl_security { - uint32 wpa_versions; - uint32 auth_type; - uint32 cipher_pairwise; - uint32 cipher_group; - uint32 wpa_auth; + u32 wpa_versions; + u32 auth_type; + u32 cipher_pairwise; + u32 cipher_group; + u32 wpa_auth; }; /* ibss information for currently joined ibss network */ @@ -226,7 +226,7 @@ struct wl_ibss { /* dongle profile */ struct wl_profile { - uint32 mode; + u32 mode; struct wlc_ssid ssid; u8 bssid[ETHER_ADDR_LEN]; struct wl_security sec; @@ -244,8 +244,8 @@ struct wl_iscan_eloop { struct wl_iscan_ctrl { struct net_device *dev; struct timer_list timer; - uint32 timer_ms; - uint32 timer_on; + u32 timer_ms; + u32 timer_on; int32 state; int32 pid; struct semaphore sync; @@ -268,15 +268,15 @@ struct wl_connect_info { struct wl_fw_ctrl { const struct firmware *fw_entry; unsigned long status; - uint32 ptr; + u32 ptr; s8 fw_name[WL_FILE_NAME_MAX]; s8 nvram_name[WL_FILE_NAME_MAX]; }; /* assoc ie length */ struct wl_assoc_ielen { - uint32 req_len; - uint32 resp_len; + u32 req_len; + u32 resp_len; }; /* wpa2 pmk list */ @@ -318,7 +318,7 @@ struct wl_priv { int32 event_pid; /* pid of main event handler thread */ unsigned long status; /* current dongle status */ void *pub; - uint32 channel; /* current channel */ + u32 channel; /* current channel */ bool iscan_on; /* iscan on/off switch */ bool iscan_kickstart; /* indicate iscan already started */ bool active_scan; /* current scan mode */ @@ -369,11 +369,11 @@ extern void wl_cfg80211_sdio_func(void *func); /* set sdio function info */ extern struct sdio_func *wl_cfg80211_get_sdio_func(void); /* set sdio function info */ extern int32 wl_cfg80211_up(void); /* dongle up */ extern int32 wl_cfg80211_down(void); /* dongle down */ -extern void wl_cfg80211_dbg_level(uint32 level); /* set dongle +extern void wl_cfg80211_dbg_level(u32 level); /* set dongle debugging level */ extern void *wl_cfg80211_request_fw(s8 *file_name); /* request fw /nvram downloading */ -extern int32 wl_cfg80211_read_fw(s8 *buf, uint32 size); /* read fw +extern int32 wl_cfg80211_read_fw(s8 *buf, u32 size); /* read fw image */ extern void wl_cfg80211_release_fw(void); /* release fw */ extern s8 *wl_cfg80211_get_fwname(void); /* get firmware name for diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index 5306368..910e56d 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -66,8 +66,8 @@ bool g_set_essid_before_scan = TRUE; static int g_onoff = G_WLAN_SET_ON; wl_iw_extra_params_t g_wl_iw_params; -extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status, - uint32 reason, char *stringBuf, uint buflen); +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; @@ -127,8 +127,8 @@ typedef struct iscan_buf { typedef struct iscan_info { struct net_device *dev; struct timer_list timer; - uint32 timer_ms; - uint32 timer_on; + u32 timer_ms; + u32 timer_on; int iscan_state; iscan_buf_t *list_hdr; iscan_buf_t *list_cur; @@ -493,7 +493,7 @@ wl_iw_get_range(struct net_device *dev, struct iw_point *dwrq, char *extra) { struct iw_range *range = (struct iw_range *)extra; - wl_uint32_list_t *list; + wl_u32_list_t *list; wl_rateset_t rateset; s8 *channels; int error, i, k; @@ -519,7 +519,7 @@ wl_iw_get_range(struct net_device *dev, WL_ERROR(("Could not alloc channels\n")); return -ENOMEM; } - list = (wl_uint32_list_t *) channels; + list = (wl_u32_list_t *) channels; dwrq->length = sizeof(struct iw_range); memset(range, 0, sizeof(range)); @@ -1097,14 +1097,14 @@ static void wl_iw_set_event_mask(struct net_device *dev) iovbuf, sizeof(iovbuf)); } -static uint32 wl_iw_iscan_get(iscan_info_t *iscan) +static u32 wl_iw_iscan_get(iscan_info_t *iscan) { iscan_buf_t *buf; iscan_buf_t *ptr; wl_iscan_results_t *list_buf; wl_iscan_results_t list; wl_scan_results_t *results; - uint32 status; + u32 status; int res = 0; MUTEX_LOCK_WL_SCAN_SET(); @@ -1185,7 +1185,7 @@ static void wl_iw_send_scan_complete(iscan_info_t *iscan) static int _iscan_sysioc_thread(void *data) { - uint32 status; + u32 status; iscan_info_t *iscan = (iscan_info_t *) data; static bool iscan_pass_abort = FALSE; DAEMONIZE("iscan_sysioc"); @@ -1745,7 +1745,7 @@ wl_iw_iscan_get_scan(struct net_device *dev, char *event = extra, *end = extra + dwrq->length, *value; iscan_info_t *iscan = g_iscan; iscan_buf_t *p_buf; - uint32 counter = 0; + u32 counter = 0; u8 channel; WL_TRACE(("%s %s buflen_from_user %d:\n", dev->name, __func__, @@ -3300,13 +3300,13 @@ int wl_iw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } bool -wl_iw_conn_status_str(uint32 event_type, uint32 status, uint32 reason, +wl_iw_conn_status_str(u32 event_type, u32 status, u32 reason, char *stringBuf, uint buflen) { typedef struct conn_fail_event_map_t { - uint32 inEvent; - uint32 inStatus; - uint32 inReason; + u32 inEvent; + u32 inStatus; + u32 inReason; const char *outName; const char *outCause; } conn_fail_event_map_t; @@ -3380,9 +3380,9 @@ wl_iw_conn_status_str(uint32 event_type, uint32 status, uint32 reason, static bool wl_iw_check_conn_fail(wl_event_msg_t *e, char *stringBuf, uint buflen) { - uint32 event = ntoh32(e->event_type); - uint32 status = ntoh32(e->status); - uint32 reason = ntoh32(e->reason); + u32 event = ntoh32(e->event_type); + u32 status = ntoh32(e->status); + u32 reason = ntoh32(e->reason); if (wl_iw_conn_status_str(event, status, reason, stringBuf, buflen)) { return TRUE; @@ -3401,12 +3401,12 @@ void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void *data) union iwreq_data wrqu; char extra[IW_CUSTOM_MAX + 1]; int cmd = 0; - uint32 event_type = ntoh32(e->event_type); + u32 event_type = ntoh32(e->event_type); u16 flags = ntoh16(e->flags); - uint32 datalen = ntoh32(e->datalen); - uint32 status = ntoh32(e->status); + u32 datalen = ntoh32(e->datalen); + u32 status = ntoh32(e->status); wl_iw_t *iw; - uint32 toto; + u32 toto; memset(&wrqu, 0, sizeof(wrqu)); memset(extra, 0, sizeof(extra)); iw = 0; diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/drivers/staging/brcm80211/brcmfmac/wl_iw.h index cca4fd7..1488657 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.h +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.h @@ -93,8 +93,8 @@ typedef struct wl_iw { struct iw_statistics wstats; int spy_num; - uint32 pwsec; - uint32 gwsec; + u32 pwsec; + u32 gwsec; bool privacy_invoked; struct ether_addr spy_addr[IW_MAX_SPY]; |