diff options
| author | Martijn Coenen <maco@google.com> | 2016-01-08 10:08:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-08 10:08:52 +0000 |
| commit | 53494e77309c2ebe58cf8b6347e51ed5494617b3 (patch) | |
| tree | 2c9651a7c987a592b9fb5c19d9337e9fbd9f9f9d | |
| parent | ca3f49d6e019def467d61fe1996574f4c08f5573 (diff) | |
| parent | ae2dabbe3237514bf7398333026840d36f458505 (diff) | |
| download | libnfc-nci-53494e77309c2ebe58cf8b6347e51ed5494617b3.tar.gz | |
Merge "Implementation of HCE for NFC-F."
am: ae2dabbe32
* commit 'ae2dabbe3237514bf7398333026840d36f458505':
Implementation of HCE for NFC-F.
| -rw-r--r-- | src/nfa/dm/nfa_dm_act.c | 2 | ||||
| -rw-r--r-- | src/nfa/dm/nfa_dm_cfg.c | 4 | ||||
| -rw-r--r-- | src/nfc/tags/ce_t3t.c | 13 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/nfa/dm/nfa_dm_act.c b/src/nfa/dm/nfa_dm_act.c index d28689e..e0268c2 100644 --- a/src/nfa/dm/nfa_dm_act.c +++ b/src/nfa/dm/nfa_dm_act.c @@ -147,7 +147,7 @@ static void nfa_dm_set_init_nci_params (void) nfa_dm_cb.params.lf_t3t_id[xx][0] = 0xFF; nfa_dm_cb.params.lf_t3t_id[xx][1] = 0xFF; nfa_dm_cb.params.lf_t3t_id[xx][2] = 0x02; - nfa_dm_cb.params.lf_t3t_id[xx][2] = 0xFE; + nfa_dm_cb.params.lf_t3t_id[xx][3] = 0xFE; } /* LF_T3T_PMM */ diff --git a/src/nfa/dm/nfa_dm_cfg.c b/src/nfa/dm/nfa_dm_cfg.c index 2ae9966..0f9400b 100644 --- a/src/nfa/dm/nfa_dm_cfg.c +++ b/src/nfa/dm/nfa_dm_cfg.c @@ -30,8 +30,8 @@ const UINT8 nfa_dm_ce_cfg[] = 13, /* total length */ NFC_PMID_LF_T3T_PMM, /* Type-3 tag default PMM */ NCI_PARAM_LEN_LF_T3T_PMM, - 0x20, - 0x79, + 0x01, /* This PAD0 is used to identify HCE-F on Android */ + 0xFE, /* This PAD0 is used to identify HCE-F on Android */ 0xFF, 0xFF, 0xFF, diff --git a/src/nfc/tags/ce_t3t.c b/src/nfc/tags/ce_t3t.c index 97de9ac..2d2b32f 100644 --- a/src/nfc/tags/ce_t3t.c +++ b/src/nfc/tags/ce_t3t.c @@ -57,7 +57,18 @@ enum { /******************************************************************************* * Static constant definitions *******************************************************************************/ -static const UINT8 CE_DEFAULT_LF_PMM[NCI_T3T_PMM_LEN] = {0x20, 0x79, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; /* Default PMm param */ +/* Default PMm param */ +static const UINT8 CE_DEFAULT_LF_PMM[NCI_T3T_PMM_LEN] = +{ + 0x01, /* This PAD0 is used to identify HCE-F on Android */ + 0xFE, /* This PAD0 is used to identify HCE-F on Android */ + 0xFF, + 0xFF, + 0xFF, + 0xFF, + 0xFF, + 0xFF +}; /******************************************************************************* ** |