diff options
| author | Martijn Coenen <martijn.coenen@nxp.com> | 2010-11-02 19:53:47 -0600 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-11-02 22:24:06 -0500 |
| commit | 774275bc7cf3914538b9f123723b8332956f4897 (patch) | |
| tree | 239bf181d703ca5784dbdbc9081593f3a7b64ed9 /src/phHciNfc_Felica.c | |
| parent | 2690dbd9a65c64f850f2a587b20712551fe39159 (diff) | |
| download | external_libnfc-nxp-774275bc7cf3914538b9f123723b8332956f4897.zip external_libnfc-nxp-774275bc7cf3914538b9f123723b8332956f4897.tar.gz external_libnfc-nxp-774275bc7cf3914538b9f123723b8332956f4897.tar.bz2 | |
Removed UID from Felica presence check.
The presence check didn't work for all Felica tags. Found
upstream that the UID shouldn't be included in the presence check.
Change-Id: Ib0b1b91c01d499ed52e024f68d58bcb9adabf4ad
Diffstat (limited to 'src/phHciNfc_Felica.c')
| -rw-r--r-- | src/phHciNfc_Felica.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/phHciNfc_Felica.c b/src/phHciNfc_Felica.c index 6c58df1..1a353a5 100644 --- a/src/phHciNfc_Felica.c +++ b/src/phHciNfc_Felica.c @@ -797,7 +797,7 @@ phHciNfc_Felica_Request_Mode( void *pHwRef) { NFCSTATUS status = NFCSTATUS_SUCCESS; - static uint8_t pres_chk_data[(PHHAL_FEL_ID_LEN + 4)] = {0}; + static uint8_t pres_chk_data[6] = {0}; if( (NULL == psHciContext) || (NULL == pHwRef) ) { @@ -808,7 +808,6 @@ phHciNfc_Felica_Request_Mode( phHciNfc_Felica_Info_t *ps_fel_info = NULL; phHciNfc_Pipe_Info_t *ps_pipe_info = NULL; phHal_sFelicaInfo_t *ps_rem_fel_info = NULL; - uint8_t i = 0; ps_fel_info = (phHciNfc_Felica_Info_t *) psHciContext->p_felica_info ; @@ -824,12 +823,12 @@ phHciNfc_Felica_Request_Mode( ps_rem_fel_info = &(ps_fel_info->felica_info.RemoteDevInfo.Felica_Info); - pres_chk_data[i++] = sizeof(pres_chk_data); - pres_chk_data[i++] = 0x00; // Felica poll - pres_chk_data[i++] = 0xFF; - pres_chk_data[i++] = 0xFF; - (void)memcpy((void *)&(pres_chk_data[i]), - (void *)ps_rem_fel_info->IDm, PHHAL_FEL_ID_LEN); + pres_chk_data[0] = sizeof(pres_chk_data); + pres_chk_data[1] = 0x00; // Felica poll + pres_chk_data[2] = 0xFF; + pres_chk_data[3] = 0xFF; + pres_chk_data[4] = 0x00; + pres_chk_data[5] = 0x00; ps_pipe_info->param_info = pres_chk_data; ps_pipe_info->param_length = sizeof(pres_chk_data); |