diff options
| author | Love Khanna <love.khanna@nxp.com> | 2017-05-30 14:30:54 +0530 |
|---|---|---|
| committer | Ruchi Kandoi <kandoiruchi@google.com> | 2017-07-06 11:32:15 -0700 |
| commit | 940b1439daeae96237d5d9be17663cc595ec594e (patch) | |
| tree | 5f7d47573506b17b94d99b7866679e7d417915c4 /halimpl | |
| parent | e5062d1b7e05845c891bf1e4ebe93236a9af4794 (diff) | |
| download | android_hardware_broadcom_nfc-940b1439daeae96237d5d9be17663cc595ec594e.tar.gz android_hardware_broadcom_nfc-940b1439daeae96237d5d9be17663cc595ec594e.tar.bz2 android_hardware_broadcom_nfc-940b1439daeae96237d5d9be17663cc595ec594e.zip | |
halimpl: NCI2.0 config params added to the configuration file.
Bug: 63146248
Test: Compiles
Change-Id: I6eb698c5482bdcdbb1c79c5127999cb615e7f447
(cherry picked from commit 8e7351be7287c5ea0d760f62511d0299ee67fb65)
Diffstat (limited to 'halimpl')
| -rw-r--r-- | halimpl/pn54x/libnfc-brcm_NCI2_0.conf | 23 | ||||
| -rw-r--r-- | halimpl/pn54x/libnfc-nxp-PN553_example_NCI2_0.conf | 5 |
2 files changed, 19 insertions, 9 deletions
diff --git a/halimpl/pn54x/libnfc-brcm_NCI2_0.conf b/halimpl/pn54x/libnfc-brcm_NCI2_0.conf index 9d6d9f9..a4d3290 100644 --- a/halimpl/pn54x/libnfc-brcm_NCI2_0.conf +++ b/halimpl/pn54x/libnfc-brcm_NCI2_0.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,19 +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_ACTIVE 0x40 /* NFC Technology A 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_ACTIVE 0x40 /* NFC Technology A active mode */ +#NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology Active */ P2P_LISTEN_TECH_MASK=0x45 PRESERVE_STORAGE=0x01 @@ -372,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 @@ -396,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 diff --git a/halimpl/pn54x/libnfc-nxp-PN553_example_NCI2_0.conf b/halimpl/pn54x/libnfc-nxp-PN553_example_NCI2_0.conf index e3783fc..3dca16e 100644 --- a/halimpl/pn54x/libnfc-nxp-PN553_example_NCI2_0.conf +++ b/halimpl/pn54x/libnfc-nxp-PN553_example_NCI2_0.conf @@ -174,7 +174,7 @@ NXP_I2C_FRAGMENTATION_ENABLED=0x00 ############################################################################### # Core configuration settings -NXP_CORE_CONF={ 20, 02, 31, 0F, +NXP_CORE_CONF={ 20, 02, 34, 10, 85, 01, 01, 28, 01, 00, 21, 01, 00, @@ -189,7 +189,8 @@ NXP_CORE_CONF={ 20, 02, 31, 0F, 80, 01, 01, 81, 01, 01, 82, 01, 0E, - 18, 01, 01 + 18, 01, 01, + 68, 01, 00 } ############################################################################### |