From d59f2b6328488de7fdf864f8a6ca051282ab4c58 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Tue, 22 Oct 2019 09:47:13 +0100 Subject: [PATCH] polaris: Re-sync NFC configs with upstream Required after LA.UM.8.3.r1-06100-sdm845.0 tag merge Change-Id: Id190bf5498a86d4829d2e4d0b637e1accd670ea6 --- nfc/libnfc-nci.conf | 9 --------- nfc/libnfc-nxp.conf | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf index 6717d6f..d153b83 100644 --- a/nfc/libnfc-nci.conf +++ b/nfc/libnfc-nci.conf @@ -48,15 +48,6 @@ AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00} # 2: screen-off card-emulation (CE4/CE3/CE1 modes are used) SCREEN_OFF_POWER_STATE=1 -############################################################################### -# Firmware patch format, Only 1 and 5 should be set -# 0 -> NFC Default -# 1 -> EMVCO Default -# 3 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE = Removal process -# 5 -> EMVCO Cert Polling, DISC_IDLE = Removal process , DISC DEACTIVATE = POWER_OFF -# 7 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE = POWER_OFF -NFA_CONFIG_FORMAT=1 - ############################################################################### # Default poll duration (in ms) # The defualt is 500ms if not set (see nfc_target.h) diff --git a/nfc/libnfc-nxp.conf b/nfc/libnfc-nxp.conf index effb8c6..69a4e24 100644 --- a/nfc/libnfc-nxp.conf +++ b/nfc/libnfc-nxp.conf @@ -531,6 +531,10 @@ PRESENCE_CHECK_ALGORITHM=2 # Extended APDU length for ISO_DEP ISO_DEP_MAX_TRANSCEIVE=0xFEFF +############################################################################### +# CORE_SET_CONF_CMD to reset Prop Emvco Flag +NXP_PROP_RESET_EMVCO_CMD={20, 02, 05, 01, A0, 44, 01, 00} + ############################################################################### # Disable Mifare CLT for JCOP4.1 # Enable 0x01 @@ -538,3 +542,10 @@ ISO_DEP_MAX_TRANSCEIVE=0xFEFF #NXP_MF_CLT_JCOP_CFG=0x01 ############################################################################### +# NFCC POLLING CONFIGURATION +# 0 -> NFC Default +# 1 -> EMVCO Default +# 3 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE = Removal process +# 5 -> EMVCO Cert Polling, DISC_IDLE = Removal process , DISC DEACTIVATE = POWER_OFF +# 7 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE = POWER_OFF +NFA_CONFIG_FORMAT=1