diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-12-27 12:53:20 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-12-27 12:53:20 -0800 |
| commit | dd55580a6f3d72175f0cb78c9fc4fac59cf9be09 (patch) | |
| tree | 39bb820cbe6d2a093abb72cc837c52c95039c9c7 /src/phFriNfc_TopazDynamicMap.c | |
| parent | 5199e59069db67d4f3bb2a466adab2e4647e8e70 (diff) | |
| parent | 68c93f6f41998fbff40a3396a633faee4d595695 (diff) | |
| download | external_libnfc-nxp-dd55580a6f3d72175f0cb78c9fc4fac59cf9be09.zip external_libnfc-nxp-dd55580a6f3d72175f0cb78c9fc4fac59cf9be09.tar.gz external_libnfc-nxp-dd55580a6f3d72175f0cb78c9fc4fac59cf9be09.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp
Conflicts:
src/phHal4Nfc_ADD.c
Change-Id: I950a66598954d21b49f723da2c58bff2ba719239
Diffstat (limited to 'src/phFriNfc_TopazDynamicMap.c')
| -rw-r--r-- | src/phFriNfc_TopazDynamicMap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/phFriNfc_TopazDynamicMap.c b/src/phFriNfc_TopazDynamicMap.c index 2aa29ea..e9d1529 100644 --- a/src/phFriNfc_TopazDynamicMap.c +++ b/src/phFriNfc_TopazDynamicMap.c @@ -199,6 +199,9 @@ so there are 4 segements in the card */ ((((block_no) + 1) == TOPAZ_STATIC_LOCK_FIRST_BLOCK_NO) ? \ (((block_no) + 1) + TOPAZ_STATIC_LOCK_BLOCK_AREAS) : \ ((block_no) + 1)) +/* Check topaz spec version number */ +#define TOPAZ_COMPARE_VERSION(device_ver, tag_ver) \ + ((device_ver & 0xF0) >= (tag_ver & 0xF0)) #ifdef FRINFC_READONLY_NDEF @@ -2368,7 +2371,7 @@ phFriNfc_Tpz_H_CheckCCBytesForWrite ( { check_index = (uint8_t)(check_index + 1); - if ((check_cc_rw[0] != ps_tpz_info->CCByteBuf[1]) || + if ((!TOPAZ_COMPARE_VERSION(check_cc_rw[0], ps_tpz_info->CCByteBuf[1])) || (check_cc_rw[1] != ps_tpz_info->CCByteBuf[2]) || (check_cc_rw[2] != ps_tpz_info->CCByteBuf[3])) { |