From e591adb423f0629f2a944743ad3cd30882c1a906 Mon Sep 17 00:00:00 2001 From: therootlord Date: Tue, 14 Aug 2018 17:42:14 -0300 Subject: [PATCH] sanders: update nfc configs from OPS28.65-14 --- configs/libnfc-brcm.conf | 37 +++++++++++++++---------------------- configs/libnfc-nxp.conf | 12 ++++++------ 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/configs/libnfc-brcm.conf b/configs/libnfc-brcm.conf index ee33ee8..a9b373b 100644 --- a/configs/libnfc-brcm.conf +++ b/configs/libnfc-brcm.conf @@ -1,8 +1,10 @@ ###################### Start of libnfc-common.conf ####################### - +# NXP Base Ver 8.0.E ############################################################################### # Application options -APPL_TRACE_LEVEL=0xFF +# 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 ############################################################################### @@ -132,6 +134,7 @@ NFA_HCI_DEFAULT_DEST_GATE=0xF0 #NFA_HCI_STATIC_PIPE_ID_F3=0x70 #NFA_HCI_STATIC_PIPE_ID_01=0x19 NFA_HCI_STATIC_PIPE_ID_C0=0x19 +NFA_HCI_STATIC_PIPE_ID_02=0x20 ############################################################################### # When disconnecting from Oberthur secure element, perform a warm-reset of # the secure element to deselect the applet. @@ -146,10 +149,13 @@ NFA_HCI_STATIC_PIPE_ID_C0=0x19 UICC_LISTEN_TECH_MASK=0x07 ############################################################################### -# Force HOST listen feature enable or disable. -# 0: Disable -# 1: Enable -HOST_LISTEN_ENABLE=0x01 +# Forcing HOST to listen for a selected protocol +# 0x00 : Disable Host Listen +# 0x01 : Enable Host to Listen (A) for ISO-DEP tech A +# 0x02 : Enable Host to Listen (B) for ISO-DEP tech B +# 0x04 : Enable Host to Listen (F) for T3T Tag Type Protocol tech F +# 0x07 : Enable Host to Listen (ABF)for ISO-DEP tech AB & T3T Tag Type Protocol tech F +HOST_LISTEN_TECH_MASK=0x07 ############################################################################### # Enabling/Disabling Forward functionality @@ -344,31 +350,18 @@ POLLING_TECH_MASK=0xEF # NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ # NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */ # NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ -P2P_LISTEN_TECH_MASK=0xC5 +P2P_LISTEN_TECH_MASK=0xC4 PRESERVE_STORAGE=0x01 -############################################################################### -# 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. - -# Maximum EE supported number -# NXP PN547C2 0x02 -# NXP PN65T 0x03 -# NXP PN548C2 0x02 -# NXP PN66T 0x03 -NFA_MAX_EE_SUPPORTED=0x02 - ############################################################################### # NCI Hal Module name -NCI_HAL_MODULE="nfc_nci" +NCI_HAL_MODULE="nfc_nci.pn54x" ############################################################################## # Deactivate notification wait time out in seconds used in ETSI Reader mode # 0 - Infinite wait -#NFA_DM_DISC_NTF_TIMEOUT=0 +NFA_DM_DISC_NTF_TIMEOUT=100 ############################################################################### # AID_MATCHING constants diff --git a/configs/libnfc-nxp.conf b/configs/libnfc-nxp.conf index c9dbb0d..0ada588 100644 --- a/configs/libnfc-nxp.conf +++ b/configs/libnfc-nxp.conf @@ -14,12 +14,12 @@ # ANDROID_LOG_ERROR 0x01 # ANDROID_LOG_SILENT 0x00 # -NXPLOG_EXTNS_LOGLEVEL=0x01 -NXPLOG_NCIHAL_LOGLEVEL=0x01 -NXPLOG_NCIX_LOGLEVEL=0x01 -NXPLOG_NCIR_LOGLEVEL=0x01 -NXPLOG_FWDNLD_LOGLEVEL=0x01 -NXPLOG_TML_LOGLEVEL=0x01 +NXPLOG_EXTNS_LOGLEVEL=0x03 +NXPLOG_NCIHAL_LOGLEVEL=0x03 +NXPLOG_NCIX_LOGLEVEL=0x03 +NXPLOG_NCIR_LOGLEVEL=0x03 +NXPLOG_FWDNLD_LOGLEVEL=0x03 +NXPLOG_TML_LOGLEVEL=0x03 ############################################################################### # Nfc Device Node name