diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-12 12:50:15 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-12 12:50:15 -0700 |
commit | 0965ae88aff802ff48fa2f35fff29feff2754962 (patch) | |
tree | 3ec8ec9a19769e2ef90cbf967e85d8074921a35e /drivers/staging/brcm80211/brcmfmac | |
parent | 0f0881b09078fe3a6bc70f05e8ba49a52b2478a2 (diff) | |
download | op-kernel-dev-0965ae88aff802ff48fa2f35fff29feff2754962.zip op-kernel-dev-0965ae88aff802ff48fa2f35fff29feff2754962.tar.gz |
Staging: brcm80211: remove FALSE #define
use the kernel provided 'false' 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/brcmfmac')
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 12 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 26 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd.h | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 38 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 274 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 38 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.c | 24 |
10 files changed, 215 insertions, 215 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 87b2585..c5d2c9a 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -118,7 +118,7 @@ bool bcmsdh_intr_query(void *sdh) ASSERT(bcmsdh); status = sdioh_interrupt_query(bcmsdh->sdioh, &on); if (SDIOH_API_SUCCESS(status)) - return FALSE; + return false; else return on; } @@ -139,7 +139,7 @@ int bcmsdh_intr_disable(void *sdh) SDIOH_API_RC status; ASSERT(bcmsdh); - status = sdioh_interrupt_set(bcmsdh->sdioh, FALSE); + status = sdioh_interrupt_set(bcmsdh->sdioh, false); return SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR; } diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index c6817b7..2582f3c 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -121,7 +121,7 @@ bool bcmsdh_chipmatch(u16 vendor, u16 device) } #endif /* BCMSDIOH_SPI */ - return FALSE; + return false; } #if defined(BCMPLATFORM_BUS) @@ -190,7 +190,7 @@ int bcmsdh_probe(struct device *dev) } #endif /* defined(OOB_INTR_ONLY) */ /* allocate SDIO Host Controller state info */ - osh = osl_attach(dev, PCI_BUS, FALSE); + osh = osl_attach(dev, PCI_BUS, false); if (!osh) { SDLX_MSG(("%s: osl_attach failed\n", __func__)); goto err; @@ -222,7 +222,7 @@ int bcmsdh_probe(struct device *dev) sdhc->sdh = sdh; sdhc->oob_irq = irq; sdhc->oob_flags = irq_flags; - sdhc->oob_irq_registered = FALSE; /* to make sure.. */ + sdhc->oob_irq_registered = false; /* to make sure.. */ #if defined(OOB_INTR_ONLY) spin_lock_init(&sdhc->irq_lock); #endif @@ -388,7 +388,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) SDLX_MSG(("%s: Disabling TI FlashMedia Controller.\n", __func__)); - osh = osl_attach(pdev, PCI_BUS, FALSE); + osh = osl_attach(pdev, PCI_BUS, false); if (!osh) { SDLX_MSG(("%s: osl_attach failed\n", __func__)); goto err; @@ -423,7 +423,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) */ /* allocate SDIO Host Controller state info */ - osh = osl_attach(pdev, PCI_BUS, FALSE); + osh = osl_attach(pdev, PCI_BUS, false); if (!osh) { SDLX_MSG(("%s: osl_attach failed\n", __func__)); goto err; @@ -634,7 +634,7 @@ void bcmsdh_unregister_oob_intr(void) set_irq_wake(sdhcinfo->oob_irq, 0); disable_irq(sdhcinfo->oob_irq); /* just in case.. */ free_irq(sdhcinfo->oob_irq, NULL); - sdhcinfo->oob_irq_registered = FALSE; + sdhcinfo->oob_irq_registered = false; } #endif /* defined(OOB_INTR_ONLY) */ /* Module parameters specific to each host-controller driver */ diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 1f277a3..15a3f5e 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -56,7 +56,7 @@ uint sd_divisor = 2; /* Default 48MHz/2 = 24MHz */ uint sd_power = 1; /* Default to SD Slot powered ON */ uint sd_clock = 1; /* Default to SD Clock turned ON */ -uint sd_hiok = FALSE; /* Don't use hi-speed mode by default */ +uint sd_hiok = false; /* Don't use hi-speed mode by default */ uint sd_msglevel = 0x01; uint sd_use_dma = true; DHD_PM_RESUME_WAIT_INIT(sdioh_request_byte_wait); @@ -105,7 +105,7 @@ static int sdioh_sdmmc_card_enablefuncs(sdioh_info_t *sd) err_ret)); } - return FALSE; + return false; } /* @@ -321,7 +321,7 @@ extern SDIOH_API_RC sdioh_interrupt_deregister(sdioh_info_t *sd) sdio_release_host(gInstance->func[2]); } - sd->intr_handler_valid = FALSE; + sd->intr_handler_valid = false; sd->intr_handler = NULL; sd->intr_handler_arg = NULL; #elif defined(HW_OOB) @@ -444,7 +444,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, if (plen >= (int)sizeof(int_val)) bcopy(params, &int_val, sizeof(int_val)); - bool_val = (int_val != 0) ? true : FALSE; + bool_val = (int_val != 0) ? true : false; actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid); switch (actionid) { @@ -514,7 +514,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, } case IOV_GVAL(IOV_RXCHAIN): - int_val = FALSE; + int_val = false; bcopy(&int_val, arg, val_size); break; @@ -1041,9 +1041,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, sd_data(("%s: Creating new %s Packet, len=%d\n", __func__, write ? "TX" : "RX", buflen_u)); #ifdef DHD_USE_STATIC_BUF - mypkt = PKTGET_STATIC(sd->osh, buflen_u, write ? true : FALSE); + mypkt = PKTGET_STATIC(sd->osh, buflen_u, write ? true : false); #else - mypkt = PKTGET(sd->osh, buflen_u, write ? true : FALSE); + mypkt = PKTGET(sd->osh, buflen_u, write ? true : false); #endif /* DHD_USE_STATIC_BUF */ if (!mypkt) { sd_err(("%s: PKTGET failed: len %d\n", @@ -1063,9 +1063,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, bcopy(PKTDATA(mypkt), buffer, buflen_u); #ifdef DHD_USE_STATIC_BUF - PKTFREE_STATIC(sd->osh, mypkt, write ? true : FALSE); + PKTFREE_STATIC(sd->osh, mypkt, write ? true : false); #else - PKTFREE(sd->osh, mypkt, write ? true : FALSE); + PKTFREE(sd->osh, mypkt, write ? true : false); #endif /* DHD_USE_STATIC_BUF */ } else if (((u32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) != 0) { /* Case 2: We have a packet, but it is unaligned. */ @@ -1077,9 +1077,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, __func__, write ? "TX" : "RX", PKTLEN(pkt))); #ifdef DHD_USE_STATIC_BUF mypkt = PKTGET_STATIC(sd->osh, PKTLEN(pkt), - write ? true : FALSE); + write ? true : false); #else - mypkt = PKTGET(sd->osh, PKTLEN(pkt), write ? true : FALSE); + mypkt = PKTGET(sd->osh, PKTLEN(pkt), write ? true : false); #endif /* DHD_USE_STATIC_BUF */ if (!mypkt) { sd_err(("%s: PKTGET failed: len %d\n", @@ -1099,9 +1099,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, bcopy(PKTDATA(mypkt), PKTDATA(pkt), PKTLEN(mypkt)); #ifdef DHD_USE_STATIC_BUF - PKTFREE_STATIC(sd->osh, mypkt, write ? true : FALSE); + PKTFREE_STATIC(sd->osh, mypkt, write ? true : false); #else - PKTFREE(sd->osh, mypkt, write ? true : FALSE); + PKTFREE(sd->osh, mypkt, write ? true : false); #endif /* DHD_USE_STATIC_BUF */ } else { /* case 3: We have a packet and it is aligned. */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index 6d0c0dd..08699d31 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -158,7 +158,7 @@ typedef struct dhd_pub { #define _DHD_PM_RESUME_WAIT(a, b) do {\ int retry = 0; \ while (dhd_mmc_suspend && retry++ != b) { \ - wait_event_timeout(a, FALSE, HZ/100); \ + wait_event_timeout(a, false, HZ/100); \ } \ } while (0) #define DHD_PM_RESUME_WAIT(a) _DHD_PM_RESUME_WAIT(a, 30) @@ -171,7 +171,7 @@ typedef struct dhd_pub { #define SPINWAIT_SLEEP(a, exp, us) do { \ uint countdown = (us) + 9999; \ while ((exp) && (countdown >= 10000)) { \ - wait_event_timeout(a, FALSE, HZ/100); \ + wait_event_timeout(a, false, HZ/100); \ countdown -= 10000; \ } \ } while (0) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c index a8c385f..cb2d0d9 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c @@ -288,7 +288,7 @@ dhd_prot_ioctl(dhd_pub_t *dhd, int ifidx, wl_ioctl_t *ioc, void *buf, int len) dhd->wme_dp = (u8) ltoh32(val); } - prot->pending = FALSE; + prot->pending = false; done: dhd_os_proto_unblock(dhd); @@ -351,7 +351,7 @@ bool dhd_proto_fcinfo(dhd_pub_t *dhd, void *pktbuf, u8 * fcbits) if ((h->flags2 & BDC_FLAG2_FC_FLAG) == BDC_FLAG2_FC_FLAG) return true; #endif - return FALSE; + return false; } int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, void *pktbuf) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 36084e4..83a000e 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -347,7 +347,7 @@ bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec) p = pktq_peek_tail(q, &eprec); ASSERT(p); if (eprec > prec) - return FALSE; + return false; } /* Evict if needed */ @@ -356,7 +356,7 @@ bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec) ASSERT(!pktq_pempty(q, eprec)); discard_oldest = AC_BITMAP_TST(dhdp->wme_dp, eprec); if (eprec == prec && !discard_oldest) - return FALSE; /* refuse newer (incoming) packet */ + return false; /* refuse newer (incoming) packet */ /* Evict packet according to discard policy */ p = discard_oldest ? pktq_pdeq(q, eprec) : pktq_pdeq_tail(q, eprec); @@ -523,7 +523,7 @@ int dhd_ioctl(dhd_pub_t *dhd_pub, dhd_ioctl_t *ioc, void *buf, uint buflen) static void wl_show_host_event(wl_event_msg_t *event, void *event_data) { uint i, status, reason; - bool group = FALSE, flush_txq = FALSE, link = FALSE; + bool group = false, flush_txq = false, link = false; char *auth_str, *event_name; unsigned char *buf; char err_msg[256], eabuf[ETHER_ADDR_STR_LEN]; diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 5c8224f..7d900fa 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -171,7 +171,7 @@ void wifi_del_dev(void) #if defined(CONFIG_PM_SLEEP) #include <linux/suspend.h> -volatile bool dhd_mmc_suspend = FALSE; +volatile bool dhd_mmc_suspend = false; DECLARE_WAIT_QUEUE_HEAD(dhd_dpc_wait); #endif /* defined(CONFIG_PM_SLEEP) */ @@ -343,7 +343,7 @@ int dhd_idletime = DHD_IDLETIME_TICKS; module_param(dhd_idletime, int, 0); /* Use polling */ -uint dhd_poll = FALSE; +uint dhd_poll = false; module_param(dhd_poll, uint, 0); /* Use cfg80211 */ @@ -426,7 +426,7 @@ static int dhd_sleep_pm_callback(struct notifier_block *nfb, return NOTIFY_OK; case PM_POST_HIBERNATION: case PM_POST_SUSPEND: - dhd_mmc_suspend = FALSE; + dhd_mmc_suspend = false; return NOTIFY_OK; } return 0; @@ -707,7 +707,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) cnt = netdev_mc_count(dev); /* Determine initial value of allmulti flag */ - allmulti = (dev->flags & IFF_ALLMULTI) ? true : FALSE; + allmulti = (dev->flags & IFF_ALLMULTI) ? true : false; /* Send down the multicast list first. */ @@ -789,7 +789,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) /* Finally, pick up the PROMISC flag as well, like the NIC driver does */ - allmulti = (dev->flags & IFF_PROMISC) ? true : FALSE; + allmulti = (dev->flags & IFF_PROMISC) ? true : false; allmulti = htol32(allmulti); memset(&ioc, 0, sizeof(ioc)); @@ -935,7 +935,7 @@ static int _dhd_sysioc_thread(void *data) dhd_info_t *dhd = (dhd_info_t *) data; int i; #ifdef SOFTAP - bool in_ap = FALSE; + bool in_ap = false; #endif while (down_interruptible(&dhd->sysioc_sem) == 0) { @@ -959,23 +959,23 @@ static int _dhd_sysioc_thread(void *data) DHD_TRACE(("attempt to set MAC for %s " "in AP Mode," "blocked. \n", dhd->iflist[i]->net->name)); - dhd->set_macaddress = FALSE; + dhd->set_macaddress = false; continue; } if (in_ap && dhd->set_multicast) { DHD_TRACE(("attempt to set MULTICAST list for %s" "in AP Mode, blocked. \n", dhd->iflist[i]->net->name)); - dhd->set_multicast = FALSE; + dhd->set_multicast = false; continue; } #endif /* SOFTAP */ if (dhd->set_multicast) { - dhd->set_multicast = FALSE; + dhd->set_multicast = false; _dhd_set_multicast_list(dhd, i); } if (dhd->set_macaddress) { - dhd->set_macaddress = FALSE; + dhd->set_macaddress = false; _dhd_set_mac_address(dhd, i, &dhd->macvalue); } @@ -1041,7 +1041,7 @@ int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, void *pktbuf) /* Look into the packet and update the packet priority */ if ((PKTPRIO(pktbuf) == 0)) - pktsetprio(pktbuf, FALSE); + pktsetprio(pktbuf, false); /* If the protocol uses a data header, apply it */ dhd_prot_hdrpush(dhdp, ifidx, pktbuf); @@ -1300,7 +1300,7 @@ static int dhd_watchdog_thread(void *data) if (kthread_should_stop()) break; if (down_interruptible(&dhd->watchdog_sem) == 0) { - if (dhd->pub.dongle_reset == FALSE) { + if (dhd->pub.dongle_reset == false) { WAKE_LOCK(&dhd->pub, WAKE_LOCK_WATCHDOG); /* Call the bus module watchdog */ dhd_bus_watchdog(&dhd->pub); @@ -1427,7 +1427,7 @@ static int dhd_toe_get(dhd_info_t *dhd, int ifidx, u32 *toe_ol) ioc.cmd = WLC_GET_VAR; ioc.buf = buf; ioc.len = (uint) sizeof(buf); - ioc.set = FALSE; + ioc.set = false; strcpy(buf, "toe_ol"); ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len); @@ -1987,7 +1987,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen) if ((dhd_watchdog_prio >= 0) && (dhd_dpc_prio >= 0)) dhd->threads_only = true; else - dhd->threads_only = FALSE; + dhd->threads_only = false; if (dhd_dpc_prio >= 0) { /* Initialize watchdog thread */ @@ -2111,7 +2111,7 @@ int dhd_bus_start(dhd_pub_t *dhdp) /* Host registration for OOB interrupt */ if (bcmsdh_register_oob_intr(dhdp)) { del_timer_sync(&dhd->timer); - dhd->wd_timer_valid = FALSE; + dhd->wd_timer_valid = false; DHD_ERROR(("%s Host failed to resgister for OOB\n", __func__)); return -ENODEV; } @@ -2123,7 +2123,7 @@ int dhd_bus_start(dhd_pub_t *dhdp) /* If bus is not ready, can't come up */ if (dhd->pub.busstate != DHD_BUS_DATA) { del_timer_sync(&dhd->timer); - dhd->wd_timer_valid = FALSE; + dhd->wd_timer_valid = false; DHD_ERROR(("%s failed bus is not ready\n", __func__)); return -ENODEV; } @@ -2302,7 +2302,7 @@ void dhd_bus_detach(dhd_pub_t *dhdp) /* Clear the watchdog timer */ del_timer_sync(&dhd->timer); - dhd->wd_timer_valid = FALSE; + dhd->wd_timer_valid = false; } } } @@ -2535,7 +2535,7 @@ void dhd_os_wd_timer(void *bus, uint wdtick) /* Totally stop the timer */ if (!wdtick && dhd->wd_timer_valid == true) { del_timer_sync(&dhd->timer); - dhd->wd_timer_valid = FALSE; + dhd->wd_timer_valid = false; save_dhd_watchdog_ms = wdtick; return; } @@ -2757,7 +2757,7 @@ void dhd_wait_for_event(dhd_pub_t *dhd, bool *lockvar) struct dhd_info *dhdinfo = dhd->info; dhd_os_sdunlock(dhd); wait_event_interruptible_timeout(dhdinfo->ctrl_wait, - (*lockvar == FALSE), HZ * 2); + (*lockvar == false), HZ * 2); dhd_os_sdlock(dhd); return; } diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 40157a1..9eef90f 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -142,7 +142,7 @@ * bufpool was present for gspi bus. */ #define PKTFREE2() if ((bus->bus != SPI_BUS) || bus->usebufpool) \ - PKTFREE(bus->dhd->osh, pkt, FALSE); + PKTFREE(bus->dhd->osh, pkt, false); DHD_SPINWAIT_SLEEP_INIT(sdioh_spinwait_sleep); extern int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len); @@ -305,7 +305,7 @@ typedef struct dhd_bus { #define CLK_PENDING 2 /* Not used yet */ #define CLK_AVAIL 3 -#define DHD_NOPMU(dhd) (FALSE) +#define DHD_NOPMU(dhd) (false) #ifdef DHD_DEBUG static int qcount[NUMPRIO]; @@ -495,7 +495,7 @@ static int dhdsdio_htclk(dhd_bus_t *bus, bool on, bool pendok) DHD_TRACE(("%s: Enter\n", __func__)); #if defined(OOB_INTR_ONLY) - pendok = FALSE; + pendok = false; #endif clkctl = 0; sdh = bus->sdh; @@ -751,7 +751,7 @@ static int dhdsdio_clkctl(dhd_bus_t *bus, uint target, bool pendok) if (bus->clkstate == CLK_NONE) dhdsdio_sdclk(bus, true); else if (bus->clkstate == CLK_AVAIL) - dhdsdio_htclk(bus, FALSE, FALSE); + dhdsdio_htclk(bus, false, false); else DHD_ERROR(("dhdsdio_clkctl: request for %d -> %d\n", bus->clkstate, target)); @@ -761,9 +761,9 @@ static int dhdsdio_clkctl(dhd_bus_t *bus, uint target, bool pendok) case CLK_NONE: /* Make sure to remove HT request */ if (bus->clkstate == CLK_AVAIL) - dhdsdio_htclk(bus, FALSE, FALSE); + dhdsdio_htclk(bus, false, false); /* Now remove the SD clock */ - dhdsdio_sdclk(bus, FALSE); + dhdsdio_sdclk(bus, false); dhd_os_wd_timer(bus->dhd, 0); break; } @@ -798,7 +798,7 @@ int dhdsdio_bussleep(dhd_bus_t *bus, bool sleep) bcmsdh_intr_disable(bus->sdh); /* Make sure the controller has the bus up */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); /* Tell device to start using OOB wakeup */ W_SDREG(SMB_USE_OOB, ®s->tosbmailbox, retries); @@ -806,7 +806,7 @@ int dhdsdio_bussleep(dhd_bus_t *bus, bool sleep) DHD_ERROR(("CANNOT SIGNAL CHIP, WILL NOT WAKE UP!!\n")); /* Turn off our contribution to the HT clock request */ - dhdsdio_clkctl(bus, CLK_SDONLY, FALSE); + dhdsdio_clkctl(bus, CLK_SDONLY, false); bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, SBSDIO_FORCE_HW_CLKREQ_OFF, NULL); @@ -835,7 +835,7 @@ int dhdsdio_bussleep(dhd_bus_t *bus, bool sleep) NULL); /* Make sure the controller has the bus up */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); /* Send misc interrupt to indicate OOB not needed */ W_SDREG(0, ®s->tosbmailboxdata, retries); @@ -846,14 +846,14 @@ int dhdsdio_bussleep(dhd_bus_t *bus, bool sleep) DHD_ERROR(("CANNOT SIGNAL CHIP TO CLEAR OOB!!\n")); /* Make sure we have SD bus access */ - dhdsdio_clkctl(bus, CLK_SDONLY, FALSE); + dhdsdio_clkctl(bus, CLK_SDONLY, false); /* Change state */ - bus->sleeping = FALSE; + bus->sleeping = false; /* Enable interrupts again */ if (bus->intr && (bus->dhd->busstate == DHD_BUS_DATA)) { - bus->intdis = FALSE; + bus->intdis = false; bcmsdh_intr_enable(bus->sdh); } } @@ -870,7 +870,7 @@ void dhd_enable_oob_intr(struct dhd_bus *bus, bool enable) sdpcmd_regs_t *regs = bus->regs; uint retries = 0; - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); if (enable == true) { /* Tell device to start using OOB wakeup */ @@ -886,7 +886,7 @@ void dhd_enable_oob_intr(struct dhd_bus *bus, bool enable) } /* Turn off our contribution to the HT clock request */ - dhdsdio_clkctl(bus, CLK_SDONLY, FALSE); + dhdsdio_clkctl(bus, CLK_SDONLY, false); #endif /* !defined(HW_OOB) */ } #endif /* defined(OOB_INTR_ONLY) */ @@ -894,7 +894,7 @@ void dhd_enable_oob_intr(struct dhd_bus *bus, bool enable) #define BUS_WAKE(bus) \ do { \ if ((bus)->sleeping) \ - dhdsdio_bussleep((bus), FALSE); \ + dhdsdio_bussleep((bus), false); \ } while (0); /* Writes a HW/SW header into the packet and sends it. */ @@ -1103,9 +1103,9 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt) /* Priority based enq */ dhd_os_sdlock_txq(bus->dhd); - if (dhd_prec_enq(bus->dhd, &bus->txq, pkt, prec) == FALSE) { + if (dhd_prec_enq(bus->dhd, &bus->txq, pkt, prec) == false) { PKTPULL(pkt, SDPCM_HDRLEN); - dhd_txcomplete(bus->dhd, pkt, FALSE); + dhd_txcomplete(bus->dhd, pkt, false); PKTFREE(osh, pkt, true); DHD_ERROR(("%s: out of bus->txq !!!\n", __func__)); ret = BCME_NORESOURCE; @@ -1149,7 +1149,7 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt) bus->dhd->dstats.tx_bytes += datalen; if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) { - bus->activity = FALSE; + bus->activity = false; dhdsdio_clkctl(bus, CLK_NONE, true); } @@ -1273,7 +1273,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) BUS_WAKE(bus); /* Make sure backplane clock is on */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); /* Hardware tag: 2 byte len followed by 2 byte ~len check (all LE) */ *(u16 *) frame = htol16((u16) msglen); @@ -1298,8 +1298,8 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) dhd_wait_for_event(bus->dhd, &bus->ctrl_frame_stat); - if (bus->ctrl_frame_stat == FALSE) { - DHD_INFO(("%s: ctrl_frame_stat == FALSE\n", __func__)); + if (bus->ctrl_frame_stat == false) { + DHD_INFO(("%s: ctrl_frame_stat == false\n", __func__)); ret = 0; } else { DHD_INFO(("%s: ctrl_frame_stat == true\n", __func__)); @@ -1316,7 +1316,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) #endif do { - bus->ctrl_frame_stat = FALSE; + bus->ctrl_frame_stat = false; ret = dhd_bcmsdh_send_buf(bus, bcmsdh_cur_sbwad(sdh), SDIO_FUNC_2, F2SYNC, frame, len, @@ -1360,7 +1360,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) } if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) { - bus->activity = FALSE; + bus->activity = false; dhdsdio_clkctl(bus, CLK_NONE, true); } @@ -1759,7 +1759,7 @@ static int dhdsdio_readshared(dhd_bus_t *bus, sdpcm_shared_t *sh) /* Read last word in memory to determine address of sdpcm_shared structure */ - rv = dhdsdio_membytes(bus, FALSE, bus->ramsize - 4, (u8 *)&addr, 4); + rv = dhdsdio_membytes(bus, false, bus->ramsize - 4, (u8 *)&addr, 4); if (rv < 0) return rv; @@ -1778,7 +1778,7 @@ static int dhdsdio_readshared(dhd_bus_t *bus, sdpcm_shared_t *sh) } /* Read hndrte_shared structure */ - rv = dhdsdio_membytes(bus, FALSE, addr, (u8 *) sh, + rv = dhdsdio_membytes(bus, false, addr, (u8 *) sh, sizeof(sdpcm_shared_t)); if (rv < 0) return rv; @@ -1871,7 +1871,7 @@ static int dhdsdio_checkdied(dhd_bus_t *bus, u8 *data, uint size) bcm_bprintf(&strbuf, "Dongle assert"); if (sdpcm_shared.assert_exp_addr != 0) { str[0] = '\0'; - bcmerror = dhdsdio_membytes(bus, FALSE, + bcmerror = dhdsdio_membytes(bus, false, sdpcm_shared.assert_exp_addr, (u8 *) str, maxstrlen); if (bcmerror < 0) @@ -1883,7 +1883,7 @@ static int dhdsdio_checkdied(dhd_bus_t *bus, u8 *data, uint size) if (sdpcm_shared.assert_file_addr != 0) { str[0] = '\0'; - bcmerror = dhdsdio_membytes(bus, FALSE, + bcmerror = dhdsdio_membytes(bus, false, sdpcm_shared.assert_file_addr, (u8 *) str, maxstrlen); if (bcmerror < 0) @@ -1898,7 +1898,7 @@ static int dhdsdio_checkdied(dhd_bus_t *bus, u8 *data, uint size) } if (sdpcm_shared.flags & SDPCM_SHARED_TRAP) { - bcmerror = dhdsdio_membytes(bus, FALSE, + bcmerror = dhdsdio_membytes(bus, false, sdpcm_shared.trap_addr, (u8 *)&tr, sizeof(trap_t)); if (bcmerror < 0) @@ -1955,7 +1955,7 @@ static int dhdsdio_mem_dump(dhd_bus_t *bus) databuf = buf; while (size) { read_size = min(MEMBLOCK, size); - ret = dhdsdio_membytes(bus, FALSE, start, databuf, read_size); + ret = dhdsdio_membytes(bus, false, start, databuf, read_size); if (ret) { printf("%s: Error membytes %d\n", __func__, ret); if (buf) @@ -1996,7 +1996,7 @@ static int dhdsdio_readconsole(dhd_bus_t *bus) /* Read console log struct */ addr = bus->console_addr + offsetof(hndrte_cons_t, log); - rv = dhdsdio_membytes(bus, FALSE, addr, (u8 *)&c->log, + rv = dhdsdio_membytes(bus, false, addr, (u8 *)&c->log, sizeof(c->log)); if (rv < 0) return rv; @@ -2022,7 +2022,7 @@ static int dhdsdio_readconsole(dhd_bus_t *bus) /* Read the console buffer */ addr = ltoh32(c->log.buf); - rv = dhdsdio_membytes(bus, FALSE, addr, c->buf, c->bufsize); + rv = dhdsdio_membytes(bus, false, addr, c->buf, c->bufsize); if (rv < 0) return rv; @@ -2114,7 +2114,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid, if (plen >= (int)sizeof(int_val)) bcopy(params, &int_val, sizeof(int_val)); - bool_val = (int_val != 0) ? true : FALSE; + bool_val = (int_val != 0) ? true : false; /* Some ioctls use the bus */ dhd_os_sdlock(bus->dhd); @@ -2140,7 +2140,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid, /* Request clock to allow SDIO accesses */ if (!bus->dhd->dongle_reset) { BUS_WAKE(bus); - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); } switch (actionid) { @@ -2151,7 +2151,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid, case IOV_SVAL(IOV_INTR): bus->intr = bool_val; - bus->intdis = FALSE; + bus->intdis = false; if (bus->dhd->up) { if (bus->intr) { DHD_INTR(("%s: enable SDIO device interrupts\n", @@ -2497,13 +2497,13 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid, exit: if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) { - bus->activity = FALSE; + bus->activity = false; dhdsdio_clkctl(bus, CLK_NONE, true); } dhd_os_sdunlock(bus->dhd); - if (actionid == IOV_SVAL(IOV_DEVRESET) && bool_val == FALSE) + if (actionid == IOV_SVAL(IOV_DEVRESET) && bool_val == false) dhd_preinit_ioctls((dhd_pub_t *) bus->dhd); return bcmerror; @@ -2548,7 +2548,7 @@ static int dhdsdio_write_vars(dhd_bus_t *bus) /* Read the vars list to temp buffer for comparison */ bcmerror = - dhdsdio_membytes(bus, FALSE, varaddr, nvram_ularray, + dhdsdio_membytes(bus, false, varaddr, nvram_ularray, varsize); if (bcmerror) { DHD_ERROR(("%s: error %d on reading %d nvram bytes at " @@ -2689,7 +2689,7 @@ static int dhdsdio_download_state(dhd_bus_t *bus, bool enter) } /* Allow HT Clock now that the ARM is running. */ - bus->alp_only = FALSE; + bus->alp_only = false; bus->dhd->busstate = DHD_BUS_LOAD; } @@ -2731,7 +2731,7 @@ dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name, BUS_WAKE(bus); /* Turn on clock in case SD command needs backplane */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); bcmerror = bcmsdh_iovar_op(bus->sdh, name, params, plen, arg, len, @@ -2743,7 +2743,7 @@ dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name, if (set && strcmp(name, "sd_divisor") == 0) { if (bcmsdh_iovar_op(bus->sdh, "sd_divisor", NULL, 0, &bus->sd_divisor, sizeof(s32), - FALSE) != BCME_OK) { + false) != BCME_OK) { bus->sd_divisor = -1; DHD_ERROR(("%s: fail on %s get\n", __func__, name)); @@ -2756,7 +2756,7 @@ dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name, if (set && strcmp(name, "sd_mode") == 0) { if (bcmsdh_iovar_op(bus->sdh, "sd_mode", NULL, 0, &bus->sd_mode, sizeof(s32), - FALSE) != BCME_OK) { + false) != BCME_OK) { bus->sd_mode = -1; DHD_ERROR(("%s: fail on %s get\n", __func__, name)); @@ -2771,7 +2771,7 @@ dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name, if (bcmsdh_iovar_op (bus->sdh, "sd_blocksize", &fnum, sizeof(s32), &bus->blocksize, sizeof(s32), - FALSE) != BCME_OK) { + false) != BCME_OK) { bus->blocksize = 0; DHD_ERROR(("%s: fail on %s get\n", __func__, "sd_blocksize")); @@ -2784,7 +2784,7 @@ dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name, bus->roundup = min(max_roundup, bus->blocksize); if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) { - bus->activity = FALSE; + bus->activity = false; dhdsdio_clkctl(bus, CLK_NONE, true); } @@ -2836,7 +2836,7 @@ void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex) BUS_WAKE(bus); /* Enable clock for device interrupts */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); /* Disable and clear interrupts at the chip level also */ W_SDREG(0, &bus->regs->hostintmask, retries); @@ -2869,17 +2869,17 @@ void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex) W_SDREG(local_hostintmask, &bus->regs->intstatus, retries); /* Turn off the backplane clock (only) */ - dhdsdio_clkctl(bus, CLK_SDONLY, FALSE); + dhdsdio_clkctl(bus, CLK_SDONLY, false); /* Clear the data packet queues */ pktq_flush(osh, &bus->txq, true); /* Clear any held glomming stuff */ if (bus->glomd) - PKTFREE(osh, bus->glomd, FALSE); + PKTFREE(osh, bus->glomd, false); if (bus->glom) - PKTFREE(osh, bus->glom, FALSE); + PKTFREE(osh, bus->glom, false); bus->glom = bus->glomd = NULL; @@ -2888,7 +2888,7 @@ void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex) dhd_os_ioctl_resp_wake(bus->dhd); /* Reset some F2 state stuff */ - bus->rxskip = FALSE; + bus->rxskip = false; bus->tx_seq = bus->rx_seq = 0; if (enforce_mutex) @@ -2914,7 +2914,7 @@ int dhd_bus_init(dhd_pub_t *dhdp, bool enforce_mutex) dhd_os_sdlock(bus->dhd); /* Make sure backplane clock is on, needed to generate F2 interrupt */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); if (bus->clkstate != CLK_AVAIL) goto exit; @@ -2970,7 +2970,7 @@ int dhd_bus_init(dhd_pub_t *dhdp, bool enforce_mutex) /* bcmsdh_intr_unmask(bus->sdh); */ - bus->intdis = FALSE; + bus->intdis = false; if (bus->intr) { DHD_INTR(("%s: enable SDIO device interrupts\n", __func__)); @@ -2995,7 +2995,7 @@ int dhd_bus_init(dhd_pub_t *dhdp, bool enforce_mutex) /* If we didn't come up, turn off backplane clock */ if (dhdp->busstate != DHD_BUS_DATA) - dhdsdio_clkctl(bus, CLK_NONE, FALSE); + dhdsdio_clkctl(bus, CLK_NONE, false); exit: if (enforce_mutex) @@ -3124,7 +3124,7 @@ dhdsdio_read_control(dhd_bus_t *bus, u8 *hdr, uint len, uint doff) DHD_ERROR(("%s: %d-byte control read exceeds %d-byte buffer\n", __func__, rdlen, bus->dhd->maxctl)); bus->dhd->rx_errors++; - dhdsdio_rxfail(bus, FALSE, FALSE); + dhdsdio_rxfail(bus, false, false); goto done; } @@ -3134,7 +3134,7 @@ dhdsdio_read_control(dhd_bus_t *bus, u8 *hdr, uint len, uint doff) __func__, len, (len - doff), bus->dhd->maxctl)); bus->dhd->rx_errors++; bus->rx_toolong++; - dhdsdio_rxfail(bus, FALSE, FALSE); + dhdsdio_rxfail(bus, false, false); goto done; } @@ -3221,7 +3221,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq) if (sublen % DHD_SDALIGN) { DHD_ERROR(("%s: sublen %d not multiple of %d\n", __func__, sublen, DHD_SDALIGN)); - usechain = FALSE; + usechain = false; } totlen += sublen; @@ -3234,7 +3234,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq) } /* Allocate/chain packet for next subframe */ - pnext = PKTGET(osh, sublen + DHD_SDALIGN, FALSE); + pnext = PKTGET(osh, sublen + DHD_SDALIGN, false); if (pnext == NULL) { DHD_ERROR(("%s: PKTGET failed, num %d len %d\n", __func__, num, sublen)); @@ -3270,13 +3270,13 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq) pfirst = pnext = NULL; } else { if (pfirst) - PKTFREE(osh, pfirst, FALSE); + PKTFREE(osh, pfirst, false); bus->glom = NULL; num = 0; } /* Done with descriptor packet */ - PKTFREE(osh, bus->glomd, FALSE); + PKTFREE(osh, bus->glomd, false); bus->glomd = NULL; bus->nextlen = 0; @@ -3343,9 +3343,9 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq) dhdsdio_rxfail(bus, true, true); } else { bus->glomerr = 0; - dhdsdio_rxfail(bus, true, FALSE); + dhdsdio_rxfail(bus, true, false); dhd_os_sdlock_rxq(bus->dhd); - PKTFREE(osh, bus->glom, FALSE); + PKTFREE(osh, bus->glom, false); dhd_os_sdunlock_rxq(bus->dhd); bus->rxglomfail++; bus->glom = NULL; @@ -3472,9 +3472,9 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq) dhdsdio_rxfail(bus, true, true); } else { bus->glomerr = 0; - dhdsdio_rxfail(bus, true, FALSE); + dhdsdio_rxfail(bus, true, false); dhd_os_sdlock_rxq(bus->dhd); - PKTFREE(osh, bus->glom, FALSE); + PKTFREE(osh, bus->glom, false); dhd_os_sdunlock_rxq(bus->dhd); bus->rxglomfail++; bus->glom = NULL; @@ -3522,7 +3522,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq) PKTPULL(pfirst, doff); if (PKTLEN(pfirst) == 0) { - PKTFREE(bus->dhd->osh, pfirst, FALSE); + PKTFREE(bus->dhd->osh, pfirst, false); if (plast) { PKTSETNEXT(plast, pnext); } else { @@ -3535,7 +3535,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq) DHD_ERROR(("%s: rx protocol error\n", __func__)); bus->dhd->rx_errors++; - PKTFREE(osh, pfirst, FALSE); + PKTFREE(osh, pfirst, false); if (plast) { PKTSETNEXT(plast, pnext); } else { @@ -3601,7 +3601,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) uint rxcount = 0; /* Total frames read */ #if defined(DHD_DEBUG) || defined(SDTEST) - bool sdtest = FALSE; /* To limit message spew from test mode */ + bool sdtest = false; /* To limit message spew from test mode */ #endif DHD_TRACE(("%s: Enter\n", __func__)); @@ -3617,7 +3617,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) #endif /* Not finished unless we encounter no more frames indication */ - *finished = FALSE; + *finished = false; for (rxseq = bus->rx_seq, rxleft = maxframes; !bus->rxskip && rxleft && bus->dhd->busstate != DHD_BUS_DOWN; @@ -3674,10 +3674,10 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) */ /* Allocate a packet buffer */ dhd_os_sdlock_rxq(bus->dhd); - pkt = PKTGET(osh, rdlen + DHD_SDALIGN, FALSE); + pkt = PKTGET(osh, rdlen + DHD_SDALIGN, false); if (!pkt) { if (bus->bus == SPI_BUS) { - bus->usebufpool = FALSE; + bus->usebufpool = false; bus->rxctl = bus->rxbuf; if (dhd_alignctl) { bus->rxctl += firstread; @@ -3713,7 +3713,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) dhd_os_sdunlock_rxq(bus->dhd); dhdsdio_rxfail(bus, true, (bus->bus == - SPI_BUS) ? FALSE + SPI_BUS) ? false : true); continue; } @@ -3747,7 +3747,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) if (sdret < 0) { DHD_ERROR(("%s (nextlen): read %d bytes failed: %d\n", __func__, rdlen, sdret)); - PKTFREE(bus->dhd->osh, pkt, FALSE); + PKTFREE(bus->dhd->osh, pkt, false); bus->dhd->rx_errors++; dhd_os_sdunlock_rxq(bus->dhd); /* Force retry w/normal header read. @@ -3756,7 +3756,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) */ dhdsdio_rxfail(bus, true, (bus->bus == - SPI_BUS) ? FALSE : + SPI_BUS) ? false : true); continue; } @@ -3789,7 +3789,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) PKTFREE2(); dhd_os_sdunlock_rxq(bus->dhd); bus->rx_badhdr++; - dhdsdio_rxfail(bus, FALSE, FALSE); + dhdsdio_rxfail(bus, false, false); GSPI_PR55150_BAILOUT; continue; } @@ -3818,7 +3818,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) dhd_os_sdunlock_rxq(bus->dhd); dhdsdio_rxfail(bus, true, (bus->bus == - SPI_BUS) ? FALSE : true); + SPI_BUS) ? false : true); GSPI_PR55150_BAILOUT; continue; } @@ -3896,7 +3896,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) if (bus->usebufpool) { dhd_os_sdlock_rxq(bus->dhd); PKTFREE(bus->dhd->osh, pkt, - FALSE); + false); dhd_os_sdunlock_rxq(bus->dhd); } continue; @@ -3905,7 +3905,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) __func__, seq)); /* Force retry w/normal header read */ bus->nextlen = 0; - dhdsdio_rxfail(bus, FALSE, true); + dhdsdio_rxfail(bus, false, true); dhd_os_sdlock_rxq(bus->dhd); PKTFREE2(); dhd_os_sdunlock_rxq(bus->dhd); @@ -3927,7 +3927,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) PKTFREE2(); dhd_os_sdunlock_rxq(bus->dhd); ASSERT(0); - dhdsdio_rxfail(bus, FALSE, FALSE); + dhdsdio_rxfail(bus, false, false); continue; } @@ -3973,7 +3973,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) DHD_ERROR(("%s: HW hdr err: len/check 0x%04x/0x%04x\n", __func__, len, check)); bus->rx_badhdr++; - dhdsdio_rxfail(bus, FALSE, FALSE); + dhdsdio_rxfail(bus, false, false); continue; } @@ -3997,7 +3997,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) __func__, doff, len, SDPCM_HDRLEN, seq)); bus->rx_badhdr++; ASSERT(0); - dhdsdio_rxfail(bus, FALSE, FALSE); + dhdsdio_rxfail(bus, false, false); continue; } @@ -4080,19 +4080,19 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) __func__, len, rdlen)); bus->dhd->rx_errors++; bus->rx_toolong++; - dhdsdio_rxfail(bus, FALSE, FALSE); + dhdsdio_rxfail(bus, false, false); continue; } dhd_os_sdlock_rxq(bus->dhd); - pkt = PKTGET(osh, (rdlen + firstread + DHD_SDALIGN), FALSE); + pkt = PKTGET(osh, (rdlen + firstread + DHD_SDALIGN), false); if (!pkt) { /* Give up on data, request rtx of events */ DHD_ERROR(("%s: PKTGET failed: rdlen %d chan %d\n", __func__, rdlen, chan)); bus->dhd->rx_dropped++; dhd_os_sdunlock_rxq(bus->dhd); - dhdsdio_rxfail(bus, FALSE, RETRYCHAN(chan)); + dhdsdio_rxfail(bus, false, RETRYCHAN(chan)); continue; } dhd_os_sdunlock_rxq(bus->dhd); @@ -4121,7 +4121,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) ? "data" : "test")), sdret)); dhd_os_sdlock_rxq(bus->dhd); - PKTFREE(bus->dhd->osh, pkt, FALSE); + PKTFREE(bus->dhd->osh, pkt, false); dhd_os_sdunlock_rxq(bus->dhd); bus->dhd->rx_errors++; dhdsdio_rxfail(bus, true, RETRYCHAN(chan)); @@ -4155,7 +4155,7 @@ deliver: } else { DHD_ERROR(("%s: glom superframe w/o " "descriptor!\n", __func__)); - dhdsdio_rxfail(bus, FALSE, FALSE); + dhdsdio_rxfail(bus, false, false); } continue; } @@ -4174,13 +4174,13 @@ deliver: if (PKTLEN(pkt) == 0) { dhd_os_sdlock_rxq(bus->dhd); - PKTFREE(bus->dhd->osh, pkt, FALSE); + PKTFREE(bus->dhd->osh, pkt, false); dhd_os_sdunlock_rxq(bus->dhd); continue; } else if (dhd_prot_hdrpull(bus->dhd, &ifidx, pkt) != 0) { DHD_ERROR(("%s: rx protocol error\n", __func__)); dhd_os_sdlock_rxq(bus->dhd); - PKTFREE(bus->dhd->osh, pkt, FALSE); + PKTFREE(bus->dhd->osh, pkt, false); dhd_os_sdunlock_rxq(bus->dhd); bus->dhd->rx_errors++; continue; @@ -4231,7 +4231,7 @@ static u32 dhdsdio_hostmail(dhd_bus_t *bus) if (!bus->rxskip) DHD_ERROR(("%s: unexpected NAKHANDLED!\n", __func__)); - bus->rxskip = FALSE; + bus->rxskip = false; intstatus |= I_HMB_FRAME_IND; } @@ -4292,7 +4292,7 @@ bool dhdsdio_dpc(dhd_bus_t *bus) uint txlimit = dhd_txbound; /* Tx frames to send before resched */ uint framecnt = 0; /* Temporary counter of tx/rx frames */ bool rxdone = true; /* Flag for no more read data */ - bool resched = FALSE; /* Flag indicating resched wanted */ + bool resched = false; /* Flag indicating resched wanted */ DHD_TRACE(("%s: Enter\n", __func__)); @@ -4364,7 +4364,7 @@ bool dhdsdio_dpc(dhd_bus_t *bus) /* Pending interrupt indicates new device status */ if (bus->ipend) { - bus->ipend = FALSE; + bus->ipend = false; R_SDREG(newstatus, ®s->intstatus, retries); bus->f1regdata++; if (bcmsdh_regfail(bus->sdh)) @@ -4449,7 +4449,7 @@ clkwait: if (bus->intr && bus->intdis && !bcmsdh_regfail(sdh)) { DHD_INTR(("%s: enable SDIO interrupts, rxdone %d framecnt %d\n", __func__, rxdone, framecnt)); - bus->intdis = FALSE; + bus->intdis = false; bcmsdh_intr_enable(sdh); } @@ -4496,7 +4496,7 @@ clkwait: bus->tx_seq = (bus->tx_seq + 1) % SDPCM_SEQUENCE_WRAP; printf("Return_dpc value is : %d\n", ret); - bus->ctrl_frame_stat = FALSE; + bus->ctrl_frame_stat = false; dhd_wait_event_wakeup(bus->dhd); } /* Send queued frames (limit 1 if rx may still be pending) */ @@ -4532,8 +4532,8 @@ clkwait: /* If we're done for now, turn off clock request. */ if ((bus->clkstate != CLK_PENDING) && bus->idletime == DHD_IDLE_IMMEDIATE) { - bus->activity = FALSE; - dhdsdio_clkctl(bus, CLK_NONE, FALSE); + bus->activity = false; + dhdsdio_clkctl(bus, CLK_NONE, false); } dhd_os_sdunlock(bus->dhd); @@ -4773,7 +4773,7 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq) if (pktlen < SDPCM_TEST_HDRLEN) { DHD_ERROR(("dhdsdio_restrcv: toss runt frame, pktlen %d\n", pktlen)); - PKTFREE(osh, pkt, FALSE); + PKTFREE(osh, pkt, false); return; } @@ -4791,7 +4791,7 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq) DHD_ERROR(("dhdsdio_testrcv: frame length mismatch, " "pktlen %d seq %d" " cmd %d extra %d len %d\n", pktlen, seq, cmd, extra, len)); - PKTFREE(osh, pkt, FALSE); + PKTFREE(osh, pkt, false); return; } } @@ -4806,14 +4806,14 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq) bus->pktgen_sent++; } else { bus->pktgen_fail++; - PKTFREE(osh, pkt, FALSE); + PKTFREE(osh, pkt, false); } bus->pktgen_rcvd++; break; case SDPCM_TEST_ECHORSP: if (bus->ext_loop) { - PKTFREE(osh, pkt, FALSE); + PKTFREE(osh, pkt, false); bus->pktgen_rcvd++; break; } @@ -4826,12 +4826,12 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq) break; } } - PKTFREE(osh, pkt, FALSE); + PKTFREE(osh, pkt, false); bus->pktgen_rcvd++; break; case SDPCM_TEST_DISCARD: - PKTFREE(osh, pkt, FALSE); + PKTFREE(osh, pkt, false); bus->pktgen_rcvd++; break; @@ -4841,7 +4841,7 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq) DHD_INFO(("dhdsdio_testrcv: unsupported or unknown command, " "pktlen %d seq %d" " cmd %d extra %d len %d\n", pktlen, seq, cmd, extra, len)); - PKTFREE(osh, pkt, FALSE); + PKTFREE(osh, pkt, false); break; } @@ -4850,7 +4850,7 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq) if (bus->pktgen_total && (bus->pktgen_rcvd >= bus->pktgen_total)) { bus->pktgen_count = 0; - dhdsdio_sdtest_set(bus, FALSE); + dhdsdio_sdtest_set(bus, false); } } } @@ -4865,11 +4865,11 @@ extern bool dhd_bus_watchdog(dhd_pub_t *dhdp) bus = dhdp->bus; if (bus->dhd->dongle_reset) - return FALSE; + return false; /* Ignore the timer if simulating bus down */ if (bus->sleeping) - return FALSE; + return false; dhd_os_sdlock(bus->dhd); @@ -4917,7 +4917,7 @@ extern bool dhd_bus_watchdog(dhd_pub_t *dhdp) if (bus->console.count >= dhd_console_ms) { bus->console.count -= dhd_console_ms; /* Make sure backplane clock is on */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); if (dhdsdio_readconsole(bus) < 0) dhd_console_ms = 0; /* On error, stop trying */ @@ -4929,7 +4929,7 @@ extern bool dhd_bus_watchdog(dhd_pub_t *dhdp) /* Generate packets if configured */ if (bus->pktgen_count && (++bus->pktgen_tick >= bus->pktgen_freq)) { /* Make sure backplane clock is on */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); bus->pktgen_tick = 0; dhdsdio_pktgen(bus); } @@ -4940,10 +4940,10 @@ extern bool dhd_bus_watchdog(dhd_pub_t *dhdp) if (++bus->idlecount >= bus->idletime) { bus->idlecount = 0; if (bus->activity) { - bus->activity = FALSE; + bus->activity = false; dhd_os_wd_timer(bus->dhd, dhd_watchdog_ms); } else { - dhdsdio_clkctl(bus, CLK_NONE, FALSE); + dhdsdio_clkctl(bus, CLK_NONE, false); } } } @@ -4977,7 +4977,7 @@ extern int dhd_bus_console_in(dhd_pub_t *dhdp, unsigned char *msg, uint msglen) /* Request clock to allow SDIO accesses */ BUS_WAKE(bus); /* No pend allowed since txpkt is called later, ht clk has to be on */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); /* Zero cbuf_index */ addr = bus->console_addr + offsetof(hndrte_cons_t, cbuf_idx); @@ -5008,7 +5008,7 @@ extern int dhd_bus_console_in(dhd_pub_t *dhdp, unsigned char *msg, uint msglen) done: if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) { - bus->activity = FALSE; + bus->activity = false; dhdsdio_clkctl(bus, CLK_NONE, true); } @@ -5055,7 +5055,7 @@ static bool dhdsdio_chipmatch(u16 chipid) return true; if (chipid == BCM4319_CHIP_ID) return true; - return FALSE; + return false; } static void *dhdsdio_probe(u16 venid, u16 devid, u16 bus_no, @@ -5078,8 +5078,8 @@ static void *dhdsdio_probe(u16 venid, u16 devid, u16 bus_no, dhd_alignctl = true; sd1idle = true; dhd_readahead = true; - retrydata = FALSE; - dhd_doflow = FALSE; + retrydata = false; + dhd_doflow = false; dhd_dongle_memsize = 0; dhd_txminmax = DHD_TXMINMAX; @@ -5157,7 +5157,7 @@ static void *dhdsdio_probe(u16 venid, u16 devid, u16 bus_no, bus->cl_devid = (u16) devid; bus->bus = DHD_BUS; bus->tx_seq = SDPCM_SEQUENCE_WRAP - 1; - bus->usebufpool = FALSE; /* Use bufpool if allocated, + bus->usebufpool = false; /* Use bufpool if allocated, else use locally malloced rxbuf */ /* attempt to attach to the dongle */ @@ -5375,7 +5375,7 @@ dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva, return true; fail: - return FALSE; + return false; } static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh) @@ -5437,7 +5437,7 @@ static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh) return true; fail: - return FALSE; + return false; } static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh) @@ -5455,8 +5455,8 @@ static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh) NULL); bus->dhd->busstate = DHD_BUS_DOWN; - bus->sleeping = FALSE; - bus->rxflow = FALSE; + bus->sleeping = false; + bus->rxflow = false; bus->prev_rxlim_hit = 0; /* Done with backplane-dependent accesses, can drop clock... */ @@ -5470,7 +5470,7 @@ static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh) /* Query the SD clock speed */ if (bcmsdh_iovar_op(sdh, "sd_divisor", NULL, 0, &bus->sd_divisor, sizeof(s32), - FALSE) != BCME_OK) { + false) != BCME_OK) { DHD_ERROR(("%s: fail on %s get\n", __func__, "sd_divisor")); bus->sd_divisor = -1; } else { @@ -5480,7 +5480,7 @@ static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh) /* Query the SD bus mode */ if (bcmsdh_iovar_op(sdh, "sd_mode", NULL, 0, - &bus->sd_mode, sizeof(s32), FALSE) != BCME_OK) { + &bus->sd_mode, sizeof(s32), false) != BCME_OK) { DHD_ERROR(("%s: fail on %s get\n", __func__, "sd_mode")); bus->sd_mode = -1; } else { @@ -5491,7 +5491,7 @@ static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh) /* Query the F2 block size, set roundup accordingly */ fnum = 2; if (bcmsdh_iovar_op(sdh, "sd_blocksize", &fnum, sizeof(s32), - &bus->blocksize, sizeof(s32), FALSE) != BCME_OK) { + &bus->blocksize, sizeof(s32), false) != BCME_OK) { bus->blocksize = 0; DHD_ERROR(("%s: fail on %s get\n", __func__, "sd_blocksize")); } else { @@ -5504,8 +5504,8 @@ static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh) default to use if supported */ if (bcmsdh_iovar_op(sdh, "sd_rxchain", NULL, 0, &bus->sd_rxchain, sizeof(s32), - FALSE) != BCME_OK) { - bus->sd_rxchain = FALSE; + false) != BCME_OK) { + bus->sd_rxchain = false; } else { DHD_INFO(("%s: bus module (through bcmsdh API) %s chaining\n", __func__, @@ -5535,11 +5535,11 @@ dhdsdio_download_firmware(struct dhd_bus *bus, osl_t *osh, void *sdh) bool ret; /* Download the firmware */ - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); ret = _dhdsdio_download_firmware(bus) == 0; - dhdsdio_clkctl(bus, CLK_SDONLY, FALSE); + dhdsdio_clkctl(bus, CLK_SDONLY, false); return ret; } @@ -5606,11 +5606,11 @@ static void dhdsdio_release_dongle(dhd_bus_t *bus, osl_t *osh) return; if (bus->sih) { - dhdsdio_clkctl(bus, CLK_AVAIL, FALSE); + dhdsdio_clkctl(bus, CLK_AVAIL, false); #if !defined(BCMLXSDMMC) si_watchdog(bus->sih, 4); #endif /* !defined(BCMLXSDMMC) */ - dhdsdio_clkctl(bus, CLK_NONE, FALSE); + dhdsdio_clkctl(bus, CLK_NONE, false); si_detach(bus->sih); if (bus->vars && bus->varsz) MFREE(osh, bus->vars, bus->varsz); @@ -5703,7 +5703,7 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus) memset(ularray, 0xaa, bus->ramsize); while ((offset + MEMBLOCK) < sizeof(dlarray)) { bcmerror = - dhdsdio_membytes(bus, FALSE, offset, + dhdsdio_membytes(bus, false, offset, ularray + offset, MEMBLOCK); if (bcmerror) { DHD_ERROR(("%s: error %d on reading %d membytes" @@ -5716,7 +5716,7 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus) } if (offset < sizeof(dlarray)) { - bcmerror = dhdsdio_membytes(bus, FALSE, offset, + bcmerror = dhdsdio_membytes(bus, false, offset, ularray + offset, sizeof(dlarray) - offset); if (bcmerror) { @@ -5810,7 +5810,7 @@ static uint process_nvram_vars(char *varbuf, uint len) dp = varbuf; - findNewline = FALSE; + findNewline = false; column = 0; for (n = 0; n < len; n++) { @@ -5820,7 +5820,7 @@ static uint process_nvram_vars(char *varbuf, uint len) continue; if (findNewline && varbuf[n] != '\n') continue; - findNewline = FALSE; + findNewline = false; if (varbuf[n] == '#') { findNewline = true; continue; @@ -5936,8 +5936,8 @@ static int _dhdsdio_download_firmware(struct dhd_bus *bus) { int bcmerror = -1; - bool embed = FALSE; /* download embedded firmware */ - bool dlok = FALSE; /* download firmware succeeded */ + bool embed = false; /* download embedded firmware */ + bool dlok = false; /* download firmware succeeded */ /* Out immediately if no image to download */ if ((bus->fw_path == NULL) || (bus->fw_path[0] == '\0')) { @@ -5965,7 +5965,7 @@ static int _dhdsdio_download_firmware(struct dhd_bus *bus) goto err; #endif } else { - embed = FALSE; + embed = false; dlok = true; } } @@ -5997,7 +5997,7 @@ static int _dhdsdio_download_firmware(struct dhd_bus *bus) } /* Take arm out of reset */ - if (dhdsdio_download_state(bus, FALSE)) { + if (dhdsdio_download_state(bus, false)) { DHD_ERROR(("%s: error getting out of ARM core reset\n", __func__)); goto err; @@ -6066,14 +6066,14 @@ int dhd_bus_devreset(dhd_pub_t *dhdp, u8 flag) /* Expect app to have torn down any connection before calling */ /* Stop the bus, disable F2 */ - dhd_bus_stop(bus, FALSE); + dhd_bus_stop(bus, false); /* Clean tx/rx buffer pointers, detach from the dongle */ dhdsdio_release_dongle(bus, bus->dhd->osh); bus->dhd->dongle_reset = true; - bus->dhd->up = FALSE; + bus->dhd->up = false; DHD_TRACE(("%s: WLAN OFF DONE\n", __func__)); /* App can now remove power from device */ @@ -6102,13 +6102,13 @@ int dhd_bus_devreset(dhd_pub_t *dhdp, u8 flag) /* Re-init bus, enable F2 transfer */ dhd_bus_init((dhd_pub_t *) bus->dhd, - FALSE); + false); #if defined(OOB_INTR_ONLY) dhd_enable_oob_intr(bus, true); #endif /* defined(OOB_INTR_ONLY) */ - bus->dhd->dongle_reset = FALSE; + bus->dhd->dongle_reset = false; bus->dhd->up = true; DHD_TRACE(("%s: WLAN ON DONE\n", @@ -6119,7 +6119,7 @@ int dhd_bus_devreset(dhd_pub_t *dhdp, u8 flag) bcmerror = BCME_SDIO_ERROR; } else { bcmerror = BCME_NOTDOWN; - DHD_ERROR(("%s: Set DEVRESET=FALSE invoked when device " + DHD_ERROR(("%s: Set DEVRESET=false invoked when device " "is on\n", __func__)); bcmerror = BCME_SDIO_ERROR; } diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index d05c86d..dfa793b 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -780,8 +780,8 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, return -EAGAIN; } - iscan_req = FALSE; - spec_scan = FALSE; + iscan_req = false; + spec_scan = false; if (request) { /* scan bss */ ssids = request->ssids; if (wl->iscan_on && (!ssids || !ssids->ssid_len)) { /* for @@ -984,7 +984,7 @@ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) if (changed & WIPHY_PARAM_RETRY_SHORT && (wl->conf->retry_short != wiphy->retry_short)) { wl->conf->retry_short = wiphy->retry_short; - err = wl_set_retry(ndev, wl->conf->retry_short, FALSE); + err = wl_set_retry(ndev, wl->conf->retry_short, false); if (!err) { return err; } @@ -1032,7 +1032,7 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, params->ssid, params->ssid_len); } if (bss) { - wl->ibss_starter = FALSE; + wl->ibss_starter = false; WL_DBG(("Found IBSS\n")); } else { wl->ibss_starter = true; @@ -1404,7 +1404,7 @@ wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, { struct wl_priv *wl = wiphy_to_wl(wiphy); scb_val_t scbval; - bool act = FALSE; + bool act = false; s32 err = 0; WL_DBG(("Reason %d\n", reason_code)); @@ -2344,7 +2344,7 @@ static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e) } } - return FALSE; + return false; } static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e) @@ -2359,7 +2359,7 @@ static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e) return true; } - return FALSE; + return false; } static bool wl_is_nonetwork(struct wl_priv *wl, const wl_event_msg_t *e) @@ -2372,7 +2372,7 @@ static bool wl_is_nonetwork(struct wl_priv *wl, const wl_event_msg_t *e) return true; } - return FALSE; + return false; } static s32 @@ -2402,7 +2402,7 @@ wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev, wl_link_down(wl); wl_init_prof(wl->profile); } else if (wl_is_nonetwork(wl, e)) { - wl_bss_connect_done(wl, ndev, e, data, FALSE); + wl_bss_connect_done(wl, ndev, e, data, false); } return err; @@ -2710,7 +2710,7 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev, scan_done_out: if (wl->scan_request) { - cfg80211_scan_done(wl->scan_request, FALSE); + cfg80211_scan_done(wl->scan_request, false); wl_set_mpc(ndev, 1); wl->scan_request = NULL; } @@ -2879,7 +2879,7 @@ static void wl_notify_iscan_complete(struct wl_iscan_ctrl *iscan, bool aborted) wl_set_mpc(ndev, 1); wl->scan_request = NULL; } - wl->iscan_kickstart = FALSE; + wl->iscan_kickstart = false; } static s32 wl_wakeup_iscan(struct wl_iscan_ctrl *iscan) @@ -2937,7 +2937,7 @@ static s32 wl_iscan_done(struct wl_priv *wl) iscan->state = WL_ISCAN_STATE_IDLE; rtnl_lock(); wl_inform_bss(wl); - wl_notify_iscan_complete(iscan, FALSE); + wl_notify_iscan_complete(iscan, false); rtnl_unlock(); return err; @@ -3102,19 +3102,19 @@ static s32 wl_init_priv(struct wl_priv *wl) wl->iscan_on = true; /* iscan on & off switch. we enable iscan per default */ #else - wl->iscan_on = FALSE; + wl->iscan_on = false; #endif /* WL_ISCAN_DISABLED */ #ifndef WL_ROAM_DISABLED wl->roam_on = true; /* roam on & off switch. we enable roam per default */ #else - wl->roam_on = FALSE; + wl->roam_on = false; #endif /* WL_ROAM_DISABLED */ - wl->iscan_kickstart = FALSE; + wl->iscan_kickstart = false; wl->active_scan = true; /* we do active scan for specific scan per default */ - wl->dongle_up = FALSE; /* dongle is not up yet */ + wl->dongle_up = false; /* dongle is not up yet */ wl_init_eq(wl); err = wl_init_priv_mem(wl); if (unlikely(err)) @@ -3137,7 +3137,7 @@ static s32 wl_init_priv(struct wl_priv *wl) static void wl_deinit_priv(struct wl_priv *wl) { wl_destroy_event_handler(wl); - wl->dongle_up = FALSE; /* dongle down */ + wl->dongle_up = false; /* dongle down */ wl_flush_eq(wl); wl_link_down(wl); wl_term_iscan(wl); @@ -3776,7 +3776,7 @@ static s32 __wl_cfg80211_up(struct wl_priv *wl) { s32 err = 0; - err = wl_config_dongle(wl, FALSE); + err = wl_config_dongle(wl, false); if (unlikely(err)) return err; @@ -3989,7 +3989,7 @@ static void wl_link_down(struct wl_priv *wl) { struct wl_connect_info *conn_info = wl_to_conn(wl); - wl->link_up = FALSE; + wl->link_up = false; kfree(conn_info->req_ie); conn_info->req_ie = NULL; conn_info->req_ie_len = 0; diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index 3ee4b54..0593bb5 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -1175,7 +1175,7 @@ static int _iscan_sysioc_thread(void *data) { u32 status; iscan_info_t *iscan = (iscan_info_t *) data; - static bool iscan_pass_abort = FALSE; + static bool iscan_pass_abort = false; status = WL_SCAN_RESULTS_PARTIAL; while (down_interruptible(&iscan->sysioc_sem) == 0) { @@ -1193,7 +1193,7 @@ static int _iscan_sysioc_thread(void *data) WL_TRACE(("%s Get results from specific scan " "status = %d\n", __func__, status)); wl_iw_send_scan_complete(iscan); - iscan_pass_abort = FALSE; + iscan_pass_abort = false; status = -1; } @@ -1255,7 +1255,7 @@ wl_iw_set_scan(struct net_device *dev, int error; WL_TRACE(("\n:%s dev:%s: SIOCSIWSCAN : SCAN\n", __func__, dev->name)); - g_set_essid_before_scan = FALSE; + g_set_essid_before_scan = false; #if defined(CSCAN) WL_ERROR(("%s: Scan from SIOCGIWSCAN not supported\n", __func__)); return -EINVAL; @@ -1413,7 +1413,7 @@ static bool ie_is_wpa_ie(u8 **wpaie, u8 **tlvs, int *tlvs_len) ie += ie[1] + 2; *tlvs_len -= (int)(ie - *tlvs); *tlvs = ie; - return FALSE; + return false; } static bool ie_is_wps_ie(u8 **wpsie, u8 **tlvs, int *tlvs_len) @@ -1429,7 +1429,7 @@ static bool ie_is_wps_ie(u8 **wpsie, u8 **tlvs, int *tlvs_len) ie += ie[1] + 2; *tlvs_len -= (int)(ie - *tlvs); *tlvs = ie; - return FALSE; + return false; } #endif /* WIRELESS_EXT > 17 */ @@ -2808,7 +2808,7 @@ wl_iw_set_wpaauth(struct net_device *dev, } } else if (val) { error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", - FALSE); + false); if (error) { WL_WSEC(("Failed to clear is_WPS_enrollee\n")); return error; @@ -2904,9 +2904,9 @@ wl_iw_set_wpaauth(struct net_device *dev, int wsec; if (paramval == 0) { - iw->privacy_invoked = FALSE; + iw->privacy_invoked = false; error = dev_wlc_intvar_set(dev, - "is_WPS_enrollee", FALSE); + "is_WPS_enrollee", false); if (error) { WL_WSEC(("Failed to clear iovar " "is_WPS_enrollee\n")); @@ -2930,7 +2930,7 @@ wl_iw_set_wpaauth(struct net_device *dev, } else { error = dev_wlc_intvar_set(dev, "is_WPS_enrollee", - FALSE); + false); if (error) { WL_WSEC(("Failed to clear " "is_WPS_enrollee\n")); @@ -3036,7 +3036,7 @@ wl_iw_get_wpaauth(struct net_device *dev, if (val) paramval = true; else - paramval = FALSE; + paramval = false; break; #if WIRELESS_EXT > 17 case IW_AUTH_ROAMING_CONTROL: @@ -3342,7 +3342,7 @@ wl_iw_conn_status_str(u32 event_type, u32 status, u32 reason, WL_INFORM(("Connection status: %s\n", stringBuf)); return true; } else { - return FALSE; + return false; } } @@ -3358,7 +3358,7 @@ wl_iw_check_conn_fail(wl_event_msg_t *e, char *stringBuf, uint buflen) if (wl_iw_conn_status_str(event, status, reason, stringBuf, buflen)) { return true; } else - return FALSE; + return false; } #endif |