commit f644e0182e68dd9488594e729408a71dad330f72
author Martijn Coenen <maco@google.com> Tue Nov 03 13:45:00 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 03 13:45:00 2015 +0000
tree 36466fe037a429ca96c0e61e72abb6bbc455b0dc
parent dacb0c215d2423f460ca9e8e716ca3c7328192e0
parent 8c3bbf44cbb767b12d79e7402dc8178bd5db07c7

Merge "add PN54x chip selection"
am: 8c3bbf44cb

* commit '8c3bbf44cbb767b12d79e7402dc8178bd5db07c7':
  add PN54x chip selection

halimpl/pn54x/hal/phNxpNciHal.c

diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c
index 9cee96a..55e72ec 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.c
+++ b/halimpl/pn54x/hal/phNxpNciHal.c
@@ -2740,7 +2740,7 @@
 void phNxpNciHal_discovery_cmd_ext (uint8_t *p_cmd_data, uint16_t cmd_len)
 {
     NXPLOG_NCIHAL_D ("phNxpNciHal_discovery_cmd_ext");
-    if ((cmd_len > 0) && (cmd_len <= sizeof(discovery_cmd)))
+    if (cmd_len > 0 && cmd_len <= sizeof(discovery_cmd))
     {
         memcpy (discovery_cmd, p_cmd_data, cmd_len);
         discovery_cmd_len = cmd_len;

src/nfa/dm/nfa_dm_cfg.c

diff --git a/src/nfa/dm/nfa_dm_cfg.c b/src/nfa/dm/nfa_dm_cfg.c
index ed64d52..2ae9966 100644
--- a/src/nfa/dm/nfa_dm_cfg.c
+++ b/src/nfa/dm/nfa_dm_cfg.c
@@ -123,7 +123,6 @@
 tNFA_HCI_CFG *p_nfa_hci_cfg = (tNFA_HCI_CFG *) &nfa_hci_cfg;
 
 BOOLEAN nfa_poll_bail_out_mode = FALSE;
-
 const tNFA_PROPRIETARY_CFG nfa_proprietary_cfg =
 {
     0x80, /* NCI_PROTOCOL_18092_ACTIVE */

src/nfca_version.c

diff --git a/src/nfca_version.c b/src/nfca_version.c
index d415d6f..047cdf4 100644
--- a/src/nfca_version.c
+++ b/src/nfca_version.c
@@ -17,7 +17,7 @@
  ******************************************************************************/
 #include "bt_types.h"
 
-const UINT8 nfca_version_string[] = "NFCDROID-AOSP_L_00.01";
+const UINT8 nfca_version_string[] = "NFCDROID-AOSP_M_00.01";
 
 /*
 // The following string should be manually updated to contain the