Mako: NFC: Set antenna tuning parameters to certified values.

Also, clean up the config file. No functional settings
are changed besides PREDSP.

Bug: 7315014
Change-Id: I36b40bfa44269d056c158f2b6e1f71a9de16154a

1 files changed, 52 insertions, 85 deletions

diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf
index 928540f..d3c94e5 100644
--- a/nfc/libnfc-brcm.conf
+++ b/nfc/libnfc-brcm.conf
@@ -13,13 +13,6 @@ PROTOCOL_TRACE_LEVEL=0x00000000
 #REPORT_PERFORMANCE_MEASURE=100
 
 ###############################################################################
-# Broadcom NFC Extras API
-# Uncomment to disable Broadcom NFC Extras API.  NfcService must be modified
-# to recognize this API.  This API is available with JNI version 401 or higher.
-# The default is enabled.
-#ENABLE_BRCM_EXTRAS_API=0
-
-###############################################################################
 # File used for NFA storage
 NFA_STORAGE="/data/nfc"
 
@@ -40,60 +33,34 @@ NFA_STORAGE="/data/nfc"
 #SNOOZE_MODE_CFG={08:00:00:00:01}
 
 ###############################################################################
-# Low Power Mode Settings
-#
-#  If NFA_DM_LP_CFG is not provided, stack default settings are
-#  used (see nfa_dm_brcm_cfg.c).  They are as follows:
-#       1             Power cycle to full power mode from CEx
-#       5             Parameter for low power mode command
-#       0             Primary Threshold for battery monitor
-#                       0-7 representing below voltages:
-#                         {2, 2.2, 2.7, 2.8, 2.9, 3, 3.1, 3.2}
-#       8             Secondary Threshold for battery monitor
-#                       0-15 representing below voltages:
-#                         {5.2, 4.87, 4.54, 4.22, 3.9, 3.73, 3.57, 3.4,
-#                          3.2, 3.1,  3.0,  2.9,  2.8, 2.7,  2.2,  2.0}
-#
-#NFA_DM_LP_CFG={01:05:00:08}
-
-###############################################################################
 # Insert a delay in milliseconds after NFC_WAKE and before write to NFCC
 NFC_WAKE_DELAY=20
+
 ###############################################################################
 # Various Delay settings (in ms) used in USERIAL
 #  POWER_ON_DELAY
 #    Delay after turning on chip, before writing to transport (default 300)
 #  PRE_POWER_OFF_DELAY
-#    Delay after deasserting NFC-Wake before turn off chip (default 100)
+#    Delay after deasserting NFC-Wake before turn off chip (default 0)
 #  POST_POWER_OFF_DELAY
 #    Delay after turning off chip, before USERIAL_close returns (default 0)
 #
 #POWER_ON_DELAY=300
-#PRE_POWER_OFF_DELAY=100
+#PRE_POWER_OFF_DELAY=0
 #POST_POWER_OFF_DELAY=0
 
 ###############################################################################
-# Device Manager Config
-#
-#  If NFA_DM_CFG is not provided, stack default settings are
-#  used (see nfa_dm_cfg.c).  They are as follows:
-#     500ms (0x1F4)   Total duration when busy polling
-#    1000ms (0x3E8)   Total duration when background polling
-#       0 (FALSE)     Automatic NDEF detection when background polling
-#       0 (FALSE)     Automatic NDEF read when background polling
-#
-#NFA_DM_CFG={00:00}
-
-###############################################################################
-# LPTD mode configuration (effective NFCA 403.10.0.34)
-#  byte[0] is the length of the parameters
+# LPTD mode configuration
+#  byte[0] is the length of the remaining bytes in this value
 #     if set to 0, LPTD params will NOT be sent to NFCC (i.e. disabled).
-#  byte[1] indicates if LPTD is enabled
-#     if set to 0, LPTD will be disabled.
-#  byte[2-n] are the LPTD parameters.
+#  byte[1] is the param id it should be set to B9.
+#  byte[2] is the length of the LPTD parameters
+#  byte[3] indicates if LPTD is enabled
+#     if set to 0, LPTD will be disabled (parameters will still be sent).
+#  byte[4-n] are the LPTD parameters.
 #  By default, LPTD is enabled and default settings are used.
-#  See nfa_dm_brcm_cfg.c for defaults
-LPTD_CFG={00:00:02:FF:FF:80:40:00:40:00:80:00:00:10:00:00:00:71:0D:2C:00:00:00:00:00:00:00:00:00:00:00:00:00:00}
+#  See nfc_hal_dm_cfg.c for defaults
+LPTD_CFG={00:B9:21:01:02:FF:FF:04:A0:0F:40:00:80:02:02:10:00:00:00:31:0C:30:00:00:00:00:00:00:00:00:00:00:00:00:00:00}
 
 ###############################################################################
 # Startup Configuration (100 bytes maximum)
@@ -108,19 +75,14 @@ LPTD_CFG={00:00:02:FF:FF:80:40:00:40:00:80:00:00:10:00:00:00:71:0D:2C:00:00:00:0
 NFA_DM_START_UP_CFG={1F:CB:01:01:A5:01:01:CA:14:00:00:00:00:06:E8:03:00:00:00:00:00:00:00:00:00:00:00:00:00:80:01:01}
 
 ###############################################################################
-# Startup Vendor Specific Configuration (100 bytes maximum)
-#  byte[0] is the length of the parameters
-#  byte[1] Start of first TLV
-#  byte[2] Length of first TLV
-#
-#NFA_DM_START_UP_VSC_CFG={03:17:01:01}        # configure ARM JTAG
-#NFA_DM_START_UP_VSC_CFG={04:09:02:01:01}     # debug logging (byte[3]:RF Frames, byte[4]:SWP Frames)
-
-###############################################################################
-# DTA Start Configuration (30 bytes maximum)
-#
-# The first byte is the length of the TLV's.
-#DTA_START_CFG={05:C9:03:40:00:00}
+# Startup Vendor Specific Configuration (100 bytes maximum);
+#  byte[0] TLV total len = 0x5
+#  byte[1] NCI_MTS_CMD|NCI_GID_PROP = 0x2f
+#  byte[2] NCI_MSG_FRAME_LOG = 0x9
+#  byte[3] 2
+#  byte[4] 0=turn off RF frame logging; 1=turn on
+#  byte[5] 0=turn off SWP frame logging; 1=turn on
+#  NFA_DM_START_UP_VSC_CFG={05:2F:09:02:01:01}
 
 ###############################################################################
 # Antenna Configuration - This data is used when setting 0xC8 config item
@@ -132,14 +94,14 @@ NFA_DM_START_UP_CFG={1F:CB:01:01:A5:01:01:CA:14:00:00:00:00:06:E8:03:00:00:00:00
 # This document is maintained by Paul Forshaw.
 #
 # The values marked as ?? should be tweaked per antenna or customer/app:
-# {06:??:00:??:??:??:00:??:24:00:1C:00:75:00:77:00:76:00:1C:00:03:00:0A:00:??:01:00:00:40:04}
-#
-#PREINIT_DSP_CFG={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}
+# {20:C8:1E:06:??:00:??:??:??:00:??:24:00:1C:00:75:00:77:00:76:00:1C:00:03:00:0A:00:??:01:00:00:40:04}
+# array[0] = 0x20 is length of the payload from array[1] to the end
+# array[1] = 0xC8 is PREINIT_DSP_CFG
+PREINIT_DSP_CFG={06:1F:00:0A:03:30:00:04:24:00:1C:00:75:00:77:00:76:00:1C:00:03:00:0A:00:4C:01:00:00:40:04}
 
 ###############################################################################
-# Configure Xtal Index (for when internal LPO can't
-# detect xtal frequency)
-#NFA_CONFIG_XTAL_INDEX=0x4
+# Configure crystal frequency when internal LPO can't detect the frequency.
+#XTAL_FREQUENCY=0
 
 ###############################################################################
 # Use Nexus S NXP RC work to allow our stack/firmware to work with a retail
@@ -168,8 +130,10 @@ USE_NXP_P2P_RC_WORKAROUND=1
 NFA_HCI_STATIC_PIPE_ID_F4=0x71
 
 ###############################################################################
-# Configure the stack to send a reset byte on the static pipe when closing
-# the pipe from the DH.
+# When disconnecting from Oberthur secure element, perform a warm-reset of
+# the secure element to deselect the applet.
+# The default hex value of the command is 0x3.  If this variable is undefined,
+# then this feature is not used.
 OBERTHUR_WARM_RESET_COMMAND=0x03
 
 ###############################################################################
@@ -211,6 +175,13 @@ POLLING_TECH_MASK=0xDF
 P2P_LISTEN_TECH_MASK=0x45
 
 ###############################################################################
+# 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
+
+###############################################################################
 # This setting allows you to disable registering the T4t Virtual SE that causes
 # the NFCC to send PPSE requests to the DH.
 # The default setting is enabled (i.e. T4t Virtual SE is registered).
@@ -222,9 +193,6 @@ P2P_LISTEN_TECH_MASK=0x45
 # 1: full-power state
 # 2: screen-off card-emulation (CE4/CE3/CE1 modes are used)
 #SCREEN_OFF_POWER_STATE=0
-####################### End of libnfc-brcm-common.conf ########################
-
-################### Start of libnfc-brcm-transport-i2c.conf ###################
 
 ###############################################################################
 # Firmware patch file
@@ -243,6 +211,17 @@ FW_PRE_PATCH="/vendor/firmware/bcm2079x_pre_firmware.ncd"
 #NFA_CONFIG_FORMAT=2
 
 ###############################################################################
+# SPD Debug mode
+#  If set to 1, any failure of downloading a patch will trigger a hard-stop
+#SPD_DEBUG=0
+
+###############################################################################
+# SPD Max Retry Count
+#  The number of attempts to download a patch before giving up (defualt is 3).
+#  Note, this resets after a power-cycle.
+#SPD_MAX_RETRY_COUNT=3
+
+###############################################################################
 # transport driver
 #
 # TRANSPORT_DRIVER=<driver>
@@ -281,6 +260,7 @@ BCMI2CNFC_ADDRESS=0x77
 
 ###############################################################################
 # SPI transport driver options
+#SPI_NEGOTIATION={0A:F0:00:01:00:00:00:FF:FF:00:00}
 
 ###############################################################################
 # UART transport driver options
@@ -298,13 +278,6 @@ BCMI2CNFC_ADDRESS=0x77
 #UART_STOPBITS="1"
 
 ###############################################################################
-# Tunnel transport driver options
-# For use when TRANSPORT_DRIVER="hwtun" (see above)
-
-#TUNNEL_ADDR="10.0.2.2"
-#TUNNEL_PORT=0x3e8
-
-###############################################################################
 # Insert a delay in microseconds per byte after a write to NFCC.
 # after writing a block of data to the NFCC, delay this an amopunt of time before
 # writing next block of data.  the delay is calculated as below
@@ -312,13 +285,7 @@ BCMI2CNFC_ADDRESS=0x77
 # e.g. after 259 bytes is written, delay (259 * 20 / 1000) 5 ms before next write
 NFC_WRITE_DELAY=20
 
-#################### End of libnfc-brcm-transport-i2c.conf ####################
-
-################### Start of libnfc-brcm-fwfsm-enabled.conf ###################
-
 ###############################################################################
-# Multi-technology (default is enabled)
-#NFA_DM_MULTI_TECH_RESP=0
-
-#################### End of libnfc-brcm-fwfsm-enabled.conf ####################
-
+# Default poll duration (in ms)
+#  The defualt is 500ms if not set (see nfc_target.h)
+#NFA_DM_DISC_DURATION_POLL=333