commit cbef2c806acfba5b63963844fccfe3fae975d6bd
author Jeff Hamilton <jham@google.com> Wed Aug 29 18:39:52 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Aug 29 18:39:52 2012 -0700
tree 02455051d20326efe8188e303ac22c16da49ed64
parent 1985108ceba65f0b01d5c4c41da49073c5d01230
parent f0096a6bac78ff99f255332771867f59b2d6d73b

Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"

src/phFriNfc_TopazDynamicMap.c

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 @@
     ((((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 @@
     {
         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]))
         {