diff options
| author | Martijn Coenen <martijn.coenen@nxp.com> | 2011-01-20 01:27:17 +0100 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2011-02-25 06:44:34 +0900 |
| commit | 4f3ef022906e5d3b763fbcfe81e3f5cd53976ab5 (patch) | |
| tree | d5adf3aff71553e358a8674d313132063a1ba562 /src/phFriNfc_NdefMap.c | |
| parent | a6e012a748e70ab203655d4e1c0d0a77b6515fad (diff) | |
| download | external_libnfc-nxp-4f3ef022906e5d3b763fbcfe81e3f5cd53976ab5.zip external_libnfc-nxp-4f3ef022906e5d3b763fbcfe81e3f5cd53976ab5.tar.gz external_libnfc-nxp-4f3ef022906e5d3b763fbcfe81e3f5cd53976ab5.tar.bz2 | |
Support formatting / makeReadOnly() of NDEF on ICODE.
Change-Id: I2a7a185ead5de8f2b165c81dcc8ab8fb46c1ddc0
Diffstat (limited to 'src/phFriNfc_NdefMap.c')
| -rw-r--r-- | src/phFriNfc_NdefMap.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/phFriNfc_NdefMap.c b/src/phFriNfc_NdefMap.c index 28f39f7..b25e9ec 100644 --- a/src/phFriNfc_NdefMap.c +++ b/src/phFriNfc_NdefMap.c @@ -674,16 +674,16 @@ phFriNfc_NdefMap_ConvertToReadOnly ( break; } - default: + case PH_FRINFC_NDEFMAP_ISO15693_CARD: { - result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, - NFCSTATUS_INVALID_REMOTE_DEVICE); + result = phFriNfc_ISO15693_ConvertToReadOnly (NdefMap); break; } - case PH_FRINFC_NDEFMAP_ISO15693_CARD: + default: { - result = phFriNfc_ISO15693_ConvertToReadOnly (NdefMap); + result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, + NFCSTATUS_INVALID_REMOTE_DEVICE); break; } } @@ -1407,7 +1407,7 @@ NFCSTATUS phFriNfc_NdefMap_GetContainerSize(const phFriNfc_NdefMap_t *NdefMap,ui #ifndef PH_FRINFC_MAP_ISO15693_DISABLED case PH_FRINFC_NDEFMAP_ISO15693_CARD: { -#if 0 +#if 1 uint16_t block_no = 0; uint8_t byte_no = 0; @@ -1423,14 +1423,12 @@ NFCSTATUS phFriNfc_NdefMap_GetContainerSize(const phFriNfc_NdefMap_t *NdefMap,ui NdefMap->ISO15693Container.actual_ndef_size); *maxSize = (NdefMap->ISO15693Container.max_data_size - - ((NdefMap->ISO15693Container.actual_ndef_size > 0) ? - ((block_no * ISO15693_BYTES_PER_BLOCK) + byte_no) : - ISO15693_BYTES_PER_BLOCK)); -#else /* #if 0 */ + ((block_no * ISO15693_BYTES_PER_BLOCK) + byte_no)); +#else /* #if 1 */ /* 2 is used to exclude the T and L part of the TLV */ *maxSize = (NdefMap->ISO15693Container.max_data_size - ISO15693_BYTES_PER_BLOCK - 2); -#endif /* #if 0 */ +#endif /* #if 1 */ *actualSize = NdefMap->ISO15693Container.actual_ndef_size; break; } |