Merge "Shamu: NFC: Remove UICC support." into mnc-dev
diff --git a/nfc/libnfc-brcm-20795a10.conf b/nfc/libnfc-brcm-20795a10.conf
index 2f621cd..cc1ef0a 100644
--- a/nfc/libnfc-brcm-20795a10.conf
+++ b/nfc/libnfc-brcm-20795a10.conf
@@ -34,11 +34,6 @@
# This is applied at stack startup.
NFA_DM_START_UP_CFG={71:80:01:01:B0:05:01:03:03:03:08:B5:03:01:03:FF:C9:0D:24:00:00:00:01:00:BB:00:E4:00:0A:01:02:D6:0D:00:02:00:00:00:00:00:01:00:01:5A:00:8A:B2:02:B8:0B:C8:1E:06:1F:00:0A:02:30:00:04:24:00:1C:00:75:00:77:00:76:00:1C:00:03:00:0A:00:56:01:00:00:40:04:D7:01:07:DD:14:00:00:00:38:16:40:40:00:00:80:00:40:24:27:0A:67:20:00:52:20:CA:05:00:00:00:00:18}
-###############################################################################
-# Pre-Discovery Startup Configuration (256 bytes maximum)
-#
-# This is applied before starting Discovery the first time.
-NFA_DM_PRE_DISCOVERY_CFG={0A:C2:08:01:00:C3:04:40:4B:4C:00}
###############################################################################
# Snooze Mode Settings
diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf
index ed023ce..c7b60e8 100644
--- a/nfc/libnfc-brcm.conf
+++ b/nfc/libnfc-brcm.conf
@@ -78,7 +78,7 @@
# so that the stack will not wait any longer than necessary. It can be set to
# 0 to disable EE and HCI sub-systems (i.e. if there are no SE on the system).
# Note, if set to 0, the ACTIVE_SE setting should also be set to 0.
-#NFA_MAX_EE_SUPPORTED=0
+NFA_MAX_EE_SUPPORTED=0
###############################################################################
# Configure the single default SE to use. The default is to use the first
@@ -86,16 +86,13 @@
# supports multiple SE (e.g. 0xF3 and 0xF4) but you want to force it to use
# one of them (e.g. 0xF4). This can be set to 0 if there are no SE on the
# system in order to skip SE initialization.
-ACTIVE_SE=0xF3
+ACTIVE_SE=0x0
###############################################################################
# Configure the default NfcA/IsoDep techology and protocol route. Can be
# either a secure element (e.g. 0xF4) or the host (0x00)
DEFAULT_ISODEP_ROUTE=0x00
-###############################################################################
-# Configure the default "off-host" AID route. The default is 0xF4
-DEFAULT_OFFHOST_ROUTE=0xF3
###############################################################################
# Configure the NFC Extras to open and use a static pipe. If the value is
@@ -106,25 +103,12 @@
#NFA_HCI_STATIC_PIPE_ID_F4=0x71
###############################################################################
-# When disconnecting from Oberthur secure element, perform a warm-reset of
-# the secure element to deselect the applet.
-# The default hex value of the command is 0x3. If this variable is undefined,
-# then this feature is not used.
-OBERTHUR_WARM_RESET_COMMAND=0x03
-
-###############################################################################
# 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.
#UICC_LISTEN_TECH_MASK=0x01
###############################################################################
-# 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}
-
-###############################################################################
# Force tag polling 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_B |
