diff options
43 files changed, 732 insertions, 574 deletions
diff --git a/halimpl/bcm2079x/adaptation/patchram.cpp b/halimpl/bcm2079x/adaptation/patchram.cpp index cb03d25..f4f01ac 100644 --- a/halimpl/bcm2079x/adaptation/patchram.cpp +++ b/halimpl/bcm2079x/adaptation/patchram.cpp @@ -135,7 +135,8 @@ static long getFileLength(FILE* fp) { static bool isFileExist(const char* pFilename) { FILE* pf; - if ((pf = fopen(pFilename, "r")) != NULL) { + pf = fopen(pFilename, "r"); + if (pf != NULL) { fclose(pf); return TRUE; } @@ -391,10 +392,12 @@ static void StartPatchDownload(uint32_t chipid) { FILE* fd; /* If an I2C fix patch file was specified, then tell the stack about it */ if (sPrePatchFn[0] != '\0') { - if ((fd = fopen(sPrePatchFn, "rb")) != NULL) { + fd = fopen(sPrePatchFn, "rb"); + if (fd != NULL) { uint32_t lenPrmBuffer = getFileLength(fd); - if ((sI2cFixPrmBuf = malloc(lenPrmBuffer)) != NULL) { + sI2cFixPrmBuf = malloc(lenPrmBuffer); + if (sI2cFixPrmBuf != NULL) { size_t actualLen = fread(sI2cFixPrmBuf, 1, lenPrmBuffer, fd); if (actualLen == lenPrmBuffer) { ALOGD("%s Setting I2C fix to %s (size: %lu)", __func__, sPrePatchFn, @@ -424,11 +427,13 @@ static void StartPatchDownload(uint32_t chipid) { uint32_t bDownloadStarted = false; /* open patchfile, read it into a buffer */ - if ((fd = fopen(sPatchFn, "rb")) != NULL) { + fd = fopen(sPatchFn, "rb"); + if (fd != NULL) { uint32_t lenPrmBuffer = getFileLength(fd); ALOGD("%s Downloading patchfile %s (size: %lu) format=%u", __func__, sPatchFn, lenPrmBuffer, NFC_HAL_PRM_FORMAT_NCD); - if ((sPrmBuf = malloc(lenPrmBuffer)) != NULL) { + sPrmBuf = malloc(lenPrmBuffer); + if (sPrmBuf != NULL) { size_t actualLen = fread(sPrmBuf, 1, lenPrmBuffer, fd); if (actualLen == lenPrmBuffer) { if (!SpdHelper::isPatchBad((uint8_t*)sPrmBuf, lenPrmBuffer)) { diff --git a/halimpl/bcm2079x/adaptation/userial_linux.c b/halimpl/bcm2079x/adaptation/userial_linux.c index d7469d9..3313a2e 100644 --- a/halimpl/bcm2079x/adaptation/userial_linux.c +++ b/halimpl/bcm2079x/adaptation/userial_linux.c @@ -743,7 +743,8 @@ uint32_t userial_read_thread(uint32_t arg) { NFC_HDR* p_buf; uint8_t* current_packet; - if ((p_buf = (NFC_HDR*)GKI_getpoolbuf(USERIAL_POOL_ID)) != NULL) { + p_buf = (NFC_HDR*)GKI_getpoolbuf(USERIAL_POOL_ID); + if (p_buf != NULL) { p_buf->offset = 0; p_buf->layer_specific = 0; @@ -1012,7 +1013,8 @@ void USERIAL_Open(tUSERIAL_PORT port, tUSERIAL_OPEN_CFG* p_cfg, { ALOGD("%s Opening %s\n", __func__, device_name); - if ((linux_cb.sock = open((char*)device_name, O_RDWR | O_NOCTTY)) == -1) { + linux_cb.sock = open((char*)device_name, O_RDWR | O_NOCTTY); + if (linux_cb.sock == -1) { ALOGI("%s unable to open %s", __func__, device_name); GKI_send_event(NFC_HAL_TASK, NFC_HAL_TASK_EVT_TERMINATE); goto done_open; @@ -1024,8 +1026,9 @@ void USERIAL_Open(tUSERIAL_PORT port, tUSERIAL_OPEN_CFG* p_cfg, if (strcmp(power_control_dev, userial_dev) == 0) linux_cb.sock_power_control = linux_cb.sock; else { - if ((linux_cb.sock_power_control = - open((char*)power_control_dev, O_RDWR | O_NOCTTY)) == -1) { + linux_cb.sock_power_control = + open((char*)power_control_dev, O_RDWR | O_NOCTTY); + if (linux_cb.sock_power_control == -1) { ALOGI("%s unable to open %s", __func__, power_control_dev); } } diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_api.c b/halimpl/bcm2079x/hal/hal/nfc_hal_api.c index 73573f8..b40bcc4 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_api.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_api.c @@ -152,7 +152,8 @@ void HAL_NfcCoreInitialized(uint16_t data_len, size = p_core_init_rsp_params[2] + NCI_MSG_HDR_SIZE; /* Send message to NFC_HAL_TASK */ - if ((p_msg = (NFC_HDR*)GKI_getbuf((uint16_t)(size + NFC_HDR_SIZE))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf((uint16_t)(size + NFC_HDR_SIZE)); + if (p_msg != NULL) { p_msg->event = NFC_HAL_EVT_POST_CORE_RESET; p_msg->offset = 0; p_msg->len = size; @@ -187,7 +188,8 @@ void HAL_NfcWrite(uint16_t data_len, uint8_t* p_data) { } /* Send message to NFC_HAL_TASK */ - if ((p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID)) != NULL) { + p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID); + if (p_msg != NULL) { p_msg->event = NFC_HAL_EVT_TO_NFC_NCI; p_msg->offset = NFC_HAL_NCI_MSG_OFFSET_SIZE; p_msg->len = data_len; @@ -227,7 +229,8 @@ bool HAL_NfcPreDiscover(void) { if (p_nfc_hal_pre_discover_cfg && *p_nfc_hal_pre_discover_cfg) { status = true; /* Send message to NFC_HAL_TASK */ - if ((p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID)) != NULL) { + p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID); + if (p_msg != NULL) { p_msg->event = NFC_HAL_EVT_PRE_DISCOVER; GKI_send_msg(NFC_HAL_TASK, NFC_HAL_TASK_MBOX, p_msg); } @@ -260,7 +263,8 @@ void HAL_NfcControlGranted(void) { HAL_TRACE_API0("HAL_NfcControlGranted ()"); /* Send message to NFC_HAL_TASK */ - if ((p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID)) != NULL) { + p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID); + if (p_msg != NULL) { p_msg->event = NFC_HAL_EVT_CONTROL_GRANTED; GKI_send_msg(NFC_HAL_TASK, NFC_HAL_TASK_MBOX, p_msg); } diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_dm.c b/halimpl/bcm2079x/hal/hal/nfc_hal_dm.c index a07dfc9..b2fec1b 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_dm.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_dm.c @@ -98,8 +98,8 @@ tHAL_NFC_STATUS nfc_hal_dm_set_config(uint8_t tlv_size, uint8_t* p_param_tlvs, return status; } - if ((p_buff = (uint8_t*)GKI_getbuf( - (uint16_t)(NCI_MSG_HDR_SIZE + tlv_size))) != NULL) { + p_buff = (uint8_t*)GKI_getbuf((uint16_t)(NCI_MSG_HDR_SIZE + tlv_size)); + if (p_buff != NULL) { p = p_buff; NCI_MSG_BLD_HDR0(p, NCI_MT_CMD, NCI_GID_CORE); @@ -843,7 +843,8 @@ void nfc_hal_dm_send_nci_cmd(const uint8_t* p_data, uint16_t len, return; } - if ((p_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID)) != NULL) { + p_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID); + if (p_buf != NULL) { nfc_hal_cb.ncit_cb.nci_wait_rsp = NFC_HAL_WAIT_RSP_VSC; p_buf->offset = NFC_HAL_NCI_MSG_OFFSET_SIZE; @@ -954,7 +955,8 @@ void nfc_hal_dm_send_bt_cmd(const uint8_t* p_data, uint16_t len, return; } - if ((p_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID)) != NULL) { + p_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID); + if (p_buf != NULL) { nfc_hal_cb.ncit_cb.nci_wait_rsp = NFC_HAL_WAIT_RSP_PROP; p_buf->offset = NFC_HAL_NCI_MSG_OFFSET_SIZE; diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_hci.c b/halimpl/bcm2079x/hal/hal/nfc_hal_hci.c index 6c99253..1033327 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_hci.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_hci.c @@ -157,8 +157,9 @@ void nfc_hal_hci_enable(void) { ((!nfc_hal_cb.hci_cb.hci_fw_workaround) || (nfc_hal_cb.nvm_cb.nvm_type == NCI_SPD_NVM_TYPE_EEPROM))) || (p_nfc_hal_cfg->nfc_hal_hci_uicc_support & HAL_NFC_HCI_UICC2_HOST)) { - if ((p_hci_netwk_cmd = (uint8_t*)GKI_getbuf( - NCI_MSG_HDR_SIZE + NFC_HAL_HCI_NETWK_INFO_SIZE)) == NULL) { + p_hci_netwk_cmd = + (uint8_t*)GKI_getbuf(NCI_MSG_HDR_SIZE + NFC_HAL_HCI_NETWK_INFO_SIZE); + if (p_hci_netwk_cmd == NULL) { HAL_TRACE_ERROR0( "nfc_hal_hci_enable: unable to allocate buffer for reading hci " "network info from nvram"); @@ -312,7 +313,8 @@ void nfc_hal_hci_fake_adm_notify_all_pipe_cleared_to_dh(void) { NFC_HAL_HCI_HOST_ID_UICC1); /* Start of new message. Allocate a buffer for message */ - if ((p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID)) != NULL) { + p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID); + if (p_msg != NULL) { /* Initialize NFC_HDR */ p_msg->len = NCI_DATA_HDR_SIZE + 0x03; p_msg->event = 0; @@ -744,8 +746,9 @@ void nfc_hal_hci_set_next_hci_netwk_config(uint8_t block) { p_nfc_hal_cfg->nfc_hal_hci_uicc_support, nfc_hal_cb.nvm_cb.nvm_type); case HC_F5_NV_BLOCK: - if ((p_hci_netwk_cmd = (uint8_t*)GKI_getbuf( - NCI_MSG_HDR_SIZE + NFC_HAL_HCI_DH_NETWK_INFO_SIZE)) == NULL) { + p_hci_netwk_cmd = (uint8_t*)GKI_getbuf(NCI_MSG_HDR_SIZE + + NFC_HAL_HCI_DH_NETWK_INFO_SIZE); + if (p_hci_netwk_cmd == NULL) { HAL_TRACE_ERROR0( "nfc_hal_hci_set_next_hci_netwk_config: unable to allocate buffer " "for reading hci network info from nvram"); diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_hci_ci.c b/halimpl/bcm2079x/hal/hal/nfc_hal_hci_ci.c index 3e92b5d..73bf6a5 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_hci_ci.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_hci_ci.c @@ -44,8 +44,8 @@ void nfc_hal_nv_ci_read(uint16_t num_bytes_read, tNFC_HAL_NV_CO_STATUS status, tNFC_HAL_HCI_EVENT_DATA* p_msg; /* Send message to NCIT task */ - if ((p_msg = (tNFC_HAL_HCI_EVENT_DATA*)GKI_getbuf( - sizeof(tNFC_HAL_HCI_EVENT_DATA))) != NULL) { + p_msg = (tNFC_HAL_HCI_EVENT_DATA*)GKI_getbuf(sizeof(tNFC_HAL_HCI_EVENT_DATA)); + if (p_msg != NULL) { p_msg->nv_read.hdr.event = NFC_HAL_HCI_RSP_NV_READ_EVT; p_msg->hdr.offset = 0; p_msg->hdr.len = sizeof(tNFC_HAL_HCI_RSP_NV_READ_EVT); @@ -75,8 +75,8 @@ void nfc_hal_nv_ci_read(uint16_t num_bytes_read, tNFC_HAL_NV_CO_STATUS status, void nfc_hal_nv_ci_write(tNFC_HAL_NV_CO_STATUS status) { tNFC_HAL_HCI_EVENT_DATA* p_msg; - if ((p_msg = (tNFC_HAL_HCI_EVENT_DATA*)GKI_getbuf( - sizeof(tNFC_HAL_HCI_EVENT_DATA))) != NULL) { + p_msg = (tNFC_HAL_HCI_EVENT_DATA*)GKI_getbuf(sizeof(tNFC_HAL_HCI_EVENT_DATA)); + if (p_msg != NULL) { p_msg->nv_write.hdr.event = NFC_HAL_HCI_RSP_NV_WRITE_EVT; p_msg->nv_write.hdr.offset = 0; p_msg->nv_write.hdr.len = sizeof(tNFC_HAL_HCI_RSP_NV_READ_EVT); diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_main.c b/halimpl/bcm2079x/hal/hal/nfc_hal_main.c index 118f678..7b4e79b 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_main.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_main.c @@ -372,7 +372,8 @@ void nfc_hal_main_start_quick_timer(TIMER_LIST_ENT* p_tle, uint16_t type, /* if timer starts on other than NCIT task (script wrapper) */ if (GKI_get_taskid() != NFC_HAL_TASK) { /* post event to start timer in NCIT task */ - if ((p_msg = (NFC_HDR*)GKI_getbuf(NFC_HDR_SIZE)) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(NFC_HDR_SIZE); + if (p_msg != NULL) { p_msg->event = NFC_HAL_EVT_TO_START_QUICK_TIMER; GKI_send_msg(NFC_HAL_TASK, NFC_HAL_TASK_MBOX, p_msg); } @@ -476,7 +477,8 @@ static void nfc_hal_send_credit_ntf_for_cid(uint8_t cid) { uint8_t *p, *ps; /* Start of new message. Allocate a buffer for message */ - if ((p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID)) != NULL) { + p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID); + if (p_msg != NULL) { /* Initialize NFC_HDR */ p_msg->len = NCI_DATA_HDR_SIZE + 0x03; p_msg->event = 0; diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_nci.c b/halimpl/bcm2079x/hal/hal/nfc_hal_nci.c index 4dde9af..8d57eeb 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_nci.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_nci.c @@ -178,8 +178,8 @@ static bool nfc_hal_nci_receive_nci_msg(tNFC_HAL_NCIT_CB* p_cb, uint8_t byte) { p_cb->rcv_len = NCI_MSG_HDR_SIZE; /* Start of new message. Allocate a buffer for message */ - if ((p_cb->p_rcv_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID)) != - NULL) { + p_cb->p_rcv_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID); + if (p_cb->p_rcv_msg != NULL) { /* Initialize NFC_HDR */ p_cb->p_rcv_msg->len = 0; p_cb->p_rcv_msg->event = 0; @@ -268,8 +268,8 @@ static bool nfc_hal_nci_receive_bt_msg(tNFC_HAL_NCIT_CB* p_cb, uint8_t byte) { p_cb->rcv_state = NFC_HAL_RCV_BT_HDR_ST; p_cb->rcv_len = HCIE_PREAMBLE_SIZE; - if ((p_cb->p_rcv_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID)) != - NULL) { + p_cb->p_rcv_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_HAL_NCI_POOL_ID); + if (p_cb->p_rcv_msg != NULL) { /* Initialize NFC_HDR */ p_cb->p_rcv_msg->len = 0; p_cb->p_rcv_msg->event = 0; diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_prm.c b/halimpl/bcm2079x/hal/hal/nfc_hal_prm.c index 1bf33e6..3d9e76f 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_prm.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_prm.c @@ -622,7 +622,8 @@ static bool nfc_hal_prm_nvm_rw_cmd(void) { } cmd_len = len + 7; - if ((p_buff = (uint8_t*)GKI_getbuf(cmd_len)) == NULL) { + p_buff = (uint8_t*)GKI_getbuf(cmd_len); + if (p_buff == NULL) { HAL_TRACE_ERROR0("NVM No buffer"); nfc_hal_prm_spd_handle_download_complete(NFC_HAL_PRM_ABORT_EVT); return true; diff --git a/halimpl/pn54x/Android.bp b/halimpl/pn54x/Android.bp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/halimpl/pn54x/Android.bp diff --git a/halimpl/pn54x/utils/phNxpConfig.cpp b/halimpl/pn54x/utils/phNxpConfig.cpp index c6576e0..aa73627 100644 --- a/halimpl/pn54x/utils/phNxpConfig.cpp +++ b/halimpl/pn54x/utils/phNxpConfig.cpp @@ -686,7 +686,8 @@ int CNfcConfig::updateTimestamp() { if (stat(config_timestamp_path, &st) != 0) { ALOGD("%s file %s not exist, creat it.\n", __func__, config_timestamp_path); - if ((fd = fopen(config_timestamp_path, "w+")) != NULL) { + fd = fopen(config_timestamp_path, "w+"); + if (fd != NULL) { fwrite(&m_timeStamp, sizeof(unsigned long), 1, fd); fclose(fd); } diff --git a/src/nfa/ce/nfa_ce_act.c b/src/nfa/ce/nfa_ce_act.c index 79867e9..38a0576 100644 --- a/src/nfa/ce/nfa_ce_act.c +++ b/src/nfa/ce/nfa_ce_act.c @@ -641,8 +641,9 @@ tNFA_STATUS nfa_ce_realloc_scratch_buffer(void) { /* Free existing scratch buffer, if one was allocated */ nfa_ce_free_scratch_buf(); - if ((nfa_ce_cb.p_scratch_buf = - (uint8_t*)nfa_mem_co_alloc(nfa_ce_cb.ndef_max_size)) != NULL) { + nfa_ce_cb.p_scratch_buf = + (uint8_t*)nfa_mem_co_alloc(nfa_ce_cb.ndef_max_size); + if (nfa_ce_cb.p_scratch_buf != NULL) { nfa_ce_cb.scratch_buf_size = nfa_ce_cb.ndef_max_size; } else { NFA_TRACE_ERROR1( @@ -689,7 +690,8 @@ tNFC_STATUS nfa_ce_set_content(void) { p_cb->listen_info[NFA_CE_LISTEN_INFO_IDX_NDEF].protocol_mask; /* Allocate a scratch buffer if needed (for handling write-requests) */ - if ((status = nfa_ce_realloc_scratch_buffer()) == NFA_STATUS_OK) { + status = nfa_ce_realloc_scratch_buffer(); + if (status == NFA_STATUS_OK) { if ((ndef_protocol_mask & NFA_PROTOCOL_MASK_T3T) && (status == NFA_STATUS_OK)) { /* Type3Tag - NFC-F */ @@ -1211,10 +1213,11 @@ bool nfa_ce_api_reg_listen(tNFA_CE_MSG* p_ce_msg) { p_ce_msg->reg_listen.p_conn_cback; /* Register this AID with CE_T4T */ - if ((p_cb->listen_info[listen_info_idx].t4t_aid_handle = - CE_T4tRegisterAID( - p_ce_msg->reg_listen.aid_len, p_ce_msg->reg_listen.aid, - nfa_ce_handle_t4t_aid_evt)) == CE_T4T_AID_HANDLE_INVALID) { + p_cb->listen_info[listen_info_idx].t4t_aid_handle = CE_T4tRegisterAID( + p_ce_msg->reg_listen.aid_len, p_ce_msg->reg_listen.aid, + nfa_ce_handle_t4t_aid_evt); + if (p_cb->listen_info[listen_info_idx].t4t_aid_handle == + CE_T4T_AID_HANDLE_INVALID) { NFA_TRACE_ERROR0("Unable to register AID"); p_cb->listen_info[listen_info_idx].flags = 0; @@ -1262,7 +1265,8 @@ bool nfa_ce_api_reg_listen(tNFA_CE_MSG* p_ce_msg) { } /* Start listening */ - if ((conn_evt.status = nfa_ce_start_listening()) != NFA_STATUS_OK) { + conn_evt.status = nfa_ce_start_listening(); + if (conn_evt.status != NFA_STATUS_OK) { NFA_TRACE_ERROR0( "nfa_ce_api_reg_listen: unable to register new listen params with DM"); p_cb->listen_info[listen_info_idx].flags = 0; diff --git a/src/nfa/ce/nfa_ce_api.c b/src/nfa/ce/nfa_ce_api.c index 16dd5c0..c988f70 100644 --- a/src/nfa/ce/nfa_ce_api.c +++ b/src/nfa/ce/nfa_ce_api.c @@ -51,8 +51,8 @@ tNFA_STATUS nfa_ce_api_deregister_listen(tNFA_HANDLE handle, return (NFA_STATUS_BAD_HANDLE); } - if ((p_ce_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)(sizeof(tNFA_CE_MSG)))) != - NULL) { + p_ce_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)(sizeof(tNFA_CE_MSG))); + if (p_ce_msg != NULL) { p_ce_msg->hdr.event = NFA_CE_API_DEREG_LISTEN_EVT; p_ce_msg->dereg_listen.handle = handle; p_ce_msg->dereg_listen.listen_info = listen_info; @@ -143,8 +143,8 @@ tNFA_STATUS NFA_CeConfigureLocalTag(tNFA_PROTOCOL_MASK protocol_mask, return (NFA_STATUS_INVALID_PARAM); } } - if ((p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG))) != - NULL) { + p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG)); + if (p_msg != NULL) { p_msg->local_tag.hdr.event = NFA_CE_API_CFG_LOCAL_TAG_EVT; /* Copy ndef info */ @@ -205,8 +205,8 @@ tNFA_STATUS NFA_CeConfigureUiccListenTech(tNFA_HANDLE ee_handle, /* Otherwise then app is configuring uicc listen for the specificed * technologies */ - if ((p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG))) != - NULL) { + p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG)); + if (p_msg != NULL) { p_msg->reg_listen.hdr.event = NFA_CE_API_REG_LISTEN_EVT; p_msg->reg_listen.listen_type = NFA_CE_REG_TYPE_UICC; @@ -253,8 +253,8 @@ tNFA_STATUS NFA_CeRegisterFelicaSystemCodeOnDH(uint16_t system_code, /* Validate parameters */ if (p_conn_cback == NULL) return (NFA_STATUS_INVALID_PARAM); - if ((p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG))) != - NULL) { + p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG)); + if (p_msg != NULL) { p_msg->reg_listen.hdr.event = NFA_CE_API_REG_LISTEN_EVT; p_msg->reg_listen.p_conn_cback = p_conn_cback; p_msg->reg_listen.listen_type = NFA_CE_REG_TYPE_FELICA; @@ -328,8 +328,8 @@ tNFA_STATUS NFA_CeRegisterAidOnDH(uint8_t aid[NFC_MAX_AID_LEN], uint8_t aid_len, /* Validate parameters */ if (p_conn_cback == NULL) return (NFA_STATUS_INVALID_PARAM); - if ((p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG))) != - NULL) { + p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG)); + if (p_msg != NULL) { p_msg->reg_listen.hdr.event = NFA_CE_API_REG_LISTEN_EVT; p_msg->reg_listen.p_conn_cback = p_conn_cback; p_msg->reg_listen.listen_type = NFA_CE_REG_TYPE_ISO_DEP; @@ -407,8 +407,8 @@ tNFA_STATUS NFA_CeSetIsoDepListenTech(tNFA_TECHNOLOGY_MASK tech_mask) { return (NFA_STATUS_INVALID_PARAM); } - if ((p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG))) != - NULL) { + p_msg = (tNFA_CE_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_CE_MSG)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_CE_API_CFG_ISODEP_TECH_EVT; p_msg->hdr.layer_specific = tech_mask; diff --git a/src/nfa/ce/nfa_ce_main.c b/src/nfa/ce/nfa_ce_main.c index 8e6d728..922d82e 100644 --- a/src/nfa/ce/nfa_ce_main.c +++ b/src/nfa/ce/nfa_ce_main.c @@ -180,7 +180,8 @@ bool nfa_ce_hdl_event(NFC_HDR* p_msg) { #endif /* Get NFA_RW sub-event */ - if ((act_idx = (p_msg->event & 0x00FF)) < NFA_CE_ACTION_TBL_SIZE) { + act_idx = (p_msg->event & 0x00FF); + if (act_idx < NFA_CE_ACTION_TBL_SIZE) { freebuf = (*nfa_ce_action_tbl[act_idx])((tNFA_CE_MSG*)p_msg); } diff --git a/src/nfa/dm/nfa_dm_act.c b/src/nfa/dm/nfa_dm_act.c index f6dd0f1..9899ce0 100644 --- a/src/nfa/dm/nfa_dm_act.c +++ b/src/nfa/dm/nfa_dm_act.c @@ -300,9 +300,9 @@ static void nfa_dm_nfc_response_cback(tNFC_RESPONSE_EVT event, case NFC_GET_CONFIG_REVT: /* 3 Get Config Response */ if (p_data->get_config.status == NFC_STATUS_OK) { - if ((p_nfa_get_confg = (tNFA_GET_CONFIG*)GKI_getbuf((uint16_t)( - sizeof(tNFA_GET_CONFIG) + p_data->get_config.tlv_size))) != - NULL) { + p_nfa_get_confg = (tNFA_GET_CONFIG*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_GET_CONFIG) + p_data->get_config.tlv_size)); + if (p_nfa_get_confg != NULL) { p_nfa_get_confg->status = NFA_STATUS_OK; p_nfa_get_confg->tlv_size = p_data->get_config.tlv_size; memcpy(p_nfa_get_confg->param_tlvs, p_data->get_config.p_param_tlvs, diff --git a/src/nfa/dm/nfa_dm_api.c b/src/nfa/dm/nfa_dm_api.c index 95ba823..e9b0b16 100644 --- a/src/nfa/dm/nfa_dm_api.c +++ b/src/nfa/dm/nfa_dm_api.c @@ -101,8 +101,8 @@ tNFA_STATUS NFA_Enable(tNFA_DM_CBACK* p_dm_cback, return (NFA_STATUS_FAILED); } - if ((p_msg = (tNFA_DM_API_ENABLE*)GKI_getbuf(sizeof(tNFA_DM_API_ENABLE))) != - NULL) { + p_msg = (tNFA_DM_API_ENABLE*)GKI_getbuf(sizeof(tNFA_DM_API_ENABLE)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_ENABLE_EVT; p_msg->p_dm_cback = p_dm_cback; p_msg->p_conn_cback = p_conn_cback; @@ -140,8 +140,8 @@ tNFA_STATUS NFA_Disable(bool graceful) { NFA_TRACE_API1("NFA_Disable (graceful=%i)", graceful); - if ((p_msg = (tNFA_DM_API_DISABLE*)GKI_getbuf(sizeof(tNFA_DM_API_DISABLE))) != - NULL) { + p_msg = (tNFA_DM_API_DISABLE*)GKI_getbuf(sizeof(tNFA_DM_API_DISABLE)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_DISABLE_EVT; p_msg->graceful = graceful; @@ -176,8 +176,9 @@ tNFA_STATUS NFA_SetConfig(tNFA_PMID param_id, uint8_t length, uint8_t* p_data) { NFA_TRACE_API1("NFA_SetConfig (): param_id:0x%X", param_id); - if ((p_msg = (tNFA_DM_API_SET_CONFIG*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_DM_API_SET_CONFIG) + length))) != NULL) { + p_msg = (tNFA_DM_API_SET_CONFIG*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_DM_API_SET_CONFIG) + length)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_SET_CONFIG_EVT; p_msg->param_id = param_id; @@ -212,8 +213,9 @@ tNFA_STATUS NFA_GetConfig(uint8_t num_ids, tNFA_PMID* p_param_ids) { NFA_TRACE_API1("NFA_GetConfig (): num_ids: %i", num_ids); - if ((p_msg = (tNFA_DM_API_GET_CONFIG*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_DM_API_GET_CONFIG) + num_ids))) != NULL) { + p_msg = (tNFA_DM_API_GET_CONFIG*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_DM_API_GET_CONFIG) + num_ids)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_GET_CONFIG_EVT; p_msg->num_ids = num_ids; @@ -278,8 +280,9 @@ tNFA_STATUS NFA_RequestExclusiveRfControl(tNFA_TECHNOLOGY_MASK poll_mask, return (NFA_STATUS_FAILED); } - if ((p_msg = (tNFA_DM_API_REQ_EXCL_RF_CTRL*)GKI_getbuf( - sizeof(tNFA_DM_API_REQ_EXCL_RF_CTRL))) != NULL) { + p_msg = (tNFA_DM_API_REQ_EXCL_RF_CTRL*)GKI_getbuf( + sizeof(tNFA_DM_API_REQ_EXCL_RF_CTRL)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_REQUEST_EXCL_RF_CTRL_EVT; p_msg->poll_mask = poll_mask; p_msg->p_conn_cback = p_conn_cback; @@ -321,7 +324,8 @@ tNFA_STATUS NFA_ReleaseExclusiveRfControl(void) { return (NFA_STATUS_FAILED); } - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_RELEASE_EXCL_RF_CTRL_EVT; nfa_sys_sendmsg(p_msg); return (NFA_STATUS_OK); @@ -370,8 +374,8 @@ tNFA_STATUS NFA_EnablePolling(tNFA_TECHNOLOGY_MASK poll_mask) { NFA_TRACE_API1("NFA_EnablePolling () 0x%X", poll_mask); - if ((p_msg = (tNFA_DM_API_ENABLE_POLL*)GKI_getbuf( - sizeof(tNFA_DM_API_ENABLE_POLL))) != NULL) { + p_msg = (tNFA_DM_API_ENABLE_POLL*)GKI_getbuf(sizeof(tNFA_DM_API_ENABLE_POLL)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_ENABLE_POLLING_EVT; p_msg->poll_mask = poll_mask; @@ -404,7 +408,8 @@ tNFA_STATUS NFA_DisablePolling(void) { NFA_TRACE_API0("NFA_DisablePolling ()"); - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_DISABLE_POLLING_EVT; nfa_sys_sendmsg(p_msg); @@ -443,7 +448,8 @@ tNFA_STATUS NFA_EnableListening(void) { NFA_TRACE_API0("NFA_EnableListening ()"); - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_ENABLE_LISTENING_EVT; nfa_sys_sendmsg(p_msg); @@ -476,7 +482,8 @@ tNFA_STATUS NFA_DisableListening(void) { NFA_TRACE_API0("NFA_DisableListening ()"); - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_DISABLE_LISTENING_EVT; nfa_sys_sendmsg(p_msg); @@ -512,7 +519,8 @@ tNFA_STATUS NFA_PauseP2p(void) { NFA_TRACE_API0("NFA_PauseP2p ()"); - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_PAUSE_P2P_EVT; nfa_sys_sendmsg(p_msg); @@ -544,7 +552,8 @@ tNFA_STATUS NFA_ResumeP2p(void) { NFA_TRACE_API0("NFA_ResumeP2p ()"); - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_RESUME_P2P_EVT; nfa_sys_sendmsg(p_msg); @@ -580,8 +589,9 @@ tNFA_STATUS NFA_SetP2pListenTech(tNFA_TECHNOLOGY_MASK tech_mask) { NFA_TRACE_API1("NFA_P2pSetListenTech (): tech_mask:0x%X", tech_mask); - if ((p_msg = (tNFA_DM_API_SET_P2P_LISTEN_TECH*)GKI_getbuf( - sizeof(tNFA_DM_API_SET_P2P_LISTEN_TECH))) != NULL) { + p_msg = (tNFA_DM_API_SET_P2P_LISTEN_TECH*)GKI_getbuf( + sizeof(tNFA_DM_API_SET_P2P_LISTEN_TECH)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_SET_P2P_LISTEN_TECH_EVT; p_msg->tech_mask = tech_mask; @@ -612,7 +622,8 @@ tNFA_STATUS NFA_StartRfDiscovery(void) { NFA_TRACE_API0("NFA_StartRfDiscovery ()"); - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_START_RF_DISCOVERY_EVT; nfa_sys_sendmsg(p_msg); @@ -641,7 +652,8 @@ tNFA_STATUS NFA_StopRfDiscovery(void) { NFA_TRACE_API0("NFA_StopRfDiscovery ()"); - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_STOP_RF_DISCOVERY_EVT; nfa_sys_sendmsg(p_msg); @@ -680,8 +692,8 @@ tNFA_STATUS NFA_SetRfDiscoveryDuration(uint16_t discovery_period_ms) { NFA_TRACE_API0("NFA_SetRfDiscoveryDuration ()"); /* Post the API message */ - if ((p_msg = (tNFA_DM_API_SET_RF_DISC_DUR*)GKI_getbuf(sizeof(NFC_HDR))) != - NULL) { + p_msg = (tNFA_DM_API_SET_RF_DISC_DUR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_SET_RF_DISC_DURATION_EVT; /* Set discovery duration */ @@ -729,8 +741,9 @@ tNFA_STATUS NFA_Select(uint8_t rf_disc_id, tNFA_NFC_PROTOCOL protocol, return (NFA_STATUS_INVALID_PARAM); } - if ((p_msg = (tNFA_DM_API_SELECT*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_DM_API_SELECT)))) != NULL) { + p_msg = + (tNFA_DM_API_SELECT*)GKI_getbuf((uint16_t)(sizeof(tNFA_DM_API_SELECT))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_SELECT_EVT; p_msg->rf_disc_id = rf_disc_id; p_msg->protocol = protocol; @@ -763,8 +776,9 @@ tNFA_STATUS NFA_UpdateRFCommParams(tNFA_RF_COMM_PARAMS* p_params) { NFA_TRACE_API0("NFA_UpdateRFCommParams ()"); - if ((p_msg = (tNFA_DM_API_UPDATE_RF_PARAMS*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_DM_API_UPDATE_RF_PARAMS)))) != NULL) { + p_msg = (tNFA_DM_API_UPDATE_RF_PARAMS*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_DM_API_UPDATE_RF_PARAMS))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_UPDATE_RF_PARAMS_EVT; memcpy(&p_msg->params, p_params, sizeof(tNFA_RF_COMM_PARAMS)); @@ -812,8 +826,9 @@ extern tNFA_STATUS NFA_Deactivate(bool sleep_mode) { NFA_TRACE_API1("NFA_Deactivate (): sleep_mode:%i", sleep_mode); - if ((p_msg = (tNFA_DM_API_DEACTIVATE*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_DM_API_DEACTIVATE)))) != NULL) { + p_msg = (tNFA_DM_API_DEACTIVATE*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_DM_API_DEACTIVATE))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_DEACTIVATE_EVT; p_msg->sleep_mode = sleep_mode; @@ -857,7 +872,8 @@ tNFA_STATUS NFA_SendRawFrame(uint8_t* p_raw_data, uint16_t data_len, return (NFA_STATUS_INVALID_PARAM); size = NFC_HDR_SIZE + NCI_MSG_OFFSET_SIZE + NCI_DATA_HDR_SIZE + data_len; - if ((p_msg = (NFC_HDR*)GKI_getbuf(size)) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(size); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_RAW_FRAME_EVT; p_msg->layer_specific = presence_check_start_delay; p_msg->offset = NCI_MSG_OFFSET_SIZE + NCI_DATA_HDR_SIZE; @@ -919,8 +935,9 @@ tNFA_STATUS NFA_RegisterNDefTypeHandler(bool handle_whole_message, tNFA_TNF tnf, return (NFA_STATUS_INVALID_PARAM); } - if ((p_msg = (tNFA_DM_API_REG_NDEF_HDLR*)GKI_getbuf((uint16_t)( - sizeof(tNFA_DM_API_REG_NDEF_HDLR) + type_name_len))) != NULL) { + p_msg = (tNFA_DM_API_REG_NDEF_HDLR*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_DM_API_REG_NDEF_HDLR) + type_name_len)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_REG_NDEF_HDLR_EVT; p_msg->flags = @@ -978,8 +995,9 @@ extern tNFA_STATUS NFA_RegisterNDefUriHandler(bool handle_whole_message, return (NFA_STATUS_INVALID_PARAM); } - if ((p_msg = (tNFA_DM_API_REG_NDEF_HDLR*)GKI_getbuf((uint16_t)( - sizeof(tNFA_DM_API_REG_NDEF_HDLR) + uri_id_len))) != NULL) { + p_msg = (tNFA_DM_API_REG_NDEF_HDLR*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_DM_API_REG_NDEF_HDLR) + uri_id_len)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_REG_NDEF_HDLR_EVT; p_msg->flags = NFA_NDEF_FLAGS_WKT_URI; @@ -1023,8 +1041,9 @@ extern tNFA_STATUS NFA_DeregisterNDefTypeHandler(tNFA_HANDLE ndef_type_handle) { NFA_TRACE_API1("NFA_DeregisterNDefHandler (): handle 0x%08x", ndef_type_handle); - if ((p_msg = (tNFA_DM_API_DEREG_NDEF_HDLR*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_DM_API_DEREG_NDEF_HDLR)))) != NULL) { + p_msg = (tNFA_DM_API_DEREG_NDEF_HDLR*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_DM_API_DEREG_NDEF_HDLR))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_DEREG_NDEF_HDLR_EVT; p_msg->ndef_type_handle = ndef_type_handle; @@ -1064,7 +1083,8 @@ tNFA_STATUS NFA_PowerOffSleepMode(bool start_stop) { nfa_dm_cb.flags |= NFA_DM_FLAGS_SETTING_PWR_MODE; } - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_DM_API_POWER_OFF_SLEEP_EVT; p_msg->layer_specific = start_stop; @@ -1098,8 +1118,8 @@ tNFC_STATUS NFA_RegVSCback(bool is_register, tNFA_VSC_CBACK* p_cback) { return (NFA_STATUS_FAILED); } - if ((p_msg = (tNFA_DM_API_REG_VSC*)GKI_getbuf(sizeof(tNFA_DM_API_REG_VSC))) != - NULL) { + p_msg = (tNFA_DM_API_REG_VSC*)GKI_getbuf(sizeof(tNFA_DM_API_REG_VSC)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_REG_VSC_EVT; p_msg->is_register = is_register; p_msg->p_cback = p_cback; @@ -1136,7 +1156,8 @@ tNFA_STATUS NFA_SendVsCommand(uint8_t oid, uint8_t cmd_params_len, NFA_TRACE_API1("NFA_SendVsCommand() oid=0x%x", oid); - if ((p_msg = (tNFA_DM_API_SEND_VSC*)GKI_getbuf(size)) != NULL) { + p_msg = (tNFA_DM_API_SEND_VSC*)GKI_getbuf(size); + if (p_msg != NULL) { p_msg->hdr.event = NFA_DM_API_SEND_VSC_EVT; p_msg->oid = oid; p_msg->p_cback = p_cback; diff --git a/src/nfa/dm/nfa_dm_main.c b/src/nfa/dm/nfa_dm_main.c index 85a6106..a8754f5 100644 --- a/src/nfa/dm/nfa_dm_main.c +++ b/src/nfa/dm/nfa_dm_main.c @@ -396,8 +396,8 @@ tNFA_STATUS nfa_dm_check_set_config(uint8_t tlv_list_len, uint8_t* p_tlv_list, /* If any TVLs to update, or if the SetConfig was initiated by the * application, then send the SET_CONFIG command */ if (updated_len || app_init) { - if ((nfc_status = NFC_SetConfig(updated_len, p_tlv_list)) == - NFC_STATUS_OK) { + nfc_status = NFC_SetConfig(updated_len, p_tlv_list); + if (nfc_status == NFC_STATUS_OK) { /* Keep track of whether we will need to notify NFA_DM_SET_CONFIG_EVT on * NFC_SET_CONFIG_REVT */ diff --git a/src/nfa/dm/nfa_dm_ndef.c b/src/nfa/dm/nfa_dm_ndef.c index 97fcbc1..bbccebf 100644 --- a/src/nfa/dm/nfa_dm_ndef.c +++ b/src/nfa/dm/nfa_dm_ndef.c @@ -387,8 +387,8 @@ void nfa_dm_ndef_handle_message(tNFA_STATUS status, uint8_t* p_msg_buf, /* Handle zero length - notify default handler */ if (len == 0) { - if ((p_handler = p_cb->p_ndef_handler[NFA_NDEF_DEFAULT_HANDLER_IDX]) != - NULL) { + p_handler = p_cb->p_ndef_handler[NFA_NDEF_DEFAULT_HANDLER_IDX]; + if (p_handler != NULL) { NFA_TRACE_DEBUG0( "Notifying default handler of zero-length NDEF message..."); ndef_data.ndef_type_handle = p_handler->ndef_type_handle; @@ -401,7 +401,8 @@ void nfa_dm_ndef_handle_message(tNFA_STATUS status, uint8_t* p_msg_buf, } /* Validate the NDEF message */ - if ((ndef_status = NDEF_MsgValidate(p_msg_buf, len, true)) != NDEF_OK) { + ndef_status = NDEF_MsgValidate(p_msg_buf, len, true); + if (ndef_status != NDEF_OK) { NFA_TRACE_ERROR1("Received invalid NDEF message. NDEF status=0x%x", ndef_status); return; @@ -432,11 +433,12 @@ void nfa_dm_ndef_handle_message(tNFA_STATUS status, uint8_t* p_msg_buf, p_payload = NDEF_RecGetPayload(p_rec, &payload_len); /* Find first handler for this type */ - if ((p_handler = nfa_dm_ndef_find_next_handler( - NULL, tnf, p_type, type_len, p_payload, payload_len)) == NULL) { + p_handler = nfa_dm_ndef_find_next_handler(NULL, tnf, p_type, type_len, + p_payload, payload_len); + if (p_handler == NULL) { /* Not a registered NDEF type. Use default handler */ - if ((p_handler = p_cb->p_ndef_handler[NFA_NDEF_DEFAULT_HANDLER_IDX]) != - NULL) { + p_handler = p_cb->p_ndef_handler[NFA_NDEF_DEFAULT_HANDLER_IDX]; + if (p_handler != NULL) { NFA_TRACE_DEBUG0("No handler found. Using default handler..."); } } diff --git a/src/nfa/ee/nfa_ee_api.c b/src/nfa/ee/nfa_ee_api.c index 8253b98..f7f09ff 100644 --- a/src/nfa/ee/nfa_ee_api.c +++ b/src/nfa/ee/nfa_ee_api.c @@ -57,14 +57,16 @@ tNFA_STATUS NFA_EeDiscover(tNFA_EE_CBACK* p_cback) { } else if ((nfa_ee_cb.p_ee_disc_cback != NULL) || (p_cback == NULL)) { NFA_TRACE_ERROR0("NFA_EeDiscover() in progress or NULL callback function"); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_DISCOVER*)GKI_getbuf( - sizeof(tNFA_EE_API_DISCOVER))) != NULL) { - p_msg->hdr.event = NFA_EE_API_DISCOVER_EVT; - p_msg->p_cback = p_cback; + } else { + p_msg = (tNFA_EE_API_DISCOVER*)GKI_getbuf(sizeof(tNFA_EE_API_DISCOVER)); + if (p_msg != NULL) { + p_msg->hdr.event = NFA_EE_API_DISCOVER_EVT; + p_msg->p_cback = p_cback; - nfa_sys_sendmsg(p_msg); + nfa_sys_sendmsg(p_msg); - status = NFA_STATUS_OK; + status = NFA_STATUS_OK; + } } return status; @@ -146,14 +148,16 @@ tNFA_STATUS NFA_EeRegister(tNFA_EE_CBACK* p_cback) { if (p_cback == NULL) { NFA_TRACE_ERROR0("NFA_EeRegister(): with NULL callback function"); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_REGISTER*)GKI_getbuf( - sizeof(tNFA_EE_API_REGISTER))) != NULL) { - p_msg->hdr.event = NFA_EE_API_REGISTER_EVT; - p_msg->p_cback = p_cback; + } else { + p_msg = (tNFA_EE_API_REGISTER*)GKI_getbuf(sizeof(tNFA_EE_API_REGISTER)); + if (p_msg != NULL) { + p_msg->hdr.event = NFA_EE_API_REGISTER_EVT; + p_msg->p_cback = p_cback; - nfa_sys_sendmsg(p_msg); + nfa_sys_sendmsg(p_msg); - status = NFA_STATUS_OK; + status = NFA_STATUS_OK; + } } return status; @@ -234,16 +238,18 @@ tNFA_STATUS NFA_EeModeSet(tNFA_HANDLE ee_handle, tNFA_EE_MD mode) { if (p_found == NULL) { NFA_TRACE_ERROR1("NFA_EeModeSet() invalid NFCEE:0x%04x", ee_handle); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_MODE_SET*)GKI_getbuf( - sizeof(tNFA_EE_API_MODE_SET))) != NULL) { - p_msg->hdr.event = NFA_EE_API_MODE_SET_EVT; - p_msg->nfcee_id = nfcee_id; - p_msg->mode = mode; - p_msg->p_cb = p_found; + } else { + p_msg = (tNFA_EE_API_MODE_SET*)GKI_getbuf(sizeof(tNFA_EE_API_MODE_SET)); + if (p_msg != NULL) { + p_msg->hdr.event = NFA_EE_API_MODE_SET_EVT; + p_msg->nfcee_id = nfcee_id; + p_msg->mode = mode; + p_msg->p_cb = p_found; - nfa_sys_sendmsg(p_msg); + nfa_sys_sendmsg(p_msg); - status = NFA_STATUS_OK; + status = NFA_STATUS_OK; + } } return status; @@ -289,18 +295,21 @@ tNFA_STATUS NFA_EeSetDefaultTechRouting( if (p_cb == NULL) { NFA_TRACE_ERROR0("Bad ee_handle"); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_SET_TECH_CFG*)GKI_getbuf( - sizeof(tNFA_EE_API_SET_TECH_CFG))) != NULL) { - p_msg->hdr.event = NFA_EE_API_SET_TECH_CFG_EVT; - p_msg->nfcee_id = nfcee_id; - p_msg->p_cb = p_cb; - p_msg->technologies_switch_on = technologies_switch_on; - p_msg->technologies_switch_off = technologies_switch_off; - p_msg->technologies_battery_off = technologies_battery_off; - - nfa_sys_sendmsg(p_msg); - - status = NFA_STATUS_OK; + } else { + p_msg = + (tNFA_EE_API_SET_TECH_CFG*)GKI_getbuf(sizeof(tNFA_EE_API_SET_TECH_CFG)); + if (p_msg != NULL) { + p_msg->hdr.event = NFA_EE_API_SET_TECH_CFG_EVT; + p_msg->nfcee_id = nfcee_id; + p_msg->p_cb = p_cb; + p_msg->technologies_switch_on = technologies_switch_on; + p_msg->technologies_switch_off = technologies_switch_off; + p_msg->technologies_battery_off = technologies_battery_off; + + nfa_sys_sendmsg(p_msg); + + status = NFA_STATUS_OK; + } } return status; @@ -346,18 +355,21 @@ tNFA_STATUS NFA_EeSetDefaultProtoRouting( if (p_cb == NULL) { NFA_TRACE_ERROR0("Bad ee_handle"); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_SET_PROTO_CFG*)GKI_getbuf( - sizeof(tNFA_EE_API_SET_PROTO_CFG))) != NULL) { - p_msg->hdr.event = NFA_EE_API_SET_PROTO_CFG_EVT; - p_msg->nfcee_id = nfcee_id; - p_msg->p_cb = p_cb; - p_msg->protocols_switch_on = protocols_switch_on; - p_msg->protocols_switch_off = protocols_switch_off; - p_msg->protocols_battery_off = protocols_battery_off; - - nfa_sys_sendmsg(p_msg); - - status = NFA_STATUS_OK; + } else { + p_msg = (tNFA_EE_API_SET_PROTO_CFG*)GKI_getbuf( + sizeof(tNFA_EE_API_SET_PROTO_CFG)); + if (p_msg != NULL) { + p_msg->hdr.event = NFA_EE_API_SET_PROTO_CFG_EVT; + p_msg->nfcee_id = nfcee_id; + p_msg->p_cb = p_cb; + p_msg->protocols_switch_on = protocols_switch_on; + p_msg->protocols_switch_off = protocols_switch_off; + p_msg->protocols_battery_off = protocols_battery_off; + + nfa_sys_sendmsg(p_msg); + + status = NFA_STATUS_OK; + } } return status; @@ -399,19 +411,22 @@ tNFA_STATUS NFA_EeAddAidRouting(tNFA_HANDLE ee_handle, uint8_t aid_len, (aid_len < NFA_MIN_AID_LEN) || (aid_len > NFA_MAX_AID_LEN)) { NFA_TRACE_ERROR1("Bad ee_handle or AID (len=%d)", aid_len); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_ADD_AID*)GKI_getbuf(size)) != NULL) { - NFA_TRACE_DEBUG2("aid:<%02x%02x>", p_aid[0], p_aid[1]); - p_msg->hdr.event = NFA_EE_API_ADD_AID_EVT; - p_msg->nfcee_id = nfcee_id; - p_msg->p_cb = p_cb; - p_msg->aid_len = aid_len; - p_msg->power_state = power_state; - p_msg->p_aid = (uint8_t*)(p_msg + 1); - memcpy(p_msg->p_aid, p_aid, aid_len); - - nfa_sys_sendmsg(p_msg); - - status = NFA_STATUS_OK; + } else { + p_msg = (tNFA_EE_API_ADD_AID*)GKI_getbuf(size); + if (p_msg != NULL) { + NFA_TRACE_DEBUG2("aid:<%02x%02x>", p_aid[0], p_aid[1]); + p_msg->hdr.event = NFA_EE_API_ADD_AID_EVT; + p_msg->nfcee_id = nfcee_id; + p_msg->p_cb = p_cb; + p_msg->aid_len = aid_len; + p_msg->power_state = power_state; + p_msg->p_aid = (uint8_t*)(p_msg + 1); + memcpy(p_msg->p_aid, p_aid, aid_len); + + nfa_sys_sendmsg(p_msg); + + status = NFA_STATUS_OK; + } } return status; @@ -447,15 +462,18 @@ tNFA_STATUS NFA_EeRemoveAidRouting(uint8_t aid_len, uint8_t* p_aid) { if ((aid_len == 0) || (p_aid == NULL) || (aid_len > NFA_MAX_AID_LEN)) { NFA_TRACE_ERROR0("Bad AID"); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_REMOVE_AID*)GKI_getbuf(size)) != NULL) { - p_msg->hdr.event = NFA_EE_API_REMOVE_AID_EVT; - p_msg->aid_len = aid_len; - p_msg->p_aid = (uint8_t*)(p_msg + 1); - memcpy(p_msg->p_aid, p_aid, aid_len); + } else { + p_msg = (tNFA_EE_API_REMOVE_AID*)GKI_getbuf(size); + if (p_msg != NULL) { + p_msg->hdr.event = NFA_EE_API_REMOVE_AID_EVT; + p_msg->aid_len = aid_len; + p_msg->p_aid = (uint8_t*)(p_msg + 1); + memcpy(p_msg->p_aid, p_aid, aid_len); - nfa_sys_sendmsg(p_msg); + nfa_sys_sendmsg(p_msg); - status = NFA_STATUS_OK; + status = NFA_STATUS_OK; + } } return status; @@ -478,8 +496,8 @@ tNFA_STATUS NFA_EeGetLmrtRemainingSize(void) { tNFA_STATUS status = NFA_STATUS_FAILED; NFA_TRACE_API0("NFA_EeGetLmrtRemainingSize()"); - if ((p_msg = (tNFA_EE_API_LMRT_SIZE*)GKI_getbuf( - sizeof(tNFA_EE_API_LMRT_SIZE))) != NULL) { + p_msg = (tNFA_EE_API_LMRT_SIZE*)GKI_getbuf(sizeof(tNFA_EE_API_LMRT_SIZE)); + if (p_msg != NULL) { p_msg->event = NFA_EE_API_LMRT_SIZE_EVT; nfa_sys_sendmsg(p_msg); status = NFA_STATUS_OK; @@ -512,12 +530,15 @@ tNFA_STATUS NFA_EeUpdateNow(void) { if (nfa_ee_cb.ee_wait_evt & NFA_EE_WAIT_UPDATE_ALL) { NFA_TRACE_ERROR0("update in progress"); status = NFA_STATUS_SEMANTIC_ERROR; - } else if ((p_msg = (NFC_HDR*)GKI_getbuf(NFC_HDR_SIZE)) != NULL) { - p_msg->event = NFA_EE_API_UPDATE_NOW_EVT; + } else { + p_msg = (NFC_HDR*)GKI_getbuf(NFC_HDR_SIZE); + if (p_msg != NULL) { + p_msg->event = NFA_EE_API_UPDATE_NOW_EVT; - nfa_sys_sendmsg(p_msg); + nfa_sys_sendmsg(p_msg); - status = NFA_STATUS_OK; + status = NFA_STATUS_OK; + } } return status; @@ -551,17 +572,19 @@ tNFA_STATUS NFA_EeConnect(tNFA_HANDLE ee_handle, uint8_t ee_interface, if ((p_cb == NULL) || (p_cback == NULL)) { NFA_TRACE_ERROR0("Bad ee_handle or NULL callback function"); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_CONNECT*)GKI_getbuf( - sizeof(tNFA_EE_API_CONNECT))) != NULL) { - p_msg->hdr.event = NFA_EE_API_CONNECT_EVT; - p_msg->nfcee_id = nfcee_id; - p_msg->p_cb = p_cb; - p_msg->ee_interface = ee_interface; - p_msg->p_cback = p_cback; - - nfa_sys_sendmsg(p_msg); - - status = NFA_STATUS_OK; + } else { + p_msg = (tNFA_EE_API_CONNECT*)GKI_getbuf(sizeof(tNFA_EE_API_CONNECT)); + if (p_msg != NULL) { + p_msg->hdr.event = NFA_EE_API_CONNECT_EVT; + p_msg->nfcee_id = nfcee_id; + p_msg->p_cb = p_cb; + p_msg->ee_interface = ee_interface; + p_msg->p_cback = p_cback; + + nfa_sys_sendmsg(p_msg); + + status = NFA_STATUS_OK; + } } return status; @@ -596,18 +619,21 @@ tNFA_STATUS NFA_EeSendData(tNFA_HANDLE ee_handle, uint16_t data_len, (p_data == NULL)) { NFA_TRACE_ERROR0("Bad ee_handle or NULL data"); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_SEND_DATA*)GKI_getbuf((uint16_t)( - sizeof(tNFA_EE_API_SEND_DATA) + data_len))) != NULL) { - p_msg->hdr.event = NFA_EE_API_SEND_DATA_EVT; - p_msg->nfcee_id = nfcee_id; - p_msg->p_cb = p_cb; - p_msg->data_len = data_len; - p_msg->p_data = (uint8_t*)(p_msg + 1); - memcpy(p_msg->p_data, p_data, data_len); - - nfa_sys_sendmsg(p_msg); - - status = NFA_STATUS_OK; + } else { + p_msg = (tNFA_EE_API_SEND_DATA*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_EE_API_SEND_DATA) + data_len)); + if (p_msg != NULL) { + p_msg->hdr.event = NFA_EE_API_SEND_DATA_EVT; + p_msg->nfcee_id = nfcee_id; + p_msg->p_cb = p_cb; + p_msg->data_len = data_len; + p_msg->p_data = (uint8_t*)(p_msg + 1); + memcpy(p_msg->p_data, p_data, data_len); + + nfa_sys_sendmsg(p_msg); + + status = NFA_STATUS_OK; + } } return status; @@ -638,15 +664,17 @@ tNFA_STATUS NFA_EeDisconnect(tNFA_HANDLE ee_handle) { if ((p_cb == NULL) || (p_cb->conn_st != NFA_EE_CONN_ST_CONN)) { NFA_TRACE_ERROR0("NFA_EeDisconnect() Bad ee_handle"); status = NFA_STATUS_INVALID_PARAM; - } else if ((p_msg = (tNFA_EE_API_DISCONNECT*)GKI_getbuf( - sizeof(tNFA_EE_API_DISCONNECT))) != NULL) { - p_msg->hdr.event = NFA_EE_API_DISCONNECT_EVT; - p_msg->nfcee_id = nfcee_id; - p_msg->p_cb = p_cb; + } else { + p_msg = (tNFA_EE_API_DISCONNECT*)GKI_getbuf(sizeof(tNFA_EE_API_DISCONNECT)); + if (p_msg != NULL) { + p_msg->hdr.event = NFA_EE_API_DISCONNECT_EVT; + p_msg->nfcee_id = nfcee_id; + p_msg->p_cb = p_cb; - nfa_sys_sendmsg(p_msg); + nfa_sys_sendmsg(p_msg); - status = NFA_STATUS_OK; + status = NFA_STATUS_OK; + } } return status; diff --git a/src/nfa/hci/nfa_hci_act.c b/src/nfa/hci/nfa_hci_act.c index 7263a28..d68cddf 100644 --- a/src/nfa/hci/nfa_hci_act.c +++ b/src/nfa/hci/nfa_hci_act.c @@ -711,10 +711,9 @@ static bool nfa_hci_api_get_reg_value(tNFA_HCI_EVENT_DATA* p_evt_data) { NFA_TRACE_WARNING1("nfa_hci_api_get_reg_value pipe:%d not open", p_evt_data->get_registry.pipe); } else { - if ((status = nfa_hciu_send_get_param_cmd( - p_evt_data->get_registry.pipe, - p_evt_data->get_registry.reg_inx)) == NFA_STATUS_OK) - return true; + status = nfa_hciu_send_get_param_cmd(p_evt_data->get_registry.pipe, + p_evt_data->get_registry.reg_inx); + if (status == NFA_STATUS_OK) return true; } } } @@ -760,12 +759,10 @@ static bool nfa_hci_api_set_reg_value(tNFA_HCI_EVENT_DATA* p_evt_data) { NFA_TRACE_WARNING1("nfa_hci_api_set_reg_value pipe:%d not open", p_evt_data->set_registry.pipe); } else { - if ((status = nfa_hciu_send_set_param_cmd( - p_evt_data->set_registry.pipe, - p_evt_data->set_registry.reg_inx, - p_evt_data->set_registry.size, - p_evt_data->set_registry.data)) == NFA_STATUS_OK) - return true; + status = nfa_hciu_send_set_param_cmd( + p_evt_data->set_registry.pipe, p_evt_data->set_registry.reg_inx, + p_evt_data->set_registry.size, p_evt_data->set_registry.data); + if (status == NFA_STATUS_OK) return true; } } } @@ -875,11 +872,11 @@ static bool nfa_hci_api_send_cmd(tNFA_HCI_EVENT_DATA* p_evt_data) { if (p_pipe->pipe_state == NFA_HCI_PIPE_OPENED) { nfa_hci_cb.pipe_in_use = p_evt_data->send_cmd.pipe; - if ((status = nfa_hciu_send_msg( - p_pipe->pipe_id, NFA_HCI_COMMAND_TYPE, - p_evt_data->send_cmd.cmd_code, p_evt_data->send_cmd.cmd_len, - p_evt_data->send_cmd.data)) == NFA_STATUS_OK) - return true; + status = nfa_hciu_send_msg(p_pipe->pipe_id, NFA_HCI_COMMAND_TYPE, + p_evt_data->send_cmd.cmd_code, + p_evt_data->send_cmd.cmd_len, + p_evt_data->send_cmd.data); + if (status == NFA_STATUS_OK) return true; } else { NFA_TRACE_WARNING1("nfa_hci_api_send_cmd pipe:%d not open", p_pipe->pipe_id); @@ -925,11 +922,11 @@ static void nfa_hci_api_send_rsp(tNFA_HCI_EVENT_DATA* p_evt_data) { ((app_handle == p_evt_data->send_rsp.hci_handle || p_pipe->local_gate == NFA_HCI_CONNECTIVITY_GATE))) { if (p_pipe->pipe_state == NFA_HCI_PIPE_OPENED) { - if ((status = nfa_hciu_send_msg( - p_pipe->pipe_id, NFA_HCI_RESPONSE_TYPE, - p_evt_data->send_rsp.response, p_evt_data->send_rsp.size, - p_evt_data->send_rsp.data)) == NFA_STATUS_OK) - return; + status = nfa_hciu_send_msg(p_pipe->pipe_id, NFA_HCI_RESPONSE_TYPE, + p_evt_data->send_rsp.response, + p_evt_data->send_rsp.size, + p_evt_data->send_rsp.data); + if (status == NFA_STATUS_OK) return; } else { NFA_TRACE_WARNING1("nfa_hci_api_send_rsp pipe:%d not open", p_pipe->pipe_id); @@ -1051,9 +1048,9 @@ static void nfa_hci_api_add_static_pipe(tNFA_HCI_EVENT_DATA* p_evt_data) { tNFA_HCI_EVT_DATA evt_data; /* Allocate a proprietary gate */ - if ((pg = nfa_hciu_alloc_gate(p_evt_data->add_static_pipe.gate, - p_evt_data->add_static_pipe.hci_handle)) != - NULL) { + pg = nfa_hciu_alloc_gate(p_evt_data->add_static_pipe.gate, + p_evt_data->add_static_pipe.hci_handle); + if (pg != NULL) { /* Assign new owner to the gate */ pg->gate_owner = p_evt_data->add_static_pipe.hci_handle; @@ -1069,8 +1066,8 @@ static void nfa_hci_api_add_static_pipe(tNFA_HCI_EVENT_DATA* p_evt_data) { p_evt_data->add_static_pipe.hci_handle); return; } - if ((pp = nfa_hciu_find_pipe_by_pid(p_evt_data->add_static_pipe.pipe)) != - NULL) { + pp = nfa_hciu_find_pipe_by_pid(p_evt_data->add_static_pipe.pipe); + if (pp != NULL) { /* This pipe is always opened */ pp->pipe_state = NFA_HCI_PIPE_OPENED; evt_data.pipe_added.status = NFA_STATUS_OK; @@ -1233,19 +1230,21 @@ void nfa_hci_handle_admin_gate_cmd(uint8_t* p_data) { /* Already, there is a pipe between these two gates, so will reject */ response = NFA_HCI_ANY_E_NOK; - } else if ((response = nfa_hciu_add_pipe_to_gate( - pipe, dest_gate, source_host, source_gate)) == - NFA_HCI_ANY_OK) { - /* Tell the application a pipe was created with its gate */ - - evt_data.created.status = NFA_STATUS_OK; - evt_data.created.pipe = pipe; - evt_data.created.source_gate = dest_gate; - evt_data.created.dest_host = source_host; - evt_data.created.dest_gate = source_gate; - - nfa_hciu_send_to_app(NFA_HCI_CREATE_PIPE_EVT, &evt_data, - pgate->gate_owner); + } else { + response = nfa_hciu_add_pipe_to_gate(pipe, dest_gate, source_host, + source_gate); + if (response == NFA_HCI_ANY_OK) { + /* Tell the application a pipe was created with its gate */ + + evt_data.created.status = NFA_STATUS_OK; + evt_data.created.pipe = pipe; + evt_data.created.source_gate = dest_gate; + evt_data.created.dest_host = source_host; + evt_data.created.dest_gate = source_gate; + + nfa_hciu_send_to_app(NFA_HCI_CREATE_PIPE_EVT, &evt_data, + pgate->gate_owner); + } } } else { response = NFA_HCI_ANY_E_NOK; @@ -1647,8 +1646,9 @@ void nfa_hci_handle_admin_gate_evt(uint8_t* p_data) { nfa_hciu_send_to_all_apps(NFA_HCI_EVENT_RCVD_EVT, &evt_data); /* Send Get Host List after receiving any pending response */ - if ((p_msg = (tNFA_HCI_API_GET_HOST_LIST*)GKI_getbuf( - sizeof(tNFA_HCI_API_GET_HOST_LIST))) != NULL) { + p_msg = (tNFA_HCI_API_GET_HOST_LIST*)GKI_getbuf( + sizeof(tNFA_HCI_API_GET_HOST_LIST)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_HCI_API_GET_HOST_LIST_EVT; /* Set Invalid handle to identify this Get Host List command is internal */ diff --git a/src/nfa/hci/nfa_hci_api.c b/src/nfa/hci/nfa_hci_api.c index 5e1cb6b..c40ed3e 100644 --- a/src/nfa/hci/nfa_hci_api.c +++ b/src/nfa/hci/nfa_hci_api.c @@ -965,7 +965,8 @@ void NFA_HciDebug(uint8_t action, uint8_t size, uint8_t* p_data) { break; case NFA_HCI_DEBUG_SIM_HCI_EVENT: - if ((p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) != NULL) { + p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_msg != NULL) { p = (uint8_t*)(p_msg + 1); p_msg->event = NFA_HCI_CHECK_QUEUE_EVT; diff --git a/src/nfa/hci/nfa_hci_ci.c b/src/nfa/hci/nfa_hci_ci.c index 42738c9..a68b6f0 100644 --- a/src/nfa/hci/nfa_hci_ci.c +++ b/src/nfa/hci/nfa_hci_ci.c @@ -40,8 +40,8 @@ void nfa_nv_ci_read(uint16_t num_bytes_read, tNFA_NV_CO_STATUS status, uint8_t block) { tNFA_HCI_EVENT_DATA* p_msg; - if ((p_msg = (tNFA_HCI_EVENT_DATA*)GKI_getbuf(sizeof(tNFA_HCI_EVENT_DATA))) != - NULL) { + p_msg = (tNFA_HCI_EVENT_DATA*)GKI_getbuf(sizeof(tNFA_HCI_EVENT_DATA)); + if (p_msg != NULL) { p_msg->nv_read.hdr.event = NFA_HCI_RSP_NV_READ_EVT; if ((status == NFA_STATUS_OK) && (num_bytes_read != 0)) @@ -67,8 +67,8 @@ void nfa_nv_ci_read(uint16_t num_bytes_read, tNFA_NV_CO_STATUS status, void nfa_nv_ci_write(tNFA_NV_CO_STATUS status) { tNFA_HCI_EVENT_DATA* p_msg; - if ((p_msg = (tNFA_HCI_EVENT_DATA*)GKI_getbuf(sizeof(tNFA_HCI_EVENT_DATA))) != - NULL) { + p_msg = (tNFA_HCI_EVENT_DATA*)GKI_getbuf(sizeof(tNFA_HCI_EVENT_DATA)); + if (p_msg != NULL) { p_msg->nv_write.hdr.event = NFA_HCI_RSP_NV_WRITE_EVT; p_msg->nv_write.status = 0; nfa_sys_sendmsg(p_msg); diff --git a/src/nfa/hci/nfa_hci_main.c b/src/nfa/hci/nfa_hci_main.c index 23e56aa..28067e8 100644 --- a/src/nfa/hci/nfa_hci_main.c +++ b/src/nfa/hci/nfa_hci_main.c @@ -544,9 +544,10 @@ void nfa_hci_startup(void) { if (ee_info[count].ee_status == NFA_EE_STATUS_INACTIVE) { NFC_NfceeModeSet(target_handle, NFC_MODE_ACTIVATE); } - if ((status = NFC_ConnCreate(NCI_DEST_TYPE_NFCEE, target_handle, - NFA_EE_INTERFACE_HCI_ACCESS, - nfa_hci_conn_cback)) == NFA_STATUS_OK) + status = + NFC_ConnCreate(NCI_DEST_TYPE_NFCEE, target_handle, + NFA_EE_INTERFACE_HCI_ACCESS, nfa_hci_conn_cback); + if (status == NFA_STATUS_OK) nfa_sys_start_timer(&nfa_hci_cb.timer, NFA_HCI_RSP_TIMEOUT_EVT, NFA_HCI_CON_CREATE_TIMEOUT_VAL); else { diff --git a/src/nfa/hci/nfa_hci_utils.c b/src/nfa/hci/nfa_hci_utils.c index d25d4a0..895f09e 100644 --- a/src/nfa/hci/nfa_hci_utils.c +++ b/src/nfa/hci/nfa_hci_utils.c @@ -183,8 +183,8 @@ uint8_t nfa_hciu_count_open_pipes_on_gate(tNFA_HCI_DYN_GATE* p_gate) { tNFA_HANDLE nfa_hciu_get_gate_owner(uint8_t gate_id) { tNFA_HCI_DYN_GATE* pg; - if ((pg = nfa_hciu_find_gate_by_gid(gate_id)) == NULL) - return (NFA_HANDLE_INVALID); + pg = nfa_hciu_find_gate_by_gid(gate_id); + if (pg == NULL) return (NFA_HANDLE_INVALID); return (pg->gate_owner); } @@ -202,11 +202,11 @@ tNFA_HANDLE nfa_hciu_get_pipe_owner(uint8_t pipe_id) { tNFA_HCI_DYN_PIPE* pp; tNFA_HCI_DYN_GATE* pg; - if ((pp = nfa_hciu_find_pipe_by_pid(pipe_id)) == NULL) - return (NFA_HANDLE_INVALID); + pp = nfa_hciu_find_pipe_by_pid(pipe_id); + if (pp == NULL) return (NFA_HANDLE_INVALID); - if ((pg = nfa_hciu_find_gate_by_gid(pp->local_gate)) == NULL) - return (NFA_HANDLE_INVALID); + pg = nfa_hciu_find_gate_by_gid(pp->local_gate); + if (pg == NULL) return (NFA_HANDLE_INVALID); return (pg->gate_owner); } @@ -236,7 +236,8 @@ tNFA_HCI_DYN_GATE* nfa_hciu_alloc_gate(uint8_t gate_id, } if (gate_id != 0) { - if ((pg = nfa_hciu_find_gate_by_gid(gate_id)) != NULL) return (pg); + pg = nfa_hciu_find_gate_by_gid(gate_id); + if (pg != NULL) return (pg); } else { /* If gate_id is 0, we need to assign a free one */ /* Loop through all possible gate IDs checking if they are already used */ @@ -315,7 +316,8 @@ tNFA_STATUS nfa_hciu_send_msg(uint8_t pipe_id, uint8_t type, nfa_hci_cb.param_in_use = *p_msg; while ((first_pkt == true) || (msg_len != 0)) { - if ((p_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) != NULL) { + p_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_buf != NULL) { p_buf->offset = NCI_MSG_OFFSET_SIZE + NCI_DATA_HDR_SIZE; /* First packet has a 2-byte header, subsequent fragments have a 1-byte @@ -422,7 +424,8 @@ tNFA_HCI_DYN_PIPE* nfa_hciu_alloc_pipe(uint8_t pipe_id) { tNFA_HCI_DYN_PIPE* pp; /* If we already have a pipe of the same ID, release it first it */ - if ((pp = nfa_hciu_find_pipe_by_pid(pipe_id)) != NULL) { + pp = nfa_hciu_find_pipe_by_pid(pipe_id); + if (pp != NULL) { if (pipe_id > NFA_HCI_LAST_DYNAMIC_PIPE) return pp; nfa_hciu_release_pipe(pipe_id); } @@ -491,7 +494,8 @@ tNFA_HCI_RESPONSE nfa_hciu_add_pipe_to_gate(uint8_t pipe_id, uint8_t local_gate, if (p_gate != NULL) { /* Allocate a pipe control block */ - if ((p_pipe = nfa_hciu_alloc_pipe(pipe_id)) != NULL) { + p_pipe = nfa_hciu_alloc_pipe(pipe_id); + if (p_pipe != NULL) { p_pipe->pipe_id = pipe_id; p_pipe->pipe_state = NFA_HCI_PIPE_CLOSED; p_pipe->dest_host = dest_host; @@ -538,7 +542,8 @@ tNFA_HCI_RESPONSE nfa_hciu_add_pipe_to_static_gate(uint8_t local_gate, local_gate, pipe_id, dest_host, dest_gate); /* Allocate a pipe control block */ - if ((p_pipe = nfa_hciu_alloc_pipe(pipe_id)) != NULL) { + p_pipe = nfa_hciu_alloc_pipe(pipe_id); + if (p_pipe != NULL) { p_pipe->pipe_id = pipe_id; p_pipe->pipe_state = NFA_HCI_PIPE_CLOSED; p_pipe->dest_host = dest_host; @@ -796,8 +801,8 @@ tNFA_HCI_RESPONSE nfa_hciu_release_pipe(uint8_t pipe_id) { NFA_TRACE_EVENT1("nfa_hciu_release_pipe: %u", pipe_id); - if ((p_pipe = nfa_hciu_find_pipe_by_pid(pipe_id)) == NULL) - return (NFA_HCI_ANY_E_NOK); + p_pipe = nfa_hciu_find_pipe_by_pid(pipe_id); + if (p_pipe == NULL) return (NFA_HCI_ANY_E_NOK); if (pipe_id > NFA_HCI_LAST_DYNAMIC_PIPE) { NFA_TRACE_DEBUG1("ignore pipe: %d", pipe_id); @@ -810,7 +815,8 @@ tNFA_HCI_RESPONSE nfa_hciu_release_pipe(uint8_t pipe_id) { /* Remove pipe from ID management gate */ nfa_hci_cb.cfg.id_mgmt_gate.pipe_inx_mask &= ~(uint32_t)(1 << pipe_index); } else { - if ((p_gate = nfa_hciu_find_gate_by_gid(p_pipe->local_gate)) == NULL) { + p_gate = nfa_hciu_find_gate_by_gid(p_pipe->local_gate); + if (p_gate == NULL) { /* Mark the pipe control block as free */ p_pipe->pipe_id = 0; return (NFA_HCI_ANY_E_NOK); @@ -851,7 +857,8 @@ void nfa_hciu_remove_all_pipes_from_host(uint8_t host) { (pp->pipe_id > NFA_HCI_LAST_DYNAMIC_PIPE)))) continue; - if ((pg = nfa_hciu_find_gate_by_gid(pp->local_gate)) != NULL) { + pg = nfa_hciu_find_gate_by_gid(pp->local_gate); + if (pg != NULL) { evt_data.deleted.status = NFA_STATUS_OK; evt_data.deleted.pipe = pp->pipe_id; @@ -994,10 +1001,9 @@ tNFA_STATUS nfa_hciu_send_close_pipe_cmd(uint8_t pipe) { tNFA_STATUS nfa_hciu_send_get_param_cmd(uint8_t pipe, uint8_t index) { tNFA_STATUS status; - if ((status = nfa_hciu_send_msg(pipe, NFA_HCI_COMMAND_TYPE, - NFA_HCI_ANY_GET_PARAMETER, 1, &index)) == - NFC_STATUS_OK) - nfa_hci_cb.param_in_use = index; + status = nfa_hciu_send_msg(pipe, NFA_HCI_COMMAND_TYPE, + NFA_HCI_ANY_GET_PARAMETER, 1, &index); + if (status == NFC_STATUS_OK) nfa_hci_cb.param_in_use = index; return status; } @@ -1020,10 +1026,10 @@ tNFA_STATUS nfa_hciu_send_set_param_cmd(uint8_t pipe, uint8_t index, memcpy(&data[1], p_data, length); - if ((status = nfa_hciu_send_msg( - pipe, NFA_HCI_COMMAND_TYPE, NFA_HCI_ANY_SET_PARAMETER, - (uint16_t)(length + 1), data)) == NFC_STATUS_OK) - nfa_hci_cb.param_in_use = index; + status = + nfa_hciu_send_msg(pipe, NFA_HCI_COMMAND_TYPE, NFA_HCI_ANY_SET_PARAMETER, + (uint16_t)(length + 1), data); + if (status == NFC_STATUS_OK) nfa_hci_cb.param_in_use = index; return status; } diff --git a/src/nfa/p2p/nfa_p2p_api.c b/src/nfa/p2p/nfa_p2p_api.c index 95c7dfb..c676701 100644 --- a/src/nfa/p2p/nfa_p2p_api.c +++ b/src/nfa/p2p/nfa_p2p_api.c @@ -520,7 +520,8 @@ tNFA_STATUS NFA_P2pSendUI(tNFA_HANDLE handle, uint8_t dsap, uint16_t length, p_msg->handle = handle; p_msg->dsap = dsap; - if ((p_msg->p_msg = (NFC_HDR*)GKI_getpoolbuf(LLCP_POOL_ID)) != NULL) { + p_msg->p_msg = (NFC_HDR*)GKI_getpoolbuf(LLCP_POOL_ID); + if (p_msg->p_msg != NULL) { p_msg->p_msg->len = length; p_msg->p_msg->offset = LLCP_MIN_OFFSET; memcpy(((uint8_t*)(p_msg->p_msg + 1) + p_msg->p_msg->offset), p_data, @@ -690,7 +691,8 @@ tNFA_STATUS NFA_P2pSendData(tNFA_HANDLE handle, uint16_t length, p_msg->conn_handle = handle; - if ((p_msg->p_msg = (NFC_HDR*)GKI_getpoolbuf(LLCP_POOL_ID)) != NULL) { + p_msg->p_msg = (NFC_HDR*)GKI_getpoolbuf(LLCP_POOL_ID); + if (p_msg->p_msg != NULL) { p_msg->p_msg->len = length; p_msg->p_msg->offset = LLCP_MIN_OFFSET; memcpy(((uint8_t*)(p_msg->p_msg + 1) + p_msg->p_msg->offset), p_data, diff --git a/src/nfa/p2p/nfa_p2p_main.c b/src/nfa/p2p/nfa_p2p_main.c index 69e14bf..c68d85f 100644 --- a/src/nfa/p2p/nfa_p2p_main.c +++ b/src/nfa/p2p/nfa_p2p_main.c @@ -234,7 +234,8 @@ static void nfa_p2p_update_active_listen(void) { p2p_listen_mask, NFA_DM_DISC_HOST_ID_DH, nfa_p2p_discovery_cback); /* restart RF discovery to update RF technologies */ - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = NFA_P2P_INT_RESTART_RF_DISC_EVT; nfa_sys_sendmsg(p_msg); } diff --git a/src/nfa/rw/nfa_rw_act.c b/src/nfa/rw/nfa_rw_act.c index 34b8dae..8aee4cb 100644 --- a/src/nfa/rw/nfa_rw_act.c +++ b/src/nfa/rw/nfa_rw_act.c @@ -218,7 +218,8 @@ static void nfa_rw_handle_ndef_detect(tRW_EVENT event, tRW_DATA* p_rw_data) { if (nfa_rw_cb.cur_op == NFA_RW_OP_READ_NDEF) { /* if ndef detection was done as part of ndef-read operation, then perform * ndef read now */ - if ((conn_evt_data.status = nfa_rw_start_ndef_read()) != NFA_STATUS_OK) { + conn_evt_data.status = nfa_rw_start_ndef_read(); + if (conn_evt_data.status != NFA_STATUS_OK) { /* Failed to start NDEF Read */ /* Command complete - perform cleanup, notify app */ @@ -228,7 +229,8 @@ static void nfa_rw_handle_ndef_detect(tRW_EVENT event, tRW_DATA* p_rw_data) { } else if (nfa_rw_cb.cur_op == NFA_RW_OP_WRITE_NDEF) { /* if ndef detection was done as part of ndef-write operation, then * perform ndef write now */ - if ((conn_evt_data.status = nfa_rw_start_ndef_write()) != NFA_STATUS_OK) { + conn_evt_data.status = nfa_rw_start_ndef_write(); + if (conn_evt_data.status != NFA_STATUS_OK) { /* Failed to start NDEF Write. */ /* Command complete - perform cleanup, notify app */ @@ -706,7 +708,8 @@ static void nfa_rw_handle_t2t_evt(tRW_EVENT event, tRW_DATA* p_rw_data) { "response!"); /* Received NACK. Let DM wakeup the tag first (by putting tag to sleep and * then waking it up) */ - if ((p_rw_data->status = nfa_dm_disc_sleep_wakeup()) == NFC_STATUS_OK) { + p_rw_data->status = nfa_dm_disc_sleep_wakeup(); + if (p_rw_data->status == NFC_STATUS_OK) { nfa_rw_cb.halt_event = event; memcpy(&nfa_rw_cb.rw_data, p_rw_data, sizeof(tRW_DATA)); return; @@ -1466,8 +1469,8 @@ static tNFC_STATUS nfa_rw_start_ndef_read(void) { /* Allocate buffer for incoming NDEF message (free previous NDEF rx buffer, if * needed) */ nfa_rw_free_ndef_rx_buf(); - if ((nfa_rw_cb.p_ndef_buf = - (uint8_t*)nfa_mem_co_alloc(nfa_rw_cb.ndef_cur_size)) == NULL) { + nfa_rw_cb.p_ndef_buf = (uint8_t*)nfa_mem_co_alloc(nfa_rw_cb.ndef_cur_size); + if (nfa_rw_cb.p_ndef_buf == NULL) { NFA_TRACE_ERROR1("Unable to allocate a buffer for reading NDEF (size=%i)", nfa_rw_cb.ndef_cur_size); @@ -1516,8 +1519,8 @@ static bool nfa_rw_detect_ndef(tNFA_RW_MSG* p_data) { tNFA_CONN_EVT_DATA conn_evt_data; NFA_TRACE_DEBUG0("nfa_rw_detect_ndef"); - if ((conn_evt_data.ndef_detect.status = nfa_rw_start_ndef_detection()) != - NFC_STATUS_OK) { + conn_evt_data.ndef_detect.status = nfa_rw_start_ndef_detection(); + if (conn_evt_data.ndef_detect.status != NFC_STATUS_OK) { /* Command complete - perform cleanup, notify app */ nfa_rw_command_complete(); conn_evt_data.ndef_detect.cur_size = 0; @@ -1634,9 +1637,9 @@ static bool nfa_rw_write_ndef(tNFA_RW_MSG* p_data) { NFA_TRACE_DEBUG0("nfa_rw_write_ndef"); /* Validate NDEF message */ - if ((ndef_status = NDEF_MsgValidate(p_data->op_req.params.write_ndef.p_data, - p_data->op_req.params.write_ndef.len, - false)) != NDEF_OK) { + ndef_status = NDEF_MsgValidate(p_data->op_req.params.write_ndef.p_data, + p_data->op_req.params.write_ndef.len, false); + if (ndef_status != NDEF_OK) { NFA_TRACE_ERROR1("Invalid NDEF message. NDEF_MsgValidate returned %i", ndef_status); diff --git a/src/nfa/rw/nfa_rw_api.c b/src/nfa/rw/nfa_rw_api.c index 8864c5f..318eabc 100644 --- a/src/nfa/rw/nfa_rw_api.c +++ b/src/nfa/rw/nfa_rw_api.c @@ -63,8 +63,8 @@ tNFA_STATUS NFA_RwDetectNDef(void) { NFA_TRACE_API0("NFA_RwDetectNDef"); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_DETECT_NDEF; @@ -108,8 +108,8 @@ tNFA_STATUS NFA_RwReadNDef(void) { NFA_TRACE_API0("NFA_RwReadNDef"); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_READ_NDEF; @@ -150,8 +150,8 @@ tNFA_STATUS NFA_RwWriteNDef(uint8_t* p_data, uint32_t len) { /* Validate parameters */ if (p_data == NULL) return (NFA_STATUS_INVALID_PARAM); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_WRITE_NDEF; p_msg->params.write_ndef.len = len; @@ -185,8 +185,8 @@ tNFA_STATUS NFA_RwPresenceCheck(tNFA_RW_PRES_CHK_OPTION option) { NFA_TRACE_API0("NFA_RwPresenceCheck"); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_PRESENCE_CHECK; p_msg->params.option = option; @@ -218,8 +218,8 @@ tNFA_STATUS NFA_RwFormatTag(void) { NFA_TRACE_API0("NFA_RwFormatTag"); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_FORMAT_TAG; @@ -272,8 +272,8 @@ tNFA_STATUS NFA_RwSetTagReadOnly(bool b_hard_lock) { NFA_TRACE_API1("NFA_RwSetTagReadOnly (): %s", b_hard_lock ? "Hard lock" : "Soft lock"); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_SET_TAG_RO; @@ -330,8 +330,8 @@ tNFA_STATUS NFA_RwLocateTlv(uint8_t tlv_type) { NFA_TRACE_API0("NFA_RwLocateTlv"); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; if (tlv_type == TAG_LOCK_CTRL_TLV) { @@ -370,8 +370,8 @@ tNFA_STATUS NFA_RwLocateTlv(uint8_t tlv_type) { tNFA_STATUS NFA_RwT1tRid(void) { tNFA_RW_OPERATION* p_msg; - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_T1T_RID; @@ -401,8 +401,8 @@ tNFA_STATUS NFA_RwT1tRid(void) { tNFA_STATUS NFA_RwT1tReadAll(void) { tNFA_RW_OPERATION* p_msg; - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_T1T_RALL; @@ -432,8 +432,8 @@ tNFA_STATUS NFA_RwT1tReadAll(void) { tNFA_STATUS NFA_RwT1tRead(uint8_t block_number, uint8_t index) { tNFA_RW_OPERATION* p_msg; - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_T1T_READ; @@ -466,8 +466,8 @@ tNFA_STATUS NFA_RwT1tWrite(uint8_t block_number, uint8_t index, uint8_t data, bool b_erase) { tNFA_RW_OPERATION* p_msg; - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->params.t1t_write.b_erase = b_erase; @@ -501,8 +501,8 @@ tNFA_STATUS NFA_RwT1tWrite(uint8_t block_number, uint8_t index, uint8_t data, tNFA_STATUS NFA_RwT1tReadSeg(uint8_t segment_number) { tNFA_RW_OPERATION* p_msg; - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_T1T_RSEG; @@ -533,8 +533,8 @@ tNFA_STATUS NFA_RwT1tReadSeg(uint8_t segment_number) { tNFA_STATUS NFA_RwT1tRead8(uint8_t block_number) { tNFA_RW_OPERATION* p_msg; - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_T1T_READ8; @@ -566,8 +566,8 @@ tNFA_STATUS NFA_RwT1tWrite8(uint8_t block_number, uint8_t* p_data, bool b_erase) { tNFA_RW_OPERATION* p_msg; - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->params.t1t_write.b_erase = b_erase; @@ -603,8 +603,8 @@ tNFA_STATUS NFA_RwT2tRead(uint8_t block_number) { NFA_TRACE_API1("NFA_RwT2tRead (): Block to read: %d", block_number); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_T2T_READ; @@ -636,8 +636,8 @@ tNFA_STATUS NFA_RwT2tWrite(uint8_t block_number, uint8_t* p_data) { NFA_TRACE_API1("NFA_RwT2tWrite (): Block to write: %d", block_number); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_T2T_WRITE; @@ -672,8 +672,8 @@ tNFA_STATUS NFA_RwT2tSectorSelect(uint8_t sector_number) { NFA_TRACE_API1("NFA_RwT2tRead (): sector to select: %d", sector_number); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_T2T_SECTOR_SELECT; @@ -712,9 +712,9 @@ tNFA_STATUS NFA_RwT3tRead(uint8_t num_blocks, tNFA_T3T_BLOCK_DESC* t3t_blocks) { if ((num_blocks == 0) || (t3t_blocks == NULL)) return (NFA_STATUS_INVALID_PARAM); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION) + - (num_blocks * sizeof(tNFA_T3T_BLOCK_DESC))))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)( + sizeof(tNFA_RW_OPERATION) + (num_blocks * sizeof(tNFA_T3T_BLOCK_DESC)))); + if (p_msg != NULL) { /* point to area after tNFA_RW_OPERATION */ p_block_desc = (uint8_t*)(p_msg + 1); @@ -763,9 +763,10 @@ tNFA_STATUS NFA_RwT3tWrite(uint8_t num_blocks, tNFA_T3T_BLOCK_DESC* t3t_blocks, if ((num_blocks == 0) || (t3t_blocks == NULL) | (p_data == NULL)) return (NFA_STATUS_INVALID_PARAM); - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)( - sizeof(tNFA_RW_OPERATION) + - (num_blocks * (sizeof(tNFA_T3T_BLOCK_DESC) + 16))))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_RW_OPERATION) + + (num_blocks * (sizeof(tNFA_T3T_BLOCK_DESC) + 16)))); + if (p_msg != NULL) { /* point to block descriptor and data areas after tNFA_RW_OPERATION */ p_block_desc = (uint8_t*)(p_msg + 1); p_data_area = p_block_desc + (num_blocks * (sizeof(tNFA_T3T_BLOCK_DESC))); @@ -820,8 +821,8 @@ tNFA_STATUS NFA_RwI93Inventory(bool afi_present, uint8_t afi, uint8_t* p_uid) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_INVENTORY; @@ -869,8 +870,8 @@ tNFA_STATUS NFA_RwI93StayQuiet(void) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_STAY_QUIET; @@ -910,8 +911,8 @@ tNFA_STATUS NFA_RwI93ReadSingleBlock(uint8_t block_number) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_READ_SINGLE_BLOCK; @@ -957,8 +958,9 @@ tNFA_STATUS NFA_RwI93WriteSingleBlock(uint8_t block_number, uint8_t* p_data) { return (NFA_STATUS_FAILED); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)( - sizeof(tNFA_RW_OPERATION) + nfa_rw_cb.i93_block_size))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_RW_OPERATION) + nfa_rw_cb.i93_block_size)); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_WRITE_SINGLE_BLOCK; @@ -1001,8 +1003,8 @@ tNFA_STATUS NFA_RwI93LockBlock(uint8_t block_number) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_LOCK_BLOCK; @@ -1045,8 +1047,8 @@ tNFA_STATUS NFA_RwI93ReadMultipleBlocks(uint8_t first_block_number, return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_READ_MULTI_BLOCK; @@ -1098,8 +1100,9 @@ tNFA_STATUS NFA_RwI93WriteMultipleBlocks(uint8_t first_block_number, data_length = nfa_rw_cb.i93_block_size * number_blocks; - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION) + data_length))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_RW_OPERATION) + data_length)); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_WRITE_MULTI_BLOCK; @@ -1149,8 +1152,9 @@ tNFA_STATUS NFA_RwI93Select(uint8_t* p_uid) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION) + I93_UID_BYTE_LEN))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( + (uint16_t)(sizeof(tNFA_RW_OPERATION) + I93_UID_BYTE_LEN)); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_SELECT; @@ -1191,8 +1195,8 @@ tNFA_STATUS NFA_RwI93ResetToReady(void) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_RESET_TO_READY; @@ -1230,8 +1234,8 @@ tNFA_STATUS NFA_RwI93WriteAFI(uint8_t afi) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_WRITE_AFI; @@ -1271,8 +1275,8 @@ tNFA_STATUS NFA_RwI93LockAFI(void) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_LOCK_AFI; @@ -1310,8 +1314,8 @@ tNFA_STATUS NFA_RwI93WriteDSFID(uint8_t dsfid) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_WRITE_DSFID; @@ -1351,8 +1355,8 @@ tNFA_STATUS NFA_RwI93LockDSFID(void) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_LOCK_DSFID; @@ -1391,8 +1395,8 @@ tNFA_STATUS NFA_RwI93GetSysInfo(uint8_t* p_uid) { return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_GET_SYS_INFO; @@ -1441,8 +1445,8 @@ tNFA_STATUS NFA_RwI93GetMultiBlockSecurityStatus(uint8_t first_block_number, return (NFA_STATUS_WRONG_PROTOCOL); } - if ((p_msg = (tNFA_RW_OPERATION*)GKI_getbuf( - (uint16_t)(sizeof(tNFA_RW_OPERATION)))) != NULL) { + p_msg = (tNFA_RW_OPERATION*)GKI_getbuf((uint16_t)(sizeof(tNFA_RW_OPERATION))); + if (p_msg != NULL) { /* Fill in tNFA_RW_OPERATION struct */ p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op = NFA_RW_OP_I93_GET_MULTI_BLOCK_STATUS; diff --git a/src/nfa/rw/nfa_rw_main.c b/src/nfa/rw/nfa_rw_main.c index 1eb7c46..e1b594b 100644 --- a/src/nfa/rw/nfa_rw_main.c +++ b/src/nfa/rw/nfa_rw_main.c @@ -146,8 +146,8 @@ void nfa_rw_proc_disc_evt(tNFA_DM_RF_DISC_EVT event, tNFC_DISCOVER* p_data, tNFA_STATUS nfa_rw_send_raw_frame(NFC_HDR* p_data) { tNFA_RW_MSG* p_msg; - if ((p_msg = (tNFA_RW_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_RW_MSG))) != - NULL) { + p_msg = (tNFA_RW_MSG*)GKI_getbuf((uint16_t)sizeof(tNFA_RW_MSG)); + if (p_msg != NULL) { p_msg->hdr.event = NFA_RW_OP_REQUEST_EVT; p_msg->op_req.op = NFA_RW_OP_SEND_RAW_FRAME; @@ -182,7 +182,8 @@ bool nfa_rw_handle_event(NFC_HDR* p_msg) { #endif /* Get NFA_RW sub-event */ - if ((act_idx = (p_msg->event & 0x00FF)) < (NFA_RW_MAX_EVT & 0xFF)) { + act_idx = (p_msg->event & 0x00FF); + if (act_idx < (NFA_RW_MAX_EVT & 0xFF)) { return (*nfa_rw_action_tbl[act_idx])((tNFA_RW_MSG*)p_msg); } else { NFA_TRACE_ERROR1("nfa_rw_handle_event: unhandled event 0x%02X", diff --git a/src/nfa/sys/nfa_sys_ptim.c b/src/nfa/sys/nfa_sys_ptim.c index d1a191e..0e42042 100644 --- a/src/nfa/sys/nfa_sys_ptim.c +++ b/src/nfa/sys/nfa_sys_ptim.c @@ -93,7 +93,8 @@ void nfa_sys_ptim_timer_update(tPTIM_CB* p_cb) { if (p_tle->p_cback) { (*p_tle->p_cback)(p_tle); } else if (p_tle->event) { - if ((p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR))) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(sizeof(NFC_HDR)); + if (p_msg != NULL) { p_msg->event = p_tle->event; p_msg->layer_specific = 0; nfa_sys_sendmsg(p_msg); diff --git a/src/nfc/llcp/llcp_link.c b/src/nfc/llcp/llcp_link.c index c862280..4be2e5f 100644 --- a/src/nfc/llcp/llcp_link.c +++ b/src/nfc/llcp/llcp_link.c @@ -922,7 +922,8 @@ static void llcp_link_proc_ui_pdu(uint8_t local_sap, uint8_t remote_sap, p_app_cb = llcp_util_get_app_cb(local_sap); /*if UI PDU sent to SAP with data link connection*/ - if ((p_dlcb = llcp_dlc_find_dlcb_by_sap(local_sap, remote_sap))) { + p_dlcb = llcp_dlc_find_dlcb_by_sap(local_sap, remote_sap); + if (p_dlcb) { llcp_util_send_frmr(p_dlcb, LLCP_FRMR_W_ERROR_FLAG, LLCP_PDU_UI_TYPE, 0); llcp_dlsm_execute(p_dlcb, LLCP_DLC_EVENT_FRAME_ERROR, NULL); if (p_msg) { diff --git a/src/nfc/nci/nci_hmsgs.c b/src/nfc/nci/nci_hmsgs.c index c9b39a0..a8195bd 100644 --- a/src/nfc/nci/nci_hmsgs.c +++ b/src/nfc/nci/nci_hmsgs.c @@ -44,8 +44,8 @@ uint8_t nci_snd_core_reset(uint8_t reset_type) { NFC_HDR* p; uint8_t* pp; - if ((p = NCI_GET_CMD_BUF(NCI_CORE_PARAM_SIZE_RESET)) == NULL) - return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(NCI_CORE_PARAM_SIZE_RESET); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + NCI_CORE_PARAM_SIZE_RESET; @@ -75,8 +75,8 @@ uint8_t nci_snd_core_init(void) { NFC_HDR* p; uint8_t* pp; - if ((p = NCI_GET_CMD_BUF(NCI_CORE_PARAM_SIZE_INIT)) == NULL) - return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(NCI_CORE_PARAM_SIZE_INIT); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + NCI_CORE_PARAM_SIZE_INIT; @@ -105,7 +105,8 @@ uint8_t nci_snd_core_get_config(uint8_t* param_ids, uint8_t num_ids) { NFC_HDR* p; uint8_t* pp; - if ((p = NCI_GET_CMD_BUF(num_ids)) == NULL) return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(num_ids); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + num_ids + 1; @@ -137,7 +138,8 @@ uint8_t nci_snd_core_set_config(uint8_t* p_param_tlvs, uint8_t tlv_size) { uint8_t* pp; uint8_t num = 0, ulen, len, *pt; - if ((p = NCI_GET_CMD_BUF(tlv_size + 1)) == NULL) return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(tlv_size + 1); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + tlv_size + 1; @@ -185,7 +187,8 @@ uint8_t nci_snd_core_conn_create(uint8_t dest_type, uint8_t num_tlv, uint8_t* pp; uint8_t size = NCI_CORE_PARAM_SIZE_CON_CREATE + tlv_size; - if ((p = NCI_GET_CMD_BUF(size)) == NULL) return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(size); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + NCI_CORE_PARAM_SIZE_CON_CREATE; @@ -220,8 +223,8 @@ uint8_t nci_snd_core_conn_close(uint8_t conn_id) { NFC_HDR* p; uint8_t* pp; - if ((p = NCI_GET_CMD_BUF(NCI_CORE_PARAM_SIZE_CON_CLOSE)) == NULL) - return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(NCI_CORE_PARAM_SIZE_CON_CLOSE); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + NCI_CORE_PARAM_SIZE_CON_CLOSE; @@ -254,8 +257,8 @@ uint8_t nci_snd_nfcee_discover(uint8_t discover_action) { NFC_HDR* p; uint8_t* pp; - if ((p = NCI_GET_CMD_BUF(NCI_PARAM_SIZE_DISCOVER_NFCEE)) == NULL) - return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(NCI_PARAM_SIZE_DISCOVER_NFCEE); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + NCI_PARAM_SIZE_DISCOVER_NFCEE; @@ -286,8 +289,8 @@ uint8_t nci_snd_nfcee_mode_set(uint8_t nfcee_id, uint8_t nfcee_mode) { NFC_HDR* p; uint8_t* pp; - if ((p = NCI_GET_CMD_BUF(NCI_CORE_PARAM_SIZE_NFCEE_MODE_SET)) == NULL) - return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(NCI_CORE_PARAM_SIZE_NFCEE_MODE_SET); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + NCI_CORE_PARAM_SIZE_NFCEE_MODE_SET; @@ -324,7 +327,8 @@ uint8_t nci_snd_discover_cmd(uint8_t num, tNCI_DISCOVER_PARAMS* p_param) { int size; size = num * sizeof(tNCI_DISCOVER_PARAMS) + 1; - if ((p = NCI_GET_CMD_BUF(size)) == NULL) return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(size); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->offset = NCI_MSG_OFFSET_SIZE; @@ -363,8 +367,8 @@ uint8_t nci_snd_discover_select_cmd(uint8_t rf_disc_id, uint8_t protocol, NFC_HDR* p; uint8_t* pp; - if ((p = NCI_GET_CMD_BUF(NCI_DISCOVER_PARAM_SIZE_SELECT)) == NULL) - return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(NCI_DISCOVER_PARAM_SIZE_SELECT); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + NCI_DISCOVER_PARAM_SIZE_SELECT; @@ -399,8 +403,8 @@ uint8_t nci_snd_deactivate_cmd(uint8_t de_act_type) { nfc_cb.reassembly = true; - if ((p = NCI_GET_CMD_BUF(NCI_DISCOVER_PARAM_SIZE_DEACT)) == NULL) - return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(NCI_DISCOVER_PARAM_SIZE_DEACT); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + NCI_DISCOVER_PARAM_SIZE_DEACT; @@ -435,7 +439,8 @@ uint8_t nci_snd_discover_map_cmd(uint8_t num, tNCI_DISCOVER_MAPS* p_maps) { size = num * sizeof(tNCI_DISCOVER_MAPS) + 1; - if ((p = NCI_GET_CMD_BUF(size)) == NULL) return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(size); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->offset = NCI_MSG_OFFSET_SIZE; @@ -472,8 +477,8 @@ uint8_t nci_snd_t3t_polling(uint16_t system_code, uint8_t rc, uint8_t tsn) { NFC_HDR* p; uint8_t* pp; - if ((p = NCI_GET_CMD_BUF(NCI_RF_PARAM_SIZE_T3T_POLLING)) == NULL) - return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(NCI_RF_PARAM_SIZE_T3T_POLLING); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + NCI_RF_PARAM_SIZE_T3T_POLLING; @@ -507,7 +512,8 @@ uint8_t nci_snd_parameter_update_cmd(uint8_t* p_param_tlvs, uint8_t tlv_size) { uint8_t* pp; uint8_t num = 0, ulen, len, *pt; - if ((p = NCI_GET_CMD_BUF(tlv_size + 1)) == NULL) return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(tlv_size + 1); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + tlv_size + 1; @@ -564,7 +570,8 @@ uint8_t nci_snd_set_routing_cmd(bool more, uint8_t num_tlv, uint8_t tlv_size, size = 2; } - if ((p = NCI_GET_CMD_BUF(size)) == NULL) return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(size); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->offset = NCI_MSG_OFFSET_SIZE; @@ -602,7 +609,8 @@ uint8_t nci_snd_get_routing_cmd(void) { uint8_t* pp; uint8_t param_size = 0; - if ((p = NCI_GET_CMD_BUF(param_size)) == NULL) return (NCI_STATUS_FAILED); + p = NCI_GET_CMD_BUF(param_size); + if (p == NULL) return (NCI_STATUS_FAILED); p->event = BT_EVT_TO_NFC_NCI; p->len = NCI_MSG_HDR_SIZE + param_size; diff --git a/src/nfc/ndef/ndef_utils.c b/src/nfc/ndef/ndef_utils.c index f83b4a3..d25c049 100644 --- a/src/nfc/ndef/ndef_utils.c +++ b/src/nfc/ndef/ndef_utils.c @@ -506,7 +506,8 @@ uint8_t* NDEF_MsgGetNextRecByType(uint8_t* p_cur_rec, uint8_t tnf, uint32_t payload_len; /* If this is the last record in the message, return NULL */ - if ((p_rec = NDEF_MsgGetNextRec(p_cur_rec)) == NULL) return (NULL); + p_rec = NDEF_MsgGetNextRec(p_cur_rec); + if (p_rec == NULL) return (NULL); for (;;) { pRecStart = p_rec; @@ -617,7 +618,8 @@ uint8_t* NDEF_MsgGetNextRecById(uint8_t* p_cur_rec, uint8_t* p_id, uint32_t payload_len; /* If this is the last record in the message, return NULL */ - if ((p_rec = NDEF_MsgGetNextRec(p_cur_rec)) == NULL) return (NULL); + p_rec = NDEF_MsgGetNextRec(p_cur_rec); + if (p_rec == NULL) return (NULL); for (;;) { pRecStart = p_rec; @@ -983,8 +985,8 @@ extern tNDEF_STATUS NDEF_MsgAppendRec(uint8_t* p_msg, uint32_t max_size, tNDEF_STATUS status; /* First, validate new records */ - if ((status = NDEF_MsgValidate(p_new_rec, new_rec_len, false)) != NDEF_OK) - return (status); + status = NDEF_MsgValidate(p_new_rec, new_rec_len, false); + if (status != NDEF_OK) return (status); /* First, make sure the record will fit */ if ((*p_cur_size + new_rec_len) > max_size) @@ -1389,7 +1391,8 @@ tNDEF_STATUS NDEF_MsgRemoveRec(uint8_t* p_msg, uint32_t* p_cur_size, /* If this is the first record in the message... */ if (*p_rec & NDEF_MB_MASK) { /* Find the second record (if any) and set his 'Message Begin' bit */ - if ((pNext = NDEF_MsgGetRecByIndex(p_msg, 1)) != NULL) { + pNext = NDEF_MsgGetRecByIndex(p_msg, 1); + if (pNext != NULL) { *pNext |= NDEF_MB_MASK; *p_cur_size -= (uint32_t)(pNext - p_msg); @@ -1405,8 +1408,8 @@ tNDEF_STATUS NDEF_MsgRemoveRec(uint8_t* p_msg, uint32_t* p_cur_size, if (*p_rec & NDEF_ME_MASK) { if (index > 0) { /* Find the previous record and set his 'Message End' bit */ - if ((pPrev = NDEF_MsgGetRecByIndex(p_msg, index - 1)) == NULL) - return false; + pPrev = NDEF_MsgGetRecByIndex(p_msg, index - 1); + if (pPrev == NULL) return false; *pPrev |= NDEF_ME_MASK; } @@ -1416,7 +1419,8 @@ tNDEF_STATUS NDEF_MsgRemoveRec(uint8_t* p_msg, uint32_t* p_cur_size, } /* Not the first or the last... get the address of the next record */ - if ((pNext = NDEF_MsgGetNextRec(p_rec)) == NULL) return false; + pNext = NDEF_MsgGetNextRec(p_rec); + if (pNext == NULL) return false; /* We are removing p_rec, so shift from pNext to the end */ shiftup(p_rec, pNext, (uint32_t)(*p_cur_size - (pNext - p_msg))); @@ -1449,8 +1453,8 @@ tNDEF_STATUS NDEF_MsgCopyAndDechunk(uint8_t* p_src, uint32_t src_len, tNDEF_STATUS status; /* First, validate the source */ - if ((status = NDEF_MsgValidate(p_src, src_len, true)) != NDEF_OK) - return (status); + status = NDEF_MsgValidate(p_src, src_len, true); + if (status != NDEF_OK) return (status); /* The output buffer must be at least as large as the input buffer */ max_out_len = src_len; diff --git a/src/nfc/nfc/nfc_main.c b/src/nfc/nfc/nfc_main.c index 89a1e30..04cd2ef 100644 --- a/src/nfc/nfc/nfc_main.c +++ b/src/nfc/nfc/nfc_main.c @@ -485,8 +485,8 @@ void nfc_main_flush_cmd_queue(void) { void nfc_main_post_hal_evt(uint8_t hal_evt, tHAL_NFC_STATUS status) { tNFC_HAL_EVT_MSG* p_msg; - if ((p_msg = (tNFC_HAL_EVT_MSG*)GKI_getbuf(sizeof(tNFC_HAL_EVT_MSG))) != - NULL) { + p_msg = (tNFC_HAL_EVT_MSG*)GKI_getbuf(sizeof(tNFC_HAL_EVT_MSG)); + if (p_msg != NULL) { /* Initialize NFC_HDR */ p_msg->hdr.len = 0; p_msg->hdr.event = BT_EVT_TO_NFC_MSGS; @@ -566,7 +566,8 @@ static void nfc_main_hal_data_cback(uint16_t data_len, uint8_t* p_data) { } if (p_data) { - if ((p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_NCI_POOL_ID)) != NULL) { + p_msg = (NFC_HDR*)GKI_getpoolbuf(NFC_NCI_POOL_ID); + if (p_msg != NULL) { /* Initialize NFC_HDR */ p_msg->len = data_len; p_msg->event = BT_EVT_TO_NFC_NCI; diff --git a/src/nfc/nfc/nfc_ncif.c b/src/nfc/nfc/nfc_ncif.c index b265bb3..d901914 100644 --- a/src/nfc/nfc/nfc_ncif.c +++ b/src/nfc/nfc/nfc_ncif.c @@ -182,7 +182,8 @@ uint8_t nfc_ncif_send_data(tNFC_CONN_CB* p_cb, NFC_HDR* p_data) { /* the data packet is too big and need to be fragmented * prepare a new GKI buffer * (even the last fragment to avoid issues) */ - if ((p = NCI_GET_CMD_BUF(ulen)) == NULL) return (NCI_STATUS_BUFFER_FULL); + p = NCI_GET_CMD_BUF(ulen); + if (p == NULL) return (NCI_STATUS_BUFFER_FULL); p->len = ulen; p->offset = NCI_MSG_OFFSET_SIZE + NCI_DATA_HDR_SIZE + 1; if (p->len) { diff --git a/src/nfc/nfc/nfc_task.c b/src/nfc/nfc/nfc_task.c index 941740a..041818e 100644 --- a/src/nfc/nfc/nfc_task.c +++ b/src/nfc/nfc/nfc_task.c @@ -63,7 +63,8 @@ void nfc_start_timer(TIMER_LIST_ENT* p_tle, uint16_t type, uint32_t timeout) { /* if timer starts on other than NFC task (scritp wrapper) */ if (GKI_get_taskid() != NFC_TASK) { /* post event to start timer in NFC task */ - if ((p_msg = (NFC_HDR*)GKI_getbuf(NFC_HDR_SIZE)) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(NFC_HDR_SIZE); + if (p_msg != NULL) { p_msg->event = BT_EVT_TO_START_TIMER; GKI_send_msg(NFC_TASK, NFC_MBOX_ID, p_msg); } @@ -176,7 +177,8 @@ void nfc_start_quick_timer(TIMER_LIST_ENT* p_tle, uint16_t type, /* if timer starts on other than NFC task (scritp wrapper) */ if (GKI_get_taskid() != NFC_TASK) { /* post event to start timer in NFC task */ - if ((p_msg = (NFC_HDR*)GKI_getbuf(NFC_HDR_SIZE)) != NULL) { + p_msg = (NFC_HDR*)GKI_getbuf(NFC_HDR_SIZE); + if (p_msg != NULL) { p_msg->event = BT_EVT_TO_START_QUICK_TIMER; GKI_send_msg(NFC_TASK, NFC_MBOX_ID, p_msg); } diff --git a/src/nfc/tags/ce_t3t.c b/src/nfc/tags/ce_t3t.c index 045f4ef..8b9b264 100644 --- a/src/nfc/tags/ce_t3t.c +++ b/src/nfc/tags/ce_t3t.c @@ -136,7 +136,8 @@ uint8_t ce_t3t_is_valid_opcode(uint8_t cmd_id) { NFC_HDR* ce_t3t_get_rsp_buf(void) { NFC_HDR* p_cmd_buf; - if ((p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_CE_POOL_ID)) != NULL) { + p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_CE_POOL_ID); + if (p_cmd_buf != NULL) { /* Reserve offset for NCI_DATA_HDR and NFC-F Sod (LEN) field */ p_cmd_buf->offset = NCI_MSG_OFFSET_SIZE + NCI_DATA_HDR_SIZE + 1; p_cmd_buf->len = 0; @@ -165,7 +166,8 @@ void ce_t3t_send_rsp(tCE_CB* p_ce_cb, uint8_t* p_nfcid2, uint8_t opcode, p_nfcid2 = p_cb->local_nfcid2; } - if ((p_rsp_msg = ce_t3t_get_rsp_buf()) != NULL) { + p_rsp_msg = ce_t3t_get_rsp_buf(); + if (p_rsp_msg != NULL) { p_dst = p_rsp_start = (uint8_t*)(p_rsp_msg + 1) + p_rsp_msg->offset; /* Response Code */ @@ -373,7 +375,8 @@ void ce_t3t_handle_check_cmd(tCE_CB* p_ce_cb, NFC_HDR* p_cmd_msg) { uint32_t ndef_len; uint16_t block_number, service_code, checksum; - if ((p_rsp_msg = ce_t3t_get_rsp_buf()) != NULL) { + p_rsp_msg = ce_t3t_get_rsp_buf(); + if (p_rsp_msg != NULL) { p_dst = p_rsp_start = (uint8_t*)(p_rsp_msg + 1) + p_rsp_msg->offset; /* Response Code */ @@ -520,7 +523,8 @@ void ce_t3t_handle_non_nfc_forum_cmd(tCE_CB* p_mem_cb, uint8_t cmd_id, uint8_t rc; bool send_response = true; - if ((p_rsp_msg = ce_t3t_get_rsp_buf()) != NULL) { + p_rsp_msg = ce_t3t_get_rsp_buf(); + if (p_rsp_msg != NULL) { p_dst = p_rsp_start = (uint8_t*)(p_rsp_msg + 1) + p_rsp_msg->offset; switch (cmd_id) { @@ -935,7 +939,8 @@ tNFC_STATUS CE_T3tSendCheckRsp(uint8_t status1, uint8_t status2, return (NFC_STATUS_FAILED); } - if ((p_rsp_msg = ce_t3t_get_rsp_buf()) != NULL) { + p_rsp_msg = ce_t3t_get_rsp_buf(); + if (p_rsp_msg != NULL) { p_dst = p_rsp_start = (uint8_t*)(p_rsp_msg + 1) + p_rsp_msg->offset; /* Response Code */ diff --git a/src/nfc/tags/rw_t1t.c b/src/nfc/tags/rw_t1t.c index 104a00f..619a78e 100644 --- a/src/nfc/tags/rw_t1t.c +++ b/src/nfc/tags/rw_t1t.c @@ -357,7 +357,8 @@ tNFC_STATUS rw_t1t_send_static_cmd(uint8_t opcode, uint8_t add, uint8_t dat) { RW_TRACE_EVENT2("RW SENT [%s]:0x%x CMD", t1t_info_to_str(p_cmd_rsp_info), p_cmd_rsp_info->opcode); - if ((status = NFC_SendData(NFC_RF_CONN_ID, p_data)) == NFC_STATUS_OK) { + status = NFC_SendData(NFC_RF_CONN_ID, p_data); + if (status == NFC_STATUS_OK) { nfc_start_quick_timer( &p_t1t->timer, NFC_TTYPE_RW_T1T_RESPONSE, (RW_T1T_TOUT_RESP * QUICK_TIMER_TICKS_PER_SEC) / 1000); @@ -421,7 +422,8 @@ tNFC_STATUS rw_t1t_send_dyn_cmd(uint8_t opcode, uint8_t add, uint8_t* p_dat) { RW_TRACE_EVENT2("RW SENT [%s]:0x%x CMD", t1t_info_to_str(p_cmd_rsp_info), p_cmd_rsp_info->opcode); - if ((status = NFC_SendData(NFC_RF_CONN_ID, p_data)) == NFC_STATUS_OK) { + status = NFC_SendData(NFC_RF_CONN_ID, p_data); + if (status == NFC_STATUS_OK) { nfc_start_quick_timer( &p_t1t->timer, NFC_TTYPE_RW_T1T_RESPONSE, (RW_T1T_TOUT_RESP * QUICK_TIMER_TICKS_PER_SEC) / 1000); @@ -497,8 +499,8 @@ tNFC_STATUS rw_t1t_select(uint8_t hr[T1T_HR_LEN], /* Alloc cmd buf for retransmissions */ if (p_t1t->p_cur_cmd_buf == NULL) { - if ((p_t1t->p_cur_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) == - NULL) { + p_t1t->p_cur_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_t1t->p_cur_cmd_buf == NULL) { RW_TRACE_ERROR0( "rw_t1t_select: unable to allocate buffer for retransmission"); return status; @@ -592,7 +594,8 @@ static void rw_t1t_process_error(void) { RW_MAX_RETRIES); /* allocate a new buffer for message */ - if ((p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) != NULL) { + p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_cmd_buf != NULL) { memcpy(p_cmd_buf, p_t1t->p_cur_cmd_buf, sizeof(NFC_HDR) + p_t1t->p_cur_cmd_buf->offset + p_t1t->p_cur_cmd_buf->len); @@ -727,7 +730,8 @@ tNFC_STATUS RW_T1tPresenceCheck(void) { (*p_rw_cb->p_cback)(RW_T1T_PRESENCE_CHECK_EVT, &evt_data); } else { /* IDLE state: send a RID command to the tag to see if it responds */ - if ((retval = rw_t1t_send_static_cmd(T1T_CMD_RID, 0, 0)) == NFC_STATUS_OK) { + retval = rw_t1t_send_static_cmd(T1T_CMD_RID, 0, 0); + if (retval == NFC_STATUS_OK) { p_rw_cb->tcb.t1t.state = RW_T1T_STATE_CHECK_PRESENCE; } } @@ -760,7 +764,8 @@ tNFC_STATUS RW_T1tRid(void) { } /* send a RID command */ - if ((status = rw_t1t_send_static_cmd(T1T_CMD_RID, 0, 0)) == NFC_STATUS_OK) { + status = rw_t1t_send_static_cmd(T1T_CMD_RID, 0, 0); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_READ; } @@ -788,7 +793,8 @@ tNFC_STATUS RW_T1tReadAll(void) { } /* send RALL command */ - if ((status = rw_t1t_send_static_cmd(T1T_CMD_RALL, 0, 0)) == NFC_STATUS_OK) { + status = rw_t1t_send_static_cmd(T1T_CMD_RALL, 0, 0); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_READ; } @@ -816,8 +822,8 @@ tNFC_STATUS RW_T1tRead(uint8_t block, uint8_t byte) { /* send READ command */ RW_T1T_BLD_ADD((addr), (block), (byte)); - if ((status = rw_t1t_send_static_cmd(T1T_CMD_READ, addr, 0)) == - NFC_STATUS_OK) { + status = rw_t1t_send_static_cmd(T1T_CMD_READ, addr, 0); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_READ; } return status; @@ -859,8 +865,8 @@ tNFC_STATUS RW_T1tWriteErase(uint8_t block, uint8_t byte, uint8_t new_byte) { } /* send WRITE-E command */ RW_T1T_BLD_ADD((addr), (block), (byte)); - if ((status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_E, addr, new_byte)) == - NFC_STATUS_OK) { + status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_E, addr, new_byte); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_WRITE; if (block < T1T_BLOCKS_PER_SEGMENT) { p_t1t->b_update = false; @@ -906,8 +912,8 @@ tNFC_STATUS RW_T1tWriteNoErase(uint8_t block, uint8_t byte, uint8_t new_byte) { } /* send WRITE-NE command */ RW_T1T_BLD_ADD((addr), (block), (byte)); - if ((status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, new_byte)) == - NFC_STATUS_OK) { + status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, new_byte); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_WRITE; if (block < T1T_BLOCKS_PER_SEGMENT) { p_t1t->b_update = false; @@ -942,8 +948,8 @@ tNFC_STATUS RW_T1tReadSeg(uint8_t segment) { if (rw_cb.tcb.t1t.hr[0] != T1T_STATIC_HR0) { /* send RSEG command */ RW_T1T_BLD_ADDS((adds), (segment)); - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_RSEG, adds, NULL)) == - NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_RSEG, adds, NULL); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_READ; } } @@ -971,8 +977,8 @@ tNFC_STATUS RW_T1tRead8(uint8_t block) { if (rw_cb.tcb.t1t.hr[0] != T1T_STATIC_HR0 || rw_cb.tcb.t1t.hr[1] >= RW_T1T_HR1_MIN) { /* send READ8 command */ - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_READ8, block, NULL)) == - NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_READ8, block, NULL); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_READ; } } @@ -1013,8 +1019,8 @@ tNFC_STATUS RW_T1tWriteErase8(uint8_t block, uint8_t* p_new_dat) { if (rw_cb.tcb.t1t.hr[0] != T1T_STATIC_HR0 || rw_cb.tcb.t1t.hr[1] >= RW_T1T_HR1_MIN) { /* send WRITE-E8 command */ - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_E8, block, p_new_dat)) == - NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_E8, block, p_new_dat); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_WRITE; if (block < T1T_BLOCKS_PER_SEGMENT) { p_t1t->b_update = false; @@ -1059,8 +1065,8 @@ tNFC_STATUS RW_T1tWriteNoErase8(uint8_t block, uint8_t* p_new_dat) { if (rw_cb.tcb.t1t.hr[0] != T1T_STATIC_HR0 || rw_cb.tcb.t1t.hr[1] >= RW_T1T_HR1_MIN) { /* send WRITE-NE command */ - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_NE8, block, p_new_dat)) == - NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_NE8, block, p_new_dat); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_WRITE; if (block < T1T_BLOCKS_PER_SEGMENT) { p_t1t->b_update = false; diff --git a/src/nfc/tags/rw_t1t_ndef.c b/src/nfc/tags/rw_t1t_ndef.c index 95aa97b..5d6185c 100644 --- a/src/nfc/tags/rw_t1t_ndef.c +++ b/src/nfc/tags/rw_t1t_ndef.c @@ -294,8 +294,8 @@ tNFC_STATUS rw_t1t_read_locks(void) { } else if (offset < (p_t1t->mem[T1T_CC_TMS_BYTE] + 1) * T1T_BLOCK_SIZE) { /* send READ8 command */ p_t1t->block_read = (uint8_t)(offset / T1T_BLOCK_SIZE); - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_READ8, p_t1t->block_read, - NULL)) == NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_READ8, p_t1t->block_read, NULL); + if (status == NFC_STATUS_OK) { /* Reading Locks */ status = NFC_STATUS_CONTINUE; p_t1t->substate = RW_T1T_SUBSTATE_WAIT_READ_LOCKS; @@ -358,20 +358,19 @@ static tNFC_STATUS rw_t1t_handle_write_rsp(bool* p_notify, uint8_t* p_data) { /* send WRITE-E command */ RW_T1T_BLD_ADD((addr), 1, (uint8_t)p_t1t->work_offset); - if ((status = rw_t1t_send_static_cmd( - T1T_CMD_WRITE_E, addr, - p_t1t->ndef_first_block[(uint8_t)p_t1t->work_offset])) != - NFC_STATUS_OK) - *p_notify = true; + status = rw_t1t_send_static_cmd( + T1T_CMD_WRITE_E, addr, + p_t1t->ndef_first_block[(uint8_t)p_t1t->work_offset]); + if (status != NFC_STATUS_OK) *p_notify = true; } else *p_notify = true; } } else { /* send WRITE-E8 command */ - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_E8, 2, - p_t1t->ndef_final_block)) != - NFC_STATUS_OK) + status = + rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_E8, 2, p_t1t->ndef_final_block); + if (status != NFC_STATUS_OK) *p_notify = true; else p_t1t->substate = RW_T1T_SUBSTATE_WAIT_SET_NULL_NDEF; @@ -394,16 +393,17 @@ static tNFC_STATUS rw_t1t_handle_write_rsp(bool* p_notify, uint8_t* p_data) { write_block[1] = 0xFF; /* send WRITE-NE8 command */ - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_NE8, T1T_LOCK_BLOCK, - write_block)) != NFC_STATUS_OK) + status = rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_NE8, T1T_LOCK_BLOCK, + write_block); + if (status != NFC_STATUS_OK) *p_notify = true; else p_t1t->substate = RW_T1T_SUBSTATE_WAIT_SET_DYN_LOCK_BITS; } else { /* send WRITE-NE command */ RW_T1T_BLD_ADD((addr), (T1T_LOCK_BLOCK), (0)); - if ((status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, - 0xFF)) != NFC_STATUS_OK) + status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, 0xFF); + if (status != NFC_STATUS_OK) *p_notify = true; else p_t1t->substate = RW_T1T_SUBSTATE_WAIT_SET_ST_LOCK_BITS; @@ -414,8 +414,8 @@ static tNFC_STATUS rw_t1t_handle_write_rsp(bool* p_notify, uint8_t* p_data) { /* send WRITE-NE command */ RW_T1T_BLD_ADD((addr), (T1T_LOCK_BLOCK), (1)); - if ((status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, 0xFF)) != - NFC_STATUS_OK) + status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, 0xFF); + if (status != NFC_STATUS_OK) *p_notify = true; else p_t1t->substate = RW_T1T_SUBSTATE_WAIT_SET_DYN_LOCK_BITS; @@ -478,9 +478,10 @@ static tNFC_STATUS rw_t1t_handle_write_rsp(bool* p_notify, uint8_t* p_data) { } /* send WRITE-NE8 command */ - if ((status = rw_t1t_send_dyn_cmd( - T1T_CMD_WRITE_NE8, (uint8_t)(offset / T1T_BLOCK_SIZE), - write_block)) == NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_NE8, + (uint8_t)(offset / T1T_BLOCK_SIZE), + write_block); + if (status == NFC_STATUS_OK) { p_t1t->substate = RW_T1T_SUBSTATE_WAIT_SET_DYN_LOCK_BITS; while (lock_count > num_locks) { p_t1t->lockbyte[lock_count - 1].lock_status = @@ -494,8 +495,8 @@ static tNFC_STATUS rw_t1t_handle_write_rsp(bool* p_notify, uint8_t* p_data) { RW_T1T_BLD_ADD((addr), ((uint8_t)(offset / T1T_BLOCK_SIZE)), ((uint8_t)(offset % T1T_BLOCK_SIZE))); value = (uint8_t)(tags_pow(2, num_bits) - 1); - if ((status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, - value)) == NFC_STATUS_OK) { + status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, value); + if (status == NFC_STATUS_OK) { p_t1t->substate = RW_T1T_SUBSTATE_WAIT_SET_DYN_LOCK_BITS; p_t1t->lockbyte[num_locks].lock_status = RW_T1T_LOCK_UPDATE_INITIATED; @@ -1155,8 +1156,8 @@ static tNFC_STATUS rw_t1t_handle_ndef_rall_rsp(void) { p_t1t->segment++; } if (p_t1t->ndef_msg_len - p_t1t->work_offset <= 8) { - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_READ8, p_t1t->block_read, - NULL)) == NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_READ8, p_t1t->block_read, NULL); + if (status == NFC_STATUS_OK) { p_t1t->tlv_detect = TAG_NDEF_TLV; p_t1t->state = RW_T1T_STATE_READ_NDEF; status = NFC_STATUS_CONTINUE; @@ -1164,8 +1165,8 @@ static tNFC_STATUS rw_t1t_handle_ndef_rall_rsp(void) { } else { /* send RSEG command */ RW_T1T_BLD_ADDS((adds), (p_t1t->segment)); - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_RSEG, adds, NULL)) == - NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_RSEG, adds, NULL); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_READ_NDEF; status = NFC_STATUS_CONTINUE; } @@ -1246,17 +1247,17 @@ static tNFC_STATUS rw_t1t_handle_ndef_read_rsp(uint8_t* p_data) { if ((p_t1t->hr[0] & 0x0F) != 1) { if ((p_t1t->ndef_msg_len - p_t1t->work_offset) <= T1T_BLOCK_SIZE) { p_t1t->block_read++; - if ((ndef_status = rw_t1t_send_dyn_cmd( - T1T_CMD_READ8, (uint8_t)(p_t1t->block_read), NULL)) == - NFC_STATUS_OK) { + ndef_status = rw_t1t_send_dyn_cmd(T1T_CMD_READ8, + (uint8_t)(p_t1t->block_read), NULL); + if (ndef_status == NFC_STATUS_OK) { ndef_status = NFC_STATUS_CONTINUE; } } else { p_t1t->segment++; /* send RSEG command */ RW_T1T_BLD_ADDS((adds), (p_t1t->segment)); - if ((ndef_status = rw_t1t_send_dyn_cmd(T1T_CMD_RSEG, adds, NULL)) == - NFC_STATUS_OK) { + ndef_status = rw_t1t_send_dyn_cmd(T1T_CMD_RSEG, adds, NULL); + if (ndef_status == NFC_STATUS_OK) { ndef_status = NFC_STATUS_CONTINUE; } } @@ -1978,9 +1979,9 @@ static void rw_t1t_update_lock_attributes(void) { p_t1t->lock_attr[0x0D] = 0xFF; } else { /* update lock_attr based on segment and using dynamic lock bytes */ - if ((total_bits = rw_t1t_get_lock_bits_for_segment( - p_t1t->segment, &start_lock_byte, &start_lock_bit, - &end_lock_byte)) != 0) { + total_bits = rw_t1t_get_lock_bits_for_segment( + p_t1t->segment, &start_lock_byte, &start_lock_bit, &end_lock_byte); + if (total_bits != 0) { xx = start_lock_bit; num_dynamic_lock_bytes = start_lock_byte; bits_covered = 0; @@ -2137,7 +2138,8 @@ tNFC_STATUS RW_T1tFormatNDef(void) { return (NFC_STATUS_REJECTED); } - if ((p_ret = t1t_tag_init_data(p_t1t->hr[0])) == NULL) { + p_ret = t1t_tag_init_data(p_t1t->hr[0]); + if (p_ret == NULL) { RW_TRACE_WARNING2("RW_T1tFormatNDef - Invalid HR - HR0: %u, HR1: %u", p_t1t->hr[0], p_t1t->hr[1]); return (NFC_STATUS_REJECTED); @@ -2173,8 +2175,8 @@ tNFC_STATUS RW_T1tFormatNDef(void) { if (rw_cb.tcb.t1t.hr[0] != T1T_STATIC_HR0 || rw_cb.tcb.t1t.hr[1] >= RW_T1T_HR1_MIN) { /* send WRITE-E8 command */ - if ((status = rw_t1t_send_dyn_cmd( - T1T_CMD_WRITE_E8, 1, p_t1t->ndef_first_block)) == NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_WRITE_E8, 1, p_t1t->ndef_first_block); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_FORMAT_TAG; p_t1t->b_update = false; p_t1t->b_rseg = false; @@ -2187,9 +2189,9 @@ tNFC_STATUS RW_T1tFormatNDef(void) { /* send WRITE-E command */ RW_T1T_BLD_ADD((addr), 1, 0); - if ((status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_E, addr, - p_t1t->ndef_first_block[0])) == - NFC_STATUS_OK) { + status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_E, addr, + p_t1t->ndef_first_block[0]); + if (status == NFC_STATUS_OK) { p_t1t->work_offset = 0; p_t1t->state = RW_T1T_STATE_FORMAT_TAG; p_t1t->substate = RW_T1T_SUBSTATE_WAIT_SET_NULL_NDEF; @@ -2456,8 +2458,8 @@ tNFC_STATUS RW_T1tWriteNDef(uint16_t msg_len, uint8_t* p_msg) { /* Dynamic data structure */ p_t1t->block_read = (uint8_t)((offset - 1) / T1T_BLOCK_SIZE); /* Read NDEF final block before updating */ - if ((status = rw_t1t_send_dyn_cmd(T1T_CMD_READ8, p_t1t->block_read, - NULL)) == NFC_STATUS_OK) { + status = rw_t1t_send_dyn_cmd(T1T_CMD_READ8, p_t1t->block_read, NULL); + if (status == NFC_STATUS_OK) { p_t1t->num_ndef_finalblock = p_t1t->block_read; p_t1t->state = RW_T1T_STATE_WRITE_NDEF; p_t1t->substate = RW_T1T_SUBSTATE_WAIT_READ_NDEF_BLOCK; @@ -2465,8 +2467,8 @@ tNFC_STATUS RW_T1tWriteNDef(uint16_t msg_len, uint8_t* p_msg) { } else { /* NDEF detected and Static memory structure so send WRITE-E command */ RW_T1T_BLD_ADD((addr), (T1T_CC_BLOCK), (T1T_CC_NMN_OFFSET)); - if ((status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_E, addr, 0)) == - NFC_STATUS_OK) { + status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_E, addr, 0); + if (status == NFC_STATUS_OK) { p_t1t->state = RW_T1T_STATE_WRITE_NDEF; p_t1t->substate = RW_T1T_SUBSTATE_WAIT_INVALIDATE_NDEF; } @@ -2509,8 +2511,8 @@ tNFC_STATUS RW_T1tSetTagReadOnly(bool b_hard_lock) { (p_t1t->tag_attribute == RW_T1_TAG_ATTRB_INITIALIZED_NDEF)) { /* send WRITE-NE command */ RW_T1T_BLD_ADD((addr), (T1T_CC_BLOCK), (T1T_CC_RWA_OFFSET)); - if ((status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, 0x0F)) == - NFC_STATUS_OK) { + status = rw_t1t_send_static_cmd(T1T_CMD_WRITE_NE, addr, 0x0F); + if (status == NFC_STATUS_OK) { p_t1t->b_update = false; p_t1t->b_rseg = false; diff --git a/src/nfc/tags/rw_t2t.c b/src/nfc/tags/rw_t2t.c index 7e8b083..bb56e7b 100644 --- a/src/nfc/tags/rw_t2t.c +++ b/src/nfc/tags/rw_t2t.c @@ -379,7 +379,8 @@ tNFC_STATUS rw_t2t_send_cmd(uint8_t opcode, uint8_t* p_dat) { RW_TRACE_EVENT2("RW SENT [%s]:0x%x CMD", t2t_info_to_str(p_cmd_rsp_info), p_cmd_rsp_info->opcode); - if ((status = NFC_SendData(NFC_RF_CONN_ID, p_data)) == NFC_STATUS_OK) { + status = NFC_SendData(NFC_RF_CONN_ID, p_data); + if (status == NFC_STATUS_OK) { nfc_start_quick_timer( &p_t2t->t2_timer, NFC_TTYPE_RW_T2T_RESPONSE, (RW_T2T_TOUT_RESP * QUICK_TIMER_TICKS_PER_SEC) / 1000); @@ -499,7 +500,8 @@ static void rw_t2t_process_error(void) { RW_MAX_RETRIES); /* allocate a new buffer for message */ - if ((p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) != NULL) { + p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_cmd_buf != NULL) { memcpy(p_cmd_buf, p_t2t->p_cur_cmd_buf, sizeof(NFC_HDR) + p_t2t->p_cur_cmd_buf->offset + p_t2t->p_cur_cmd_buf->len); @@ -604,7 +606,8 @@ static void rw_t2t_resume_op(void) { p_t2t->p_cmd_rsp_info = (tT2T_CMD_RSP_INFO*)p_cmd_rsp_info; /* allocate a new buffer for message */ - if ((p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) != NULL) { + p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_cmd_buf != NULL) { memcpy(p_cmd_buf, p_t2t->p_sec_cmd_buf, sizeof(NFC_HDR) + p_t2t->p_sec_cmd_buf->offset + p_t2t->p_sec_cmd_buf->len); @@ -648,7 +651,8 @@ tNFC_STATUS rw_t2t_sector_change(uint8_t sector) { uint8_t* p; tRW_T2T_CB* p_t2t = &rw_cb.tcb.t2t; - if ((p_data = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) == NULL) { + p_data = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_data == NULL) { RW_TRACE_ERROR0("rw_t2t_sector_change - No buffer"); return (NFC_STATUS_NO_BUFFERS); } @@ -663,7 +667,8 @@ tNFC_STATUS rw_t2t_sector_change(uint8_t sector) { p_data->len = 4; - if ((status = NFC_SendData(NFC_RF_CONN_ID, p_data)) == NFC_STATUS_OK) { + status = NFC_SendData(NFC_RF_CONN_ID, p_data); + if (status == NFC_STATUS_OK) { /* Passive rsp command and suppose not to get response to this command */ p_t2t->p_cmd_rsp_info = NULL; p_t2t->substate = RW_T2T_SUBSTATE_WAIT_SELECT_SECTOR; @@ -705,8 +710,8 @@ tNFC_STATUS rw_t2t_read(uint16_t block) { if (p_t2t->sector != block / T2T_BLOCKS_PER_SECTOR) { sector_byte2[0] = 0xFF; /* First Move to new sector before sending Read command */ - if ((status = rw_t2t_send_cmd(T2T_CMD_SEC_SEL, sector_byte2)) == - NFC_STATUS_OK) { + status = rw_t2t_send_cmd(T2T_CMD_SEC_SEL, sector_byte2); + if (status == NFC_STATUS_OK) { /* Prepare command that needs to be sent after sector change op is * completed */ p_t2t->select_sector = (uint8_t)(block / T2T_BLOCKS_PER_SECTOR); @@ -728,8 +733,8 @@ tNFC_STATUS rw_t2t_read(uint16_t block) { } /* Send Read command as sector change is not needed */ - if ((status = rw_t2t_send_cmd(T2T_CMD_READ, (uint8_t*)read_cmd)) == - NFC_STATUS_OK) { + status = rw_t2t_send_cmd(T2T_CMD_READ, (uint8_t*)read_cmd); + if (status == NFC_STATUS_OK) { p_t2t->block_read = block; RW_TRACE_EVENT1("rw_t2t_read Sent Command for Block: %u", block); } @@ -764,8 +769,8 @@ tNFC_STATUS rw_t2t_write(uint16_t block, uint8_t* p_write_data) { if (p_t2t->sector != block / T2T_BLOCKS_PER_SECTOR) { sector_byte2[0] = 0xFF; /* First Move to new sector before sending Write command */ - if ((status = rw_t2t_send_cmd(T2T_CMD_SEC_SEL, sector_byte2)) == - NFC_STATUS_OK) { + status = rw_t2t_send_cmd(T2T_CMD_SEC_SEL, sector_byte2); + if (status == NFC_STATUS_OK) { /* Prepare command that needs to be sent after sector change op is * completed */ p_t2t->select_sector = (uint8_t)(block / T2T_BLOCKS_PER_SECTOR); @@ -786,7 +791,8 @@ tNFC_STATUS rw_t2t_write(uint16_t block, uint8_t* p_write_data) { } /* Send Write command as sector change is not needed */ - if ((status = rw_t2t_send_cmd(T2T_CMD_WRITE, write_cmd)) == NFC_STATUS_OK) { + status = rw_t2t_send_cmd(T2T_CMD_WRITE, write_cmd); + if (status == NFC_STATUS_OK) { RW_TRACE_EVENT1("rw_t2t_write Sent Command for Block: %u", block); } @@ -810,8 +816,8 @@ tNFC_STATUS rw_t2t_select(void) { /* Alloc cmd buf for retransmissions */ if (p_t2t->p_cur_cmd_buf == NULL) { - if ((p_t2t->p_cur_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) == - NULL) { + p_t2t->p_cur_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_t2t->p_cur_cmd_buf == NULL) { RW_TRACE_ERROR0( "rw_t2t_select: unable to allocate buffer for retransmission"); return (NFC_STATUS_FAILED); @@ -819,8 +825,8 @@ tNFC_STATUS rw_t2t_select(void) { } /* Alloc cmd buf for holding a command untill sector changes */ if (p_t2t->p_sec_cmd_buf == NULL) { - if ((p_t2t->p_sec_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) == - NULL) { + p_t2t->p_sec_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_t2t->p_sec_cmd_buf == NULL) { RW_TRACE_ERROR0( "rw_t2t_select: unable to allocate buffer used during sector change"); return (NFC_STATUS_FAILED); @@ -895,8 +901,8 @@ tNFC_STATUS RW_T2tPresenceCheck(void) { (*p_rw_cb->p_cback)(RW_T2T_PRESENCE_CHECK_EVT, &evt_data); } else { /* IDLE state: send a READ command to block 0 of the current sector */ - if ((retval = rw_t2t_send_cmd(T2T_CMD_READ, §or_blk)) == - NFC_STATUS_OK) { + retval = rw_t2t_send_cmd(T2T_CMD_READ, §or_blk); + if (retval == NFC_STATUS_OK) { p_rw_cb->tcb.t2t.state = RW_T2T_STATE_CHECK_PRESENCE; } } @@ -925,7 +931,8 @@ tNFC_STATUS RW_T2tRead(uint16_t block) { return (NFC_STATUS_FAILED); } - if ((status = rw_t2t_read(block)) == NFC_STATUS_OK) { + status = rw_t2t_read(block); + if (status == NFC_STATUS_OK) { p_t2t->state = RW_T2T_STATE_READ; RW_TRACE_EVENT0("RW_T2tRead Sent Read command"); } @@ -956,7 +963,8 @@ tNFC_STATUS RW_T2tWrite(uint16_t block, uint8_t* p_write_data) { return (NFC_STATUS_FAILED); } - if ((status = rw_t2t_write(block, p_write_data)) == NFC_STATUS_OK) { + status = rw_t2t_write(block, p_write_data); + if (status == NFC_STATUS_OK) { p_t2t->state = RW_T2T_STATE_WRITE; if (block < T2T_FIRST_DATA_BLOCK) p_t2t->b_read_hdr = false; @@ -1007,8 +1015,8 @@ tNFC_STATUS RW_T2tSectorSelect(uint8_t sector) { sector_byte2[0] = 0xFF; - if ((status = rw_t2t_send_cmd(T2T_CMD_SEC_SEL, sector_byte2)) == - NFC_STATUS_OK) { + status = rw_t2t_send_cmd(T2T_CMD_SEC_SEL, sector_byte2); + if (status == NFC_STATUS_OK) { p_t2t->state = RW_T2T_STATE_SELECT_SECTOR; p_t2t->select_sector = sector; p_t2t->substate = RW_T2T_SUBSTATE_WAIT_SELECT_SECTOR_SUPPORT; diff --git a/src/nfc/tags/rw_t2t_ndef.c b/src/nfc/tags/rw_t2t_ndef.c index 7562bf0..626f653 100644 --- a/src/nfc/tags/rw_t2t_ndef.c +++ b/src/nfc/tags/rw_t2t_ndef.c @@ -775,7 +775,8 @@ tNFC_STATUS rw_t2t_read_locks(void) { p_t2t->substate = RW_T2T_SUBSTATE_WAIT_READ_LOCKS; /* send READ8 command */ - if ((status = rw_t2t_read((uint16_t)block)) == NFC_STATUS_OK) { + status = rw_t2t_read((uint16_t)block); + if (status == NFC_STATUS_OK) { /* Reading Locks */ status = NFC_STATUS_CONTINUE; } else { @@ -818,8 +819,8 @@ void rw_t2t_extract_default_locks_info(void) { /* No Lock control tlv is detected. Indicates lock bytes are present in * default location */ /* Add a virtual Lock tlv to map this default lock location */ - if ((p_ret = t2t_tag_init_data(p_t2t->tag_hdr[0], false, 0)) != NULL) - bytes_locked_per_lock_bit = p_ret->default_lock_blpb; + p_ret = t2t_tag_init_data(p_t2t->tag_hdr[0], false, 0); + if (p_ret != NULL) bytes_locked_per_lock_bit = p_ret->default_lock_blpb; num_dynamic_lock_bits = ((p_t2t->tag_hdr[T2T_CC2_TMS_BYTE] * T2T_TMS_TAG_FACTOR) - @@ -890,7 +891,8 @@ tNFC_STATUS rw_t2t_read_ndef_last_block(void) { p_t2t->substate = RW_T2T_SUBSTATE_WAIT_READ_NDEF_LAST_BLOCK; /* Read NDEF last block before updating */ - if ((status = rw_t2t_read(block)) == NFC_STATUS_OK) { + status = rw_t2t_read(block); + if (status == NFC_STATUS_OK) { if ((p_t2t->new_ndef_msg_len + 1) <= p_t2t->max_ndef_msg_len) { /* Locate Terminator TLV Block */ total_ndef_bytes++; @@ -1129,7 +1131,8 @@ tNFC_STATUS rw_t2t_write_ndef_first_block(uint16_t msg_len, bool b_update_len) { } else { rw_t2t_update_cb(block, write_block, b_update_len); /* Update the identified block with newly prepared data */ - if ((status = rw_t2t_write(block, write_block)) == NFC_STATUS_OK) { + status = rw_t2t_write(block, write_block); + if (status == NFC_STATUS_OK) { p_t2t->b_read_data = false; } } @@ -1814,8 +1817,8 @@ static void rw_t2t_handle_format_tag_rsp(uint8_t* p_data) { memcpy(p_t2t->tag_data, p_data, T2T_READ_DATA_LEN); p_t2t->b_read_data = true; version_no = (uint16_t)p_data[0] << 8 | p_data[1]; - if ((p_ret = t2t_tag_init_data(p_t2t->tag_hdr[0], true, version_no)) != - NULL) { + p_ret = t2t_tag_init_data(p_t2t->tag_hdr[0], true, version_no); + if (p_ret != NULL) { /* Valid Version Number */ if (p_ret->b_calc_cc) /* Calculate tag size from Version Information */ tms = rw_t2t_get_tag_size(p_data); @@ -1850,9 +1853,8 @@ static void rw_t2t_handle_format_tag_rsp(uint8_t* p_data) { locked_area = ((uint16_t)p_t2t->tag_data[2] << 8 | p_t2t->tag_data[3]) * ((uint16_t)p_t2t->tag_data[6]); - if ((status = - rw_t2t_set_lock_tlv(addr, p_t2t->tag_data[7], locked_area)) == - NFC_STATUS_REJECTED) { + status = rw_t2t_set_lock_tlv(addr, p_t2t->tag_data[7], locked_area); + if (status == NFC_STATUS_REJECTED) { /* Cannot calculate Lock TLV. Set Null NDEF TLV and complete Format * Operation */ next_block = T2T_FIRST_DATA_BLOCK; @@ -1876,9 +1878,8 @@ static void rw_t2t_handle_format_tag_rsp(uint8_t* p_data) { p_t2t->substate = RW_T2T_SUBSTATE_WAIT_SET_NULL_NDEF; /* send WRITE-E8 command */ - if ((status = rw_t2t_write(next_block, p_t2t->ndef_final_block)) == - NFC_STATUS_OK) - p_t2t->b_read_data = false; + status = rw_t2t_write(next_block, p_t2t->ndef_final_block); + if (status == NFC_STATUS_OK) p_t2t->b_read_data = false; break; case RW_T2T_SUBSTATE_WAIT_SET_NULL_NDEF: @@ -2183,9 +2184,9 @@ static void rw_t2t_update_lock_attributes(void) { } /* Get lock bits applicable for the current segment */ - if ((total_bits = rw_t2t_get_lock_bits_for_segment( - p_t2t->segment, &start_lock_byte, &start_lock_bit, - &end_lock_byte)) != 0) { + total_bits = rw_t2t_get_lock_bits_for_segment( + p_t2t->segment, &start_lock_byte, &start_lock_bit, &end_lock_byte); + if (total_bits != 0) { /* update lock_attributes based on current segment using dynamic lock bytes */ xx = start_lock_bit; @@ -2395,8 +2396,8 @@ tNFC_STATUS rw_t2t_set_dynamic_lock_bits(uint8_t* p_data) { p_t2t->substate = RW_T2T_SUBSTATE_WAIT_SET_DYN_LOCK_BITS; /* send WRITE command to set dynamic lock bits */ - if ((status = rw_t2t_write((uint16_t)(offset / T2T_BLOCK_SIZE), - write_block)) == NFC_STATUS_OK) { + status = rw_t2t_write((uint16_t)(offset / T2T_BLOCK_SIZE), write_block); + if (status == NFC_STATUS_OK) { while (lock_count > num_locks) { /* Set update initiated flag to indicate a write command is sent to * set dynamic lock bits of the block */ @@ -2470,8 +2471,8 @@ tNFC_STATUS rw_t2t_set_lock_tlv(uint16_t addr, uint8_t num_dyn_lock_bits, p_t2t->substate = RW_T2T_SUBSTATE_WAIT_SET_LOCK_TLV; /* send WRITE-E8 command */ - if ((status = rw_t2t_write(T2T_FIRST_DATA_BLOCK, data_block)) == - NFC_STATUS_OK) { + status = rw_t2t_write(T2T_FIRST_DATA_BLOCK, data_block); + if (status == NFC_STATUS_OK) { p_t2t->b_read_data = false; } else p_t2t->substate = RW_T2T_SUBSTATE_NONE; @@ -2515,7 +2516,8 @@ tNFC_STATUS rw_t2t_set_cc(uint8_t tms) { p_t2t->substate = RW_T2T_SUBSTATE_WAIT_SET_CC; /* send WRITE-E8 command */ - if ((status = rw_t2t_write(T2T_CC_BLOCK, cc_block)) == NFC_STATUS_OK) { + status = rw_t2t_write(T2T_CC_BLOCK, cc_block); + if (status == NFC_STATUS_OK) { p_t2t->state = RW_T2T_STATE_FORMAT_TAG; p_t2t->b_read_hdr = false; } else @@ -2542,7 +2544,8 @@ tNFC_STATUS rw_t2t_format_tag(void) { tNFC_STATUS status = NFC_STATUS_FAILED; bool b_blank_tag = true; - if ((p_ret = t2t_tag_init_data(p_t2t->tag_hdr[0], false, 0)) == NULL) { + p_ret = t2t_tag_init_data(p_t2t->tag_hdr[0], false, 0); + if (p_ret == NULL) { RW_TRACE_WARNING1( "rw_t2t_format_tag - Unknown Manufacturer ID: %u, Cannot Format the " "tag!", @@ -2581,7 +2584,8 @@ tNFC_STATUS rw_t2t_format_tag(void) { /* If Version number is not read, READ it now */ p_t2t->substate = RW_T2T_SUBSTATE_WAIT_READ_VERSION_INFO; - if ((status = rw_t2t_read(p_ret->version_block)) == NFC_STATUS_OK) + status = rw_t2t_read(p_ret->version_block); + if (status == NFC_STATUS_OK) p_t2t->state = RW_T2T_STATE_FORMAT_TAG; else p_t2t->substate = RW_T2T_SUBSTATE_NONE; @@ -2650,7 +2654,8 @@ tNFC_STATUS rw_t2t_soft_lock_tag(void) { p_t2t->substate = RW_T2T_SUBSTATE_WAIT_SET_CC_RO; /* First Soft lock the tag */ - if ((status = rw_t2t_write(T2T_CC_BLOCK, write_block)) == NFC_STATUS_OK) { + status = rw_t2t_write(T2T_CC_BLOCK, write_block); + if (status == NFC_STATUS_OK) { p_t2t->state = RW_T2T_STATE_SET_TAG_RO; p_t2t->b_read_hdr = false; } else { @@ -2685,13 +2690,14 @@ tNFC_STATUS RW_T2tFormatNDef(void) { /* If UID is not read, READ it now */ p_t2t->substate = RW_T2T_SUBSTATE_WAIT_READ_CC; - if ((status = rw_t2t_read(0)) == NFC_STATUS_OK) + status = rw_t2t_read(0); + if (status == NFC_STATUS_OK) p_t2t->state = RW_T2T_STATE_FORMAT_TAG; else p_t2t->substate = RW_T2T_SUBSTATE_NONE; } else { - if ((status = rw_t2t_format_tag()) != NFC_STATUS_OK) - p_t2t->b_read_hdr = false; + status = rw_t2t_format_tag(); + if (status != NFC_STATUS_OK) p_t2t->b_read_hdr = false; } return status; } @@ -2781,7 +2787,8 @@ tNFC_STATUS RW_T2tLocateTlv(uint8_t tlv_type) { } /* Start reading tag, looking for the specified TLV */ - if ((status = rw_t2t_read((uint16_t)block)) == NFC_STATUS_OK) { + status = rw_t2t_read((uint16_t)block); + if (status == NFC_STATUS_OK) { p_t2t->state = RW_T2T_STATE_DETECT_TLV; } else { p_t2t->substate = RW_T2T_SUBSTATE_NONE; @@ -2879,7 +2886,8 @@ tNFC_STATUS RW_T2tReadNDef(uint8_t* p_buffer, uint16_t buf_len) { rw_t2t_handle_ndef_read_rsp(p_t2t->tag_data); } else { /* Start reading NDEF Message */ - if ((status = rw_t2t_read(block)) == NFC_STATUS_OK) { + status = rw_t2t_read(block); + if (status == NFC_STATUS_OK) { p_t2t->state = RW_T2T_STATE_READ_NDEF; } } @@ -2967,7 +2975,8 @@ tNFC_STATUS RW_T2tWriteNDef(uint16_t msg_len, uint8_t* p_msg) { rw_t2t_handle_ndef_write_rsp( &p_t2t->tag_data[(block - T2T_FIRST_DATA_BLOCK) * T2T_BLOCK_LEN]); } else { - if ((status = rw_t2t_read(block)) == NFC_STATUS_OK) + status = rw_t2t_read(block); + if (status == NFC_STATUS_OK) p_t2t->state = RW_T2T_STATE_WRITE_NDEF; else p_t2t->substate = RW_T2T_SUBSTATE_NONE; @@ -3005,13 +3014,14 @@ tNFC_STATUS RW_T2tSetTagReadOnly(bool b_hard_lock) { if (!p_t2t->b_read_hdr) { /* Read CC block before configuring tag as Read only */ p_t2t->substate = RW_T2T_SUBSTATE_WAIT_READ_CC; - if ((status = rw_t2t_read((uint16_t)0)) == NFC_STATUS_OK) { + status = rw_t2t_read((uint16_t)0); + if (status == NFC_STATUS_OK) { p_t2t->state = RW_T2T_STATE_SET_TAG_RO; } else p_t2t->substate = RW_T2T_SUBSTATE_NONE; } else { - if ((status = rw_t2t_soft_lock_tag()) != NFC_STATUS_OK) - p_t2t->b_read_hdr = false; + status = rw_t2t_soft_lock_tag(); + if (status != NFC_STATUS_OK) p_t2t->b_read_hdr = false; } return status; diff --git a/src/nfc/tags/rw_t3t.c b/src/nfc/tags/rw_t3t.c index d25b4cd..2d1768b 100644 --- a/src/nfc/tags/rw_t3t.c +++ b/src/nfc/tags/rw_t3t.c @@ -265,7 +265,8 @@ void rw_t3t_process_error(tNFC_STATUS status) { RW_MAX_RETRIES); /* allocate a new buffer for message */ - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { memcpy(p_cmd_buf, p_cb->p_cur_cmd_buf, sizeof(NFC_HDR) + p_cb->p_cur_cmd_buf->offset + p_cb->p_cur_cmd_buf->len); @@ -373,7 +374,8 @@ void rw_t3t_handle_nci_poll_ntf(uint8_t nci_status, uint8_t num_responses, sensf_res_buf_size, p_sensf_res_buf); } else { /* Handle POLL ntf in response to RW_T3tPoll */ - if ((evt_data.t3t_poll.status = nci_status) == NCI_STATUS_OK) { + evt_data.t3t_poll.status = nci_status; + if (evt_data.t3t_poll.status == NCI_STATUS_OK) { evt_data.t3t_poll.rc = p_cb->cur_poll_rc; evt_data.t3t_poll.response_num = num_responses; evt_data.t3t_poll.response_bufsize = sensf_res_buf_size; @@ -600,7 +602,8 @@ tNFC_STATUS rw_t3t_send_to_lower(NFC_HDR* p_msg) { NFC_HDR* rw_t3t_get_cmd_buf(void) { NFC_HDR* p_cmd_buf; - if ((p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) != NULL) { + p_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_cmd_buf != NULL) { /* Reserve offset for NCI_DATA_HDR and NFC-F Sod (LEN) field */ p_cmd_buf->offset = NCI_MSG_OFFSET_SIZE + NCI_DATA_HDR_SIZE + 1; p_cmd_buf->len = 0; @@ -632,7 +635,8 @@ tNFC_STATUS rw_t3t_send_cmd(tRW_T3T_CB* p_cb, uint8_t rw_t3t_cmd, p_cb->cur_tout = timeout_ticks; p_cb->rw_state = RW_T3T_STATE_COMMAND_PENDING; - if ((retval = rw_t3t_send_to_lower(p_cmd_buf)) == NFC_STATUS_OK) { + retval = rw_t3t_send_to_lower(p_cmd_buf); + if (retval == NFC_STATUS_OK) { /* Start timer for waiting for response */ nfc_start_quick_timer(&p_cb->timer, NFC_TTYPE_RW_T3T_RESPONSE, timeout_ticks); @@ -665,7 +669,8 @@ tNFC_STATUS rw_t3t_send_update_ndef_attribute_cmd(tRW_T3T_CB* p_cb, uint32_t ln; uint8_t* p_ndef_attr_info_start; - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { /* Construct T3T message */ p = p_cmd_start = (uint8_t*)(p_cmd_buf + 1) + p_cmd_buf->offset; @@ -754,7 +759,8 @@ tNFC_STATUS rw_t3t_send_next_ndef_update_cmd(tRW_T3T_CB* p_cb) { uint8_t blocks_per_update; uint32_t timeout; - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { /* Construct T3T message */ p = p_cmd_start = (uint8_t*)(p_cmd_buf + 1) + p_cmd_buf->offset; @@ -894,7 +900,8 @@ tNFC_STATUS rw_t3t_send_next_ndef_check_cmd(tRW_T3T_CB* p_cb) { NFC_HDR* p_cmd_buf; uint8_t *p_cmd_start, *p; - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { /* Construct T3T message */ p = p_cmd_start = (uint8_t*)(p_cmd_buf + 1) + p_cmd_buf->offset; @@ -1079,7 +1086,8 @@ tNFC_STATUS rw_t3t_send_check_cmd(tRW_T3T_CB* p_cb, uint8_t num_blocks, tNFC_STATUS retval = NFC_STATUS_OK; p_cb->cur_cmd = RW_T3T_CMD_CHECK; - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { /* Construct T3T message */ p = p_cmd_start = (uint8_t*)(p_cmd_buf + 1) + p_cmd_buf->offset; rw_t3t_message_set_block_list(p_cb, &p, num_blocks, p_t3t_blocks); @@ -1114,7 +1122,8 @@ tNFC_STATUS rw_t3t_send_update_cmd(tRW_T3T_CB* p_cb, uint8_t num_blocks, tNFC_STATUS retval = NFC_STATUS_OK; p_cb->cur_cmd = RW_T3T_CMD_UPDATE; - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { /* Construct T3T message */ p = p_cmd_start = (uint8_t*)(p_cmd_buf + 1) + p_cmd_buf->offset; rw_t3t_message_set_block_list(p_cb, &p, num_blocks, p_t3t_blocks); @@ -1149,7 +1158,8 @@ tNFC_STATUS rw_t3t_check_mc_block(tRW_T3T_CB* p_cb) { uint8_t *p, *p_cmd_start; /* Read Memory Configuration block */ - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { /* Construct T3T message */ p = p_cmd_start = (uint8_t*)(p_cmd_buf + 1) + p_cmd_buf->offset; @@ -1199,7 +1209,8 @@ tNFC_STATUS rw_t3t_send_raw_frame(tRW_T3T_CB* p_cb, uint16_t len, uint8_t* p; tNFC_STATUS retval = NFC_STATUS_OK; - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { /* Construct T3T message */ p = (uint8_t*)(p_cmd_buf + 1) + p_cmd_buf->offset; @@ -1531,8 +1542,8 @@ void rw_t3t_act_handle_check_ndef_rsp(tRW_T3T_CB* p_cb, NFC_HDR* p_msg_rsp) { /* Send CHECK cmd for next NDEF segment, if needed */ if (!(p_cb->flags & RW_T3T_FL_IS_FINAL_NDEF_SEGMENT)) { - if ((nfc_status = rw_t3t_send_next_ndef_check_cmd(p_cb)) == - NFC_STATUS_OK) { + nfc_status = rw_t3t_send_next_ndef_check_cmd(p_cb); + if (nfc_status == NFC_STATUS_OK) { /* Still getting more segments. Don't send RW_T3T_CHECK_CPLT_EVT yet */ check_complete = false; @@ -1588,8 +1599,8 @@ void rw_t3t_act_handle_update_ndef_rsp(tRW_T3T_CB* p_cb, NFC_HDR* p_msg_rsp) { /* If any more NDEF bytes to update, then send next UPDATE command */ else if (p_cb->ndef_msg_bytes_sent < p_cb->ndef_msg_len) { /* Send UPDATE command for next segment of NDEF */ - if ((nfc_status = rw_t3t_send_next_ndef_update_cmd(p_cb)) == - NFC_STATUS_OK) { + nfc_status = rw_t3t_send_next_ndef_update_cmd(p_cb); + if (nfc_status == NFC_STATUS_OK) { /* Wait for update response */ update_complete = false; } @@ -1598,8 +1609,8 @@ void rw_t3t_act_handle_update_ndef_rsp(tRW_T3T_CB* p_cb, NFC_HDR* p_msg_rsp) { block */ else { p_cb->flags |= RW_T3T_FL_IS_FINAL_NDEF_SEGMENT; - if ((nfc_status = rw_t3t_send_update_ndef_attribute_cmd(p_cb, false)) == - NFC_STATUS_OK) { + nfc_status = rw_t3t_send_update_ndef_attribute_cmd(p_cb, false); + if (nfc_status == NFC_STATUS_OK) { /* Wait for update response */ update_complete = false; } @@ -1670,7 +1681,8 @@ static void rw_t3t_handle_ndef_detect_poll_rsp(tRW_T3T_CB* p_cb, /* Tag responded for NDEF poll */ /* Read NDEF attribute block */ - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { /* Construct T3T message */ p = p_cmd_start = (uint8_t*)(p_cmd_buf + 1) + p_cmd_buf->offset; @@ -1698,9 +1710,9 @@ static void rw_t3t_handle_ndef_detect_poll_rsp(tRW_T3T_CB* p_cb, p_cmd_buf->len = (uint16_t)(p - p_cmd_start); /* Send the T3T message */ - if ((evt_data.status = - rw_t3t_send_cmd(p_cb, RW_T3T_CMD_DETECT_NDEF, p_cmd_buf, - rw_t3t_check_timeout(1))) == NFC_STATUS_OK) { + evt_data.status = rw_t3t_send_cmd(p_cb, RW_T3T_CMD_DETECT_NDEF, p_cmd_buf, + rw_t3t_check_timeout(1)); + if (evt_data.status == NFC_STATUS_OK) { /* CHECK command sent. Wait for response */ return; } @@ -1732,7 +1744,8 @@ tNFC_STATUS rw_t3t_update_block(tRW_T3T_CB* p_cb, uint8_t block_id, NFC_HDR* p_cmd_buf; tNFC_STATUS status; - if ((p_cmd_buf = rw_t3t_get_cmd_buf()) != NULL) { + p_cmd_buf = rw_t3t_get_cmd_buf(); + if (p_cmd_buf != NULL) { p_dst = p_cmd_start = (uint8_t*)(p_cmd_buf + 1) + p_cmd_buf->offset; /* Add UPDATE opcode to message */ @@ -2310,8 +2323,8 @@ tNFC_STATUS rw_t3t_select(uint8_t peer_nfcid2[NCI_RF_F_UID_LEN], /* Alloc cmd buf for retransmissions */ if (p_cb->p_cur_cmd_buf == NULL) { - if ((p_cb->p_cur_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID)) == - NULL) { + p_cb->p_cur_cmd_buf = (NFC_HDR*)GKI_getpoolbuf(NFC_RW_POOL_ID); + if (p_cb->p_cur_cmd_buf == NULL) { RW_TRACE_ERROR0( "rw_t3t_select: unable to allocate buffer for retransmission"); p_cb->rw_state = RW_T3T_STATE_NOT_ACTIVATED; @@ -2477,8 +2490,8 @@ tNFC_STATUS RW_T3tDetectNDef(void) { return (NFC_STATUS_FAILED); } - if ((retval = (tNFC_STATUS)nci_snd_t3t_polling(T3T_SYSTEM_CODE_NDEF, 0, 0)) == - NCI_STATUS_OK) { + retval = (tNFC_STATUS)nci_snd_t3t_polling(T3T_SYSTEM_CODE_NDEF, 0, 0); + if (retval == NCI_STATUS_OK) { p_cb->cur_cmd = RW_T3T_CMD_DETECT_NDEF; p_cb->cur_tout = RW_T3T_DEFAULT_CMD_TIMEOUT_TICKS; p_cb->cur_poll_rc = 0; @@ -2736,8 +2749,8 @@ tNFC_STATUS RW_T3tPresenceCheck(void) { } } else { /* IDLE state: send POLL command */ - if ((retval = (tNFC_STATUS)nci_snd_t3t_polling(0xFFFF, T3T_POLL_RC_SC, - 0)) == NCI_STATUS_OK) { + retval = (tNFC_STATUS)nci_snd_t3t_polling(0xFFFF, T3T_POLL_RC_SC, 0); + if (retval == NCI_STATUS_OK) { p_rw_cb->tcb.t3t.flags |= RW_T3T_FL_W4_PRESENCE_CHECK_POLL_RSP; p_rw_cb->tcb.t3t.rw_state = RW_T3T_STATE_COMMAND_PENDING; p_rw_cb->tcb.t3t.cur_poll_rc = 0; @@ -2781,8 +2794,8 @@ tNFC_STATUS RW_T3tPoll(uint16_t system_code, tT3T_POLL_RC rc, uint8_t tsn) { return (NFC_STATUS_FAILED); } - if ((retval = (tNFC_STATUS)nci_snd_t3t_polling(system_code, (uint8_t)rc, - tsn)) == NCI_STATUS_OK) { + retval = (tNFC_STATUS)nci_snd_t3t_polling(system_code, (uint8_t)rc, tsn); + if (retval == NCI_STATUS_OK) { /* start timer for waiting for responses */ p_cb->cur_poll_rc = rc; p_cb->rw_state = RW_T3T_STATE_COMMAND_PENDING; @@ -2860,8 +2873,8 @@ tNFC_STATUS RW_T3tGetSystemCodes(void) { p_cb->rw_state); return (NFC_STATUS_FAILED); } else { - if ((retval = (tNFC_STATUS)nci_snd_t3t_polling(0xFFFF, T3T_POLL_RC_SC, - 0)) == NCI_STATUS_OK) { + retval = (tNFC_STATUS)nci_snd_t3t_polling(0xFFFF, T3T_POLL_RC_SC, 0); + if (retval == NCI_STATUS_OK) { p_cb->cur_cmd = RW_T3T_CMD_GET_SYSTEM_CODES; p_cb->cur_tout = RW_T3T_DEFAULT_CMD_TIMEOUT_TICKS; p_cb->cur_poll_rc = T3T_POLL_RC_SC; @@ -2906,9 +2919,9 @@ tNFC_STATUS RW_T3tFormatNDef(void) { return (NFC_STATUS_FAILED); } else { /* Poll tag, to see if Felica-Lite system is supported */ - if ((retval = (tNFC_STATUS)nci_snd_t3t_polling(T3T_SYSTEM_CODE_FELICA_LITE, - T3T_POLL_RC_SC, 0)) == - NCI_STATUS_OK) { + retval = (tNFC_STATUS)nci_snd_t3t_polling(T3T_SYSTEM_CODE_FELICA_LITE, + T3T_POLL_RC_SC, 0); + if (retval == NCI_STATUS_OK) { p_cb->cur_cmd = RW_T3T_CMD_FORMAT; p_cb->cur_tout = RW_T3T_DEFAULT_CMD_TIMEOUT_TICKS; p_cb->cur_poll_rc = T3T_POLL_RC_SC; @@ -2968,9 +2981,9 @@ tNFC_STATUS RW_T3tSetReadOnly(bool b_hard_lock) { return (retval); } else { /* Poll tag, to see if Felica-Lite system is supported */ - if ((retval = (tNFC_STATUS)nci_snd_t3t_polling(T3T_SYSTEM_CODE_FELICA_LITE, - T3T_POLL_RC_SC, 0)) == - NCI_STATUS_OK) { + retval = (tNFC_STATUS)nci_snd_t3t_polling(T3T_SYSTEM_CODE_FELICA_LITE, + T3T_POLL_RC_SC, 0); + if (retval == NCI_STATUS_OK) { if (b_hard_lock) p_cb->cur_cmd = RW_T3T_CMD_SET_READ_ONLY_HARD; else diff --git a/src/nfc/tags/rw_t4t.c b/src/nfc/tags/rw_t4t.c index 49ecd83..dbc35e0 100644 --- a/src/nfc/tags/rw_t4t.c +++ b/src/nfc/tags/rw_t4t.c @@ -2119,8 +2119,8 @@ tNFC_STATUS RW_T4tPresenceCheck(uint8_t option) { status = false; if (option == RW_T4T_CHK_EMPTY_I_BLOCK) { /* use empty I block for presence check */ - if ((p_data = (NFC_HDR*)GKI_getbuf(NCI_MSG_OFFSET_SIZE + - NCI_DATA_HDR_SIZE)) != NULL) { + p_data = (NFC_HDR*)GKI_getbuf(NCI_MSG_OFFSET_SIZE + NCI_DATA_HDR_SIZE); + if (p_data != NULL) { p_data->offset = NCI_MSG_OFFSET_SIZE + NCI_DATA_HDR_SIZE; p_data->len = 0; if (NFC_SendData(NFC_RF_CONN_ID, (NFC_HDR*)p_data) == NFC_STATUS_OK) |