diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-12 12:15:18 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-12 12:15:18 -0700 |
commit | 0f0881b09078fe3a6bc70f05e8ba49a52b2478a2 (patch) | |
tree | cbca0ae7144a4c16a260bc859420f2b2b8b2656f /drivers/staging/brcm80211/sys | |
parent | f1c6b7fb708e3cb6f5e7b46916e9def728c15345 (diff) | |
download | op-kernel-dev-0f0881b09078fe3a6bc70f05e8ba49a52b2478a2.zip op-kernel-dev-0f0881b09078fe3a6bc70f05e8ba49a52b2478a2.tar.gz |
Staging: brcm80211: remove TRUE #define
use the kernel provided 'true' value instead, especially
as we are using a 'bool' for these variables.
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')
-rw-r--r-- | drivers/staging/brcm80211/sys/wl_mac80211.c | 24 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_ampdu.c | 48 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_antsel.c | 10 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bmac.c | 88 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bsscfg.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_channel.c | 12 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_event.c | 16 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_key.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 208 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.h | 12 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_rate.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_rpctx.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_scb.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_stf.c | 12 |
14 files changed, 222 insertions, 222 deletions
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index 8aec7f1..7a3116b 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -609,7 +609,7 @@ wl_ops_conf_tx(struct ieee80211_hw *hw, u16 queue, params->txop, params->cw_min, params->cw_max, params->aifs)); WL_LOCK(wl); - wlc_wme_setparams(wl->wlc, queue, (void *)params, TRUE); + wlc_wme_setparams(wl->wlc, queue, (void *)params, true); WL_UNLOCK(wl); return 0; @@ -649,7 +649,7 @@ wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, pktq_init(&scb->scb_ampdu.txq, AMPDU_MAX_SCB_TID, AMPDU_MAX_SCB_TID * PKTQ_LEN_DEFAULT); - sta->ht_cap.ht_supported = TRUE; + sta->ht_cap.ht_supported = true; #ifdef WLC_HIGH_ONLY sta->ht_cap.ampdu_factor = AMPDU_RX_FACTOR_16K; #else @@ -787,7 +787,7 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs, } /* Requires pkttag feature */ - osh = osl_attach(btparam, bustype, TRUE); + osh = osl_attach(btparam, bustype, true); ASSERT(osh); #ifdef WLC_HIGH_ONLY @@ -1721,7 +1721,7 @@ void BCMFASTPATH wl_intrson(wl_info_t *wl) bool wl_alloc_dma_resources(wl_info_t *wl, uint addrwidth) { - return TRUE; + return true; } u32 BCMFASTPATH wl_intrsoff(wl_info_t *wl) @@ -1834,7 +1834,7 @@ static void BCMFASTPATH wl_dpc(unsigned long data) INT_UNLOCK(wl, flags); } - wl->resched = wlc_dpc(wl->wlc, TRUE); + wl->resched = wlc_dpc(wl->wlc, true); } /* wlc_dpc() may bring the driver down */ @@ -1899,7 +1899,7 @@ static void _wl_timer(wl_timer_t *t) t->timer.expires = jiffies + t->ms * HZ / 1000; atomic_inc(&t->wl->callbacks); add_timer(&t->timer); - t->set = TRUE; + t->set = true; } else t->set = FALSE; @@ -1957,14 +1957,14 @@ void wl_add_timer(wl_info_t *wl, wl_timer_t *t, uint ms, int periodic) t->ms = ms; t->periodic = (bool) periodic; - t->set = TRUE; + t->set = true; t->timer.expires = jiffies + ms * HZ / 1000; atomic_inc(&wl->callbacks); add_timer(&t->timer); } -/* return TRUE if timer successfully deleted, FALSE if still pending */ +/* return true if timer successfully deleted, FALSE if still pending */ bool wl_del_timer(wl_info_t *wl, wl_timer_t *t) { if (t->set) { @@ -1975,7 +1975,7 @@ bool wl_del_timer(wl_info_t *wl, wl_timer_t *t) atomic_dec(&wl->callbacks); } - return TRUE; + return true; } void wl_free_timer(wl_info_t *wl, wl_timer_t *t) @@ -2081,7 +2081,7 @@ static int BCMFASTPATH wl_start(struct sk_buff *skb, wl_info_t *wl) wl->txq_tail = skb; if (wl->txq_dispatched == FALSE) { - wl->txq_dispatched = TRUE; + wl->txq_dispatched = true; if (schedule_work(&wl->txq_task.work)) { atomic_inc(&wl->callbacks); @@ -2153,7 +2153,7 @@ static void wl_txq_free(wl_info_t *wl) while (wl->txq_head) { skb = wl->txq_head; wl->txq_head = skb->prev; - PKTFREE(wl->osh, skb, TRUE); + PKTFREE(wl->osh, skb, true); } wl->txq_tail = NULL; @@ -2224,7 +2224,7 @@ static void wl_rpcq_add(wl_info_t *wl, rpc_buf_t *buf) wl->rpcq_tail = buf; if (wl->rpcq_dispatched == FALSE) { - wl->rpcq_dispatched = TRUE; + wl->rpcq_dispatched = true; wl_schedule_task(wl, wl_rpcq_dispatch, wl); } diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c index 00e92be..796848f 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c @@ -188,7 +188,7 @@ ampdu_info_t *wlc_ampdu_attach(wlc_info_t *wlc) ampdu->wlc = wlc; for (i = 0; i < AMPDU_MAX_SCB_TID; i++) - ampdu->ini_enable[i] = TRUE; + ampdu->ini_enable[i] = true; /* Disable ampdu for VO by default */ ampdu->ini_enable[PRIO_8021D_VO] = FALSE; ampdu->ini_enable[PRIO_8021D_NC] = FALSE; @@ -335,7 +335,7 @@ 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; - u32 phy_rate = MCS_RATE(FFPLD_MAX_MCS, TRUE, FALSE); + u32 phy_rate = MCS_RATE(FFPLD_MAX_MCS, true, FALSE); u32 txunfl_ratio; u8 max_mpdu; u32 current_ampdu_cnt = 0; @@ -463,7 +463,7 @@ static void wlc_ffpld_calc_mcs2ampdu_table(ampdu_info_t *ampdu, int f) /* note : we divide/multiply by 100 to avoid integer overflows */ max_mpdu = min_t(u8, fifo->mcs2ampdu_table[FFPLD_MAX_MCS], AMPDU_NUM_MPDU_LEGACY); - phy_rate = MCS_RATE(FFPLD_MAX_MCS, TRUE, FALSE); + phy_rate = MCS_RATE(FFPLD_MAX_MCS, true, FALSE); dma_rate = (((phy_rate / 100) * (max_mpdu * FFPLD_MPDU_SIZE - fifo->ampdu_pld_size)) @@ -474,7 +474,7 @@ static void wlc_ffpld_calc_mcs2ampdu_table(ampdu_info_t *ampdu, int f) dma_rate = dma_rate >> 7; for (i = 0; i < FFPLD_MAX_MCS; i++) { /* shifting to keep it within integer range */ - phy_rate = MCS_RATE(i, TRUE, FALSE) >> 7; + phy_rate = MCS_RATE(i, true, FALSE) >> 7; if (phy_rate > dma_rate) { tmp = ((fifo->ampdu_pld_size * phy_rate) / ((phy_rate - dma_rate) * FFPLD_MPDU_SIZE)) + 1; @@ -514,7 +514,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) u8 rts_preamble_type = WLC_LONG_PREAMBLE; u8 rts_fbr_preamble_type = WLC_LONG_PREAMBLE; - bool rr = TRUE, fbr = FALSE; + 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; u32 ampdu_len, maxlen = 0; @@ -618,11 +618,11 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) /* Handle retry limits */ if (txrate[0].count <= rr_retry_limit) { txrate[0].count++; - rr = TRUE; + rr = true; fbr = FALSE; ASSERT(!fbr); } else { - fbr = TRUE; + fbr = true; rr = FALSE; txrate[1].count++; } @@ -651,11 +651,11 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) fc = ltoh16(rts->fc); if ((fc & FC_KIND_MASK) == FC_RTS) { mcl |= TXC_SENDRTS; - use_rts = TRUE; + use_rts = true; } if ((fc & FC_KIND_MASK) == FC_CTS) { mcl |= TXC_SENDCTS; - use_cts = TRUE; + use_cts = true; } } else { mcl |= (TXC_AMPDU_MIDDLE << TXC_AMPDU_SHIFT); @@ -739,7 +739,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) /* if (first mpdu for host agg) */ /* test whether to add more */ - if ((MCS_RATE(mcs, TRUE, FALSE) >= f->dmaxferrate) && + if ((MCS_RATE(mcs, true, FALSE) >= f->dmaxferrate) && (count == f->mcs2ampdu_table[mcs])) { WL_AMPDU_ERR(("wl%d: PR 37644: stopping ampdu at %d for mcs %d", wlc->pub->unit, count, mcs)); break; @@ -831,7 +831,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) } /* set the preload length */ - if (MCS_RATE(mcs, TRUE, FALSE) >= f->dmaxferrate) { + if (MCS_RATE(mcs, true, FALSE) >= f->dmaxferrate) { dma_len = min(dma_len, f->ampdu_pld_size); txh->PreloadSize = htol16(dma_len); } else @@ -855,14 +855,14 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) wlc_compute_rtscts_dur(wlc, use_cts, rts_rspec, rspec, rts_preamble_type, preamble_type, ampdu_len, - TRUE); + true); rts->durid = htol16(durid); durid = wlc_compute_rtscts_dur(wlc, use_cts, rts_rspec_fallback, rspec_fallback, rts_fbr_preamble_type, fbr_preamble_type, - ampdu_len, TRUE); + ampdu_len, true); txh->RTSDurFallback = htol16(durid); /* set TxFesTimeNormal */ txh->TxFesTimeNormal = rts->durid; @@ -891,7 +891,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) #ifdef WLC_HIGH_ONLY if (wlc->rpc_agg & BCM_RPC_TP_HOST_AGG_AMPDU) bcm_rpc_tp_agg_set(bcm_rpc_tp_get(wlc->rpc), - BCM_RPC_TP_HOST_AGG_AMPDU, TRUE); + BCM_RPC_TP_HOST_AGG_AMPDU, true); #endif for (i = 0; i < count; i++) wlc_txfifo(wlc, fifo, pkt[i], i == (count - 1), @@ -959,7 +959,7 @@ wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p, ASSERT(!ampdu->p); ampdu->p = p; bcopy(txs, &du->txs, sizeof(tx_status_t)); - ampdu->waiting_status = TRUE; + ampdu->waiting_status = true; return; #endif /* WLC_LOW */ } @@ -1031,7 +1031,7 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p, bool ba_recd = FALSE, ack_recd = FALSE; u8 suc_mpdu = 0, tot_mpdu = 0; uint supr_status; - bool update_rate = TRUE, retry = TRUE, tx_error = FALSE; + bool update_rate = true, retry = true, tx_error = FALSE; u16 mimoantsel = 0; u8 antselid = 0; u8 retry_limit, rr_retry_limit; @@ -1087,7 +1087,7 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p, bitmap[6] = (s2 >> 16) & 0xff; bitmap[7] = (s2 >> 24) & 0xff; - ba_recd = TRUE; + ba_recd = true; } else { WLCNTINCR(ampdu->cnt->noba); if (supr_status) { @@ -1117,7 +1117,7 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p, */ if (wlc_ffpld_check_txfunfl(wlc, prio2fifo[tid]) > 0) { - tx_error = TRUE; + tx_error = true; #ifdef WLC_HIGH_ONLY /* With BMAC, TX Underflows should not happen */ WL_ERROR(("wl%d: BMAC TX Underflow?", @@ -1193,7 +1193,7 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p, ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, p); - ack_recd = TRUE; + ack_recd = true; suc_mpdu++; } } @@ -1262,7 +1262,7 @@ ampdu_cleanup_tid_ini(ampdu_info_t *ampdu, scb_ampdu_t *scb_ampdu, u8 tid, ASSERT(ini == &scb_ampdu->ini[ini->tid]); /* free all buffered tx packets */ - pktq_pflush(ampdu->wlc->osh, &scb_ampdu->txq, ini->tid, TRUE, NULL, 0); + pktq_pflush(ampdu->wlc->osh, &scb_ampdu->txq, ini->tid, true, NULL, 0); } /* initialize the initiator code for tid */ @@ -1318,7 +1318,7 @@ int wlc_ampdu_set(ampdu_info_t *ampdu, bool on) bool wlc_ampdu_cap(ampdu_info_t *ampdu) { if (WLC_PHY_11N_CAP(ampdu->wlc->band)) - return TRUE; + return true; else return FALSE; } @@ -1333,13 +1333,13 @@ static void ampdu_update_max_txlen(ampdu_info_t *ampdu, u8 dur) rate = MCS_RATE(mcs, FALSE, FALSE); ampdu->max_txlen[mcs][0][0] = (rate * dur) >> 3; /* 40 MHz, No SGI */ - rate = MCS_RATE(mcs, TRUE, FALSE); + rate = MCS_RATE(mcs, true, FALSE); ampdu->max_txlen[mcs][1][0] = (rate * dur) >> 3; /* 20MHz, SGI */ - rate = MCS_RATE(mcs, FALSE, TRUE); + rate = MCS_RATE(mcs, FALSE, true); ampdu->max_txlen[mcs][0][1] = (rate * dur) >> 3; /* 40 MHz, SGI */ - rate = MCS_RATE(mcs, TRUE, TRUE); + rate = MCS_RATE(mcs, true, true); ampdu->max_txlen[mcs][1][1] = (rate * dur) >> 3; } } diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.c b/drivers/staging/brcm80211/sys/wlc_antsel.c index 81e1735..671a0aa 100644 --- a/drivers/staging/brcm80211/sys/wlc_antsel.c +++ b/drivers/staging/brcm80211/sys/wlc_antsel.c @@ -118,7 +118,7 @@ antsel_info_t *wlc_antsel_attach(wlc_info_t *wlc, osl_t *osh, /* Antenna selection availability */ if (((u16) getintvar(asi->pub->vars, "aa2g") == 7) || ((u16) getintvar(asi->pub->vars, "aa5g") == 7)) { - asi->antsel_avail = TRUE; + asi->antsel_avail = true; } else if (((u16) getintvar(asi->pub->vars, "aa2g") == 3) @@ -139,18 +139,18 @@ antsel_info_t *wlc_antsel_attach(wlc_info_t *wlc, osl_t *osh, ((u16) getintvar(asi->pub->vars, "aa5g") == 0)) { /* hack to match old 4321CB2 cards with 2of3 antenna switch */ asi->antsel_type = ANTSEL_2x3; - asi->antsel_avail = TRUE; + asi->antsel_avail = true; } else if (asi->pub->boardflags2 & BFL2_2X4_DIV) { asi->antsel_type = ANTSEL_2x4; - asi->antsel_avail = TRUE; + asi->antsel_avail = true; } /* Set the antenna selection type for the low driver */ wlc_bmac_antsel_type_set(wlc_hw, asi->antsel_type); /* Init (auto/manual) antenna selection */ - wlc_antsel_init_cfg(asi, &asi->antcfg_11n, TRUE); - wlc_antsel_init_cfg(asi, &asi->antcfg_cur, TRUE); + wlc_antsel_init_cfg(asi, &asi->antcfg_11n, true); + wlc_antsel_init_cfg(asi, &asi->antcfg_cur, true); return asi; } diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index 360a9e6..335c8db 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -266,7 +266,7 @@ static u32 WLBANDINITFN(wlc_setband_inact) (wlc_info_t *wlc, uint bandunit) /* Process received frames */ /* - * Return TRUE if more frames need to be processed. FALSE otherwise. + * Return true if more frames need to be processed. FALSE otherwise. * Param 'bound' indicates max. # frames to process before break out. */ static bool BCMFASTPATH @@ -321,7 +321,7 @@ wlc_bmac_recv(wlc_hw_info_t *wlc_hw, uint fifo, bool bound) } /* second-level interrupt processing - * Return TRUE if another dpc needs to be re-scheduled. FALSE otherwise. + * Return true if another dpc needs to be re-scheduled. FALSE otherwise. * Param 'bounded' indicates if applicable loops should be bounded. */ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded) @@ -440,7 +440,7 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded) ASSERT(wlc_ps_check(wlc)); /* make sure the bound indication and the implementation are in sync */ - ASSERT(bounded == TRUE || wlc->macintstatus == 0); + ASSERT(bounded == true || wlc->macintstatus == 0); /* it isn't done and needs to be resched if macintstatus is non-zero */ return wlc->macintstatus != 0; @@ -682,7 +682,7 @@ static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme) /* initial ucode host flags */ wlc_mhfdef(wlc, wlc_hw->band->mhfs, pio_mhf2); - return TRUE; + return true; } static void wlc_bmac_detach_dmapio(wlc_hw_info_t *wlc_hw) @@ -721,7 +721,7 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit, ASSERT(sizeof(wlc_d11rxhdr_t) <= WL_HWRXOFF); - wme = TRUE; + wme = true; wlc_hw = wlc->hw; wlc_hw->wlc = wlc; @@ -832,11 +832,11 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit, if (D11REV_LE(wlc_hw->corerev, 4) || (wlc_hw->boardflags & BFL_NOPLLDOWN)) - wlc_bmac_pllreq(wlc_hw, TRUE, WLC_PLLREQ_SHARED); + wlc_bmac_pllreq(wlc_hw, true, WLC_PLLREQ_SHARED); if ((BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS) && (si_pci_war16165(wlc_hw->sih))) - wlc->war16165 = TRUE; + wlc->war16165 = true; /* check device id(srom, nvram etc.) to set bands */ if (wlc_hw->deviceid == BCM43224_D11N_ID) { @@ -1239,8 +1239,8 @@ int wlc_bmac_up_finish(wlc_hw_info_t *wlc_hw) { WL_TRACE(("wl%d: %s:\n", wlc_hw->unit, __func__)); - wlc_hw->up = TRUE; - wlc_phy_hw_state_upd(wlc_hw->band->pi, TRUE); + wlc_hw->up = true; + wlc_phy_hw_state_upd(wlc_hw->band->pi, true); /* FULLY enable dynamic power control and d11 core interrupt */ wlc_clkctl_clk(wlc_hw, CLK_DYNAMIC); @@ -1958,7 +1958,7 @@ WLBANDINITFN(wlc_bmac_bsinit) (wlc_info_t *wlc, chanspec_t chanspec) wlc_bmac_update_slot_timing(wlc_hw, BAND_5G(wlc_hw->band-> - bandtype) ? TRUE : wlc_hw-> + bandtype) ? true : wlc_hw-> shortslot); /* write phytype and phyvers */ @@ -2065,7 +2065,7 @@ void wlc_bmac_phy_reset(wlc_hw_info_t *wlc_hw) /* reset the PHY */ si_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_PCLKE), (SICF_PRST | SICF_PCLKE)); - phy_in_reset = TRUE; + phy_in_reset = true; } else { si_core_cflags(wlc_hw->sih, @@ -2149,12 +2149,12 @@ static bool wlc_isgoodchip(wlc_hw_info_t *wlc_hw) return FALSE; } - return TRUE; + return true; } static bool wlc_validboardtype(wlc_hw_info_t *wlc_hw) { - bool goodboard = TRUE; + bool goodboard = true; uint boardrev = wlc_hw->boardrev; if (boardrev == 0) @@ -2200,7 +2200,7 @@ static char *wlc_get_macaddr(wlc_hw_info_t *wlc_hw) } /* - * Return TRUE if radio is disabled, otherwise FALSE. + * Return true if radio is disabled, otherwise FALSE. * hw radio disable signal is an external pin, users activate it asynchronously * this function could be called when driver is down and w/o clock * it operates on different registers depending on corerev and boardflag. @@ -2282,7 +2282,7 @@ void wlc_bmac_hw_up(wlc_hw_info_t *wlc_hw) wlc_phy_por_inform(wlc_hw->band->pi); wlc_hw->ucode_loaded = FALSE; - wlc_hw->wlc->pub->hw_up = TRUE; + wlc_hw->wlc->pub->hw_up = true; if ((wlc_hw->boardflags & BFL_FEM) && (CHIPID(wlc_hw->sih->chip) == BCM4313_CHIP_ID)) { @@ -2299,7 +2299,7 @@ static bool wlc_dma_rxreset(wlc_hw_info_t *wlc_hw, uint fifo) osl_t *osh; if (D11REV_LT(wlc_hw->corerev, 12)) { - bool rxidle = TRUE; + bool rxidle = true; u16 rcv_frm_cnt = 0; osh = wlc_hw->osh; @@ -2389,9 +2389,9 @@ void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags) */ wlc_hw->clk = FALSE; si_core_reset(wlc_hw->sih, flags, resetbits); - wlc_hw->clk = TRUE; + wlc_hw->clk = true; if (wlc_hw->band && wlc_hw->band->pi) - wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, TRUE); + wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, true); wlc_mctrl_reset(wlc_hw); @@ -2401,7 +2401,7 @@ void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags) wlc_bmac_phy_reset(wlc_hw); /* turn on PHY_PLL */ - wlc_bmac_core_phypll_ctl(wlc_hw, TRUE); + wlc_bmac_core_phypll_ctl(wlc_hw, true); /* clear sw intstatus */ wlc_hw->wlc->macintstatus = 0; @@ -2502,7 +2502,7 @@ static void wlc_coreinit(wlc_info_t *wlc) * 2) newer chips, driver wants to controls the fifo allocation */ if (D11REV_GE(wlc_hw->corerev, 4)) - fifosz_fixup = TRUE; + fifosz_fixup = true; /* let the PSM run to the suspended state, set mode to BSS STA */ W_REG(osh, ®s->macintstatus, -1); @@ -2539,7 +2539,7 @@ static void wlc_coreinit(wlc_info_t *wlc) } /* For old ucode, txfifo sizes needs to be modified(increased) for Corerev >= 9 */ - if (fifosz_fixup == TRUE) { + if (fifosz_fixup == true) { wlc_corerev_fifofixup(wlc_hw); } @@ -2794,7 +2794,7 @@ static void wlc_ucode_download(wlc_hw_info_t *wlc_hw) if (WLCISNPHY(wlc_hw->band)) { wlc_ucode_write(wlc_hw, bcm43xx_16_mimo, bcm43xx_16_mimosz); - wlc_hw->ucode_loaded = TRUE; + wlc_hw->ucode_loaded = true; } else WL_ERROR(("%s: wl%d: unsupported phy in corerev %d\n", __func__, wlc_hw->unit, wlc_hw->corerev)); @@ -2802,7 +2802,7 @@ static void wlc_ucode_download(wlc_hw_info_t *wlc_hw) if (WLCISLCNPHY(wlc_hw->band)) { wlc_ucode_write(wlc_hw, bcm43xx_24_lcn, bcm43xx_24_lcnsz); - wlc_hw->ucode_loaded = TRUE; + wlc_hw->ucode_loaded = true; } else { WL_ERROR(("%s: wl%d: unsupported phy in corerev %d\n", __func__, wlc_hw->unit, wlc_hw->corerev)); @@ -2920,27 +2920,27 @@ void wlc_bmac_fifoerrors(wlc_hw_info_t *wlc_hw) WL_ERROR(("wl%d: fifo %d: receive fifo overflow\n", unit, idx)); WLCNTINCR(wlc_hw->wlc->pub->_cnt->rxoflo); - fatal = TRUE; + fatal = true; } if (intstatus & I_PC) { WL_ERROR(("wl%d: fifo %d: descriptor error\n", unit, idx)); WLCNTINCR(wlc_hw->wlc->pub->_cnt->dmade); - fatal = TRUE; + fatal = true; } if (intstatus & I_PD) { WL_ERROR(("wl%d: fifo %d: data error\n", unit, idx)); WLCNTINCR(wlc_hw->wlc->pub->_cnt->dmada); - fatal = TRUE; + fatal = true; } if (intstatus & I_DE) { WL_ERROR(("wl%d: fifo %d: descriptor protocol error\n", unit, idx)); WLCNTINCR(wlc_hw->wlc->pub->_cnt->dmape); - fatal = TRUE; + fatal = true; } if (intstatus & I_RU) { @@ -2952,7 +2952,7 @@ void wlc_bmac_fifoerrors(wlc_hw_info_t *wlc_hw) WL_ERROR(("wl%d: fifo %d: transmit fifo underflow\n", idx, unit)); WLCNTINCR(wlc_hw->wlc->pub->_cnt->txuflo); - fatal = TRUE; + fatal = true; } if (fatal) { @@ -3107,7 +3107,7 @@ bool wlc_bmac_tx_fifo_suspended(wlc_hw_info_t *wlc_hw, uint tx_fifo) if (dma_txsuspended(wlc_hw->di[tx_fifo]) && (R_REG(wlc_hw->osh, &wlc_hw->regs->chnstatus) & (1 << tx_fifo)) == 0) - return TRUE; + return true; return FALSE; } @@ -3167,7 +3167,7 @@ void wlc_bmac_tx_fifo_resume(wlc_hw_info_t *wlc_hw, uint tx_fifo) * Read and clear macintmask and macintstatus and intstatus registers. * This routine should be called with interrupts off * Return: - * -1 if DEVICEREMOVED(wlc) evaluates to TRUE; + * -1 if DEVICEREMOVED(wlc) evaluates to true; * 0 if the interrupt is not for us, or we are in some special cases; * device interrupt status bits otherwise. */ @@ -3262,7 +3262,7 @@ static inline u32 wlc_intstatus(wlc_info_t *wlc, bool in_isr) } /* Update wlc->macintstatus and wlc->intstatus[]. */ -/* Return TRUE if they are updated successfully. FALSE otherwise */ +/* Return true if they are updated successfully. FALSE otherwise */ bool wlc_intrsupd(wlc_info_t *wlc) { u32 macintstatus; @@ -3279,13 +3279,13 @@ bool wlc_intrsupd(wlc_info_t *wlc) /* update interrupt status in software */ wlc->macintstatus |= macintstatus; - return TRUE; + return true; } /* * First-level interrupt processing. - * Return TRUE if this was our interrupt, FALSE otherwise. - * *wantdpc will be set to TRUE if further wlc_dpc() processing is required, + * Return true if this was our interrupt, FALSE otherwise. + * *wantdpc will be set to true if further wlc_dpc() processing is required, * FALSE otherwise. */ bool BCMFASTPATH wlc_isr(wlc_info_t *wlc, bool *wantdpc) @@ -3299,7 +3299,7 @@ bool BCMFASTPATH wlc_isr(wlc_info_t *wlc, bool *wantdpc) return FALSE; /* read and clear macintstatus and intstatus registers */ - macintstatus = wlc_intstatus(wlc, TRUE); + macintstatus = wlc_intstatus(wlc, true); if (macintstatus == 0xffffffff) WL_ERROR(("DEVICEREMOVED detected in the ISR code path.\n")); @@ -3308,13 +3308,13 @@ bool BCMFASTPATH wlc_isr(wlc_info_t *wlc, bool *wantdpc) if (macintstatus == 0) return FALSE; - *wantdpc = TRUE; + *wantdpc = true; /* save interrupt status bits */ ASSERT(wlc->macintstatus == 0); wlc->macintstatus = macintstatus; - return TRUE; + return true; } @@ -3346,7 +3346,7 @@ static bool wlc_bmac_txstatus_corerev4(wlc_hw_info_t *wlc_hw) } if (fatal) - return TRUE; + return true; /* post more rbufs */ dma_rxfill(wlc_hw->di[RX_TXSTATUS_FIFO]); @@ -3371,7 +3371,7 @@ wlc_bmac_dotxstatus(wlc_hw_info_t *wlc_hw, tx_status_t *txs, u32 s2) } /* process tx completion events in BMAC - * Return TRUE if more tx status need to be processed. FALSE otherwise. + * Return true if more tx status need to be processed. FALSE otherwise. */ static bool BCMFASTPATH wlc_bmac_txstatus(wlc_hw_info_t *wlc_hw, bool bound, bool *fatal) @@ -3429,7 +3429,7 @@ wlc_bmac_txstatus(wlc_hw_info_t *wlc_hw, bool bound, bool *fatal) return 0; if (n >= max_tx_num) - morepending = TRUE; + morepending = true; } if (!pktq_empty(&wlc->active_queue->q)) @@ -3755,7 +3755,7 @@ bool wlc_bmac_validate_chip_access(wlc_hw_info_t *wlc_hw) return FALSE; } - return TRUE; + return true; } #define PHYPLL_WAIT_US 100000 @@ -4116,7 +4116,7 @@ void wlc_bmac_set_clk(wlc_hw_info_t *wlc_hw, bool on) /* this will be true for all ai chips */ bool wlc_bmac_taclear(wlc_hw_info_t *wlc_hw, bool ta_ok) { - return TRUE; + return true; } /* Lower down relevant GPIOs like LED when going down w/o @@ -4150,7 +4150,7 @@ bool wlc_bmac_radio_hw(wlc_hw_info_t *wlc_hw, bool enable) if (PMUCTL_ENAB(wlc_hw->sih)) { AND_REG(wlc_hw->osh, &wlc_hw->regs->clk_ctl_st, ~CCS_FORCEHWREQOFF); - si_pmu_radio_enable(wlc_hw->sih, TRUE); + si_pmu_radio_enable(wlc_hw->sih, true); } wlc_phy_anacore(wlc_hw->band->pi, ON); @@ -4172,7 +4172,7 @@ bool wlc_bmac_radio_hw(wlc_hw_info_t *wlc_hw, bool enable) } } - return TRUE; + return true; } u16 wlc_bmac_rate_shm_offset(wlc_hw_info_t *wlc_hw, u8 rate) diff --git a/drivers/staging/brcm80211/sys/wlc_bsscfg.h b/drivers/staging/brcm80211/sys/wlc_bsscfg.h index a821ff6..ae5542a 100644 --- a/drivers/staging/brcm80211/sys/wlc_bsscfg.h +++ b/drivers/staging/brcm80211/sys/wlc_bsscfg.h @@ -79,7 +79,7 @@ struct wlc_bsscfg { bool wsec_restrict; /* drop unencrypted packets if wsec is enabled */ bool eap_restrict; /* restrict data until 802.1X auth succeeds */ u16 WPA_auth; /* WPA: authenticated key management */ - bool wpa2_preauth; /* default is TRUE, wpa_cap sets value */ + bool wpa2_preauth; /* default is true, wpa_cap sets value */ bool wsec_portopen; /* indicates keys are plumbed */ wsec_iv_t wpa_none_txiv; /* global txiv for WPA_NONE, tkip and aes */ int wsec_index; /* 0-3: default tx key, -1: not set */ diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c index 3f0aa73..ae152bb1 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.c +++ b/drivers/staging/brcm80211/sys/wlc_channel.c @@ -692,7 +692,7 @@ wlc_channel_get_chanvec(struct wlc_info *wlc, const char *country_abbrev, return FALSE; wlc_locale_get_channels(locale, channels); - return TRUE; + return true; } /* set the driver's current country and regulatory information using a country code @@ -773,7 +773,7 @@ wlc_set_country_common(wlc_cm_info_t *wlc_cm, li_mimo = wlc_get_mimo_2g(country->locale_mimo_2G); if (li_mimo && (li_mimo->flags & WLC_NO_MIMO)) { wlc_set_nmode(wlc, OFF); - wlc->stf->no_cddstbc = TRUE; + wlc->stf->no_cddstbc = true; } else { wlc->stf->no_cddstbc = FALSE; if (N_ENAB(wlc->pub) != wlc->protection->nmode_user) @@ -985,7 +985,7 @@ static void wlc_channels_commit(wlc_cm_info_t *wlc_cm) */ if (NBANDS(wlc) > 1 || BAND_2G(wlc->band->bandtype)) { wlc_phy_chanspec_ch14_widefilter_set(wlc->band->pi, - wlc_japan(wlc) ? TRUE : + wlc_japan(wlc) ? true : FALSE); } @@ -1511,7 +1511,7 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec, return; } -/* Returns TRUE if currently set country is Japan or variant */ +/* Returns true if currently set country is Japan or variant */ bool wlc_japan(struct wlc_info *wlc) { return wlc_japan_ccode(wlc->cmi->country_abbrev); @@ -1583,7 +1583,7 @@ wlc_valid_chanspec_ext(wlc_cm_info_t *wlc_cm, chanspec_t chspec, bool dualband) /* check that the lower sideband allows an upper sideband */ if ((upper_sideband & (CH_UPPER_SB | CH_EWA_VALID)) == (CH_UPPER_SB | CH_EWA_VALID)) - return TRUE; + return true; return FALSE; } #endif /* 40 MHZ */ @@ -1598,5 +1598,5 @@ bool wlc_valid_chanspec(wlc_cm_info_t *wlc_cm, chanspec_t chspec) bool wlc_valid_chanspec_db(wlc_cm_info_t *wlc_cm, chanspec_t chspec) { - return wlc_valid_chanspec_ext(wlc_cm, chspec, TRUE); + return wlc_valid_chanspec_ext(wlc_cm, chspec, true); } diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c index 9d887f4..4af1e71 100644 --- a/drivers/staging/brcm80211/sys/wlc_event.c +++ b/drivers/staging/brcm80211/sys/wlc_event.c @@ -106,13 +106,13 @@ int wlc_eventq_down(wlc_eventq_t *eq) if (!wl_del_timer(eq->wl, eq->timer)) callbacks++; - ASSERT(wlc_eventq_avail(eq) == TRUE); + ASSERT(wlc_eventq_avail(eq) == true); ASSERT(eq->workpending == FALSE); - eq->workpending = TRUE; + eq->workpending = true; if (eq->cb) eq->cb(eq->wlc); - ASSERT(eq->workpending == TRUE); + ASSERT(eq->workpending == true); eq->workpending = FALSE; eq->tpending = FALSE; } else { @@ -153,7 +153,7 @@ void wlc_eventq_enq(wlc_eventq_t *eq, wlc_event_t *e) eq->head = eq->tail = e; if (!eq->tpending) { - eq->tpending = TRUE; + eq->tpending = true; /* Use a zero-delay timer to trigger * delayed processing of the event. */ @@ -214,16 +214,16 @@ static void wlc_timer_cb(void *arg) { struct wlc_eventq *eq = (struct wlc_eventq *)arg; - ASSERT(eq->tpending == TRUE); - ASSERT(wlc_eventq_avail(eq) == TRUE); + ASSERT(eq->tpending == true); + ASSERT(wlc_eventq_avail(eq) == true); ASSERT(eq->workpending == FALSE); - eq->workpending = TRUE; + eq->workpending = true; if (eq->cb) eq->cb(eq->wlc); ASSERT(wlc_eventq_avail(eq) == FALSE); - ASSERT(eq->tpending == TRUE); + ASSERT(eq->tpending == true); eq->workpending = FALSE; eq->tpending = FALSE; } diff --git a/drivers/staging/brcm80211/sys/wlc_key.h b/drivers/staging/brcm80211/sys/wlc_key.h index 98c537c..b4f2051 100644 --- a/drivers/staging/brcm80211/sys/wlc_key.h +++ b/drivers/staging/brcm80211/sys/wlc_key.h @@ -65,7 +65,7 @@ struct wlc_bsscfg; #define WSEC_KEY(wlc, i) (((wlc)->wsec_keys[i] && (wlc)->wsec_keys[i]->len) ? \ (wlc)->wsec_keys[i] : NULL) -#define WSEC_SCB_KEY_VALID(scb) (((scb)->key && (scb)->key->len) ? TRUE : FALSE) +#define WSEC_SCB_KEY_VALID(scb) (((scb)->key && (scb)->key->len) ? true : FALSE) /* default key */ #define WSEC_BSS_DEFAULT_KEY(bsscfg) (((bsscfg)->wsec_index == -1) ? \ diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index cbd0504..464bd63 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -349,7 +349,7 @@ void wlc_get_rcmta(wlc_info_t *wlc, int idx, struct ether_addr *addr) /* keep the chip awake if needed */ bool wlc_stay_awake(wlc_info_t *wlc) { - return TRUE; + return true; } /* conditions under which the PM bit should be set in outgoing frames and STAY_AWAKE is meaningful @@ -378,7 +378,7 @@ bool wlc_ps_allowed(wlc_info_t *wlc) return FALSE; } - return TRUE; + return true; } void wlc_reset(wlc_info_t *wlc) @@ -408,7 +408,7 @@ void wlc_reset(wlc_info_t *wlc) * have been cleared instantly in wlc_bmac_reset() and no txstatus interrupt * will come to driver to fetch those flushed dma pkt pointers. */ - wlc->reset_bmac_pending = TRUE; + wlc->reset_bmac_pending = true; wlc_rpctx_txreclaim(wlc->rpctx); @@ -530,8 +530,8 @@ void wlc_init(wlc_info_t *wlc) _rifs ? (EDCF_AC_VO_TXOP_AP << 5) : MAXFRAMEBURST_TXOP)); /* initialize maximum allowed duty cycle */ - wlc_duty_cycle_set(wlc, wlc->tx_duty_cycle_ofdm, TRUE, TRUE); - wlc_duty_cycle_set(wlc, wlc->tx_duty_cycle_cck, FALSE, TRUE); + wlc_duty_cycle_set(wlc, wlc->tx_duty_cycle_ofdm, true, true); + wlc_duty_cycle_set(wlc, wlc->tx_duty_cycle_cck, FALSE, true); /* Update some shared memory locations related to max AMPDU size allowed to received */ wlc_ampdu_shm_upd(wlc->ampdu); @@ -626,7 +626,7 @@ void wlc_mac_promisc(wlc_info_t *wlc) /* check if hps and wake states of sw and hw are in sync */ bool wlc_ps_check(wlc_info_t *wlc) { - bool res = TRUE; + bool res = true; bool hps, wake; bool wake_ok; @@ -689,7 +689,7 @@ void wlc_set_ps_ctrl(wlc_info_t *wlc) bool awake_before; hps = PS_ALLOWED(wlc); - wake = hps ? (STAY_AWAKE(wlc)) : TRUE; + wake = hps ? (STAY_AWAKE(wlc)) : true; WL_TRACE(("wl%d: wlc_set_ps_ctrl: hps %d wake %d\n", wlc->pub->unit, hps, wake)); @@ -860,7 +860,7 @@ void wlc_set_chanspec(wlc_info_t *wlc, chanspec_t chanspec) if (NBANDS(wlc) > 1) { bandunit = CHSPEC_WLCBANDUNIT(chanspec); if (wlc->band->bandunit != bandunit || wlc->bandinit_pending) { - switchband = TRUE; + switchband = true; if (wlc->bandlocked) { WL_ERROR(("wl%d: %s: chspec %d band is locked!\n", wlc->pub->unit, __func__, CHSPEC_CHANNEL(chanspec))); return; @@ -1084,7 +1084,7 @@ static u32 wlc_watchdog_backup_bi(wlc_info_t *wlc) } /* Change to run the watchdog either from a periodic timer or from tbtt handler. - * Call watchdog from tbtt handler if tbtt is TRUE, watchdog timer otherwise. + * Call watchdog from tbtt handler if tbtt is true, watchdog timer otherwise. */ void wlc_watchdog_upd(wlc_info_t *wlc, bool tbtt) { @@ -1105,13 +1105,13 @@ void wlc_watchdog_upd(wlc_info_t *wlc, bool tbtt) /* arm watchdog timer and drive the watchdog there */ else if (!tbtt && !wlc->WDarmed) { wl_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG, - TRUE); - wlc->WDarmed = TRUE; + true); + wlc->WDarmed = true; } if (tbtt && !wlc->WDarmed) { wl_add_timer(wlc->wl, wlc->wdtimer, wlc_watchdog_backup_bi(wlc), - TRUE); - wlc->WDarmed = TRUE; + true); + wlc->WDarmed = true; } } @@ -1216,7 +1216,7 @@ static void wlc_ht_update_sgi_rx(wlc_info_t *wlc, int val) if (wlc->pub->up) { wlc_update_beacon(wlc); - wlc_update_probe_resp(wlc, TRUE); + wlc_update_probe_resp(wlc, true); } } @@ -1230,8 +1230,8 @@ static void wlc_ht_update_ldpc(wlc_info_t *wlc, s8 val) if (wlc->pub->up) { wlc_update_beacon(wlc); - wlc_update_probe_resp(wlc, TRUE); - wlc_phy_ldpc_override_set(wlc->band->pi, (val ? TRUE : FALSE)); + wlc_update_probe_resp(wlc, true); + wlc_phy_ldpc_override_set(wlc->band->pi, (val ? true : FALSE)); } } @@ -1346,9 +1346,9 @@ static void WLBANDINITFN(wlc_setband) (wlc_info_t *wlc, uint bandunit) return; /* wait for at least one beacon before entering sleeping state */ - wlc->PMawakebcn = TRUE; + wlc->PMawakebcn = true; FOREACH_AS_STA(wlc, idx, cfg) - cfg->PMawakebcn = TRUE; + cfg->PMawakebcn = true; wlc_set_ps_ctrl(wlc); /* band-specific initializations */ @@ -1568,7 +1568,7 @@ bool wlc_timers_init(wlc_info_t *wlc, int unit) goto fail; } - return TRUE; + return true; fail: return FALSE; @@ -1582,7 +1582,7 @@ void wlc_info_init(wlc_info_t *wlc, int unit) { int i; /* Assume the device is there until proven otherwise */ - wlc->device_present = TRUE; + wlc->device_present = true; /* set default power output percentage to 100 percent */ wlc->txpwr_percent = 100; @@ -1593,13 +1593,13 @@ void wlc_info_init(wlc_info_t *wlc, int unit) /* initialize CCK preamble mode to unassociated state */ wlc->shortpreamble = FALSE; - wlc->legacy_probe = TRUE; + wlc->legacy_probe = true; /* various 802.11g modes */ wlc->shortslot = FALSE; wlc->shortslot_override = WLC_SHORTSLOT_AUTO; - wlc->barker_overlap_control = TRUE; + wlc->barker_overlap_control = true; wlc->barker_preamble = WLC_BARKER_SHORT_ALLOWED; wlc->txburst_limit_override = AUTO; @@ -1615,7 +1615,7 @@ void wlc_info_init(wlc_info_t *wlc, int unit) wlc_protection_upd(wlc, WLC_PROT_OVERLAP, WLC_PROTECTION_CTL_OVERLAP); /* 802.11g draft 4.0 NonERP elt advertisement */ - wlc->include_legacy_erp = TRUE; + wlc->include_legacy_erp = true; wlc->stf->ant_rx_ovr = ANT_RX_DIV_DEF; wlc->stf->txant = ANT_TX_DEF; @@ -1654,7 +1654,7 @@ void wlc_info_init(wlc_info_t *wlc, int unit) wlc->PSpoll = FALSE; /* APSD defaults */ - wlc->wme_apsd = TRUE; + wlc->wme_apsd = true; wlc->apsd_sta_usp = FALSE; wlc->apsd_trigger_timeout = 0; /* disable the trigger timer */ wlc->apsd_trigger_ac = AC_BITMAP_ALL; @@ -1674,19 +1674,19 @@ void wlc_info_init(wlc_info_t *wlc, int unit) wlc->pub->_wme = AUTO; #ifdef BCMSDIODEV_ENABLED - wlc->pub->_priofc = TRUE; /* enable priority flow control for sdio dongle */ + wlc->pub->_priofc = true; /* enable priority flow control for sdio dongle */ #endif wlc->pub->_ampdu = AMPDU_AGG_HOST; wlc->pub->bcmerror = 0; - wlc->ibss_allowed = TRUE; - wlc->ibss_coalesce_allowed = TRUE; + wlc->ibss_allowed = true; + wlc->ibss_coalesce_allowed = true; wlc->pub->_coex = ON; /* intialize mpc delay */ wlc->mpc_delay_off = wlc->mpc_dlycnt = WLC_MPC_MIN_DELAYCNT; - wlc->pr80838_war = TRUE; + wlc->pr80838_war = true; } static bool wlc_state_bmac_sync(wlc_info_t *wlc) @@ -1700,7 +1700,7 @@ static bool wlc_state_bmac_sync(wlc_info_t *wlc) wlc_protection_upd(wlc, WLC_PROT_N_PAM_OVR, (s8) state_bmac.preamble_ovr); - return TRUE; + return true; } static uint wlc_attach_module(wlc_info_t *wlc) @@ -2132,7 +2132,7 @@ static bool wlc_attach_stf_ant_init(wlc_info_t *wlc) (s8) getintvar(vars, (BAND_5G(bandtype) ? "ag1" : "ag0")); wlc_attach_antgain_init(wlc); - return TRUE; + return true; } #ifdef WLC_HIGH_ONLY @@ -2399,7 +2399,7 @@ void wlc_ap_upd(wlc_info_t *wlc) wlc->vlan_mode = AP_ENAB(wlc->pub) ? OFF : AUTO; /* fixup mpc */ - wlc->mpc = TRUE; + wlc->mpc = true; } /* read hwdisable state and propagate to wlc flag */ @@ -2415,7 +2415,7 @@ static void wlc_radio_hwdisable_upd(wlc_info_t *wlc) } } -/* return TRUE if Minimum Power Consumption should be entered, FALSE otherwise */ +/* return true if Minimum Power Consumption should be entered, FALSE otherwise */ bool wlc_is_non_delay_mpc(wlc_info_t *wlc) { return FALSE; @@ -2454,7 +2454,7 @@ void wlc_radio_mpc_upd(wlc_info_t *wlc) radio_state = (mboolisset(wlc->pub->radio_disabled, WL_RADIO_MPC_DISABLE) ? OFF : ON); - mpc_radio = (wlc_ismpc(wlc) == TRUE) ? OFF : ON; + mpc_radio = (wlc_ismpc(wlc) == true) ? OFF : ON; if (radio_state == ON && mpc_radio == OFF) wlc->mpc_delay_off = wlc->mpc_dlycnt; @@ -2472,7 +2472,7 @@ void wlc_radio_mpc_upd(wlc_info_t *wlc) * wlc->mpc_delay_off to wlc->mpc_dlycnt, so that we restart the countdown of mpc_delay_off */ if ((wlc->prev_non_delay_mpc == FALSE) && - (wlc_is_non_delay_mpc(wlc) == TRUE) && wlc->mpc_delay_off) { + (wlc_is_non_delay_mpc(wlc) == true) && wlc->mpc_delay_off) { wlc->mpc_delay_off = wlc->mpc_dlycnt; } wlc->prev_non_delay_mpc = wlc_is_non_delay_mpc(wlc); @@ -2498,7 +2498,7 @@ static void wlc_down_led_upd(wlc_info_t *wlc) /* maintain LEDs while in down state, turn on sbclk if not available yet */ /* turn on sbclk if necessary */ if (!AP_ENAB(wlc->pub)) { - wlc_pllreq(wlc, TRUE, WLC_PLLREQ_FLIP); + wlc_pllreq(wlc, true, WLC_PLLREQ_FLIP); wlc_pllreq(wlc, FALSE, WLC_PLLREQ_FLIP); } @@ -2553,18 +2553,18 @@ static bool wlc_radio_monitor_start(wlc_info_t *wlc) { /* Don't start the timer if HWRADIO feature is disabled */ if (wlc->radio_monitor || (wlc->pub->wlfeatureflag & WL_SWFL_NOHWRADIO)) - return TRUE; + return true; - wlc->radio_monitor = TRUE; - wlc_pllreq(wlc, TRUE, WLC_PLLREQ_RADIO_MON); - wl_add_timer(wlc->wl, wlc->radio_timer, TIMER_INTERVAL_RADIOCHK, TRUE); - return TRUE; + wlc->radio_monitor = true; + wlc_pllreq(wlc, true, WLC_PLLREQ_RADIO_MON); + wl_add_timer(wlc->wl, wlc->radio_timer, TIMER_INTERVAL_RADIOCHK, true); + return true; } bool wlc_radio_monitor_stop(wlc_info_t *wlc) { if (!wlc->radio_monitor) - return TRUE; + return true; ASSERT((wlc->pub->wlfeatureflag & WL_SWFL_NOHWRADIO) != WL_SWFL_NOHWRADIO); @@ -2577,13 +2577,13 @@ bool wlc_radio_monitor_stop(wlc_info_t *wlc) /* bring the driver down, but don't reset hardware */ void wlc_out(wlc_info_t *wlc) { - wlc_bmac_set_noreset(wlc->hw, TRUE); + wlc_bmac_set_noreset(wlc->hw, true); wlc_radio_upd(wlc); wl_down(wlc->wl); wlc_bmac_set_noreset(wlc->hw, FALSE); - /* core clk is TRUE in BMAC driver due to noreset, need to mirror it in HIGH */ - wlc->clk = TRUE; + /* core clk is true in BMAC driver due to noreset, need to mirror it in HIGH */ + wlc->clk = true; /* This will make sure that when 'up' is done * after 'out' it'll restore hardware (especially gpios) @@ -2606,7 +2606,7 @@ static bool wlc_tx_prec_map_verify(wlc_info_t *wlc) WLC_TX_FIFO_CHECK(wlc, TX_CTL_FIFO))) return FALSE; else - return TRUE; + return true; } return WLC_TX_FIFO_CHECK(wlc, TX_AC_BK_FIFO) @@ -2624,7 +2624,7 @@ static void wlc_watchdog_by_timer(void *arg) /* set to normal osl watchdog period */ wl_del_timer(wlc->wl, wlc->wdtimer); wl_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG, - TRUE); + true); } } @@ -2709,7 +2709,7 @@ static void wlc_watchdog(void *arg) } #ifdef WLC_LOW /* BMAC_NOTE: for HIGH_ONLY driver, this seems being called after RPC bus failed */ - ASSERT(wlc_bmac_taclear(wlc->hw, TRUE)); + ASSERT(wlc_bmac_taclear(wlc->hw, true)); #endif /* Verify that tx_prec_map and fifos are in sync to avoid lock ups */ @@ -2729,7 +2729,7 @@ int wlc_up(wlc_info_t *wlc) if (!wlc->pub->hw_up) { wlc_bmac_hw_up(wlc->hw); - wlc->pub->hw_up = TRUE; + wlc->pub->hw_up = true; } if ((wlc->pub->boardflags & BFL_FEM) @@ -2779,7 +2779,7 @@ int wlc_up(wlc_info_t *wlc) } /* wlc_bmac_up_prep has done wlc_corereset(). so clk is on, set it */ - wlc->clk = TRUE; + wlc->clk = true; wlc_radio_monitor_stop(wlc); @@ -2795,7 +2795,7 @@ int wlc_up(wlc_info_t *wlc) WLC_BAND_ALL); wl_init(wlc->wl); - wlc->pub->up = TRUE; + wlc->pub->up = true; if (wlc->bandinit_pending) { wlc_suspend_mac_and_wait(wlc); @@ -2815,8 +2815,8 @@ int wlc_up(wlc_info_t *wlc) /* start one second watchdog timer */ ASSERT(!wlc->WDarmed); - wl_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG, TRUE); - wlc->WDarmed = TRUE; + wl_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG, true); + wlc->WDarmed = true; /* ensure antenna config is up to date */ wlc_stf_phy_txant_upd(wlc); @@ -2878,7 +2878,7 @@ uint wlc_down(wlc_info_t *wlc) return callbacks; /* in between, mpc could try to bring down again.. */ - wlc->going_down = TRUE; + wlc->going_down = true; callbacks += wlc_bmac_down_prep(wlc->hw); @@ -2912,7 +2912,7 @@ uint wlc_down(wlc_info_t *wlc) /* flush tx queues */ for (qi = wlc->tx_queues; qi != NULL; qi = qi->next) { - pktq_flush(wlc->osh, &qi->q, TRUE, NULL, 0); + pktq_flush(wlc->osh, &qi->q, true, NULL, 0); ASSERT(pktq_empty(&qi->q)); } @@ -2957,7 +2957,7 @@ int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config) s8 shortslot = WLC_SHORTSLOT_AUTO; /* Advertise and use shortslot (-1/0/1 Auto/Off/On) */ bool shortslot_restrict = FALSE; /* Restrict association to stations that support shortslot */ - bool ignore_bcns = TRUE; /* Ignore legacy beacons on the same channel */ + bool ignore_bcns = true; /* Ignore legacy beacons on the same channel */ bool ofdm_basic = FALSE; /* Make 6, 12, and 24 basic rates */ int preamble = WLC_PLCP_LONG; /* Advertise and use short preambles (-1/0/1 Auto/Off/On) */ bool preamble_restrict = FALSE; /* Restrict association to stations that support short @@ -2986,7 +2986,7 @@ int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config) return BCME_RANGE; /* update configuration value */ - if (config == TRUE) + if (config == true) wlc_protection_upd(wlc, WLC_PROT_G_USER, gmode); /* Clear supported rates filter */ @@ -3012,9 +3012,9 @@ int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config) break; case GMODE_ONLY: - ofdm_basic = TRUE; + ofdm_basic = true; preamble = WLC_PLCP_SHORT; - preamble_restrict = TRUE; + preamble_restrict = true; break; case GMODE_PERFORMANCE: @@ -3023,10 +3023,10 @@ int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config) &wlc->sup_rates_override); shortslot = WLC_SHORTSLOT_ON; - shortslot_restrict = TRUE; - ofdm_basic = TRUE; + shortslot_restrict = true; + ofdm_basic = true; preamble = WLC_PLCP_SHORT; - preamble_restrict = TRUE; + preamble_restrict = true; break; default: @@ -3159,7 +3159,7 @@ int wlc_set_nmode(wlc_info_t *wlc, s32 nmode) case WL_11N_3x3: ASSERT(WLC_PHY_11N_CAP(wlc->band)); /* force GMODE_AUTO if NMODE is ON */ - wlc_set_gmode(wlc, GMODE_AUTO, TRUE); + wlc_set_gmode(wlc, GMODE_AUTO, true); if (nmode == WL_11N_3x3) wlc->pub->_n_enab = SUPPORT_HT; else @@ -3196,7 +3196,7 @@ static int wlc_set_rateset(wlc_info_t *wlc, wlc_rateset_t *rs_arg) bandunit = wlc->band->bandunit; bcopy((char *)&rs, (char *)&new, sizeof(wlc_rateset_t)); if (wlc_rate_hwrs_filter_sort_validate - (&new, &wlc->bandstate[bandunit]->hw_rateset, TRUE, + (&new, &wlc->bandstate[bandunit]->hw_rateset, true, wlc->stf->txstreams)) goto good; @@ -3207,7 +3207,7 @@ static int wlc_set_rateset(wlc_info_t *wlc, wlc_rateset_t *rs_arg) if (wlc_rate_hwrs_filter_sort_validate(&new, &wlc-> bandstate[bandunit]-> - hw_rateset, TRUE, + hw_rateset, true, wlc->stf->txstreams)) goto good; } @@ -3379,7 +3379,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) if (!wlc->pub->up && IS_MBAND_UNLOCKED(wlc)) { if (wlc->band->bandunit != CHSPEC_WLCBANDUNIT(chspec)) - wlc->bandinit_pending = TRUE; + wlc->bandinit_pending = true; else wlc->bandinit_pending = FALSE; } @@ -3452,7 +3452,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) break; case WLC_GET_SHMEM: - ta_ok = TRUE; + ta_ok = true; /* optional band is stored in the second integer of incoming buffer */ band = @@ -3473,7 +3473,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) break; case WLC_SET_SHMEM: - ta_ok = TRUE; + ta_ok = true; /* optional band is stored in the second integer of incoming buffer */ band = @@ -3495,7 +3495,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) break; case WLC_R_REG: /* MAC registers */ - ta_ok = TRUE; + ta_ok = true; r = (rw_reg_t *) arg; band = WLC_BAND_AUTO; @@ -3531,7 +3531,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) break; case WLC_W_REG: - ta_ok = TRUE; + ta_ok = true; r = (rw_reg_t *) arg; band = WLC_BAND_AUTO; @@ -4007,7 +4007,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) break; } - wlc->wake = val ? TRUE : FALSE; + wlc->wake = val ? true : FALSE; /* if down, we're done */ if (!wlc->pub->up) @@ -4167,7 +4167,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) if (AP_ENAB(wlc->pub) && wlc->clk) { wlc_update_beacon(wlc); - wlc_update_probe_resp(wlc, TRUE); + wlc_update_probe_resp(wlc, true); } break; @@ -4180,7 +4180,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) case WLC_SET_GMODE: if (!wlc->pub->associated) - bcmerror = wlc_set_gmode(wlc, (u8) val, TRUE); + bcmerror = wlc_set_gmode(wlc, (u8) val, true); else { bcmerror = BCME_ASSOCIATED; break; @@ -4277,7 +4277,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) if (wlc->pub->up && AP_ENAB(wlc->pub) && wlc->pub->associated) { wlc_update_beacon(wlc); - wlc_update_probe_resp(wlc, TRUE); + wlc_update_probe_resp(wlc, true); } break; } @@ -4321,7 +4321,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif) /* treat the 'val' parm as the key id */ key = WSEC_BSS_DEFAULT_KEY(bsscfg); if (key != NULL) { - *pval = key->id == val ? TRUE : FALSE; + *pval = key->id == val ? true : FALSE; } else { bcmerror = BCME_BADKEYIDX; } @@ -4764,8 +4764,8 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid, /* convenience int ptr for 4-byte gets (requires int aligned arg) */ ret_int_ptr = (s32 *) arg; - bool_val = (int_val != 0) ? TRUE : FALSE; - bool_val2 = (int_val2 != 0) ? TRUE : FALSE; + bool_val = (int_val != 0) ? true : FALSE; + bool_val2 = (int_val2 != 0) ? true : FALSE; WL_TRACE(("wl%d: %s: id %d\n", wlc->pub->unit, __func__, IOV_ID(actionid))); @@ -4799,7 +4799,7 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid, /* Remove override bit and clip to max qdbm value */ qdbm = (u8)min_t(u32, (int_val & ~WL_TXPWR_OVERRIDE), 0xff); /* Extract override setting */ - override = (int_val & WL_TXPWR_OVERRIDE) ? TRUE : FALSE; + override = (int_val & WL_TXPWR_OVERRIDE) ? true : FALSE; err = wlc_phy_txpower_set(wlc->band->pi, qdbm, override); break; @@ -5025,12 +5025,12 @@ bool wlc_chipmatch(u16 vendor, u16 device) } if ((device == BCM43224_D11N_ID) || (device == BCM43225_D11N2G_ID)) - return TRUE; + return true; if (device == BCM4313_D11N2G_ID) - return TRUE; + return true; if ((device == BCM43236_D11N_ID) || (device == BCM43236_D11N2G_ID)) - return TRUE; + return true; WL_ERROR(("wlc_chipmatch: unknown device id %04x\n", device)); return FALSE; @@ -5209,7 +5209,7 @@ void wlc_device_removed(void *arg) * 'prec' is the precedence number that has already been mapped * from the packet priority. * - * Returns TRUE if packet consumed (queued), FALSE if not. + * Returns true if packet consumed (queued), FALSE if not. */ bool BCMFASTPATH wlc_prec_enq(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec) @@ -5268,7 +5268,7 @@ wlc_prec_enq_head(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec, } ASSERT(0); - PKTFREE(wlc->osh, p, TRUE); + PKTFREE(wlc->osh, p, true); WLCNTINCR(wlc->pub->_cnt->txnobuf); } @@ -5279,7 +5279,7 @@ wlc_prec_enq_head(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec, p = pktq_penq(q, prec, pkt); ASSERT(p != NULL); - return TRUE; + return true; } void BCMFASTPATH wlc_txq_enq(void *ctx, struct scb *scb, void *sdu, uint prec) @@ -5300,7 +5300,7 @@ void BCMFASTPATH wlc_txq_enq(void *ctx, struct scb *scb, void *sdu, uint prec) wlc->pub->unit)); /* ASSERT(9 == 8); *//* XXX we might hit this condtion in case packet flooding from mac80211 stack */ - PKTFREE(wlc->osh, sdu, TRUE); + PKTFREE(wlc->osh, sdu, true); WLCNTINCR(wlc->pub->_cnt->txnobuf); } @@ -5374,7 +5374,7 @@ void BCMFASTPATH wlc_send_q(wlc_info_t *wlc, wlc_txq_info_t *qi) if (in_send_q) return; else - in_send_q = TRUE; + in_send_q = true; prec_map = wlc->tx_prec_map; @@ -5390,7 +5390,7 @@ void BCMFASTPATH wlc_send_q(wlc_info_t *wlc, wlc_txq_info_t *qi) err = wlc_prep_pdu(wlc, pkt[0], &fifo); if (!err) { for (i = 0; i < count; i++) { - wlc_txfifo(wlc, fifo, pkt[i], TRUE, 1); + wlc_txfifo(wlc, fifo, pkt[i], true, 1); } } } @@ -5463,7 +5463,7 @@ wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit, s8 txpktpend) } if (WLC_WAR16165(wlc)) - wlc_war16165(wlc, TRUE); + wlc_war16165(wlc, true); #ifdef WLC_HIGH_ONLY if (RPCTX_ENAB(wlc->pub)) { @@ -5750,7 +5750,7 @@ static bool wlc_phy_rspec_check(wlc_info_t *wlc, u16 bw, ratespec_t rspec) ASSERT(RSPEC_STF(rspec) == PHY_TXC1_MODE_SISO); } - return TRUE; + return true; } u16 BCMFASTPATH wlc_phytxctl1_calc(wlc_info_t *wlc, ratespec_t rspec) @@ -5996,7 +5996,7 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw, for (k = 0; k < hw->max_rates; k++) { is_mcs[k] = - txrate[k]->flags & IEEE80211_TX_RC_MCS ? TRUE : FALSE; + txrate[k]->flags & IEEE80211_TX_RC_MCS ? true : FALSE; if (!is_mcs[k]) { ASSERT(!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)); if ((txrate[k]->idx >= 0) @@ -6008,7 +6008,7 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw, short_preamble[k] = txrate[k]-> flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE ? - TRUE : FALSE; + true : FALSE; } else { ASSERT((txrate[k]->idx >= 0) && (txrate[k]->idx < @@ -6024,10 +6024,10 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw, */ use_rts |= txrate[k]-> - flags & IEEE80211_TX_RC_USE_RTS_CTS ? TRUE : FALSE; + flags & IEEE80211_TX_RC_USE_RTS_CTS ? true : FALSE; use_cts |= txrate[k]-> - flags & IEEE80211_TX_RC_USE_CTS_PROTECT ? TRUE : FALSE; + flags & IEEE80211_TX_RC_USE_CTS_PROTECT ? true : FALSE; if (is_mcs[k]) rate_val[k] |= NRATE_MCS_INUSE; @@ -6564,8 +6564,8 @@ void wlc_tbtt(wlc_info_t *wlc, d11regs_t *regs) } wl_add_timer(wlc->wl, wlc->wdtimer, - wlc_watchdog_backup_bi(wlc), TRUE); - wlc->WDarmed = TRUE; + wlc_watchdog_backup_bi(wlc), true); + wlc->WDarmed = true; } } @@ -6879,7 +6879,7 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2) } totlen = pkttotlen(osh, p); - free_pdu = TRUE; + free_pdu = true; wlc_txfifo_complete(wlc, queue, 1); @@ -6902,7 +6902,7 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2) fatal: ASSERT(0); if (p) - PKTFREE(osh, p, TRUE); + PKTFREE(osh, p, true); #ifdef WLC_HIGH_ONLY /* If this is a split driver, do the big-hammer here. @@ -6910,7 +6910,7 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2) */ wl_init(wlc->wl); #endif - return TRUE; + return true; } @@ -7203,7 +7203,7 @@ void wlc_bss_list_free(wlc_info_t *wlc, wlc_bss_list_t *bss_list) /* Process received frames */ /* - * Return TRUE if more frames need to be processed. FALSE otherwise. + * Return true if more frames need to be processed. FALSE otherwise. * Param 'bound' indicates max. # frames to process before break out. */ /* WLC_HIGH_API */ @@ -7704,7 +7704,7 @@ bool wlc_valid_rate(wlc_info_t *wlc, ratespec_t rspec, int band, bool verbose) for (i = 0; i < hw_rateset->count; i++) if (hw_rateset->rates[i] == RSPEC2RATE(rspec)) - return TRUE; + return true; error: if (verbose) { WL_ERROR(("wl%d: wlc_valid_rate: rate spec 0x%x not in hw_rateset\n", wlc->pub->unit, rspec)); @@ -7725,13 +7725,13 @@ static void wlc_update_mimo_band_bwcap(wlc_info_t *wlc, u8 bwcap) if (band->bandtype == WLC_BAND_5G) { if ((bwcap == WLC_N_BW_40ALL) || (bwcap == WLC_N_BW_20IN2G_40IN5G)) - band->mimo_cap_40 = TRUE; + band->mimo_cap_40 = true; else band->mimo_cap_40 = FALSE; } else { ASSERT(band->bandtype == WLC_BAND_2G); if (bwcap == WLC_N_BW_40ALL) - band->mimo_cap_40 = TRUE; + band->mimo_cap_40 = true; else band->mimo_cap_40 = FALSE; } @@ -7938,7 +7938,7 @@ void wlc_bss_update_beacon(wlc_info_t *wlc, wlc_bsscfg_t *cfg) (wlc, wlc->bcn_rspec, CHSPEC_IS2G(cfg->current_bss-> chanspec) ? WLC_BAND_2G : WLC_BAND_5G, - TRUE)); + true)); /* update the template and ucode shm */ wlc_bcn_prb_template(wlc, FC_BEACON, wlc->bcn_rspec, cfg, bcn, @@ -8300,7 +8300,7 @@ mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, u32 int_val) rspec |= RSPEC_SHORT_GI; if ((rate != 0) - && !wlc_valid_rate(wlc, rspec, cur_band->bandtype, TRUE)) { + && !wlc_valid_rate(wlc, rspec, cur_band->bandtype, true)) { return rate; } @@ -8494,7 +8494,7 @@ void wlc_ht_mimops_cap_update(wlc_info_t *wlc, u8 mimops_mode) if (AP_ENAB(wlc->pub) && wlc->clk) { wlc_update_beacon(wlc); - wlc_update_probe_resp(wlc, TRUE); + wlc_update_probe_resp(wlc, true); } } diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h index 1fb055e..c9f8442 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.h +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.h @@ -119,7 +119,7 @@ typedef struct wlc_bss_list { */ #define WLC_PORTOPEN(cfg) \ (((cfg)->WPA_auth != WPA_AUTH_DISABLED && WSEC_ENABLED((cfg)->wsec)) ? \ - (cfg)->wsec_portopen : TRUE) + (cfg)->wsec_portopen : true) #define PS_ALLOWED(wlc) wlc_ps_allowed(wlc) #define STAY_AWAKE(wlc) wlc_stay_awake(wlc) @@ -191,7 +191,7 @@ extern const u8 prio2fifo[]; #define WLC_PLLREQ_FLIP 0x4 /* hold/release pll for some short operation */ /* Do we support this rate? */ -#define VALID_RATE_DBG(wlc, rspec) wlc_valid_rate(wlc, rspec, WLC_BAND_AUTO, TRUE) +#define VALID_RATE_DBG(wlc, rspec) wlc_valid_rate(wlc, rspec, WLC_BAND_AUTO, true) /* * Macros to check if AP or STA is active. @@ -270,7 +270,7 @@ typedef struct wlc_stf { u16 phytxant; /* phyTx antenna setting in txheader */ u8 ss_opmode; /* singlestream Operational mode, 0:siso; 1:cdd */ - bool ss_algosel_auto; /* if TRUE, use wlc->stf->ss_algo_channel; */ + bool ss_algosel_auto; /* if true, use wlc->stf->ss_algo_channel; */ /* else use wlc->band->stf->ss_mode_band; */ u16 ss_algo_channel; /* ss based on per-channel algo: 0: SISO, 1: CDD 2: STBC */ u8 no_cddstbc; /* stf override, 1: no CDD (or STBC) allowed */ @@ -500,7 +500,7 @@ struct wlc_hw_info { #ifdef BCMSDIO void *sdh; #endif - bool ucode_loaded; /* TRUE after ucode downloaded */ + bool ucode_loaded; /* true after ucode downloaded */ #ifdef WLC_LOW_ONLY struct wl_timer *wdtimer; /* timer for watchdog routine */ @@ -765,7 +765,7 @@ struct wlc_info { s8 barker_preamble; /* current Barker Preamble Mode */ s8 shortslot_override; /* 11g ShortSlot override */ bool include_legacy_erp; /* include Legacy ERP info elt ID 47 as well as g ID 42 */ - bool barker_overlap_control; /* TRUE: be aware of overlapping BSSs for barker */ + bool barker_overlap_control; /* true: be aware of overlapping BSSs for barker */ bool ignore_bcns; /* override: ignore non shortslot bcns in a 11g network */ bool legacy_probe; /* restricts probe requests to CCK rates */ @@ -846,7 +846,7 @@ struct antsel_info { /* sum the individual fifo tx pending packet counts */ #if defined(WLC_HIGH_ONLY) -#define TXPKTPENDTOT(wlc) (wlc_rpctx_txpktpend((wlc)->rpctx, 0, TRUE)) +#define TXPKTPENDTOT(wlc) (wlc_rpctx_txpktpend((wlc)->rpctx, 0, true)) #define TXPKTPENDGET(wlc, fifo) (wlc_rpctx_txpktpend((wlc)->rpctx, (fifo), FALSE)) #define TXPKTPENDINC(wlc, fifo, val) (wlc_rpctx_txpktpendinc((wlc)->rpctx, (fifo), (val))) #define TXPKTPENDDEC(wlc, fifo, val) (wlc_rpctx_txpktpenddec((wlc)->rpctx, (fifo), (val))) diff --git a/drivers/staging/brcm80211/sys/wlc_rate.c b/drivers/staging/brcm80211/sys/wlc_rate.c index 64134d0..1108d1c 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.c +++ b/drivers/staging/brcm80211/sys/wlc_rate.c @@ -268,12 +268,12 @@ static bool wlc_rateset_valid(wlc_rateset_t *rs, bool check_brate) return FALSE; if (!check_brate) - return TRUE; + return true; /* error if no basic rates */ for (idx = 0; idx < rs->count; idx++) { if (rs->rates[idx] & WLC_RATE_FLAG) - return TRUE; + return true; } return FALSE; } @@ -326,7 +326,7 @@ wlc_rate_hwrs_filter_sort_validate(wlc_rateset_t *rs, rs->mcs[i] = (rs->mcs[i] & hw_rs->mcs[i]); if (wlc_rateset_valid(rs, check_brate)) - return TRUE; + return true; else return FALSE; } diff --git a/drivers/staging/brcm80211/sys/wlc_rpctx.h b/drivers/staging/brcm80211/sys/wlc_rpctx.h index ed29896..d2b94ea 100644 --- a/drivers/staging/brcm80211/sys/wlc_rpctx.h +++ b/drivers/staging/brcm80211/sys/wlc_rpctx.h @@ -34,7 +34,7 @@ struct wlc_rpc_phy { struct rpc_info *rpc; }; -#define RPCTX_ENAB(pub) (TRUE) +#define RPCTX_ENAB(pub) (true) extern rpctx_info_t *wlc_rpctx_attach(wlc_pub_t *pub, struct wlc_info *wlc); extern int wlc_rpctx_fifoinit(rpctx_info_t *rpctx, uint fifo, uint ntxd); extern void wlc_rpctx_detach(rpctx_info_t *rpctx); diff --git a/drivers/staging/brcm80211/sys/wlc_scb.h b/drivers/staging/brcm80211/sys/wlc_scb.h index a496778..ce26c74 100644 --- a/drivers/staging/brcm80211/sys/wlc_scb.h +++ b/drivers/staging/brcm80211/sys/wlc_scb.h @@ -80,5 +80,5 @@ struct scb { #define SCB_SEQNUM(scb, prio) ((scb)->seqnum[(prio)]) #define SCB_PS(a) NULL #define SCB_STBC_CAP(a) ((a)->flags & SCB_STBCCAP) -#define SCB_AMPDU(a) TRUE +#define SCB_AMPDU(a) true #endif /* _wlc_scb_h_ */ diff --git a/drivers/staging/brcm80211/sys/wlc_stf.c b/drivers/staging/brcm80211/sys/wlc_stf.c index 1ac0aaf..05a67df 100644 --- a/drivers/staging/brcm80211/sys/wlc_stf.c +++ b/drivers/staging/brcm80211/sys/wlc_stf.c @@ -79,7 +79,7 @@ static void wlc_stf_stbc_rx_ht_update(wlc_info_t *wlc, int val) if (wlc->pub->up) { wlc_update_beacon(wlc); - wlc_update_probe_resp(wlc, TRUE); + wlc_update_probe_resp(wlc, true); } } @@ -97,12 +97,12 @@ void wlc_tempsense_upd(wlc_info_t *wlc) if (wlc->stf->txchain == wlc->stf->hw_txchain) { if (txchain && (txchain < wlc->stf->hw_txchain)) { /* turn off 1 tx chain */ - wlc_stf_txchain_set(wlc, txchain, TRUE); + wlc_stf_txchain_set(wlc, txchain, true); } } else if (wlc->stf->txchain < wlc->stf->hw_txchain) { if (txchain == wlc->stf->hw_txchain) { /* turn back on txchain */ - wlc_stf_txchain_set(wlc, txchain, TRUE); + wlc_stf_txchain_set(wlc, txchain, true); } } } @@ -172,7 +172,7 @@ static bool wlc_stf_stbc_tx_set(wlc_info_t *wlc, s32 int_val) wlc->bandstate[BAND_2G_INDEX]->band_stf_stbc_tx = (s8) int_val; wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = (s8) int_val; - return TRUE; + return true; } bool wlc_stf_stbc_rx_set(wlc_info_t *wlc, s32 int_val) @@ -189,7 +189,7 @@ bool wlc_stf_stbc_rx_set(wlc_info_t *wlc, s32 int_val) } wlc_stf_stbc_rx_ht_update(wlc, int_val); - return TRUE; + return true; } static int wlc_stf_txcore_set(wlc_info_t *wlc, u8 Nsts, u8 core_mask) @@ -421,7 +421,7 @@ int wlc_stf_attach(wlc_info_t *wlc) wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = OFF; if (WLC_STBC_CAP_PHY(wlc)) { - wlc->stf->ss_algosel_auto = TRUE; + wlc->stf->ss_algosel_auto = true; wlc->stf->ss_algo_channel = (u16) -1; /* Init the default value */ } return 0; |