tama-common: Switch to AOSP NFC

Change-Id: I0dea5ce8a9a2f4a7cce74824ef5e2e50e965242b
This commit is contained in:
Michael Bestas 2021-03-29 21:03:42 +03:00 • committed by Danny Trunk
commit d1574d5224
5 changed files with 32 additions and 83 deletions

View file

@ -320,7 +320,6 @@ PRODUCT_PACKAGES += \
android.hardware.nfc@1.2-service \
com.android.nfc_extras \
NfcNci \
libchrome.vendor \
SecureElement \
Tag

View file

@ -369,16 +369,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</interface>
<fqname>@1.0::IDisplayPostproc/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.nxp.nxpnfc</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>INxpNfc</name>
<instance>default</instance>
</interface>
<fqname>@1.0::INxpNfc/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.data.factory</name>
<transport>hwbinder</transport>

View file

@ -1,48 +1,12 @@
###################### Start of libnfc-common.conf #######################
########################## Start of libnfc-nci.conf ###########################
###############################################################################
# Application options
APPL_TRACE_LEVEL=0xFF
PROTOCOL_TRACE_LEVEL=0xFFFFFFFF
NFC_DEBUG_ENABLED=0x01
NFC_DEBUG_ENABLED=0
###############################################################################
# File used for NFA storage
NFA_STORAGE="/data/nfc"
###############################################################################
# Force UICC to only listen to 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_B | NFA_TECHNOLOGY_MASK_F
UICC_LISTEN_TECH_MASK=0x07
###############################################################################
# Configure the default Destination Gate used by HCI (the default is 4, which
# is the ETSI loopback gate.
NFA_HCI_DEFAULT_DEST_GATE=0xF0
###############################################################################
# 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
# Disable 0x00
# Enable 0x01
NXP_FWD_FUNCTIONALITY_ENABLE=0x00
###############################################################################
# AID for Empty Select command
# 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}
###############################################################################
# When screen is turned off, specify the desired power state of the controller.
# 0: power-off-sleep state; DEFAULT
@ -50,11 +14,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
###############################################################################
# Default poll duration (in ms)
# The defualt is 500ms if not set (see nfc_target.h)
NFA_DM_DISC_DURATION_POLL=300
###############################################################################
# Force tag polling for the following technology(s).
# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
@ -67,8 +26,8 @@ NFA_DM_DISC_DURATION_POLL=300
# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */
# NFA_TECHNOLOGY_MASK_B 0x02 /* NFC Technology B */
# 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_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=0x2F
@ -80,24 +39,44 @@ POLLING_TECH_MASK=0x2F
# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE
#
# Notable bits:
# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */
# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */
# 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 */
P2P_LISTEN_TECH_MASK=0x05
P2P_LISTEN_TECH_MASK=0x00
PRESERVE_STORAGE=0x01
###############################################################################
# Deactivate notification wait time out in seconds used in ETSI Reader mode
# 0 - Infinite wait
NFA_DM_DISC_NTF_TIMEOUT=0
# 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
###############################################################################
# AID_MATCHING constants
# AID_MATCHING_EXACT_ONLY 0x00
# AID_MATCHING_EXACT_OR_PREFIX 0x01
# AID_MATCHING_PREFIX_ONLY 0x02
# AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03
AID_MATCHING_MODE=0x01
###############################################################################
###############################################################################
#Set the default Felica T3T System Code :
#This settings will be used when application does not set this parameter
DEFAULT_SYS_CODE={FE:FE}
###############################################################################
#Set if the AID routing should be blocked for the power modes not supported.
NFA_AID_BLOCK_ROUTE=1
###############################################################################
# Power state for off host AID routing
OFFHOST_AID_ROUTE_PWR_STATE=0x3B

View file

@ -1011,23 +1011,7 @@ vendor/lib64/unnhal-acc-common.so
vendor/lib64/unnhal-acc-hvx.so
# NFC
vendor/bin/hw/android.hardware.nfc@1.2-service
vendor/etc/init/android.hardware.nfc@1.2-service.rc
vendor/lib/ese_client.so
vendor/lib/ese_spi_nxp.so
vendor/lib/hal_libnfc.so
vendor/lib/nfc_nci_nxp.so
vendor/lib/vendor.nxp.eventprocessor@1.0.so
vendor/lib/vendor.nxp.nxpese@1.0.so
vendor/lib/vendor.nxp.nxpnfc@1.0.so
vendor/lib64/ese_client.so
vendor/lib64/ese_spi_nxp.so
vendor/lib64/hal_libnfc.so
vendor/lib64/libpn553_fw.so
vendor/lib64/nfc_nci_nxp.so
vendor/lib64/vendor.nxp.eventprocessor@1.0.so
vendor/lib64/vendor.nxp.nxpese@1.0.so
vendor/lib64/vendor.nxp.nxpnfc@1.0.so
vendor/lib64/libpn553_fw.so:vendor/lib/libpn553_fw.so
# Peripheral manager
vendor/bin/pm-proxy

View file

@ -34,9 +34,6 @@ media.settings.xml=/vendor/etc/media_profiles_vendor.xml
# Netflix custom property
ro.netflix.bsp_rev=Q845-05000-1
# NFC
ro.nfc.port=I2C
# QC framework value-adds
ro.vendor.qti.va_aosp.support=1