diff options
| author | Love Khanna <love.khanna@nxp.com> | 2017-04-14 15:30:25 +0530 |
|---|---|---|
| committer | Ruchi Kandoi <kandoiruchi@google.com> | 2017-06-28 11:21:49 -0700 |
| commit | f4b940105821e44bfca47164e11429249eab9864 (patch) | |
| tree | 0a1f840fae355c9beba015e69e772451e8347f36 /halimpl | |
| parent | 7202e66fd2d463c75feca95d26d75d3cf71a4d92 (diff) | |
| download | android_hardware_broadcom_nfc-f4b940105821e44bfca47164e11429249eab9864.tar.gz android_hardware_broadcom_nfc-f4b940105821e44bfca47164e11429249eab9864.tar.bz2 android_hardware_broadcom_nfc-f4b940105821e44bfca47164e11429249eab9864.zip | |
halimpl: Remove ISO15693 workaround for NCI2.0
Test: compiles.
Change-Id: I8aa95408588cb3a41acf83ed1853e7a513b6f48b
Diffstat (limited to 'halimpl')
| -rw-r--r-- | halimpl/pn54x/hal/phNxpNciHal_ext.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/halimpl/pn54x/hal/phNxpNciHal_ext.c b/halimpl/pn54x/hal/phNxpNciHal_ext.c index a857c72..81d4bb1 100644 --- a/halimpl/pn54x/hal/phNxpNciHal_ext.c +++ b/halimpl/pn54x/hal/phNxpNciHal_ext.c @@ -276,12 +276,14 @@ NFCSTATUS phNxpNciHal_process_ext_rsp(uint8_t* p_ntf, uint16_t* p_len) { if (icode_send_eof == 3) { icode_send_eof = 0; } - if (p_ntf[p_ntf[2] + 2] == 0x00) { - NXPLOG_NCIHAL_D("> Going through workaround - data of ISO 15693"); - p_ntf[2]--; - (*p_len)--; - } else { - p_ntf[p_ntf[2] + 2] |= 0x01; + if (nxpncihal_ctrl.nci_info.nci_version != NCI_VERSION_2_0) { + if (p_ntf[p_ntf[2] + 2] == 0x00) { + NXPLOG_NCIHAL_D("> Going through workaround - data of ISO 15693"); + p_ntf[2]--; + (*p_len)--; + } else { + p_ntf[p_ntf[2] + 2] |= 0x01; + } } } else if (p_ntf[2] == 0x02 && p_ntf[1] == 0x00 && icode_detected == 1) { NXPLOG_NCIHAL_D("> ICODE EOF response do not send to upper layer"); |