summaryrefslogtreecommitdiff
path: root/nfc
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2014-07-21 12:33:24 -0700
committerMartijn Coenen <maco@google.com>2014-07-21 12:33:24 -0700
commit97a3aa1bec42e1996a12155410b417b2f910e4b7 (patch)
tree0101fb2697a03b5b31c74afd8bc7e08e30168cde /nfc
parent6f5b6f9acaa2f03cc6ef346aa93f5de57a9d7aeb (diff)
downloadshamu-97a3aa1bec42e1996a12155410b417b2f910e4b7.tar.gz
Shamu: NFC: Enable UICC and PRESERVE_STORAGE.
Change-Id: I62441146e75f455e7eb80018507d3e8e8a8bbe55
Diffstat (limited to 'nfc')
-rw-r--r--nfc/libnfc-brcm-20795a10.conf2
-rw-r--r--nfc/libnfc-brcm.conf14
2 files changed, 13 insertions, 3 deletions
diff --git a/nfc/libnfc-brcm-20795a10.conf b/nfc/libnfc-brcm-20795a10.conf
index a37c3119..60bb8fa1 100644
--- a/nfc/libnfc-brcm-20795a10.conf
+++ b/nfc/libnfc-brcm-20795a10.conf
@@ -31,7 +31,7 @@ LPTD_CFG={03:B9:01:00}
# Startup Configuration (256 bytes maximum)
#
# 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:E8:03: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:03:DD:14:00:00:00:0E:22:48:48:06:04:83:C2:00:17:27:0A:67:20:00:52:20:CA:05:00:00:00:00:08}
+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:E8:03: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:03:DD:14:00:00:00:0E:22:48:48:06:04:83:C2:00:17:27:0A:67:20:00:52:20:CA:05:00:00:00:00:18}
###############################################################################
# Pre-Discovery Startup Configuration (256 bytes maximum)
diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf
index ec1077c6..91693fa3 100644
--- a/nfc/libnfc-brcm.conf
+++ b/nfc/libnfc-brcm.conf
@@ -13,6 +13,7 @@ PROTOCOL_TRACE_LEVEL=0xFFFFFFFF
###############################################################################
# File used for NFA storage
NFA_STORAGE="/data/nfc"
+PRESERVE_STORAGE=1
###############################################################################
# Insert a delay in milliseconds after NFC_WAKE and before write to NFCC
@@ -73,7 +74,7 @@ NFCC_ENABLE_TIMEOUT=0
# 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
@@ -81,7 +82,16 @@ NFA_MAX_EE_SUPPORTED=0
# 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=0
+#ACTIVE_SE=0
+
+###############################################################################
+# 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