From 69a37182f887cfdb753219449211708ceea62052 Mon Sep 17 00:00:00 2001
From: Andre Eisenbach <eisenbach@google.com>
Date: Wed, 6 Dec 2017 16:22:22 -0800
Subject: [PATCH] Rename libnfc-brcm.conf -> libnfc-nci.conf

Test: manual
Merged-In: I213034b54724b1ed0f43b32bc757ea7d8873ee74
Change-Id: I213034b54724b1ed0f43b32bc757ea7d8873ee74
---
 configs/{libnfc-brcm.conf => libnfc-nci.conf} | 26 +------------------
 device.mk                                     |  2 +-
 2 files changed, 2 insertions(+), 26 deletions(-)
 rename configs/{libnfc-brcm.conf => libnfc-nci.conf} (91%)

diff --git a/configs/libnfc-brcm.conf b/configs/libnfc-nci.conf
similarity index 91%
rename from configs/libnfc-brcm.conf
rename to configs/libnfc-nci.conf
index a9b373b..d935528 100644
--- a/configs/libnfc-brcm.conf
+++ b/configs/libnfc-nci.conf
@@ -2,10 +2,7 @@
 # NXP Base Ver 8.0.E
 ###############################################################################
 # Application options
-# Motorola liugy4 18/01/05 IKSWO-42693 TS27 15.9.3.2.1
-# Change from 0xFF to 0x04, disable DEBUB logs
-APPL_TRACE_LEVEL=0x04
-PROTOCOL_TRACE_LEVEL=0xFFFFFFFF
+NFC_DEBUG_ENABLED=0
 
 ###############################################################################
 # performance measurement
@@ -174,12 +171,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
@@ -296,21 +287,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.
diff --git a/device.mk b/device.mk
index f0e0682..53c8a7b 100644
--- a/device.mk
+++ b/device.mk
@@ -279,7 +279,7 @@ PRODUCT_COPY_FILES += \
     frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/libnfc-brcm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-brcm.conf \
+    $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
     $(LOCAL_PATH)/configs/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
 
 # Netutils