river: Update configs & NFC from river QPU30.52-2-5

Signed-off-by: Andrew Hexen <SyberHexen@gmail.com>
Change-Id: I7ea68ea1d4471135b0bdb1444110463d64e4f9e5

5 files changed, 260 insertions, 264 deletions

diff --git a/configs/sensors/sensor_def_qcomdev.conf b/configs/sensors/sensor_def_qcomdev.conf
index 858c485..37ca1d8 100644
--- a/configs/sensors/sensor_def_qcomdev.conf
+++ b/configs/sensors/sensor_def_qcomdev.conf
@@ -194,15 +194,15 @@
 10610 0x43333 0x10001 # raw accel margin: 4.2, Q16
 
 # Mot Off Body config
-10700 0x00000000   0x10001 # Default/On-Body running variance alpha coefficient: 0.0, Q16
-10701 0x00000000   0x10001 # Variance low threshold: 0.0, Q16
-10702 0x00140000   0x10001 # Variance high threshold: 20.0, Q16
+10700 0x0000199A   0x10001 # Default/On-Body running variance alpha coefficient: 0.10, Q16
+10701 0x00000290   0x10001 # Variance low threshold: 0.01, Q16
+10702 0x0000170B   0x10001 # Variance high threshold: 0.09, Q16
 10703 1            0x10001 # Thresh count. Variance must exceed for this many samples: 1
-10704 0x00000000   0x10001 # Off Body running variance alpha coefficient: 0.0, Q16
-10705 0x00140000   0x10001 # Off Body variance high threshold: 20.0, Q16
+10704 0x0000199A   0x10001 # Off Body running variance alpha coefficient: 0.10, Q16
+10705 0x00050000   0x10001 # Off Body variance high threshold: 5.0, Q16
 10706 0x00020000   0x10001 # Theta exit. Exit Off Body on theta change >= to this: 2.0, Q16
-10707 0x00000000   0x10001 # Theta low. Theta must be below this: 0.0 Q16
-10708 0x00B40000   0x10001 # Theta high. Theta must be above this: 180.0 Q16
+10707 0x00B40000   0x10001 # Theta low. Theta must be below this: 180.0 Q16
+10708 0x00000000   0x10001 # Theta high. Theta must be above this: 0.0 Q16
 
 # ALS/Prox Config (AMS TMD3702-based)
 107 130     0x10001 # Prox Covered Threshold (PIHT)
diff --git a/configs/thermal-engine.conf b/configs/thermal-engine.conf
index b09caf8..ab55774 100644
--- a/configs/thermal-engine.conf
+++ b/configs/thermal-engine.conf
@@ -1,8 +1,8 @@
 [FRONT_TEMP]
 algo_type        virtual
 trip_sensor      msm_therm
-set_point        -18000
-set_point_clr    -20000
+thresholds       -18000
+thresholds_clr   -20000
 sensors          msm_therm pa_therm0 chg_therm batt_temp
 weights          110       100       85        110
 offsets          -2000     -2000     -2000     -2000
@@ -22,8 +22,8 @@ action_info      1
 [BACK_TEMP]
 algo_type        virtual
 trip_sensor      msm_therm
-set_point        -18000
-set_point_clr    -20000
+thresholds       -18000
+thresholds_clr   -20000
 sensors          msm_therm pa_therm0 chg_therm batt_temp
 weights          110       100       85        110
 offsets          -1000     -1000     -1000     -1000
diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf
index 113defd..290550a 100644
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -1,19 +1,15 @@
 ###############################################################################
 ## Modified by Motorola Mobility LLC
-## Version : common.4 (2018/09/03)
+## Version : common.6 (2019/09/25)
 ###############################################################################
 
 ########################## Start of libnfc-nci.conf ###########################
 ###############################################################################
 # Application options
-NFC_DEBUG_ENABLED=0x01
+APPL_TRACE_LEVEL=0xFF
+PROTOCOL_TRACE_LEVEL=0xFFFFFFFF
 
-###############################################################################
-# performance measurement
-# Change this setting to control how often USERIAL log the performance (throughput)
-# data on read/write/poll
-# defailt is to log performance dara for every 100 read or write
-#REPORT_PERFORMANCE_MEASURE=100
+NFC_DEBUG_ENABLED=0x01
 
 ###############################################################################
 # File used for NFA storage
@@ -24,13 +20,6 @@ NFA_STORAGE="/data/nfc"
 # is the ETSI loopback gate.
 NFA_HCI_DEFAULT_DEST_GATE=0xF0
 
-
-###############################################################################
-# Configure the default NfcA/IsoDep techology and protocol route. Can be
-# either a secure element (e.g. 0xF4) or the host (0x00)
-#DEFAULT_ISODEP_ROUTE=0x00
-
-
 ###############################################################################
 # Force UICC to only listen to the following technology(s).
 # The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
@@ -65,13 +54,9 @@ AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
 SCREEN_OFF_POWER_STATE=1
 
 ###############################################################################
-# Firmware patch format, Only 1 and 5 should be set
-#   0 -> NFC Default
-#   1 -> EMVCO Default
-#   3 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE =  Removal process
-#   5 -> EMVCO Cert Polling, DISC_IDLE = Removal process  , DISC DEACTIVATE =   POWER_OFF
-#   7 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE =  POWER_OFF
-NFA_CONFIG_FORMAT=1
+# Default poll duration (in ms)
+#  The defualt is 500ms if not set (see nfc_target.h)
+#NFA_DM_DISC_DURATION_POLL=333
 
 ###############################################################################
 # Force tag polling for the following technology(s).
@@ -86,10 +71,11 @@ NFA_CONFIG_FORMAT=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
+
 ###############################################################################
 # Force P2P to only listen for the following technology(s).
 # The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
@@ -102,8 +88,10 @@ POLLING_TECH_MASK=0xEF
 # NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
 # NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
 P2P_LISTEN_TECH_MASK=0xC4
+
 ###############################################################################
 PRESERVE_STORAGE=0x01
+
 ##############################################################################
 # Deactivate notification wait time out in seconds used in ETSI Reader mode
 # 0 - Infinite wait
@@ -117,29 +105,3 @@ NFA_DM_DISC_NTF_TIMEOUT=100
 AID_MATCHING_MODE=0x01
 
 ###############################################################################
-# Preferred Secure Element for Technology based routing
-# eSE               0x01
-# UICC              0x02
-
-NXP_PRFD_TECH_SE=0x02
-
-################################################################################
-#Set bit to 1 , black list is enabled
-#Set bit to 0,  to disable balcklist
-NFA_AID_BLOCK_ROUTE=0x01
-
-################################################################################
-# Maximum WTX requests entertained by MW
-NXP_WM_MAX_WTX_COUNT=50
-################################################################################
-#Set the default Felica T3T System Code :
-#This settings will be used when application does not set this parameter
-DEFAULT_SYS_CODE={FE:FF}
-#########################################################################
-
-###############################################################################
-#White list of Hosts
-#This values will be the Hosts(NFCEEs) in the HCI Network.
-DEVICE_HOST_WHITE_LIST={80:81:C0}
-
-###############################################################################
diff --git a/nfc/libnfc-nxp-gcf.conf b/nfc/libnfc-nxp-gcf.conf
index 81b392e..6820ee6 100644
--- a/nfc/libnfc-nxp-gcf.conf
+++ b/nfc/libnfc-nxp-gcf.conf
@@ -1,6 +1,6 @@
 ###############################################################################
 ## Modified by Motorola Mobility LLC
-## Version : river.10 (2018/11/01)
+## Version : river.final.1 2019/10/18)
 ###############################################################################
 
 ## This file is used by NFC NXP NCI HAL(external/libnfc-nci/halimpl/pn54x)
@@ -72,16 +72,11 @@ NXP_ACT_PROP_EXTN={2F, 02, 00}
 NXP_NFC_PROFILE_EXTN={20, 02, 05, 01, A0, 44, 01, 00}
 
 ###############################################################################
-# NFCC Configuration Control
-# Allow NFCC to manage RF Config       0x01
-# Don't allow NFCC to manage RF Config 0x00
-NXP_NFC_MERGE_RF_PARAMS={20, 02, 04, 01, 85, 01, 01}
-
-###############################################################################
 # Standby enable settings
 #    Disabled - 0x00
 #    Enabled  - 0x01
-NXP_CORE_STANDBY={2F, 00, 01, 01}
+# Default should be on in firmware
+# NXP_CORE_STANDBY={2F, 00, 01, 01}
 
 ###############################################################################
 # NXP TVDD configurations settings
@@ -98,6 +93,21 @@ NXP_EXT_TVDD_CFG_1={20, 02, 0F, 01, A0, 0E, 0B, 31, 01, 01, 31, 00, 00, 00, 20,
 #monitoring 5V from DCDC, 3.3V for both RM and CM, DCDCWaitTime=4.2ms
 NXP_EXT_TVDD_CFG_2={20, 02, 13, 02, A0, 66, 01, 00, A0, 0E, 0B, 11, 01, C2, B2, 00, BA, 1E, 12, 00, D0, 0C}
 
+###############################################################################
+# Set configuration optimization decision setting
+# Enable    = 0x01
+# Disable   = 0x00
+NXP_SET_CONFIG_ALWAYS=0x01
+
+###############################################################################
+# Core configuration rf field filter settings to enable set to 01 to disable set
+# to 00 last bit
+NXP_CORE_RF_FIELD={ 20, 02, 05, 01, A0, 62, 01, 00 }
+
+###############################################################################
+# To enable i2c fragmentation set i2c fragmentation enable 0x01 to disable set
+# to 0x00
+NXP_I2C_FRAGMENTATION_ENABLED=0x00
 ################################################################################
 #  NXP RF Eval1_SLALM_CFG2_EFM_40x20 configuration settings for FW Version = 01.01.0B
 #
@@ -355,15 +365,6 @@ NXP_CORE_CONF={ 20, 02, 2A, 0E,
 #                                     A0, 53, 06, FF, FF, FF, FF, FF, FF,
 #                                     A0, 54, 06, 00, 00, 00, 00, 00, 00}
 
-
-###############################################################################
-# Default SE Options
-# No secure element 0x00
-# eSE               0x01
-# UICC              0x02
-# UICC2             0x04
-NXP_DEFAULT_SE=0x02
-
 ###############################################################################
 #Enable SWP full power mode when phone is power off
 NXP_SWP_FULL_PWR_ON=0x00
@@ -393,7 +394,7 @@ NXP_CE_ROUTE_STRICT_DISABLE=0x01
 NXP_DEFAULT_NFCEE_DISC_TIMEOUT=20
 
 ###############################################################################
-NXP_DEFAULT_NFCEE_TIMEOUT=0x06
+NXP_DEFAULT_NFCEE_TIMEOUT=20
 
 ###############################################################################
 #Timeout in secs
@@ -409,26 +410,42 @@ NXP_SWP_RD_TAG_OP_TIMEOUT=0x01
 # host  0x00
 # eSE   0x01
 # UICC  0x02
-# UICC2 0x04
 DEFAULT_AID_ROUTE=0x02
 
 ###############################################################################
-#Set the Mifare Desfire route Location :
-#This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-# UICC2 0x04
-DEFAULT_DESFIRE_ROUTE=0x02
+# Configure the default NfcA/IsoDep techology and protocol route. Can be
+# either a secure element (e.g. 0xF4) or the host (0x00)
+# host  0x00
+# eSE   0x01
+# UICC  0x02
+DEFAULT_ISODEP_ROUTE=0x02
+
+###############################################################################
+# Configure the single default SE to use.  The default is to use the first
+# SE that is detected by the stack.  This value might be used when the phone
+# supports multiple SE (e.g. 0xC0 and 0x80) but you want to force it to use
+# one of them (e.g. 0xC0).
+# host  0x00
+# eSE   0x01
+# UICC  0x02
+DEFAULT_OFFHOST_ROUTE=0x02
+
+###############################################################################
+# Configure the single default SE to use.  The default is to use the first
+# SE that is detected by the stack.  This value might be used when the phone
+# supports multiple SE (e.g. 0xF3 and 0xF4) but you want to force it to use
+# one of them (e.g. 0xF4).
+# host  0x00
+# eSE   0x01
+# UICC  0x02
+DEFAULT_NFCF_ROUTE=0x02
 
 ###############################################################################
-#Set the Mifare CLT route Location :
+#Set the default Felica T3T System Code OffHost route Location :
 #This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-# UICC2 0x04
-DEFAULT_MIFARE_CLT_ROUTE=0x02
+# host  0x00
+# eSE   0x01
+DEFAULT_SYS_CODE_ROUTE=0x01
 
 ###############################################################################
 #Set the default AID Power state :
@@ -436,9 +453,9 @@ DEFAULT_MIFARE_CLT_ROUTE=0x02
 # 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
-DEFAULT_AID_PWR_STATE=0x1B
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_AID_PWR_STATE=0x19
 
 ###############################################################################
 #Set the Mifare Desfire Power state :
@@ -446,9 +463,9 @@ DEFAULT_AID_PWR_STATE=0x1B
 # 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
-DEFAULT_DESFIRE_PWR_STATE=0x1B
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_ISODEP_PWR_STATE=0x1B
 
 ###############################################################################
 #Set the Mifare CLT Power state :
@@ -456,48 +473,48 @@ DEFAULT_DESFIRE_PWR_STATE=0x1B
 # 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
-DEFAULT_MIFARE_CLT_PWR_STATE=0x1B
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_OFFHOST_PWR_STATE=0x1B
 
 ###############################################################################
-#Set the Felica CLT route Location :
+#Set the Felica CLT Power state :
 #This settings will be used when application does not set this parameter
-# eSE  0x01
-# UICC 0x02
-# UICC2 0x04
-DEFAULT_FELICA_CLT_ROUTE=0x01
-DEFAULT_NFCF_ROUTE=0x01
-DEFAULT_OFFHOST_ROUTE=0x02
-PRESENCE_CHECK_ALGORITHM=2
+# bit pos 0 = Switch On
+# bit pos 1 = Switch Off
+# bit pos 2 = Battery Off
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_NFCF_PWR_STATE=0x1B
 
 ###############################################################################
-#Set the Felica CLT Power state :
+#Set the SYS_CODE Power state :
 #This settings will be used when application does not set this parameter
 # 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
-DEFAULT_FELICA_CLT_PWR_STATE=0x1B
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_SYS_CODE_PWR_STATE=0x1B
 
 ###############################################################################
-# AID Matching platform options
-# AID_MATCHING_L 0x01
-# AID_MATCHING_K 0x02
-AID_MATCHING_PLATFORM=0x01
+# Configure the NFC Extras to open and use a static pipe.  If the value is
+# not set or set to 0, then the default is use a dynamic pipe based on a
+# destination gate (see NFA_HCI_DEFAULT_DEST_GATE).  Note there is a value
+# for each UICC (where F3="UICC0" and F4="UICC1")
+OFF_HOST_ESE_PIPE_ID=0x19
+OFF_HOST_SIM_PIPE_ID=0x0A
 
 ###############################################################################
-# P61 interface options
-# NFC 0x01
-# SPI 0x02
-NXP_P61_LS_DEFAULT_INTERFACE=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
 
 ###############################################################################
-# P61 LTSM interface options
-# NFC 0x01
-# SPI 0x02
-NXP_P61_LTSM_DEFAULT_INTERFACE=0x01
+# AID Matching platform options
+# AID_MATCHING_L 0x01
+# AID_MATCHING_K 0x02
+AID_MATCHING_PLATFORM=0x01
 
 ###############################################################################
 #CHINA_TIANJIN_RF_SETTING
@@ -514,18 +531,6 @@ NXP_CHINA_TIANJIN_RF_ENABLED=0x01
 NXP_SWP_SWITCH_TIMEOUT=0x0A
 
 ###############################################################################
-# P61 interface options for JCOP Download
-# NFC 0x01
-# SPI 0x02
-NXP_P61_JCOP_DEFAULT_INTERFACE=0x01
-
-###############################################################################
-# P61 JCOP OS download  options
-# FRAMEWORK API BY APPLICATION 0x00
-# AT BOOT_TIME 0x01
-NXP_JCOPDL_AT_BOOT_ENABLE=0x00
-
-###############################################################################
 # Loader service version
 # NFC service checks for LS version 2.0 or 2.1
 # LS2.0 0x20
@@ -600,24 +605,35 @@ NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE=0x01
 NXP_NCI_PARSER_LIBRARY=0x00
 
 ###############################################################################
+#This config will enable different level of Rf transaction debugs based on the
+#following values provided. Decoded information will be printed in adb logcat
+#Debug Mode         Levels
+#Disable Debug      0x00
+#L1 Debug           0x01
+#L2 Debug           0x02
+#L1 & L2 Debug      0x03
+#L1 & L2 & RSSI     0x04
+#L1 & L2 & Felica   0x05
+#NXP_CORE_PROP_SYSTEM_DEBUG=0x00
+
+###############################################################################
+# Enable/Disable Block Route feature.
+# Block Route will restrict routing to first matched rule
+# Block Route enable   0x01
+# Block Route disable  0x00
+AID_BLOCK_ROUTE=0x00
+
+###############################################################################
 # Enable or Disable RF_STATUS_UPDATE to EseHal module
 # Disable           0x00
 # Enable            0x01
-RF_STATUS_UPDATE_ENABLE=0x01
+RF_STATUS_UPDATE_ENABLE=0x00
 
 ###############################################################################
 # Timeout value in milliseconds to send response for Felica command received
 NXP_HCEF_CMD_RSP_TIMEOUT_VALUE=5000
 
 ###############################################################################
-# Configure the NFC Extras to open and use a static pipe.  If the value is
-# not set or set to 0, then the default is use a dynamic pipe based on a
-# destination gate (see NFA_HCI_DEFAULT_DEST_GATE).  Note there is a value
-# for each EE (ESE/SIM)
-NFA_HCI_STATIC_PIPE_ID_C0=0x16
-NFA_HCI_STATIC_PIPE_ID_80=0x0A
-
-###############################################################################
 # Vendor Specific Proprietary Protocol & Discovery Configuration
 # Set to 0xFF if unsupported
 #  byte[0] NCI_PROTOCOL_18092_ACTIVE
@@ -629,29 +645,30 @@ NFA_HCI_STATIC_PIPE_ID_80=0x0A
 #  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
 #  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
 #  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
-NFA_PROPRIETARY_CFG={05:FF:FF:06:81:80:70:FF:FF}
-
-#################################################################################
-# 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
+NFA_PROPRIETARY_CFG={05, FF, FF, 06, 81, 80, 70, FF, FF}
 
 ###############################################################################
-# Core configuration rf field filter settings to enable set to 01 to disable set
-# to 00 last bit
-NXP_CORE_RF_FIELD={ 20, 02, 05, 01, A0, 62, 01, 00 }
+#White list of Hosts
+#This values will be the Hosts(NFCEEs) in the HCI Network.
+DEVICE_HOST_WHITE_LIST={C0, 02}
 
 ###############################################################################
-# To enable i2c fragmentation set i2c fragmentation enable 0x01 to disable set
-# to 0x00
-NXP_I2C_FRAGMENTATION_ENABLED=0x00
+#OffHost UICC route location for MultiSE
+#UICC1 = 02
+#UICC2 = 03
+OFFHOST_ROUTE_UICC={02}
 
 ###############################################################################
-# Set configuration optimization decision setting
-# Enable    = 0x01
-# Disable   = 0x00
-NXP_SET_CONFIG_ALWAYS=0x01
+# 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
+# 1  NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
+# 2 NFA_RW_PRES_CHK_ISO_DEP_NAK; Type - 4 tag protocol iso-dep nak presence check
+PRESENCE_CHECK_ALGORITHM=2
 
 ###############################################################################
 # Extended APDU length for ISO_DEP
 ISO_DEP_MAX_TRANSCEIVE=0xFEFF
+
+################################################################################
+# Maximum WTX requests entertained by MW
+NXP_WM_MAX_WTX_COUNT=50
diff --git a/nfc/libnfc-nxp.conf b/nfc/libnfc-nxp.conf
index fc0d3c8..fc8952e 100644
--- a/nfc/libnfc-nxp.conf
+++ b/nfc/libnfc-nxp.conf
@@ -1,6 +1,6 @@
 ###############################################################################
 ## Modified by Motorola Mobility LLC
-## Version : river.final (2018/11/13)
+## Version : river.final.1 2019/10/18)
 ###############################################################################
 
 ## This file is used by NFC NXP NCI HAL(external/libnfc-nci/halimpl/pn54x)
@@ -72,16 +72,11 @@ NXP_ACT_PROP_EXTN={2F, 02, 00}
 NXP_NFC_PROFILE_EXTN={20, 02, 05, 01, A0, 44, 01, 00}
 
 ###############################################################################
-# NFCC Configuration Control
-# Allow NFCC to manage RF Config       0x01
-# Don't allow NFCC to manage RF Config 0x00
-NXP_NFC_MERGE_RF_PARAMS={20, 02, 04, 01, 85, 01, 01}
-
-###############################################################################
 # Standby enable settings
 #    Disabled - 0x00
 #    Enabled  - 0x01
-NXP_CORE_STANDBY={2F, 00, 01, 01}
+# Default should be on in firmware
+# NXP_CORE_STANDBY={2F, 00, 01, 01}
 
 ###############################################################################
 # NXP TVDD configurations settings
@@ -98,6 +93,21 @@ NXP_EXT_TVDD_CFG_1={20, 02, 0F, 01, A0, 0E, 0B, 31, 01, 01, 31, 00, 00, 00, 20,
 #monitoring 5V from DCDC, 3.3V for both RM and CM, DCDCWaitTime=4.2ms
 NXP_EXT_TVDD_CFG_2={20, 02, 13, 02, A0, 66, 01, 00, A0, 0E, 0B, 11, 01, C2, B2, 00, BA, 1E, 1A, 00, D0, 0C}
 
+###############################################################################
+# Set configuration optimization decision setting
+# Enable    = 0x01
+# Disable   = 0x00
+NXP_SET_CONFIG_ALWAYS=0x01
+
+###############################################################################
+# Core configuration rf field filter settings to enable set to 01 to disable set
+# to 00 last bit
+NXP_CORE_RF_FIELD={ 20, 02, 05, 01, A0, 62, 01, 00 }
+
+###############################################################################
+# To enable i2c fragmentation set i2c fragmentation enable 0x01 to disable set
+# to 0x00
+NXP_I2C_FRAGMENTATION_ENABLED=0x00
 ################################################################################
 #  NXP RF Eval1_SLALM_CFG2_EFM_40x20 configuration settings for FW Version = 01.01.0B
 #
@@ -355,15 +365,6 @@ NXP_CORE_CONF={ 20, 02, 2A, 0E,
 #                                     A0, 53, 06, FF, FF, FF, FF, FF, FF,
 #                                     A0, 54, 06, 00, 00, 00, 00, 00, 00}
 
-
-###############################################################################
-# Default SE Options
-# No secure element 0x00
-# eSE               0x01
-# UICC              0x02
-# UICC2             0x04
-NXP_DEFAULT_SE=0x02
-
 ###############################################################################
 #Enable SWP full power mode when phone is power off
 NXP_SWP_FULL_PWR_ON=0x00
@@ -393,7 +394,7 @@ NXP_CE_ROUTE_STRICT_DISABLE=0x01
 NXP_DEFAULT_NFCEE_DISC_TIMEOUT=20
 
 ###############################################################################
-NXP_DEFAULT_NFCEE_TIMEOUT=0x06
+NXP_DEFAULT_NFCEE_TIMEOUT=20
 
 ###############################################################################
 #Timeout in secs
@@ -409,26 +410,42 @@ NXP_SWP_RD_TAG_OP_TIMEOUT=0x01
 # host  0x00
 # eSE   0x01
 # UICC  0x02
-# UICC2 0x04
 DEFAULT_AID_ROUTE=0x02
 
 ###############################################################################
-#Set the Mifare Desfire route Location :
-#This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-# UICC2 0x04
-DEFAULT_DESFIRE_ROUTE=0x02
+# Configure the default NfcA/IsoDep techology and protocol route. Can be
+# either a secure element (e.g. 0xF4) or the host (0x00)
+# host  0x00
+# eSE   0x01
+# UICC  0x02
+DEFAULT_ISODEP_ROUTE=0x02
+
+###############################################################################
+# Configure the single default SE to use.  The default is to use the first
+# SE that is detected by the stack.  This value might be used when the phone
+# supports multiple SE (e.g. 0xC0 and 0x80) but you want to force it to use
+# one of them (e.g. 0xC0).
+# host  0x00
+# eSE   0x01
+# UICC  0x02
+DEFAULT_OFFHOST_ROUTE=0x02
+
+###############################################################################
+# Configure the single default SE to use.  The default is to use the first
+# SE that is detected by the stack.  This value might be used when the phone
+# supports multiple SE (e.g. 0xF3 and 0xF4) but you want to force it to use
+# one of them (e.g. 0xF4).
+# host  0x00
+# eSE   0x01
+# UICC  0x02
+DEFAULT_NFCF_ROUTE=0x02
 
 ###############################################################################
-#Set the Mifare CLT route Location :
+#Set the default Felica T3T System Code OffHost route Location :
 #This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-# UICC2 0x04
-DEFAULT_MIFARE_CLT_ROUTE=0x02
+# host  0x00
+# eSE   0x01
+DEFAULT_SYS_CODE_ROUTE=0x01
 
 ###############################################################################
 #Set the default AID Power state :
@@ -436,9 +453,9 @@ DEFAULT_MIFARE_CLT_ROUTE=0x02
 # 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
-DEFAULT_AID_PWR_STATE=0x1B
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_AID_PWR_STATE=0x19
 
 ###############################################################################
 #Set the Mifare Desfire Power state :
@@ -446,9 +463,9 @@ DEFAULT_AID_PWR_STATE=0x1B
 # 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
-DEFAULT_DESFIRE_PWR_STATE=0x1B
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_ISODEP_PWR_STATE=0x1B
 
 ###############################################################################
 #Set the Mifare CLT Power state :
@@ -456,48 +473,48 @@ DEFAULT_DESFIRE_PWR_STATE=0x1B
 # 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
-DEFAULT_MIFARE_CLT_PWR_STATE=0x1B
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_OFFHOST_PWR_STATE=0x1B
 
 ###############################################################################
-#Set the Felica CLT route Location :
+#Set the Felica CLT Power state :
 #This settings will be used when application does not set this parameter
-# eSE  0x01
-# UICC 0x02
-# UICC2 0x04
-DEFAULT_FELICA_CLT_ROUTE=0x01
-DEFAULT_NFCF_ROUTE=0x01
-DEFAULT_OFFHOST_ROUTE=0x02
-PRESENCE_CHECK_ALGORITHM=2
+# bit pos 0 = Switch On
+# bit pos 1 = Switch Off
+# bit pos 2 = Battery Off
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_NFCF_PWR_STATE=0x1B
 
 ###############################################################################
-#Set the Felica CLT Power state :
+#Set the SYS_CODE Power state :
 #This settings will be used when application does not set this parameter
 # 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
-DEFAULT_FELICA_CLT_PWR_STATE=0x1B
+# bit pos 3 = Screen Off
+# bit pos 4 = Screen Lock
+DEFAULT_SYS_CODE_PWR_STATE=0x1B
 
 ###############################################################################
-# AID Matching platform options
-# AID_MATCHING_L 0x01
-# AID_MATCHING_K 0x02
-AID_MATCHING_PLATFORM=0x01
+# Configure the NFC Extras to open and use a static pipe.  If the value is
+# not set or set to 0, then the default is use a dynamic pipe based on a
+# destination gate (see NFA_HCI_DEFAULT_DEST_GATE).  Note there is a value
+# for each UICC (where F3="UICC0" and F4="UICC1")
+OFF_HOST_ESE_PIPE_ID=0x19
+OFF_HOST_SIM_PIPE_ID=0x0A
 
 ###############################################################################
-# P61 interface options
-# NFC 0x01
-# SPI 0x02
-NXP_P61_LS_DEFAULT_INTERFACE=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
 
 ###############################################################################
-# P61 LTSM interface options
-# NFC 0x01
-# SPI 0x02
-NXP_P61_LTSM_DEFAULT_INTERFACE=0x01
+# AID Matching platform options
+# AID_MATCHING_L 0x01
+# AID_MATCHING_K 0x02
+AID_MATCHING_PLATFORM=0x01
 
 ###############################################################################
 #CHINA_TIANJIN_RF_SETTING
@@ -514,18 +531,6 @@ NXP_CHINA_TIANJIN_RF_ENABLED=0x01
 NXP_SWP_SWITCH_TIMEOUT=0x0A
 
 ###############################################################################
-# P61 interface options for JCOP Download
-# NFC 0x01
-# SPI 0x02
-NXP_P61_JCOP_DEFAULT_INTERFACE=0x01
-
-###############################################################################
-# P61 JCOP OS download  options
-# FRAMEWORK API BY APPLICATION 0x00
-# AT BOOT_TIME 0x01
-NXP_JCOPDL_AT_BOOT_ENABLE=0x00
-
-###############################################################################
 # Loader service version
 # NFC service checks for LS version 2.0 or 2.1
 # LS2.0 0x20
@@ -600,24 +605,35 @@ NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE=0x01
 NXP_NCI_PARSER_LIBRARY=0x00
 
 ###############################################################################
+#This config will enable different level of Rf transaction debugs based on the
+#following values provided. Decoded information will be printed in adb logcat
+#Debug Mode         Levels
+#Disable Debug      0x00
+#L1 Debug           0x01
+#L2 Debug           0x02
+#L1 & L2 Debug      0x03
+#L1 & L2 & RSSI     0x04
+#L1 & L2 & Felica   0x05
+#NXP_CORE_PROP_SYSTEM_DEBUG=0x00
+
+###############################################################################
+# Enable/Disable Block Route feature.
+# Block Route will restrict routing to first matched rule
+# Block Route enable   0x01
+# Block Route disable  0x00
+AID_BLOCK_ROUTE=0x00
+
+###############################################################################
 # Enable or Disable RF_STATUS_UPDATE to EseHal module
 # Disable           0x00
 # Enable            0x01
-RF_STATUS_UPDATE_ENABLE=0x01
+RF_STATUS_UPDATE_ENABLE=0x00
 
 ###############################################################################
 # Timeout value in milliseconds to send response for Felica command received
 NXP_HCEF_CMD_RSP_TIMEOUT_VALUE=5000
 
 ###############################################################################
-# Configure the NFC Extras to open and use a static pipe.  If the value is
-# not set or set to 0, then the default is use a dynamic pipe based on a
-# destination gate (see NFA_HCI_DEFAULT_DEST_GATE).  Note there is a value
-# for each EE (ESE/SIM)
-NFA_HCI_STATIC_PIPE_ID_C0=0x16
-NFA_HCI_STATIC_PIPE_ID_80=0x0A
-
-###############################################################################
 # Vendor Specific Proprietary Protocol & Discovery Configuration
 # Set to 0xFF if unsupported
 #  byte[0] NCI_PROTOCOL_18092_ACTIVE
@@ -629,29 +645,30 @@ NFA_HCI_STATIC_PIPE_ID_80=0x0A
 #  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
 #  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
 #  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
-NFA_PROPRIETARY_CFG={05:FF:FF:06:81:80:70:FF:FF}
-
-#################################################################################
-# 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
+NFA_PROPRIETARY_CFG={05, FF, FF, 06, 81, 80, 70, FF, FF}
 
 ###############################################################################
-# Core configuration rf field filter settings to enable set to 01 to disable set
-# to 00 last bit
-NXP_CORE_RF_FIELD={ 20, 02, 05, 01, A0, 62, 01, 00 }
+#White list of Hosts
+#This values will be the Hosts(NFCEEs) in the HCI Network.
+DEVICE_HOST_WHITE_LIST={C0, 02}
 
 ###############################################################################
-# To enable i2c fragmentation set i2c fragmentation enable 0x01 to disable set
-# to 0x00
-NXP_I2C_FRAGMENTATION_ENABLED=0x00
+#OffHost UICC route location for MultiSE
+#UICC1 = 02
+#UICC2 = 03
+OFFHOST_ROUTE_UICC={02}
 
 ###############################################################################
-# Set configuration optimization decision setting
-# Enable    = 0x01
-# Disable   = 0x00
-NXP_SET_CONFIG_ALWAYS=0x01
+# 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
+# 1  NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
+# 2 NFA_RW_PRES_CHK_ISO_DEP_NAK; Type - 4 tag protocol iso-dep nak presence check
+PRESENCE_CHECK_ALGORITHM=2
 
 ###############################################################################
 # Extended APDU length for ISO_DEP
 ISO_DEP_MAX_TRANSCEIVE=0xFEFF
+
+################################################################################
+# Maximum WTX requests entertained by MW
+NXP_WM_MAX_WTX_COUNT=50