commit 20caced35b14fe06c8c22b62da79b6d45c30b09e
author Linux Build Service Account <lnxbuild@quicinc.com> Thu Sep 21 08:25:33 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 21 08:25:33 2017 -0700
tree 824e518a33f889915879001bd5b34b2b5744b190
parent 5f01895f77ff5c8502130376a98043d83a8e16b7
parent 1c5cfc83b5f2633487371436a1630244823a7a79

Merge "NFC: Cleanup extra cherry-picked changes"

halimpl/pn54x/libnfc-nxp-PN81T_example.conf

diff --git a/halimpl/pn54x/libnfc-nxp-PN81T_example.conf b/halimpl/pn54x/libnfc-nxp-PN81T_example.conf
index 4df5951..1677416 100644
--- a/halimpl/pn54x/libnfc-nxp-PN81T_example.conf
+++ b/halimpl/pn54x/libnfc-nxp-PN81T_example.conf
@@ -197,8 +197,8 @@
 # bit pos 0 = Switch On
 # bit pos 1 = Switch Off
 # bit pos 2 = Battery Off
-# bit pos 3 = Screen Lock
-# bit pos 4 = Screen Off
+# bit pos 3 = Screen On lock
+# bit pos 4 = Screen off unlock
 DEFAULT_AID_PWR_STATE=0x19
 
 ###############################################################################
@@ -207,8 +207,8 @@
 # bit pos 0 = Switch On
 # bit pos 1 = Switch Off
 # bit pos 2 = Battery Off
-# bit pos 3 = Screen Lock
-# bit pos 4 = Screen Off
+# bit pos 3 = Screen On lock
+# bit pos 4 = Screen off unlock
 DEFAULT_DESFIRE_PWR_STATE=0x1B
 
 ###############################################################################
@@ -217,8 +217,8 @@
 # bit pos 0 = Switch On
 # bit pos 1 = Switch Off
 # bit pos 2 = Battery Off
-# bit pos 3 = Screen Lock
-# bit pos 4 = Screen Off
+# bit pos 3 = Screen On lock
+# bit pos 4 = Screen off unlock
 DEFAULT_MIFARE_CLT_PWR_STATE=0x1B
 
 ###############################################################################
@@ -227,8 +227,8 @@
 # bit pos 0 = Switch On
 # bit pos 1 = Switch Off
 # bit pos 2 = Battery Off
-# bit pos 3 = Screen Lock
-# bit pos 4 = Screen Off
+# bit pos 3 = Screen On lock
+# bit pos 4 = Screen off unlock
 DEFAULT_FELICA_CLT_PWR_STATE=0x1B
 
 ###############################################################################

src/hal/include/nci_defs.h

diff --git a/src/hal/include/nci_defs.h b/src/hal/include/nci_defs.h
index bfc7a2e..0e9ba18 100644
--- a/src/hal/include/nci_defs.h
+++ b/src/hal/include/nci_defs.h
@@ -544,11 +544,11 @@
 #define NCI_ROUTE_PWR_STATE_BATT_OFF 0x04
 #if (NXP_EXTNS == TRUE)
 /* The device is screen off Unlock mode */
-#define NCI_ROUTE_PWR_STATE_SCREEN_OFF_UNLOCK()   ((NFC_GetNCIVersion() == NCI_VERSION_2_0)?0x08:0x00)
+#define NCI_ROUTE_PWR_STATE_SCREEN_OFF_UNLOCK()   ((NFC_GetNCIVersion() == NCI_VERSION_2_0)?0x08:0x80)
 /* The device is screen on lock mode */
 #define NCI_ROUTE_PWR_STATE_SCREEN_ON_LOCK()    ((NFC_GetNCIVersion() == NCI_VERSION_2_0)?0x10:0x40)
 /* The device is screen off lock mode */
-#define NCI_ROUTE_PWR_STATE_SCREEN_OFF_LOCK()   ((NFC_GetNCIVersion() == NCI_VERSION_2_0)?0x20:0x80)
+#define NCI_ROUTE_PWR_STATE_SCREEN_OFF_LOCK()   ((NFC_GetNCIVersion() == NCI_VERSION_2_0)?0x20:0x00)
 #endif
 /* Hardware / Registration Identification  */
 #define NCI_NFCEE_TAG_HW_ID 0x00