From 122258443608a6264e5fbb3130ada8a558b4a8c7 Mon Sep 17 00:00:00 2001 From: Ruchi Kandoi Date: Wed, 24 May 2017 11:13:04 -0700 Subject: [PATCH] libnfc-brcm.conf changes for NCI2.0 Test: tag read, payments and Android beam Bug: 63146248 Change-Id: I20e044f77a2857a2aea219a67858a459958eb8e8 --- nfc/libnfc-brcm.conf | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf index b6abbee6..05cb160b 100644 --- a/nfc/libnfc-brcm.conf +++ b/nfc/libnfc-brcm.conf @@ -312,7 +312,9 @@ MAX_RF_DATA_CREDITS=1 # 2 NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate # 3 NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0 # 4 NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3 -PRESENCE_CHECK_ALGORITHM=1 +# 5 NFA_RW_PRES_CHK_ISO_DEP_NAK; Type - 4 tag protocol iso-dep nak presence check +# command is sent waiting for rsp and ntf. +PRESENCE_CHECK_ALGORITHM=5 ############################################################################### # Force tag polling for the following technology(s). @@ -320,7 +322,7 @@ PRESENCE_CHECK_ALGORITHM=1 # 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_KOVIO | -# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE. +# NFA_TECHNOLOGY_MASK_ACTIVE # # Notable bits: # NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ @@ -328,21 +330,19 @@ PRESENCE_CHECK_ALGORITHM=1 # NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ # NFA_TECHNOLOGY_MASK_ISO15693 0x08 /* Proprietary Technology */ # NFA_TECHNOLOGY_MASK_KOVIO 0x20 /* Proprietary Technology */ -# NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */ -# NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ -POLLING_TECH_MASK=0x4F +# NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology Active */ +POLLING_TECH_MASK=0x6F ############################################################################### # 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 +# NFA_TECHNOLOGY_MASK_ACTIVE # # Notable bits: # NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ # 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 */ +# NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology Active */ P2P_LISTEN_TECH_MASK=0x45 PRESERVE_STORAGE=0x01 @@ -374,7 +374,8 @@ NCI_HAL_MODULE="nfc_nci" # AID_MATCHING_EXACT_ONLY 0x00 # AID_MATCHING_EXACT_OR_PREFIX 0x01 # AID_MATCHING_PREFIX_ONLY 0x02 -AID_MATCHING_MODE=0x01 +# AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03 +AID_MATCHING_MODE=0x03 ############################################################################### # Default Secure Element route id @@ -398,3 +399,9 @@ NFA_PROPRIETARY_CFG={05:FF:FF:06:81:80:70:FF:FF} # Bail out mode # If set to 1, NFCC is using bail out mode for either Type A or Type B poll. NFA_POLL_BAIL_OUT_MODE=0x01 +############################################################################### +# Enable/Disable Block Route feature. +# Block Route will restrict routing to first matched rule +# Block Route enable 0x01 +# Block Route disable 0x00 +NFA_BLOCK_ROUTE=0x00