From 0ac6fbb3c729bcd32b0d9012d0cc775cfd015cd1 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 23 Apr 2017 16:24:47 -0600 Subject: [PATCH] drivers/ieee80211/: Change all occurrences of _info, _warn, and _err to wlinfo, wlwarn, and wlerr. --- drivers/wireless/ieee80211/bcmf_cdc.c | 18 ++++----- drivers/wireless/ieee80211/bcmf_core.c | 22 +++++------ drivers/wireless/ieee80211/bcmf_driver.c | 10 ++--- drivers/wireless/ieee80211/bcmf_sdio.c | 26 ++++++------- drivers/wireless/ieee80211/bcmf_sdpcm.c | 24 ++++++------ drivers/wireless/ieee80211/bcmf_utils.c | 48 +++++++++++++----------- drivers/wireless/ieee80211/mmc_sdio.c | 26 ++++++------- 7 files changed, 89 insertions(+), 85 deletions(-) diff --git a/drivers/wireless/ieee80211/bcmf_cdc.c b/drivers/wireless/ieee80211/bcmf_cdc.c index b3f772963f4..79a8f050308 100644 --- a/drivers/wireless/ieee80211/bcmf_cdc.c +++ b/drivers/wireless/ieee80211/bcmf_cdc.c @@ -202,7 +202,7 @@ int bcmf_cdc_control_request(FAR struct bcmf_dev_s *priv, frame = bcmf_cdc_allocate_frame(priv, name, data, out_len); if (!frame) { - _err("Cannot allocate cdc frame\n"); + wlerr("Cannot allocate cdc frame\n"); ret = -ENOMEM; goto exit_sem_post; } @@ -224,7 +224,7 @@ int bcmf_cdc_control_request(FAR struct bcmf_dev_s *priv, ret = bcmf_sem_wait(&priv->control_timeout, CDC_CONTROL_TIMEOUT_MS); if (ret != OK) { - _err("Error while waiting for control response %d\n", ret); + wlerr("Error while waiting for control response %d\n", ret); goto exit_sem_post; } @@ -234,7 +234,7 @@ int bcmf_cdc_control_request(FAR struct bcmf_dev_s *priv, if (priv->control_status != 0) { - _err("Invalid cdc status 0x%x\n", priv->control_status); + wlerr("Invalid cdc status 0x%x\n", priv->control_status); ret = -EINVAL; } @@ -275,7 +275,7 @@ int bcmf_cdc_process_control_frame(FAR struct bcmf_dev_s *priv, if (data_size < sizeof(struct bcmf_cdc_header)) { - _err("Control frame too small\n"); + wlerr("Control frame too small\n"); return -EINVAL; } @@ -284,7 +284,7 @@ int bcmf_cdc_process_control_frame(FAR struct bcmf_dev_s *priv, if (data_size < cdc_header->len || data_size < sizeof(struct bcmf_cdc_header) + cdc_header->len) { - _err("Invalid control frame size\n"); + wlerr("Invalid control frame size\n"); return -EINVAL; } @@ -300,7 +300,7 @@ int bcmf_cdc_process_control_frame(FAR struct bcmf_dev_s *priv, { if (priv->control_rxdata_len > cdc_header->len) { - _err("Not enough data %d %d\n", + wlerr("Not enough data %d %d\n", priv->control_rxdata_len, cdc_header->len); priv->control_rxdata_len = cdc_header->len; } @@ -312,14 +312,14 @@ int bcmf_cdc_process_control_frame(FAR struct bcmf_dev_s *priv, return OK; } - _info("Got unexpected control frame\n"); + wlinfo("Got unexpected control frame\n"); return -EINVAL; } int bcmf_cdc_process_event_frame(FAR struct bcmf_dev_s *priv, struct bcmf_frame_s *frame) { - _info("Event message\n"); + wlinfo("Event message\n"); bcmf_hexdump(frame->base, frame->len, (unsigned long)frame->base); return OK; } @@ -327,7 +327,7 @@ int bcmf_cdc_process_event_frame(FAR struct bcmf_dev_s *priv, int bcmf_cdc_process_data_frame(FAR struct bcmf_dev_s *priv, struct bcmf_frame_s *frame) { - _info("Data message\n"); + wlinfo("Data message\n"); bcmf_hexdump(frame->base, frame->len, (unsigned long)frame->base); return OK; } \ No newline at end of file diff --git a/drivers/wireless/ieee80211/bcmf_core.c b/drivers/wireless/ieee80211/bcmf_core.c index a0bf4ab262e..77cd59f3145 100644 --- a/drivers/wireless/ieee80211/bcmf_core.c +++ b/drivers/wireless/ieee80211/bcmf_core.c @@ -165,7 +165,7 @@ int bcmf_upload_binary(FAR struct bcmf_sdio_dev_s *sbus, uint32_t address, address & SBSDIO_SB_OFT_ADDR_MASK, buf, size); if (ret != OK) { - _err("transfer failed %d %x %d\n", ret, address, size); + wlerr("transfer failed %d %x %d\n", ret, address, size); return ret; } @@ -186,7 +186,7 @@ int bcmf_upload_nvram(FAR struct bcmf_sdio_dev_s *sbus) nvram_sz = (*sbus->chip->nvram_image_size + 63) & (-64); - _info("nvram size is %d %d bytes\n", nvram_sz, + wlinfo("nvram size is %d %d bytes\n", nvram_sz, *sbus->chip->nvram_image_size); /* Write image */ @@ -262,7 +262,7 @@ int bcmf_core_upload_firmware(FAR struct bcmf_sdio_dev_s *sbus) { int ret; - _info("upload firmware\n"); + wlinfo("upload firmware\n"); /* Disable ARMCM3 core and reset SOCRAM core * to set device in firmware upload mode */ @@ -274,23 +274,23 @@ int bcmf_core_upload_firmware(FAR struct bcmf_sdio_dev_s *sbus) /* Flash chip firmware */ - _info("firmware size is %d bytes\n", *sbus->chip->firmware_image_size); + wlinfo("firmware size is %d bytes\n", *sbus->chip->firmware_image_size); ret = bcmf_upload_binary(sbus, 0, sbus->chip->firmware_image, *sbus->chip->firmware_image_size); if (ret != OK) { - _err("Failed to upload firmware\n"); + wlerr("Failed to upload firmware\n"); return ret; } /* Flash NVRAM configuration file */ - _info("upload nvram configuration\n"); + wlinfo("upload nvram configuration\n"); ret = bcmf_upload_nvram(sbus); if (ret != OK) { - _err("Failed to upload nvram\n"); + wlerr("Failed to upload nvram\n"); return ret; } @@ -304,7 +304,7 @@ int bcmf_core_upload_firmware(FAR struct bcmf_sdio_dev_s *sbus) up_mdelay(10); if (!bcmf_core_isup(sbus, WLAN_ARMCM3_CORE_ID)) { - _err("Cannot start ARMCM3 core\n"); + wlerr("Cannot start ARMCM3 core\n"); return -ETIMEDOUT; } @@ -317,7 +317,7 @@ bool bcmf_core_isup(FAR struct bcmf_sdio_dev_s *sbus, unsigned int core) if (core >= MAX_CORE_ID) { - _err("Invalid core id %d\n", core); + wlerr("Invalid core id %d\n", core); return false; } uint32_t base = sbus->chip->core_base[core]; @@ -340,7 +340,7 @@ void bcmf_core_disable(FAR struct bcmf_sdio_dev_s *sbus, unsigned int core) if (core >= MAX_CORE_ID) { - _err("Invalid core id %d\n", core); + wlerr("Invalid core id %d\n", core); return; } uint32_t base = sbus->chip->core_base[core]; @@ -378,7 +378,7 @@ void bcmf_core_reset(FAR struct bcmf_sdio_dev_s *sbus, unsigned int core) if (core >= MAX_CORE_ID) { - _err("Invalid core id %d\n", core); + wlerr("Invalid core id %d\n", core); return; } uint32_t base = sbus->chip->core_base[core]; diff --git a/drivers/wireless/ieee80211/bcmf_driver.c b/drivers/wireless/ieee80211/bcmf_driver.c index a30659b2266..828de645f00 100644 --- a/drivers/wireless/ieee80211/bcmf_driver.c +++ b/drivers/wireless/ieee80211/bcmf_driver.c @@ -151,7 +151,7 @@ int bcmf_wl_set_mac_address(FAR struct bcmf_dev_s *priv, uint8_t *addr) return ret; } - _info("MAC address updated %02X:%02X:%02X:%02X:%02X:%02X\n", + wlinfo("MAC address updated %02X:%02X:%02X:%02X:%02X:%02X\n", addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); memcpy(priv->mac_addr, addr, 6); @@ -312,7 +312,7 @@ int bcmf_run_escan(FAR struct bcmf_dev_s *priv) params->params.channel_num = 0; - _info("start scan\n"); + wlinfo("start scan\n"); out_len = sizeof(*params); ret = bcmf_cdc_iovar_request(priv, CHIP_STA_INTERFACE, true, @@ -365,7 +365,7 @@ int bcmf_wl_initialize(FAR struct bcmf_dev_s *priv) memcpy(priv->mac_addr, tmp_buf, 6); - _info("MAC address is %02X:%02X:%02X:%02X:%02X:%02X\n", + wlinfo("MAC address is %02X:%02X:%02X:%02X:%02X:%02X\n", tmp_buf[0], tmp_buf[1], tmp_buf[2], tmp_buf[3], tmp_buf[4], tmp_buf[5]); @@ -387,7 +387,7 @@ int bcmf_wl_initialize(FAR struct bcmf_dev_s *priv) tmp_buf[out_len-1] = 0; } - _info("fw version <%s>\n", tmp_buf); + wlinfo("fw version <%s>\n", tmp_buf); /* FIXME Configure event mask to enable all asynchronous events */ @@ -412,7 +412,7 @@ int bcmf_sdio_initialize(int minor, FAR struct sdio_dev_s *dev) int ret; FAR struct bcmf_dev_s *priv; - _info("minor: %d\n", minor); + wlinfo("minor: %d\n", minor); priv = bcmf_allocate_device(); if (!priv) diff --git a/drivers/wireless/ieee80211/bcmf_sdio.c b/drivers/wireless/ieee80211/bcmf_sdio.c index 178e716187e..6df441faaa1 100644 --- a/drivers/wireless/ieee80211/bcmf_sdio.c +++ b/drivers/wireless/ieee80211/bcmf_sdio.c @@ -155,7 +155,7 @@ int bcmf_sdio_bus_sleep(FAR struct bcmf_sdio_dev_s *sbus, bool sleep) SBSDIO_HT_AVAIL_REQ | SBSDIO_FORCE_HT); if (ret != OK) { - _err("HT Avail request failed %d\n", ret); + wlerr("HT Avail request failed %d\n", ret); return ret; } @@ -181,7 +181,7 @@ int bcmf_sdio_bus_sleep(FAR struct bcmf_sdio_dev_s *sbus, bool sleep) if (loops <= 0) { - _err("HT clock not ready\n"); + wlerr("HT clock not ready\n"); return -ETIMEDOUT; } @@ -254,7 +254,7 @@ int bcmf_probe(FAR struct bcmf_sdio_dev_s *sbus) exit_error: - _err("ERROR: failed to probe device %d\n", sbus->minor); + wlerr("ERROR: failed to probe device %d\n", sbus->minor); return ret; } @@ -300,7 +300,7 @@ int bcmf_businitialize(FAR struct bcmf_sdio_dev_s *sbus) if (loops <= 0) { - _err("failed to enable ALP\n"); + wlerr("failed to enable ALP\n"); return -ETIMEDOUT; } @@ -651,7 +651,7 @@ int bcmf_bus_sdio_initialize(FAR struct bcmf_dev_s *priv, if (ret <= 0) { - _err("Cannot spawn bcmf thread\n"); + wlerr("Cannot spawn bcmf thread\n"); ret = -EBADE; goto exit_uninit_hw; } @@ -684,19 +684,19 @@ int bcmf_chipinitialize(FAR struct bcmf_sdio_dev_s *sbus) { return ret; } - _info("chip id is 0x%x\n", value); + wlinfo("chip id is 0x%x\n", value); int chipid = value & 0xffff; switch (chipid) { #ifdef CONFIG_IEEE80211_BROADCOM_BCM43362 case SDIO_DEVICE_ID_BROADCOM_43362: - _info("bcm43362 chip detected\n"); + wlinfo("bcm43362 chip detected\n"); sbus->chip = (struct bcmf_sdio_chip*)&bcmf_43362_config_sdio; break; #endif default: - _err("chip 0x%x is not supported\n", chipid); + wlerr("chip 0x%x is not supported\n", chipid); return -ENODEV; } return OK; @@ -718,7 +718,7 @@ int bcmf_sdio_thread(int argc, char **argv) FAR struct bcmf_dev_s *priv = g_sdio_priv; FAR struct bcmf_sdio_dev_s *sbus = (FAR struct bcmf_sdio_dev_s*)priv->bus; - _info("Enter\n"); + wlinfo("Enter\n"); /* FIXME wait for the chip to be ready to receive commands */ @@ -731,7 +731,7 @@ int bcmf_sdio_thread(int argc, char **argv) ret = sem_wait(&sbus->thread_signal); if (ret != OK) { - _err("Error while waiting for semaphore\n"); + wlerr("Error while waiting for semaphore\n"); break; } @@ -759,14 +759,14 @@ int bcmf_sdio_thread(int argc, char **argv) bcmf_write_sbregw(sbus, CORE_BUS_REG(sbus->chip->core_base[SDIOD_CORE_ID], intstatus), sbus->intstatus); - // _info("intstatus %x\n", sbus->intstatus); + // wlinfo("intstatus %x\n", sbus->intstatus); } /* On frame indication, read available frames */ if (sbus->intstatus & I_HMB_FRAME_IND) { - // _info("Frames available\n"); + // wlinfo("Frames available\n"); do { @@ -794,7 +794,7 @@ int bcmf_sdio_thread(int argc, char **argv) // bcmf_sdio_bus_sleep(sbus, true); } - _info("Exit\n"); + wlinfo("Exit\n"); return 0; } \ No newline at end of file diff --git a/drivers/wireless/ieee80211/bcmf_sdpcm.c b/drivers/wireless/ieee80211/bcmf_sdpcm.c index b363bba249d..e6146b5af85 100644 --- a/drivers/wireless/ieee80211/bcmf_sdpcm.c +++ b/drivers/wireless/ieee80211/bcmf_sdpcm.c @@ -147,19 +147,19 @@ int bcmf_sdpcm_process_header(FAR struct bcmf_sdio_dev_s *sbus, if (header->data_offset < sizeof(struct bcmf_sdpcm_header) || header->data_offset > header->size) { - _err("Invalid data offset\n"); + wlerr("Invalid data offset\n"); bcmf_sdpcm_rxfail(sbus, false); return -ENXIO; } /* Update tx credits */ - // _info("update credit %x %x %x\n", header->credit, + // wlinfo("update credit %x %x %x\n", header->credit, // sbus->tx_seq, sbus->max_seq); if (header->credit - sbus->tx_seq > 0x40) { - _err("seq %d: max tx seq number error\n", sbus->tx_seq); + wlerr("seq %d: max tx seq number error\n", sbus->tx_seq); sbus->max_seq = sbus->tx_seq + 2; } else @@ -194,7 +194,7 @@ int bcmf_sdpcm_readframe(FAR struct bcmf_dev_s *priv) ret = bcmf_transfer_bytes(sbus, false, 2, 0, (uint8_t*)header, 4); if (ret != OK) { - _info("failread size\n"); + wlinfo("failread size\n"); ret = -EIO; goto exit_abort; } @@ -211,7 +211,7 @@ int bcmf_sdpcm_readframe(FAR struct bcmf_dev_s *priv) if (((~len & 0xffff) ^ checksum) || len < sizeof(struct bcmf_sdpcm_header)) { - _err("Invalid header checksum or len %x %x\n", len, checksum); + wlerr("Invalid header checksum or len %x %x\n", len, checksum); ret = -EINVAL; goto exit_abort; } @@ -219,7 +219,7 @@ int bcmf_sdpcm_readframe(FAR struct bcmf_dev_s *priv) // FIXME define for size if (len > sizeof(tmp_buffer)) { - _err("Frame is too large, cancel %d\n", len); + wlerr("Frame is too large, cancel %d\n", len); ret = -ENOMEM; goto exit_abort; } @@ -234,7 +234,7 @@ int bcmf_sdpcm_readframe(FAR struct bcmf_dev_s *priv) goto exit_free_abort; } - // _info("Receive frame\n"); + // wlinfo("Receive frame\n"); // bcmf_hexdump((uint8_t*)header, header->size, (unsigned int)header); /* Process and validate header */ @@ -242,7 +242,7 @@ int bcmf_sdpcm_readframe(FAR struct bcmf_dev_s *priv) ret = bcmf_sdpcm_process_header(sbus, header); if (ret != OK) { - _err("Error while processing header %d\n", ret); + wlerr("Error while processing header %d\n", ret); ret = -EINVAL; goto exit_free_frame; } @@ -270,7 +270,7 @@ int bcmf_sdpcm_readframe(FAR struct bcmf_dev_s *priv) break; default: - _err("Got unexpected message type %d\n", header->channel); + wlerr("Got unexpected message type %d\n", header->channel); ret = OK; } @@ -302,7 +302,7 @@ int bcmf_sdpcm_sendframe(FAR struct bcmf_dev_s *priv) if (sbus->tx_seq == sbus->max_seq) { // TODO handle this case - _err("No credit to send frame\n"); + wlerr("No credit to send frame\n"); return -EAGAIN; } @@ -320,7 +320,7 @@ int bcmf_sdpcm_sendframe(FAR struct bcmf_dev_s *priv) header->sequence = sbus->tx_seq++; - // _info("Send frame\n"); + // wlinfo("Send frame\n"); // bcmf_hexdump(sframe->frame_header.base, sframe->frame_header.len, // (unsigned long)sframe->frame_header.base); @@ -328,7 +328,7 @@ int bcmf_sdpcm_sendframe(FAR struct bcmf_dev_s *priv) sframe->frame_header.len); if (ret != OK) { - _info("fail send frame %d\n", ret); + wlinfo("fail send frame %d\n", ret); ret = -EIO; goto exit_abort; // TODO handle retry count and remove frame from queue + abort TX diff --git a/drivers/wireless/ieee80211/bcmf_utils.c b/drivers/wireless/ieee80211/bcmf_utils.c index 3b0fbf4b411..dbd53b06196 100644 --- a/drivers/wireless/ieee80211/bcmf_utils.c +++ b/drivers/wireless/ieee80211/bcmf_utils.c @@ -15,31 +15,35 @@ void bcmf_hexdump(uint8_t *data, unsigned int len, unsigned long offset) { - unsigned int i; - unsigned int char_count = 0; - char char_line[20]; - char hex_line[64]; + unsigned int i; + unsigned int char_count = 0; + char char_line[20]; + char hex_line[64]; - for(i = 0; i < len; i++) - { - if (char_count >= LINE_LEN) { - /* Flush line */ - _info("%08x: %s%s\n", offset+i-char_count, hex_line, char_line); - char_count = 0; - } + for(i = 0; i < len; i++) + { + if (char_count >= LINE_LEN) + { + /* Flush line */ - sprintf(hex_line+3*char_count, "%02x ", data[i]); - sprintf(char_line+char_count, "%c", - data[i] < 0x20 || data[i] >= 0x7f? '.': data[i]); - char_count ++; - } + wlinfo("%08x: %s%s\n", offset+i-char_count, hex_line, char_line); + char_count = 0; + } - if (char_count > 0) { - /* Flush last line */ - memset(hex_line+3*char_count, ' ', 3*(LINE_LEN-char_count)); - hex_line[3*LINE_LEN] = 0; - _info("%08x: %s%s\n", offset+i-char_count, hex_line, char_line); - } + sprintf(hex_line+3*char_count, "%02x ", data[i]); + sprintf(char_line+char_count, "%c", + data[i] < 0x20 || data[i] >= 0x7f? '.': data[i]); + char_count ++; + } + + if (char_count > 0) + { + /* Flush last line */ + + memset(hex_line+3*char_count, ' ', 3*(LINE_LEN-char_count)); + hex_line[3*LINE_LEN] = 0; + wlinfo("%08x: %s%s\n", offset+i-char_count, hex_line, char_line); + } } /**************************************************************************** diff --git a/drivers/wireless/ieee80211/mmc_sdio.c b/drivers/wireless/ieee80211/mmc_sdio.c index 947c71a956e..39c41391602 100644 --- a/drivers/wireless/ieee80211/mmc_sdio.c +++ b/drivers/wireless/ieee80211/mmc_sdio.c @@ -60,7 +60,7 @@ int sdio_sendcmdpoll(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) ret = SDIO_WAITRESPONSE(dev, cmd); if (ret != OK) { - _err("ERROR: Wait for response to cmd: %08x failed: %d\n", + wlerr("ERROR: Wait for response to cmd: %08x failed: %d\n", cmd, ret); } } @@ -98,7 +98,7 @@ int sdio_io_rw_direct(FAR struct sdio_dev_s *dev, bool write, if (ret != OK) { - _err("ERROR: SDIO_RECVR5 failed %d\n", ret); + wlerr("ERROR: SDIO_RECVR5 failed %d\n", ret); return ret; } @@ -144,7 +144,7 @@ int sdio_io_rw_extended(FAR struct sdio_dev_s *dev, bool write, { /* Use byte mode */ - // _info("byte mode\n"); + // wlinfo("byte mode\n"); arg.cmd53.block_mode = 0; arg.cmd53.byte_block_count = blocklen; nblocks = 1; @@ -165,7 +165,7 @@ int sdio_io_rw_extended(FAR struct sdio_dev_s *dev, bool write, if (write) { - // _info("prep write %d %d\n", blocklen, nblocks); + // wlinfo("prep write %d %d\n", blocklen, nblocks); sdio_sendcmdpoll(dev, SDIO_ACMD53, (uint32_t)arg.value); ret = SDIO_RECVR5(dev, SDIO_ACMD53, (uint32_t*)&resp); @@ -174,7 +174,7 @@ int sdio_io_rw_extended(FAR struct sdio_dev_s *dev, bool write, } else { - // _info("prep read %d\n", blocklen * nblocks); + // wlinfo("prep read %d\n", blocklen * nblocks); SDIO_RECVSETUP(dev, buf, blocklen * nblocks); SDIO_SENDCMD(dev, SDIO_ACMD53, (uint32_t)arg.value); @@ -184,7 +184,7 @@ int sdio_io_rw_extended(FAR struct sdio_dev_s *dev, bool write, if (ret != OK) { - _err("ERROR: SDIO_RECVR5 failed %d\n", ret); + wlerr("ERROR: SDIO_RECVR5 failed %d\n", ret); return ret; } @@ -192,17 +192,17 @@ int sdio_io_rw_extended(FAR struct sdio_dev_s *dev, bool write, if (wkupevent & SDIOWAIT_TIMEOUT) { - _err("timeout\n"); + wlerr("timeout\n"); return -ETIMEDOUT; } if (resp.flags.error || (wkupevent & SDIOWAIT_ERROR)) { - _err("error 1\n"); + wlerr("error 1\n"); return -EIO; } if (resp.flags.function_number || resp.flags.out_of_range) { - _err("error 2\n"); + wlerr("error 2\n"); return -EINVAL; } @@ -266,11 +266,11 @@ int sdio_probe(FAR struct sdio_dev_s *dev) ret = SDIO_RECVR6(dev, SD_CMD3, &data); if (ret != OK) { - _err("ERROR: RCA request failed: %d\n", ret); + wlerr("ERROR: RCA request failed: %d\n", ret); return ret; } - _info("rca is %x\n", data >> 16); + wlinfo("rca is %x\n", data >> 16); /* Send CMD7 with the argument == RCA in order to select the card * and put it in Transfer State */ @@ -280,7 +280,7 @@ int sdio_probe(FAR struct sdio_dev_s *dev) ret = SDIO_RECVR1(dev, MMCSD_CMD7S, &data); if (ret != OK) { - _err("ERROR: card selection failed: %d\n", ret); + wlerr("ERROR: card selection failed: %d\n", ret); return ret; } @@ -358,7 +358,7 @@ int sdio_enable_function(FAR struct sdio_dev_s *dev, uint8_t function) { /* Function enabled */ - _info("Function %d enabled\n", function); + wlinfo("Function %d enabled\n", function); return OK; } }