Merge "Rename libnfc-brcm.conf -> libnfc-nci.conf"

2 files changed, 2 insertions, 23 deletions

diff --git a/device.mk b/device.mk
index dc069d5..95e4d43 100644
--- a/device.mk
+++ b/device.mk
@@ -353,7 +353,7 @@ PRODUCT_PACKAGES += \
 endif
 
 PRODUCT_COPY_FILES += \
-    device/huawei/angler/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
+    device/huawei/angler/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf \
     device/huawei/angler/nfc/libnfc-nxp.conf:system/etc/libnfc-nxp.conf
 
 DEVICE_PACKAGE_OVERLAYS := \
diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-nci.conf
index 7bd8ddb..c8b3061 100755
--- a/nfc/libnfc-brcm.conf
+++ b/nfc/libnfc-nci.conf
@@ -2,8 +2,7 @@
 
 ###############################################################################
 # Application options
-APPL_TRACE_LEVEL=0x01
-PROTOCOL_TRACE_LEVEL=0x00000000
+NFC_DEBUG_ENABLED=0
 
 ###############################################################################
 # performance measurement
@@ -168,12 +167,6 @@ UICC_IDLE_TIMEOUT=0
 # 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}
-###############################################################################
-# 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
@@ -290,20 +283,6 @@ 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
-###############################################################################
-# Antenna Configuration - This data is used when setting 0xC8 config item
-# at startup (before discovery is started).  If not used, no value is sent.
-#
-# The settings for this value are documented here:
-# http://wcgbu.broadcom.com/wpan/PM/Project%20Document%20Library/bcm20791B0/
-#   Design/Doc/PHY%20register%20settings/BCM20791-B2-1027-02_PHY_Recommended_Reg_Settings.xlsx
-# This document is maintained by Paul Forshaw.
-#
-# The values marked as ?? should be tweaked per antenna or customer/app:
-# {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: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.