diff options
| author | Sherry Smith <sherrys@broadcom.com> | 2014-02-05 11:59:23 -0800 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2014-05-19 13:28:25 -0700 |
| commit | c2ae26946b121d427431808ef4d9b515f739dc78 (patch) | |
| tree | 2e4482df4748010f7efc788f4d74c6442e2ec8cb | |
| parent | 3c8ee3d9f5df8d315dc9d47a4fb05d6411028e8a (diff) | |
| download | libnfc-nci-c2ae26946b121d427431808ef4d9b515f739dc78.tar.gz | |
Check maximum size of listen-mode routing table.
Change-Id: Id02e7057c6b5efd86ad9f835e189af616945d348
| -rw-r--r-- | src/nfa/ee/nfa_ee_act.c | 7 | ||||
| -rw-r--r-- | src/nfa/int/nfa_ee_int.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/nfa/ee/nfa_ee_act.c b/src/nfa/ee/nfa_ee_act.c index 482c85d..0c83106 100644 --- a/src/nfa/ee/nfa_ee_act.c +++ b/src/nfa/ee/nfa_ee_act.c @@ -2110,11 +2110,7 @@ static BOOLEAN nfa_ee_need_recfg(void) /* if no routing/vs is configured, do not need to send the info to NFCC */ if (nfa_ee_cb.ee_cfged || nfa_ee_cb.ee_cfg_sts) { - if (nfa_ee_cb.ee_cfged & NFA_EE_CFGED_UPDATE_NOW) - { - needed = TRUE; - } - else if (nfa_ee_cb.ee_cfg_sts & NFA_EE_STS_CHANGED) + if (nfa_ee_cb.ee_cfg_sts & NFA_EE_STS_CHANGED) { needed = TRUE; } @@ -2160,6 +2156,7 @@ void nfa_ee_rout_timeout(tNFA_EE_MSG *p_data) /* discovery is not started */ nfa_ee_update_rout(); } + if (nfa_ee_cb.wait_rsp) nfa_ee_cb.ee_wait_evt |= NFA_EE_WAIT_UPDATE_RSP; if (ee_cfged & NFA_EE_CFGED_UPDATE_NOW) diff --git a/src/nfa/int/nfa_ee_int.h b/src/nfa/int/nfa_ee_int.h index 5e183b8..c2014d3 100644 --- a/src/nfa/int/nfa_ee_int.h +++ b/src/nfa/int/nfa_ee_int.h @@ -161,7 +161,7 @@ typedef struct tNFA_NFC_PROTOCOL lf_protocol; /* Listen F protocol */ tNFA_NFC_PROTOCOL lbp_protocol; /* Listen B' protocol */ UINT8 size_mask; /* the size for technology and protocol routing */ - UINT8 size_aid; /* the size for aid routing */ + UINT16 size_aid; /* the size for aid routing */ } tNFA_EE_ECB; /* data type for NFA_EE_API_DISCOVER_EVT */ |