diff options
| author | George Chang <georgekgchang@google.com> | 2023-12-06 07:53:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-06 07:53:55 +0000 |
| commit | b1478b0d416b66ab2aa0e32f651fb9d074aba9e0 (patch) | |
| tree | a999d7b2316230b413d795aaccea35816c871c35 | |
| parent | 4d9841f96d754300a5892b1fcadc68c27ca9ef5e (diff) | |
| parent | 9fc296828fb86e8e4e71cd692fa843feeecc69ea (diff) | |
| download | nfc-b1478b0d416b66ab2aa0e32f651fb9d074aba9e0.tar.gz | |
Merge "Remove unused Config options" into main
| -rw-r--r-- | conf/libnfc-nci.conf | 18 | ||||
| -rw-r--r-- | src/include/nfc_config.h | 1 |
2 files changed, 1 insertions, 18 deletions
diff --git a/conf/libnfc-nci.conf b/conf/libnfc-nci.conf index ce280527..4466025a 100644 --- a/conf/libnfc-nci.conf +++ b/conf/libnfc-nci.conf @@ -32,23 +32,7 @@ SCREEN_OFF_POWER_STATE=1 # 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_A_ACTIVE 0x40 /* NFC Technology A active mode */ -# NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ -POLLING_TECH_MASK=0x2F - -############################################################################### -# 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 -# -# 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 */ -P2P_LISTEN_TECH_MASK=0x00 +POLLING_TECH_MASK=0x0F ############################################################################### # Force UICC to only listen to the following technology(s). diff --git a/src/include/nfc_config.h b/src/include/nfc_config.h index 690ad6e6..141e7acf 100644 --- a/src/include/nfc_config.h +++ b/src/include/nfc_config.h @@ -25,7 +25,6 @@ #define NAME_NFA_STORAGE "NFA_STORAGE" #define NAME_PRESERVE_STORAGE "PRESERVE_STORAGE" #define NAME_POLLING_TECH_MASK "POLLING_TECH_MASK" -#define NAME_P2P_LISTEN_TECH_MASK "P2P_LISTEN_TECH_MASK" #define NAME_UICC_LISTEN_TECH_MASK "UICC_LISTEN_TECH_MASK" #define NAME_OFFHOST_LISTEN_TECH_MASK "OFFHOST_LISTEN_TECH_MASK" #define NAME_HOST_LISTEN_TECH_MASK "HOST_LISTEN_TECH_MASK" |