commit e4d3c945777c912ba71e79ac99cb11190cf8f90a
author Martijn Coenen <maco@google.com> Thu Aug 30 08:54:40 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Thu Aug 30 08:54:41 2012 -0700
tree a43b8e73dae508378d2a876e26e85c633acb4d85
parent cbef2c806acfba5b63963844fccfe3fae975d6bd
parent 95696b8de4657f02ba1f75d7592e0670810d807f

Merge "Add support for target-customized NFC stack configuration"

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

src/phHciNfc_AdminMgmt.c

diff --git a/src/phHciNfc_AdminMgmt.c b/src/phHciNfc_AdminMgmt.c
index b65abf2..45298a1 100644
--- a/src/phHciNfc_AdminMgmt.c
+++ b/src/phHciNfc_AdminMgmt.c
@@ -997,6 +997,7 @@
                 pipe_id = hcp_message->payload[RESPONSE_PIPEID_OFFSET];
                 p_pipe_info = (phHciNfc_Pipe_Info_t *)
                         phOsalNfc_GetMemory(sizeof(phHciNfc_Pipe_Info_t));
+                memset(p_pipe_info, 0, sizeof(phHciNfc_Pipe_Info_t));
                 if(NULL != p_pipe_info)
                 {
                     /* The Source Host is the UICC Host */