vs980: Update nfc-brcm config and commonize generic config

Change-Id: Id8ed8b645e5645f11f9d210085b22b31e0d64d21

3 files changed, 8 insertions, 275 deletions

diff --git a/device.mk b/device.mk
index b8e0723..0b6f505 100644
--- a/device.mk
+++ b/device.mk
@@ -31,7 +31,6 @@ PRODUCT_PACKAGES += \
 
 # NFC configs
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
     $(LOCAL_PATH)/nfc/libnfc-brcm-20791b05.conf:system/etc/libnfc-brcm-20791b05.conf
 
 # GPS
diff --git a/nfc/libnfc-brcm-20791b05.conf b/nfc/libnfc-brcm-20791b05.conf
index 2cf9181..e8be9d3 100644
--- a/nfc/libnfc-brcm-20791b05.conf
+++ b/nfc/libnfc-brcm-20791b05.conf
@@ -1,12 +1,14 @@
 ###############################################################################
 # Firmware patch file
 #  If the value is not set then patch download is disabled.
-FW_PATCH="/vendor/firmware/BCM20791B5_002.006.013.0011.0054_Generic_I2C_NCD_Signed_configdata.ncd"
+#FW_PATCH="/vendor/firmware/BCM20791B5_002.006.013.0011.0074_Generic_I2C_NCD_Signed_configdata.ncd"
+FW_PATCH="/vendor/firmware/BCM20791B5_002.006.013.0011.0098_Generic_I2C_NCD_Signed_configdata.ncd"
 
 ###############################################################################
 # Firmware pre-patch file (sent before the above patch file)
 #  If the value is not set then pre-patch is not used.
-FW_PRE_PATCH="/vendor/firmware/BCM20791B5_002.006.013.0011.0054_Generic_PreI2C_NCD_Signed_configdata.ncd"
+#FW_PRE_PATCH="/vendor/firmware/BCM20791B5_002.006.013.0011.0074_Generic_PreI2C_NCD_Signed_configdata.ncd"
+FW_PRE_PATCH="/vendor/firmware/BCM20791B5_002.006.013.0011.0098_Generic_PreI2C_NCD_Signed_configdata.ncd"
 
 ###############################################################################
 # LPTD mode configuration
@@ -19,20 +21,20 @@ FW_PRE_PATCH="/vendor/firmware/BCM20791B5_002.006.013.0011.0054_Generic_PreI2C_N
 #  byte[4-n] are the LPTD parameters.
 #  By default, LPTD is enabled and default settings are used.
 #  See nfc_hal_dm_cfg.c for defaults
-LPTD_CFG={38:B9:36:01:00:FF:FF:04:00:00:00:A0:0F:40:00:00:12:02:10:00:00:00:2D:0B:30:00:00:00:00:00:00:00:00:00:00:00:00:00:00:03:00:D0:07:00:00:08:07:00:00:C8:00:00:00:00:00:00:00}
+LPTD_CFG={38:B9:36:01:00:FF:FF:06:00:00:00:A0:0F:40:00:00:12:02:10:00:00:00:2D:0B:30:00:00:00:00:00:00:00:00:00:00:00:00:00:00:03:00:D0:07:00:00:08:07:00:00:C8:00:00:00:00:00:00:00}
 
 ###############################################################################
 # Startup Configuration (256 bytes maximum)
 #
 # This is applied at stack startup.
 #
-NFA_DM_START_UP_CFG={44:CB:01:09:A5:01:01:CA:1A:00:00:00:00:0E:F0:55:00:00:0F:00:00:00:00:A0:25:26:00:14:00:00:00:10:B8:0B:06:B5:03:01:02:FF:80:01:01:C9:03:03:0F:AB:5B:01:02:B2:04:E8:03:00:00:CF:02:02:08:B1:06:00:20:00:00:45:12}
+NFA_DM_START_UP_CFG={4A:CB:01:01:A5:01:01:CA:1C:00:00:00:00:0E:F0:55:00:00:0F:00:00:00:00:20:A1:07:00:14:01:00:00:10:B8:0B:06:00:02:B5:03:01:03:FF:80:01:01:C9:03:03:0F:AB:5B:01:00:B2:04:E8:03:00:00:CF:02:02:08:B1:06:00:20:00:00:40:12:AD:02:05:01}
 
 ###############################################################################
 # Pre-Discovery Startup Configuration (256 bytes maximum)
 #
 # This is applied before starting Discovery the first time.
-NFA_DM_PRE_DISCOVERY_CFG={0A:C2:08:01:08:00:04:80:C3:C9:01}
+NFA_DM_PRE_DISCOVERY_CFG={0A:C2:08:01:08:00:04:40:4B:4C:00}
 
 ###############################################################################
 # Antenna Configuration - This data is used when setting 0xC8 config item
@@ -46,7 +48,7 @@ NFA_DM_PRE_DISCOVERY_CFG={0A:C2:08:01:08:00:04:80:C3:C9:01}
 # {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={20:C8:1E:06:1F:00:0A:03:30:00:04:24:00:1C:00:75:00:77:00:76:00:1C:00:03:00:0A:00:0C:01:00:00:40:04}
+PREINIT_DSP_CFG={20:C8:1E: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}
 
 ###############################################################################
 # Snooze Mode Settings
diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf
deleted file mode 100644
index 34b6de3..0000000
--- a/nfc/libnfc-brcm.conf
+++ /dev/null
@@ -1,268 +0,0 @@
-###############################################################################
-# v2.1 : 2014-02-17
-#     Workaround Patch for SWP Current Consumption Issue
-#     POWER_SAVER_WORKAROUND_1=0xf3
-# v2.0
-#
-###############################################################################
-# Application options
-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
-
-###############################################################################
-# File used for NFA storage
-NFA_STORAGE="/data/nfc"
-
-PRESERVE_STORAGE=1
-
-###############################################################################
-# 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 0)
-#  POST_POWER_OFF_DELAY
-#    Delay after turning off chip, before USERIAL_close returns (default 0)
-#  CE3_PRE_POWER_OFF_DELAY
-#    Delay after deasserting NFC-Wake before turn off chip (default 1000)
-#    when going to CE3 Switch Off mode
-#
-#POWER_ON_DELAY=300
-PRE_POWER_OFF_DELAY=10
-#POST_POWER_OFF_DELAY=0
-#CE3_PRE_POWER_OFF_DELAY=1500
-CE3_PRE_POWER_OFF_DELAY=400
-
-###############################################################################
-# Maximum time (ms) to wait for RESET NTF after setting REG_PU to high
-# The default is 1000.
-NFCC_ENABLE_TIMEOUT=1000
-
-###############################################################################
-# Device Manager Config
-#
-#  If NFA_DM_CFG is not provided, stack default settings are
-#  used (see nfa_dm_cfg.c).  They are as follows:
-#       0 (FALSE)     Automatic NDEF detection when background polling
-#       0 (FALSE)     Automatic NDEF read when background polling
-#
-#NFA_DM_CFG={00:00}
-
-###############################################################################
-# Default poll duration (in ms)
-#  The defualt is 500ms if not set (see nfc_target.h)
-#NFA_DM_DISC_DURATION_POLL=500
-
-###############################################################################
-# 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}
-
-###############################################################################
-# Configure the default Destination Gate used by HCI (the default is 4, which
-# is the ETSI loopback gate.
-#NFA_HCI_DEFAULT_DEST_GATE=0x04
-
-###############################################################################
-# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h.
-# The value is set to 3 by default as it assumes we will discover 0xF2,
-# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced
-# so that the stack will not wait any longer than necessary.
-#NFA_MAX_EE_SUPPORTED=3
-
-###############################################################################
-# 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).  This can be set to 0 if there are no SE on the
-# system in order to skip SE initialization.
-#ACTIVE_SE=0xF3
-
-###############################################################################
-# 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=0xF3
-
-###############################################################################
-# Configure the default "off-host" AID route.  The default is 0xF4
-DEFAULT_OFFHOST_ROUTE=0xF3
-
-###############################################################################
-# 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_F3=0x70
-NFA_HCI_STATIC_PIPE_ID_F4=0x71
-
-###############################################################################
-# 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
-
-###############################################################################
-# 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.
-# If variable is not defined, code will detect UICC's technologies.
-#UICC_LISTEN_TECH_MASK=0x03
-
-GCF_LISTEN_TECH_MASK=0x03
-
-# Workaround patch for Current Consumption 
-POWER_SAVER_WORKAROUND_1=0xF3
-
-###############################################################################
-# Exclude some technologies when establishing the listen mask. This is handy
-# when UICC_LISTEN_TECH_MASK is not specified and the mask is based on what is
-# discovered in the UICC.  This provides a method to remove certain techs.
-# Default is 0x00 (i.e. don't exclude any technology).
-UICC_LISTEN_TECH_EXCLUDE_MASK=0x10
-
-###############################################################################
-# AID for Empty Select command
-# If specified, this AID will be substituted when an Empty SELECT command is
-# detected.  The first byte is the length of the AID.  Maximum length is 16.
-AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
-
-###############################################################################
-# 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.
-#
-# Notable bits:
-#   NFA_TECHNOLOGY_MASK_KOVIO       0x20
-#   NFA_TECHNOLOGY_MASK_A_ACTIVE    0x40
-#   NFA_TECHNOLOGY_MASK_F_ACTIVE    0x80
-#POLLING_TECH_MASK=0x3F
-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.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
-#            NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE
-#P2P_LISTEN_TECH_MASK=0x05
-P2P_LISTEN_TECH_MASK=0xC4
-
-###############################################################################
-# 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
-
-###############################################################################
-# When screen is turned off, specify the desired power state of the controller.
-# 0: power-off-sleep state; DEFAULT
-# 1: full-power state
-# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used)
-SCREEN_OFF_POWER_STATE=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>
-#
-#  where <driver> can be, for example:
-#    "/dev/ttyS"        (UART)
-#    "/dev/bcmi2cnfc"   (I2C)
-#    "hwtun"            (HW Tunnel)
-#    "/dev/bcmspinfc"   (SPI)
-#    "/dev/btusb0"      (BT USB)
-TRANSPORT_DRIVER="/dev/bcm2079x"
-
-###############################################################################
-# power control driver
-# Specify a kernel driver that support ioctl commands to control NFC_EN and
-# NFC_WAKE gpio signals.
-#
-# POWER_CONTRL_DRIVER=<driver>
-#  where <driver> can be, for example:
-#    "/dev/nfcpower"
-#    "/dev/bcmi2cnfc"   (I2C)
-#    "/dev/bcmspinfc"   (SPI)
-#    i2c and spi driver may be used to control NFC_EN and NFC_WAKE signal
-POWER_CONTROL_DRIVER="/dev/bcm2079x"
-
-###############################################################################
-# I2C transport driver options
-# Mako does not support 10-bit I2C addresses
-# Revert to 7-bit address
-#BCMI2CNFC_ADDRESS=0x77
-
-###############################################################################
-# I2C transport driver try to read multiple packets in read() if data is available
-# remove the comment below to enable this feature
-#READ_MULTIPLE_PACKETS=1
-
-###############################################################################
-# SPI transport driver options
-#SPI_NEGOTIATION={0A:F0:00:01:00:00:00:FF:FF:00:00}
-
-###############################################################################
-# UART transport driver options
-#
-# PORT=1,2,3,...
-# BAUD=115200, 19200, 9600, 4800,
-# DATABITS=8, 7, 6, 5
-# PARITY="even" | "odd" | "none"
-# STOPBITS="0" | "1" | "1.5" | "2"
-
-#UART_PORT=2
-#UART_BAUD=115200
-#UART_DATABITS=8
-#UART_PARITY="none"
-#UART_STOPBITS="1"
-
-###############################################################################
-# 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
-#   NFC_WRITE_DELAY * (number of byte written) / 1000 milliseconds
-# e.g. after 259 bytes is written, delay (259 * 20 / 1000) 5 ms before next write
-NFC_WRITE_DELAY=20
-
-###############################################################################
-# Configuration for the RF discovery frequency for each technology. The values mean
-# frequency for NFC Technology A
-#                   Technology B
-#                   Technology F
-#                   Proprietary Technology/15693
-#                   Proprietary Technology/B-Prime
-#                   Proprietary Technology/Kovio
-#                   Technology A active mode
-#                   Technology F active mode
-#POLL_FREQUENCY={01:01:01:01:01:01:01:01}