Add support for NFC 1.1

Test: Enable/Disable NFC, Tag reading
Bug: 75980364
Change-Id: I0100d257409bc796aabc533b41649d6cdac00a24

2 files changed, 44 insertions, 84 deletions

diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf
index e8bd3d8..828fc15 100644
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -26,18 +26,6 @@ AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
 SCREEN_OFF_POWER_STATE=1
 
 ###############################################################################
-# Maximum Number of Credits to be allowed by the NFCC
-#   This value overrides what the NFCC specifices allowing the host to have
-#   the control to work-around transport limitations.  If this value does
-#   not exist or is set to 0, the NFCC will provide the number of credits.
-MAX_RF_DATA_CREDITS=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).
 # The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
 # Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B |
@@ -84,12 +72,13 @@ PRESERVE_STORAGE=0x01
 NFA_MAX_EE_SUPPORTED=0x02
 
 ###############################################################################
-# NCI Hal Module name
-NCI_HAL_MODULE="nfc_nci"
-
-###############################################################################
 # AID_MATCHING constants
 # AID_MATCHING_EXACT_ONLY 0x00
 # AID_MATCHING_EXACT_OR_PREFIX 0x01
 # AID_MATCHING_PREFIX_ONLY 0x02
 AID_MATCHING_MODE=0x01
+
+###############################################################################
+#Set the default Felica T3T System Code :
+#This settings will be used when application does not set this parameter
+DEFAULT_FELICA_SYS_CODE={FE,FF}
diff --git a/nfc/libnfc-nxp.conf b/nfc/libnfc-nxp.conf
index 562a5fb..2b06cce 100644
--- a/nfc/libnfc-nxp.conf
+++ b/nfc/libnfc-nxp.conf
@@ -25,14 +25,10 @@ NXP_NFC_DEV_NODE="/dev/nq-nci"
 MIFARE_READER_ENABLE=0x01
 
 ###############################################################################
-# Vzw Feature enable
-VZW_FEATURE_ENABLE=0x01
-
-###############################################################################
-# File name for Firmware
-# for library format ex: libpn5xx_fw.so
-# for binary format ex: pn5xx.bin
-NXP_FW_NAME="libpn557_fw.so"
+# Firmware file type
+#.so file   0x01
+#.bin file  0x02
+NXP_FW_TYPE=0x01
 
 ###############################################################################
 # System clock source selection configuration
@@ -64,16 +60,6 @@ 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
-#NXP_CORE_STANDBY={2F, 00, 01, 01}
-
-###############################################################################
 # NXP TVDD configurations settings
 # Allow NFCC to configure External TVDD, two configurations (1 and 2) supported,
 # out of them only one can be configured at a time.
@@ -125,12 +111,6 @@ NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, C2, B2, 00, B2, 1E, 1F,
 #}
 
 ###############################################################################
-# Set configuration optimization decision setting
-# Enable    = 0x01
-# Disable   = 0x00
-NXP_SET_CONFIG_ALWAYS=0x00
-
-###############################################################################
 # Core configuration extensions
 # It includes
 # Wired mode settings A0ED, A0EE
@@ -202,12 +182,7 @@ NXP_SWP_FULL_PWR_ON=0x00
 # eSE   0x01
 # UICC  0x02
 # UICC2 0x03
-DEFAULT_FELICA_SYS_CODE_ROUTE=0xC0
-
-###############################################################################
-#Set the default Felica T3T System Code :
-#This settings will be used when application does not set this parameter
-DEFAULT_FELICA_SYS_CODE={FE,FF}
+DEFAULT_SYS_CODE_ROUTE=0xC0
 
 ###############################################################################
 # AID Matching platform options
@@ -236,8 +211,23 @@ NXP_SWP_SWITCH_TIMEOUT=0x0A
 RF_STATUS_UPDATE_ENABLE=0x01
 
 ###############################################################################
-# Default Secure Element route id
-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).
+DEFAULT_OFFHOST_ROUTE=0xC0
+
+###############################################################################
+# 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).
+DEFAULT_NFCF_ROUTE=0xC0
+
+###############################################################################
+# Configure the default NfcA/IsoDep techology and protocol route. Can be
+# either a secure element (e.g. 0xF4) or the host (0x00)
+DEFAULT_ROUTE=0xC0
 
 ###############################################################################
 # Vendor Specific Proprietary Protocol & Discovery Configuration
@@ -259,13 +249,6 @@ NFA_PROPRIETARY_CFG={05, FF, FF, 06, 81, 80, 70, FF, FF}
 NFA_POLL_BAIL_OUT_MODE=0x01
 
 ###############################################################################
-# Enable/Disable Block Route feature.
-# Block Route will restrict routing to first matched rule
-# Block Route enable   0x01
-# Block Route disable  0x00
-NFA_BLOCK_ROUTE=0x00
-
-###############################################################################
 # White list of Hosts
 # This values will be the Hosts(NFCEEs) in the HCI Network.
 DEVICE_HOST_WHITE_LIST={ C0, 02}
@@ -275,41 +258,29 @@ DEVICE_HOST_WHITE_LIST={ C0, 02}
 ISO_DEP_MAX_TRANSCEIVE=0xFEFF
 
 ###############################################################################
-# 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).
-ACTIVE_SE=0xC0
-
-###############################################################################
-# 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).
-ACTIVE_SE_NFCF=0xC0
-
-###############################################################################
-# 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
-
+# 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
+#    command is sent waiting for rsp and ntf.
+PRESENCE_CHECK_ALGORITHM=2
 ###############################################################################
 # 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")
-NFA_HCI_STATIC_PIPE_ID_C0=0x19
+OFF_HOST_ESE_PIPE_ID=0x19
+OFF_HOST_SIM_PIPE_ID=0x70
 
 ###############################################################################
-# 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
-#    command is sent waiting for rsp and ntf.
-PRESENCE_CHECK_ALGORITHM=2
+#Set the Felica T3T System 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 On lock
+# bit pos 4 = Screen off unlock
+# bit pos 5 = Screen Off lock
+DEFAULT_SYS_CODE_PWR_STATE=0x39
 
 ###############################################################################
-# Enable or Disable RF_STATUS_UPDATE to EseHal module
-# Disable           0x00
-# Enable            0x01
-RF_STATUS_UPDATE_ENABLE=0x01