w7: fic NFC (update from the LG G3)

Change-Id: I65354f1c6f5c0a63c873d54c1e19624e5579d29a

4 files changed, 277 insertions, 255 deletions

diff --git a/msm8226.mk b/msm8226.mk
index bd5f362..500409f 100644
--- a/msm8226.mk
+++ b/msm8226.mk
@@ -183,12 +183,12 @@ PRODUCT_PACKAGES += \
 # Configs
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/prebuilt/etc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
-    $(LOCAL_PATH)/prebuilt/etc/nfc-nci.conf:system/etc/nfc-nci.conf \
     $(LOCAL_PATH)/prebuilt/etc/libnfc-nxp.conf:system/etc/libnfc-nxp.conf \
     $(LOCAL_PATH)/prebuilt/etc/nfcee_access.xml:system/etc/nfcee_access.xml \
     frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
-    frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
-    frameworks/native/data/etc/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \
+    frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \
+    frameworks/native/data/etc/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml \
+    frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml
 
 NFCEE_ACCESS_PATH := $(LOCAL_PATH)/prebuilt/etc/nfcee_access.xml
 endif
diff --git a/prebuilt/etc/libnfc-brcm.conf b/prebuilt/etc/libnfc-brcm.conf
index 4769169..c3beb7c 100644
--- a/prebuilt/etc/libnfc-brcm.conf
+++ b/prebuilt/etc/libnfc-brcm.conf
@@ -1,4 +1,4 @@
-###################### Start of libnfc-common.conf #######################
+###################### Start of libnfc-brcm.conf #######################
 
 ###############################################################################
 # Application options
@@ -143,7 +143,7 @@ NFA_HCI_STATIC_PIPE_ID_C0=0x19
 # Force UICC to only listen to the following technology(s).
 # The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
 # Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
-UICC_LISTEN_TECH_MASK=0xC7
+UICC_LISTEN_TECH_MASK=0x07
 
 ###############################################################################
 # Force HOST listen feature enable or disable.
@@ -305,7 +305,6 @@ MAX_RF_DATA_CREDITS=1
 # array[1] = 0xC8 is PREINIT_DSP_CFG
 #PREINIT_DSP_CFG={20:C8:1E:06:1F:00:0F:03:3C:00:04:24:00:1C:00:75:00:77:00:76:00:1C:00:03:00:0A:00:48:01:00:00:40:04}
 
-
 ###############################################################################
 # Choose the presence-check algorithm for type-4 tag.  If not defined, the default value is 1.
 # 0  NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
@@ -328,7 +327,7 @@ MAX_RF_DATA_CREDITS=1
 # NFA_TECHNOLOGY_MASK_B             0x02    /* NFC Technology B             */
 # NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
 # NFA_TECHNOLOGY_MASK_ISO15693      0x08    /* Proprietary Technology       */
-# NFA_TECHNOLOGY_MASK_KOVIO             0x20    /* Proprietary Technology       */
+# NFA_TECHNOLOGY_MASK_KOVIO         0x20    /* Proprietary Technology       */
 # NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
 # NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
 POLLING_TECH_MASK=0xEF
@@ -364,7 +363,22 @@ NFA_MAX_EE_SUPPORTED=0x02
 ###############################################################################
 # NCI Hal Module name
 NCI_HAL_MODULE="nfc_nci.pn54x"
-#NCI_HAL_MODULE="nfc_lg.default"
+
+##############################################################################
+# Deactivate notification wait time out in seconds used in ETSI Reader mode
+# 0 - Infinite wait
+NFA_DM_DISC_NTF_TIMEOUT=100
+
+###############################################################################
+# AID_MATCHING constants
+# AID_MATCHING_EXACT_ONLY 0x00
+# AID_MATCHING_EXACT_OR_PREFIX 0x01
+# AID_MATCHING_PREFIX_ONLY 0x02
+AID_MATCHING_MODE=0x01
+
+###############################################################################
+# Default Secure Element route id
+DEFAULT_OFFHOST_ROUTE=0x02
 
 ###############################################################################
 # Vendor Specific Proprietary Protocol & Discovery Configuration
@@ -380,20 +394,13 @@ NCI_HAL_MODULE="nfc_nci.pn54x"
 #  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
 NFA_PROPRIETARY_CFG={05:FF:FF:06:81:80:77:FF:FF}
 
-##############################################################################
-# Deactivate notification wait time out in seconds used in ETSI Reader mode
-# 0 - Infinite wait
-NFA_DM_DISC_NTF_TIMEOUT=100
-
 ###############################################################################
-# AID_MATCHING constants
-# AID_MATCHING_EXACT_ONLY 0x00
-# AID_MATCHING_EXACT_OR_PREFIX 0x01
-# AID_MATCHING_PREFIX_ONLY 0x02
-AID_MATCHING_MODE=0x01
+# Bail out mode
+#  If set to 1, NFCC is using bail out mode for either Type A or Type B poll.
+NFA_POLL_BAIL_OUT_MODE=0x01
 
 ###############################################################################
-# Preferred Secure Element for Technology based routing
-# eSE               0x01
-# UICC              0x02
-NXP_PRFD_TECH_SE=0x02
+# Enable/Disable NFC-F HCE
+# Disable       0x00
+# Enable        non-zero value
+ENABLE_NFCF_HCE=0x00
diff --git a/prebuilt/etc/libnfc-nxp.conf b/prebuilt/etc/libnfc-nxp.conf
index 6c901d6..b3ddf44 100644
--- a/prebuilt/etc/libnfc-nxp.conf
+++ b/prebuilt/etc/libnfc-nxp.conf
@@ -2,12 +2,12 @@
 ## and NFC Service Java Native Interface Extensions (packages/apps/Nfc/nci/jni/extns/pn547)
 
 ###############################################################################
-# Application options 
+# Application options
 # Logging Levels
-# NXPLOG_DEFAULT_LOGLEVEL    0x01  
-# ANDROID_LOG_DEBUG          0x03 
-# ANDROID_LOG_WARN           0x02 
-# ANDROID_LOG_ERROR          0x01 
+# NXPLOG_DEFAULT_LOGLEVEL    0x01
+# ANDROID_LOG_DEBUG          0x03
+# ANDROID_LOG_WARN           0x02
+# ANDROID_LOG_ERROR          0x01
 # ANDROID_LOG_SILENT         0x00
 #
 NXPLOG_EXTNS_LOGLEVEL=0x03
@@ -18,40 +18,39 @@ NXPLOG_FWDNLD_LOGLEVEL=0x03
 NXPLOG_TML_LOGLEVEL=0x03
 
 ###############################################################################
+# Nfc Device Node name
+NXP_NFC_DEV_NODE="/dev/pn547"
+
+###############################################################################
 # Extension for Mifare reader enable
+#    0x00 - Disabled
+#    0x01 - Enabled
 MIFARE_READER_ENABLE=0x01
 
 ###############################################################################
-# Vzw Feature enable
-VZW_FEATURE_ENABLE=0x01
-###############################################################################
-
-# File location for Firmware
-FW_STORAGE="/vendor/firmware/libpn547_fw.so"
+# File name for Firmware
+NXP_FW_NAME="libpn547_fw.so"
 
 ###############################################################################
 # System clock source selection configuration
-#define CLK_SRC_XTAL       1
-#define CLK_SRC_PLL        2
-
-NXP_SYS_CLK_SRC_SEL=0x01
+#    CLK_SRC_XTAL     - 0x01
+#    CLK_SRC_PLL      - 0x02
+NXP_SYS_CLK_SRC_SEL=0x02
 
 ###############################################################################
-# System clock frequency selection configuration
-#define CLK_FREQ_13MHZ         1
-#define CLK_FREQ_19_2MHZ       2
-#define CLK_FREQ_24MHZ         3
-#define CLK_FREQ_26MHZ         4
-#define CLK_FREQ_38_4MHZ       5
-#define CLK_FREQ_52MHZ         6
-
-NXP_SYS_CLK_FREQ_SEL=0x00
+# System clock frequency selection configuration for PLL
+#    CLK_FREQ_13MHZ   - 0x01
+#    CLK_FREQ_19_2MHZ - 0x02
+#    CLK_FREQ_24MHZ   - 0x03
+#    CLK_FREQ_26MHZ   - 0x04
+#    CLK_FREQ_38_4MHZ - 0x05
+#    CLK_FREQ_52MHZ   - 0x06
+NXP_SYS_CLK_FREQ_SEL=0x02
 
 ###############################################################################
-# The timeout value to be used for clock request acknowledgment 
-# min value = 0x01 to max = 0x19
-
-NXP_SYS_CLOCK_TO_CFG=0x01
+# The timeout value to be used for clock request acknowledgment
+# min value = 0x01 to max = 0x0A
+NXP_SYS_CLOCK_TO_CFG=0x02
 
 ###############################################################################
 # NXP proprietary settings
@@ -63,112 +62,254 @@ NXP_NFC_PROFILE_EXTN={20, 02, 05, 01, A0, 44, 01, 00}
 
 ###############################################################################
 # Standby enable settings
+#    0x00 - Disabled
+#    0x01 - Enabled
 NXP_CORE_STANDBY={2F, 00, 01, 01}
 
 ###############################################################################
-#Atonomous Mode
-#Enable 0x01
-#Disable 0x00
-NXP_CORE_SCRN_OFF_AUTONOMOUS_ENABLE=0x00
-
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
+# NXP RF configuration settings for ALM/PLM settings
 NXP_RF_CONF_BLK_1={
+    20, 02, F7, 21,
+    A0, 0E, 01, 01,
+    A0, 0D, 03, 00, 40, 04,
+    A0, 0D, 03, 04, 43, 20,
+    A0, 0D, 03, 04, FF, 05,
+    A0, 0D, 06, 06, 44, A3, 90, 03, 00,
+    A0, 0D, 06, 06, 30, CF, 00, 08, 00,
+    A0, 0D, 06, 06, 2F, 8F, 05, 80, 0C,
+    A0, 0D, 04, 06, 03, 00, 71,
+    A0, 0D, 03, 06, 48, 1A,
+    A0, 0D, 03, 06, 43, A0,
+    A0, 0D, 06, 06, 42, 00, 00, F3, F3,
+    A0, 0D, 06, 06, 41, 80, 00, 00, 00,
+    A0, 0D, 03, 06, 37, 18,
+    A0, 0D, 03, 06, 16, 00,
+    A0, 0D, 03, 06, 15, 00,
+    A0, 0D, 06, 06, FF, 05, 00, 00, 00,
+    A0, 0D, 06, 08, 44, 00, 00, 00, 00,
+    A0, 0D, 06, 20, 4A, 00, 00, 00, 00,
+    A0, 0D, 06, 20, 42, 88, 10, FF, FF,
+    A0, 0D, 03, 20, 16, 00,
+    A0, 0D, 03, 20, 15, 00,
+    A0, 0D, 06, 22, 44, 22, 00, 02, 00,
+    A0, 0D, 06, 22, 2D, 50, 44, 0C, 00,
+    A0, 0D, 04, 32, 03, 40, 3D,
+    A0, 0D, 06, 32, 42, 00, 00, FF, FF,
+    A0, 0D, 03, 32, 16, 00,
+    A0, 0D, 03, 32, 15, 01,
+    A0, 0D, 03, 32, 0D, 22,
+    A0, 0D, 03, 32, 14, 22,
+    A0, 0D, 06, 32, 4A, 30, 0F, 01, 1F,
+    A0, 0D, 06, 34, 2D, 24, 77, 0C, 00,
+    A0, 0D, 06, 34, 44, 21, 00, 02, 00,
+    A0, 0D, 06, 35, 44, 21, 00, 02, 00
 }
 
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
 NXP_RF_CONF_BLK_2={
+    20, 02, F4, 1F,
+    A0, 0D, 06, 38, 4A, 53, 07, 01, 1B,
+    A0, 0D, 06, 38, 42, 68, 10, FF, FF,
+    A0, 0D, 03, 38, 16, 00,
+    A0, 0D, 03, 38, 15, 00,
+    A0, 0D, 06, 3A, 2D, 15, 47, 0D, 00,
+    A0, 0D, 06, 3C, 4A, 52, 07, 01, 1B,
+    A0, 0D, 06, 3C, 42, 68, 10, FF, FF,
+    A0, 0D, 03, 3C, 16, 00,
+    A0, 0D, 03, 3C, 15, 00,
+    A0, 0D, 06, 3E, 2D, 15, 47, 0D, 00,
+    A0, 0D, 06, 40, 42, F0, 10, FF, FF,
+    A0, 0D, 03, 40, 0D, 02,
+    A0, 0D, 03, 40, 14, 02,
+    A0, 0D, 06, 40, 4A, 12, 07, 00, 00,
+    A0, 0D, 03, 40, 16, 00,
+    A0, 0D, 03, 40, 15, 00,
+    A0, 0D, 06, 42, 2D, 15, 47, 0D, 00,
+    A0, 0D, 06, 46, 44, 21, 00, 02, 00,
+    A0, 0D, 06, 46, 2D, 05, 47, 0E, 00,
+    A0, 0D, 06, 44, 4A, 33, 07, 01, 07,
+    A0, 0D, 06, 44, 42, 88, 10, FF, FF,
+    A0, 0D, 03, 44, 16, 00,
+    A0, 0D, 03, 44, 15, 00,
+    A0, 0D, 06, 4A, 44, 22, 00, 02, 00,
+    A0, 0D, 06, 4A, 2D, 05, 37, 0C, 00,
+    A0, 0D, 06, 48, 4A, 33, 07, 01, 07,
+    A0, 0D, 06, 48, 42, 88, 10, FF, FF,
+    A0, 0D, 03, 48, 16, 00,
+    A0, 0D, 03, 48, 15, 00,
+    A0, 0D, 06, 4E, 44, 22, 00, 02, 00,
+    A0, 0D, 06, 4E, 2D, 05, 37, 0C, 00
 }
-
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
 NXP_RF_CONF_BLK_3={
+    20, 02, F7, 1E,
+    A0, 0D, 06, 4C, 4A, 33, 07, 01, 07,
+    A0, 0D, 06, 4C, 42, 88, 10, FF, FF,
+    A0, 0D, 03, 4C, 16, 00,
+    A0, 0D, 03, 4C, 15, 00,
+    A0, 0D, 06, 52, 44, 22, 00, 02, 00,
+    A0, 0D, 06, 52, 2D, 05, 25, 0C, 00,
+    A0, 0D, 06, 50, 42, 90, 10, FF, FF,
+    A0, 0D, 06, 50, 4A, 11, 0F, 01, 07,
+    A0, 0D, 03, 50, 16, 00,
+    A0, 0D, 03, 50, 15, 00,
+    A0, 0D, 06, 56, 2D, 05, 9E, 0C, 00,
+    A0, 0D, 06, 56, 44, 22, 00, 02, 00,
+    A0, 0D, 06, 5C, 2D, 05, 69, 0C, 00,
+    A0, 0D, 06, 5C, 44, 21, 00, 02, 00,
+    A0, 0D, 06, 54, 42, 88, 10, FF, FF,
+    A0, 0D, 06, 54, 4A, 33, 07, 01, 07,
+    A0, 0D, 03, 54, 16, 00,
+    A0, 0D, 03, 54, 15, 00,
+    A0, 0D, 06, 5A, 42, 90, 10, FF, FF,
+    A0, 0D, 06, 5A, 4A, 31, 07, 01, 07,
+    A0, 0D, 03, 5A, 16, 00,
+    A0, 0D, 03, 5A, 15, 00,
+    A0, 0D, 06, 98, 2F, AF, 05, 80, 0F,
+    A0, 0D, 06, 9A, 42, 00, 00, FF, FF,
+    A0, 0D, 06, 30, 44, A3, 90, 03, 00,
+    A0, 0D, 06, 6C, 44, A3, 90, 03, 00,
+    A0, 0D, 06, 6C, 30, CF, 00, 08, 00,
+    A0, 0D, 06, 6C, 2F, 8F, 05, 80, 0C,
+    A0, 0D, 06, 70, 2F, 8F, 05, 80, 12,
+    A0, 0D, 06, 70, 30, CF, 00, 08, 00
 }
-
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
 NXP_RF_CONF_BLK_4={
+    20, 02, F7, 1E,
+    A0, 0D, 06, 74, 2F, 8F, 05, 80, 12,
+    A0, 0D, 06, 74, 30, DF, 00, 07, 00,
+    A0, 0D, 06, 78, 2F, 1F, 06, 80, 01,
+    A0, 0D, 06, 78, 30, 3F, 00, 04, 00,
+    A0, 0D, 06, 78, 44, A2, 90, 03, 00,
+    A0, 0D, 03, 78, 47, 00,
+    A0, 0D, 06, 7C, 2F, AF, 05, 80, 0F,
+    A0, 0D, 06, 7C, 30, CF, 00, 07, 00,
+    A0, 0D, 06, 7C, 44, A3, 90, 03, 00,
+    A0, 0D, 06, 7D, 30, CF, 00, 08, 00,
+    A0, 0D, 06, 80, 2F, AF, 05, 80, 90,
+    A0, 0D, 06, 80, 44, A3, 90, 03, 00,
+    A0, 0D, 06, 84, 2F, AF, 05, 80, 92,
+    A0, 0D, 06, 84, 44, A3, 90, 03, 00,
+    A0, 0D, 06, 88, 2F, 7F, 04, 80, 10,
+    A0, 0D, 06, 88, 30, 5F, 00, 16, 00,
+    A0, 0D, 03, 88, 47, 00,
+    A0, 0D, 06, 88, 44, A1, 90, 03, 00,
+    A0, 0D, 03, 0C, 48, 1A,
+    A0, 0D, 03, 10, 43, 20,
+    A0, 0D, 06, 6A, 42, F8, 10, FF, FF,
+    A0, 0D, 03, 6A, 16, 00,
+    A0, 0D, 03, 6A, 15, 01,
+    A0, 0D, 06, 6A, 4A, 30, 0F, 01, 1F,
+    A0, 0D, 06, 8C, 42, 88, 10, FF, FF,
+    A0, 0D, 06, 8C, 4A, 33, 07, 01, 07,
+    A0, 0D, 03, 8C, 16, 00,
+    A0, 0D, 03, 8C, 15, 00,
+    A0, 0D, 06, 92, 42, 90, 10, FF, FF,
+    A0, 0D, 06, 92, 4A, 31, 07, 01, 07
 }
 
 ###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
-NXP_RF_CONF_BLK_5={
+# Core configuration extensions
+# It includes
+# A002      - Clock Request
+#             0x00 - Disabled
+#             0x01 - Enabled
+# A003      - Clock Selection
+#             Please refer to User Manual
+# A004      - Clock Time Out
+#             Defined in ms
+# A00E      - Load Modulation Mode
+#             0x00 - PLM
+#             0x01 - ALM
+# A012      - SWP interface 2 configuration
+#             0x00 - SWP
+#             0x02 - DWP
+#             Please refer to User Manual
+# A040-A043 - Ultra Low Power Tag Detector
+#             Please refer to Application Note of ULPTD
+# A05E      - Jewel Reader
+#             Please refer to User Manual
+# A0CD      - SWP S1 line behavior
+#             Defined S1 High time out during Activation sequence
+# A0EC      - SWP1 interface
+#             0x00 - Disabled
+#             0x01 - Enabled
+# A0ED      - SWP2 interface
+#             0x00 - Disabled
+#             0x01 - Enabled
+NXP_CORE_CONF_EXTN_PM={20, 02, 30, 0B,
+        A0, 02, 01, 01,
+        A0, 03, 01, 11,
+        A0, 04, 01, 02,
+        A0, 06, 01, 01,
+        A0, 11, 04, 01, 22, 67, CD,
+        A0, 5E, 01, 01,
+        A0, CD, 01, 0F,
+        A0, EC, 01, 01,
+        A0, ED, 01, 00,
+        A0, CB, 01, 78,
+        A0, CE, 01, 7F
 }
 
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
-NXP_RF_CONF_BLK_6={
+NXP_CORE_CONF_EXTN_XTAL={20, 02, 30, 0B,
+        A0, 02, 01, 01,
+        A0, 03, 01, 08,
+        A0, 04, 01, 02,
+        A0, 06, 01, 01,
+        A0, 11, 04, 14, 0B, B8, 14,
+        A0, 5E, 01, 01,
+        A0, CD, 01, 0F,
+        A0, EC, 01, 01,
+        A0, ED, 01, 00,
+        A0, CB, 01, 78,
+        A0, CE, 01, 7F
 }
 
-###############################################################################
-# apply Low Power Polling(LPM) Algorithm, detecting RF field using short-term single carrier
-NXP_POLLING_MODE={
+NXP_CORE_CONF_EXTN={20, 02, 2C, 0A,
+        A0, 02, 01, 01,
+        A0, 03, 01, 11,
+        A0, 04, 01, 02,
+        A0, 11, 04, 01, 22, 67, CD,
+        A0, 5E, 01, 01,
+        A0, CD, 01, 0F,
+        A0, EC, 01, 01,
+        A0, ED, 01, 00,
+        A0, CB, 01, 78,
+        A0, CE, 01, 7F
 }
 
 ###############################################################################
-# Core configuration extensions
-# It includes
-# Wired mode settings A0ED, A0EE
-# Tag Detector A040, A041, A043
-# Low Power mode A007
-# Clock settings A002, A003
-# PbF settings A008
-NXP_CORE_CONF_EXTN={20, 02, 16, 04,
-    A0, EC, 01, 01,  
-    A0, ED, 01, 01,
-    A0, 5E, 01, 01,
-    A0, 0D, 06, 3E, 2D, 15, 88, 15, 00
-    }
-#       A0, 40, 01, 01, 
-#       A0, 41, 01, 02, 
-#       A0, 43, 01, 04,
-#       A0, 02, 01, 01, 
-#       A0, 03, 01, 11,
-#       A0, 07, 01, 03,
-#       A0, 08, 01, 01
-#       }
-
-NXP_CORE_CONF_EXTN_PM={
-}
-
-NXP_CORE_CONF_EXTN_XTAL={
+# apply Low Power Polling(LPM) Algorithm, detecting RF field using short-term single carrier
+# NORMAL Polling : {20, 02, 11, 04, A0, 40, 01, 00, A0, 41, 01, 04, A0, 42, 01, 19, A0, 43, 01, 50}
+# LPM Polling    : {20, 02, 11, 04, A0, 40, 01, 01, A0, 41, 01, 04, A0, 42, 01, 19, A0, 43, 01, 00}
+# HYBRID Polling : {20, 02, 11, 04, A0, 40, 01, 01, A0, 41, 01, 04, A0, 42, 01, 19, A0, 43, 01, 04}
+
+NXP_POLLING_MODE={20, 02, 11, 04,
+        A0, 40, 01, 01,
+        A0, 41, 01, 04,
+        A0, 42, 01, 19,
+        A0, 43, 01, 04
 }
 
 ###############################################################################
-# Core configuration rf field filter settings to enable set 01 ,to disable set to 00 last bit
-#NXP_CORE_RF_FIELD={ 20, 02, 05, 01, A0, 62, 01, 01
-#        }
-###############################################################################
-# To enable i2c fragmentation set i2c fragmentation enable 0x01 to disable set to 0x00
-NXP_I2C_FRAGMENTATION_ENABLED=0x00
-###############################################################################
-# Core configuration settings 
+# Core configuration settings
 NXP_CORE_CONF={ 20, 02, 2B, 0D,
-        28, 01, 00,
+        18, 01, 01,
         21, 01, 00,
+        28, 01, 00,
         30, 01, 08,
         31, 01, 03,
         33, 04, 01, 02, 03, 04,
-        54, 01, 06,
         50, 01, 02,
+        54, 01, 06,
         5B, 01, 00,
         60, 01, 0E,
         80, 01, 01,
         81, 01, 01,
-        82, 01, 0E,
-        18, 01, 01 
+        82, 01, 0E
         }
- 
+
 ###############################################################################
-# Mifare Classic Key settings 
-#NXP_CORE_MFCKEY_SETTING={20, 02, 25,04, A0, 51, 06, A0, A1, A2, A3, A4, A5, 
+# Mifare Classic Key settings
+#NXP_CORE_MFCKEY_SETTING={20, 02, 25,04, A0, 51, 06, A0, A1, A2, A3, A4, A5,
 #                                     A0, 52, 06, D3, F7, D3, F7, D3, F7,
 #                                     A0, 53, 06, FF, FF, FF, FF, FF, FF,
 #                                     A0, 54, 06, 00, 00, 00, 00, 00, 00}
@@ -178,62 +319,26 @@ NXP_CORE_CONF={ 20, 02, 2B, 0D,
 # No secure element 0x00
 # eSE               0x01
 # UICC              0x02
- 
-NXP_DEFAULT_SE=0x02
 
-NXP_DEFAULT_NFCEE_TIMEOUT=0x06
-###############################################################################
-#Enable SWP full power mode when phone is power off
-NXP_SWP_FULL_PWR_ON=0x01
+NXP_DEFAULT_SE=0x02
 
 ###############################################################################
-#Set the default AID route Location :
-#This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-DEFAULT_AID_ROUTE=0x00
+NXP_DEFAULT_NFCEE_TIMEOUT=0x06
 
 ###############################################################################
-#Set the Mifare Desfire route Location :
-#This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-DEFAULT_DESFIRE_ROUTE=0x02
+#Enable SWP full power mode when phone is power off
+NXP_SWP_FULL_PWR_ON=0x00
 
 ###############################################################################
-#Set the Mifare CLT route Location :
-#This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-DEFAULT_MIFARE_CLT_ROUTE=0x02
-
-##############################################################################
-#### Select the CHIP ####
+#Chip type
 #PN547C2            0x01
 #PN65T              0x02
-#PN548AD            0x03
-#PN66T              0x04
 
 NXP_NFC_CHIP=0x01
 
-#Timeout in secs
+###############################################################################
+#SWP Reader feature
+#Timeout in seconds
 NXP_SWP_RD_START_TIMEOUT=0x0A
-#Timeout in secs
+#Timeout in seconds
 NXP_SWP_RD_TAG_OP_TIMEOUT=0x01
-###############################################################################
-# CE when Screen state is locked
-# Disable           0x00
-# Enable            0x01
-NXP_CE_ROUTE_STRICT_DISABLE=0x01
-
-
-###############################################################################
-
-# AID Matching platform options
-# AID_MATCHING_L 0x01
-# AID_MATCHING_K 0x02
-AID_MATCHING_PLATFORM=0x01
-
diff --git a/prebuilt/etc/nfc-nci.conf b/prebuilt/etc/nfc-nci.conf
deleted file mode 100644
index d0dbf1e..0000000
--- a/prebuilt/etc/nfc-nci.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-## this file is used by NFC Hardware Abstraction Layer at external/libnfc-nci/halimpl/
-
-###############################################################################
-#chip hardware version<v.2.0.S> <JNI.NCI_MW.NCI_HAL.KERNEL><SUPPORTED features><unique id>
-#supported features <SE:swp1,numer of ses><P2P,A F><others><LISTEN ABF B Prime><POLL ABF kovio>
-NFC_BUILD_ID = V2.1.S.01.01.01.01.1105000707.1112132050
-# Application logging mask
-APPL_TRACE_LEVEL=0x00
-PROTOCOL_TRACE_LEVEL=0x00000000
-
-#####################################################################################
-# File used for NFA storage
-NFA_STORAGE="/data/nfc"
-
-NFC_WAKE_DELAY=20
-
-#default
-NFA_DM_START_UP_CFG={17:80:01:00:08:01:01:11:01:01:AF:02:00:07:AF:02:01:07:C0:01:01:BF:01:02}
-#####################################################################################
-# listen to the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B.
-
-UICC_LISTEN_TECH_MASK=0x07
-# Protocol mask for NFC-A technology protocols(T1T,T2T and 4A).
-# The bits (for NFC A protocol mask)are defined in nfa_api.h.
-# Default is T4AT
-# 0x01- T1T, 0x02- T2T, 0x04- T4AT
-NFCA_PROTOCOL_MASK=0x04
-###############################################################################
-# Force tag polling for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B |
-#            NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 |
-#            NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_A_ACTIVE |
-#            NFA_TECHNOLOGY_MASK_F_ACTIVE.
-#
-# 0x01- A, 0x02- B, 0x04- F, 0x20- Kovio
-POLLING_TECH_MASK=0x27
-
-# Force P2P to only listen for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
-#            NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE
-# 0x01- NFC DEP A , 0x04:- NFC DEP F
-P2P_LISTEN_TECH_MASK=0x05
-
-###############################################################################
-# Firmware patch file
-#  If the value is not set then patch download is disabled.
-FW_PATCH="/system/etc/firmware/Signedrompatch.bin"
-###############################################################################
-# Firmware patch file
-#FW_PRE_PATCH="/system/etc/firmware/Signedromprepatch.bin"
-NVM_FILE_PATH="/system/etc/firmware/nfc_test.bin"
-FUSED_NVM_FILE_PATH="/system/etc/firmware/fused_nvm.bin"
-###############################################################################
-
-#
-TRANSPORT_DRIVER="/dev/nfc-nci"
-
-###############################################################################
-# power control driver
-
-POWER_CONTROL_DRIVER="/dev/nfc-nci"
-
-###############################################################################
-# Maximum Number of Credits to be allowed by the NFCC
-MAX_RF_DATA_CREDITS=1
-###############################################################################
-#Patch and nvm update flags
-# These flags needs to be set to enable the patch update and nvm update mechanism
-# of middleware
-###############################################################################
-PATCH_UPDATE_ENABLE_FLAG=0x01
-NVM_UPDATE_ENABLE_FLAG=0x00
-FUSED_NVM_UPDATE_ENABLE_FLAG=0x00
-PM_ENABLE_FLAG=0x01
-SCREEN_OFF_POWER_STATE=0x01
-###############################################################################
-# Time out value for closing the connection opened for patch download
-###############################################################################
-PATCH_DNLD_NFC_HAL_CMD_TOUT=4000
-PATCH_VERSION=21
-###############################################################################
-#Default listen mode routing table
-# This is the default listen mode routing configuration for NFCC.
-# Default is for ISO DEP and NFC DEP
-DEFAULT_LISTEN_MODE_ROUTING={00:02:0A:01:03:01:01:04:01:03:00:01:05}
-###############################################################################