History log of /external/libnfc-nci/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
32e62a0f33d1e6a52adc4b9d982a80c01c374211 08-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
f613ca9c2764133eb8d46cf8e015d613ce1a3224 06-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
6a2bbecb67e10ce3cddcaacaae4c9f9c65227c03 05-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
6f4065ac4c0041a5e45afdd9ddd6a3fd9c99d6d6 04-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
fe251c12ac6c4275835f359f0f8573afca942a7a 03-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
2ac37f2035369da40dce21836715e9503332c285 02-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
2a95695de3a9855abbf67e50bb756f4a49d983ad 01-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
eac0b6e59ed87fe7aa2366421e2ec6c2e48b93ed 30-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
553772c7f95e56b335cfba2606c3b4ce1cef2348 29-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
71866c27936526ec0867e4a6c57028127cbc99fb 28-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
3c61d4539e880f0ad4238f38d3bc5cfd54c9897f 27-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
7de630d9366e1cb456be927d88546d69f95dc508 26-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
dcb7b7d169ba00fabb4513277fc3e87366774062 25-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
6e5add019440d2cdebc34154b45ba8075d4eb3c4 23-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
7cffaf2db11885592975de633a7ca4e5433e8631 22-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
928b89387323ee0fcaf04e676f6858742b5a9e19 21-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
6656ffc986091b74337997cbadd89f65cf5c358c 20-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
2a75646ea1acaec075f5198c9a9ae93b56345ad3 19-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
953c492ea53547b5e2d422b4a1ada2e83ab74e99 18-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
949b7278bd57e8faa28fe3a0f1ff36f436e71e9b 16-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
95b97eb7a51911c1ae1272f469302d0645ea4df6 15-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
6d05f87e89174c9d6b55eca236c052e81278acc2 14-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
f75594454de9311570eeee4e1612a043d922c3b7 13-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
d666ff94ece6e3d4fadafb08e333eb725031183a 12-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
bf3adb16d4e2d51bc12c4775e01b76ed912b5601 11-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
3ab4afe9ff001d0f7e61a53c05d564cc724f211a 09-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
1a39efa77eec60da5e0ffcc0361fb642bc35ad90 08-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
a5335068cbe0f33b4dfd45a2c578e390f420155c 07-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
1608a4f60aa8e0fba9210461949de9fe9b13b7d8 06-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
b663a0a80b5e392c9a67a6af00f678a870c039f4 05-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
6d701bb123d72c60dffa821a5d6ad13cc4a4d915 04-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
d4b191c64942b650eea76a9b7946da38447b97e6 02-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
72fed57270f63d55921b698c4292e13836e080f9 01-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
1376d9541c54886e23c6076448031262e72ed4a8 30-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
c9e064765dfcfe3379e436161ff4ffceaf8d324c 29-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
9e6ee74e582babb329d361aa708d5509f741444f 28-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
50fde81b40b32c3f617c059a31ae1acf419c2f7b 27-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed2d14c15500d990e9d61e7d22042608fa80c5c7
ed2d14c15500d990e9d61e7d22042608fa80c5c7 26-Sep-2014 Martijn Coenen <maco@google.com> Merge "Fix null pointer dereference." into lmp-dev
c19fe79a280fb5451b9f7506222c8676dd91d12b 25-Sep-2014 Martijn Coenen <maco@google.com> Fix null pointer dereference.

Bug: 16517161
Change-Id: I0d19b7c9fa41e7643ab643d6f3e865cd3589dcb2
rc/nfa/ce/nfa_ce_act.c
0e941689ce284f047dfc080fb0d784c3082832c4 25-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8df564e55201ea56bea9da4587c0d25f5ecf90ba
4874f5cc6298276c4de52623f42dd90cd5ccb656 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8df564e55201ea56bea9da4587c0d25f5ecf90ba
e54bc48a5a27fb244b531c9adfd1c5a695d9c217 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 58268861a9aee36b541b6534c341657fb221c2f2
43159ed890123668dddbe389dd49520fe68f1035 23-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 58268861a9aee36b541b6534c341657fb221c2f2
8df564e55201ea56bea9da4587c0d25f5ecf90ba 23-Sep-2014 Martijn Coenen <maco@google.com> Add a system property to set the cold boot flag.

Bug: 17298769
Change-Id: I588a1e0c60e3be703566f859163e40aa793d278c
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
57d8ae1f3232dda104cc579d42a1b0d11f66d6f0 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 58268861a9aee36b541b6534c341657fb221c2f2
b2ce6f188e3b455389d80b8451bc043a8d0de64d 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 58268861a9aee36b541b6534c341657fb221c2f2
21839912c1bdb8300e8d0232cc4551e232d482d4 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 58268861a9aee36b541b6534c341657fb221c2f2
3cf8fd34dfc2bfcbcad77511a4d33a42f1a2e1d7 15-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 58268861a9aee36b541b6534c341657fb221c2f2
e5e7f4731b7be0e713a38f2ccfa1821b050232a4 14-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 58268861a9aee36b541b6534c341657fb221c2f2
4116e7e5ffeec766555b1e65331e1811129197ff 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to c517d0ed11a775fd7d102ec2d0345275e7ecf71a
58268861a9aee36b541b6534c341657fb221c2f2 02-Oct-2013 Sherry Smith <sherrys@broadcom.com> If wildcard AID is registered, always use NFA_CE_DEACTIVATED_EVT.

Fixes an issue where activation is done by an
NFA_CE_DEACTIVATED_EVT, but deactivation is done
by NFA_DEACTIVATED_EVT (no _CE_).

Bug: 16517161

Change-Id: Ic84b54b25e7487efc47bdeb31a290abfcc07634f
rc/nfa/ce/nfa_ce_act.c
rc/nfa/ce/nfa_ce_main.c
rc/nfa/int/nfa_ce_int.h
rc/nfc/include/ce_api.h
rc/nfc/int/ce_int.h
c517d0ed11a775fd7d102ec2d0345275e7ecf71a 04-Sep-2014 Evan Chu <evanchu@broadcom.com> Support isColdBoot flag.

The flag is required to notify the firmware about the current boot
situation: cold boot or not. The firmware needs this information
to properly configure the secure element.

Needed for GCF certification.

Bug: 16517161
Change-Id: Ic4bc35676f85e53eaad6e951b578d34cae0ec8b9
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
c3c16fd45e1cb9a8d05878b45483511c3486115d 20-Aug-2014 Martijn Coenen <maco@google.com> Change NFCA version string to match AOSP.

Used in EMV certification; needs to reflect that the version
of the NFCDROID stack in AOSP is different from the versions
that Broadcom is using.

Bug: 16517161
Change-Id: I10f47b629f89143f3da281251c2ff1f8048e8f6d
rc/nfca_version.c
fab494609ab8b2a7df104b7d923cda47f7668cc3 06-Aug-2014 Martijn Coenen <maco@google.com> Merge changes Idf9591f5,I4fda82bb into lmp-dev

* changes:
Handle adjustment of routing table during power-off-sleep mode.
Fix Coverity items.
fab6ab84257e6abee4686e699cb6f632fa9d0997 29-Jul-2014 Sherry Smith <sherrys@broadcom.com> Handle adjustment of routing table during power-off-sleep mode.

Stack preserves the changes of the routing table
during power-off-sleep mode. Stack sends the changes to
the controller when entering full-power mode.

Change-Id: Idf9591f57c496a4ad793562609ed3a03d4cb9f91
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_main.c
rc/nfa/ee/nfa_ee_act.c
rc/nfa/int/nfa_dm_int.h
1569641423dac0a41af7596fdef972126e698f46 16-Jul-2014 Evan Chu <evanchu@broadcom.com> Fix Coverity items.

Change-Id: I4fda82bb996aa51d5979f85cb0b284e5b722d36a
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/adaptation/spdhelper.cpp
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/config.cpp
rc/include/NfcAdaptation.h
077f48fc39770c8db3cdc27ba65c2f12299199dd 25-Jul-2014 Martijn Coenen <maco@google.com> Rename Broadcom HAL.

Currently it's built using $(TARGET_DEVICE),
but the HAL doesn't have any dependencies on the
target device at all - it's the same for any device.

Renamed to nfc_nci.bcm2079x.default

Also, added a new configuration variable to determine
the name of the HAL, and use that for loading the correct one.

Bug: 16542494
Change-Id: I3c148b1c9491de828030b8d2352d7cd6ed294fce
ndroid.mk
alimpl/bcm2079x/nfc_nci.c
rc/adaptation/NfcAdaptation.cpp
rc/include/config.h
67fe610c4b6462d96e252fa2c68d67ce63787fcb 02-Jun-2014 Sherry Smith <sherrys@broadcom.com> Add padding for type-3 tag's timeout calculation to avoid premature timeout.

Change-Id: I5781bfff3b532ac615ae05e54c804708d04a491c
rc/nfc/tags/rw_t3t.c
818b56eda129e0370afe6bcb808b0ed55c898d13 15-May-2014 Sherry Smith <sherrys@broadcom.com> Use timeout value calculated from PMm for T3T Check and Update commands.

Change-Id: I0c6cbf0f8ceb52305c3f3ba1df9db715193f57b0
rc/nfc/int/rw_int.h
rc/nfc/tags/rw_t3t.c
fe3c73255e8f9944510442e9611f76f938b0f38d 06-Jun-2014 Paul Chaisson <chaisson@broadcom.com> Support putting NFCC into a mode before powering off.

Support sending Set_PwrLevel or Set_NfcOff prior to powering off
NFCC when closing the transport.

Change-Id: Ia68fa76f20754c151bcebb38da1de6030fc41f9a
alimpl/bcm2079x/adaptation/userial_linux.c
rc/include/config.h
c6d8cda88d41587a86032d6cc778e920dab94cf8 02-May-2014 Paul Chaisson <chaisson@broadcom.com> Disable BOC before sending XTAL_INDEX_CMD.

Send a few poke commands to perform global reset to avoid
issue when booting in the field of a payment reader

Change-Id: Icb9e87f8070fcfbd6c593a9f5b96b62c49dacd48
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm_cfg.c
alimpl/bcm2079x/hal/hal/nfc_hal_nci.c
rc/hal/include/nfc_hal_api.h
rc/hal/int/nfc_hal_int.h
rc/include/config.h
f937782dff072eeea70c04db97bdc76d8b6ef9f2 23-Apr-2014 Paul Chaisson <chaisson@broadcom.com> Add 20795A1 work-around for EEPROM issue

Erase personality data EEPROM as work around, if no patch
in NVM and chip id is 20795A1.

Change-Id: Ia5b0d305c5e1ba567abe07c4bb00c36f8277c9b0
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
rc/hal/int/nfc_brcm_defs.h
rc/hal/int/nfc_hal_int.h
e09fd9c5ce2c1eaef0831d8699a01404bea14894 14-May-2014 Sherry Smith <sherrys@broadcom.com> Re-send discovery config parameters when waking from power-off-sleep.

Change-Id: Ie0291c461c458205949975ae42e325d07bdd98b3
rc/nfa/ce/nfa_ce_main.c
rc/nfa/int/nfa_ce_int.h
a5c7b4468b580946f0dd6ab73168071be5214ab3 24-Mar-2014 Evan Chu <evanchu@broadcom.com> Clear CNfcConfig object when Broadcom HAL is deinitialized.

Clearing the CNfcConfig object allows the object to re-read the .conf
when Broadcom HAL is initialized again. Therefore, when user turns
off and turns on NFC using the Settings app, the .conf is re-read.

Change-Id: I9a2bb18d1bb7b0e4fc70bee611ff4fc34d515f64
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
eb80fc88f43b81e457689da8cb357473a63190b4 19-Mar-2014 Paul Chaisson <chaisson@broadcom.com> Handle Transmission error during NDef Read operation.

Handle Transmission error during NDEF Read operation of
a T2t that we wake up from the HALT state.

Change-Id: I4494b75edda176baeb4745fb9ea6af81a15fdd7d
rc/nfa/rw/nfa_rw_act.c
1c9ec36d38f5c62c9ab6874141e3559777046438 04-Jun-2014 Martijn Coenen <maco@google.com> abort() in case of unrecoverable link timeout.

NCI assumes a perfect transport link, but
sometimes reality catches up...and you need
to abort :-)

Change-Id: Ic198c3c64aabe0942c18ec512636690393cd41e4
rc/nfc/nfc/nfc_ncif.c
8ea91d26af20cb3c049ed4d31013719aed917e2a 19-May-2014 Martijn Coenen <maco@google.com> Make new stack work with B3 chipsets.

- We're still using the old kernel driver on our B3 devices;
adapt code accordingly.
- We should sleep at least 200ms after address change. This
will be modified upstream also.

Change-Id: I9c3a14982c85d4f2dee02dd9134640c73761a517
alimpl/bcm2079x/adaptation/userial_linux.c
9a804c6ab0a6f4cddfe5f9a50602a4f1bc39e89d 01-Mar-2014 Paul Chaisson <chaisson@broadcom.com> Fix coverity issue.

Double file close issue resolved.

Change-Id: I2ad69ca8911f7d9cbdc344c3f1dfcb0033b8db87
rc/adaptation/libmain.c
8adba7675549bb507514c4f602723aa7d8e43f67 31-Jan-2014 Sherry Smith <sherrys@broadcom.com> Work-around for Mifare Desfire tag.

When a Mifare Desfire tag is identified, perform RF-deactivate
to sleep, then RF-select ISO-DEP interface to re-activate the tag,
even the current interface is already ISO-DEP.

The above operation puts the tag in the right mode to
accept native Desfire commands, not just NFC Forum commands.

This patch fixes a problem where data from the tag is received by the stack,
but the stack does not emit NFA_DATA_EVT.

Change-Id: If347353cdd03902a2faf9bad404eece90e1e32c0
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_discover.c
b7cb567fb2a69c4f8afbb5c5f819e2390ba6424d 07-Feb-2014 Evan Chu <evanchu@broadcom.com> .Conf variable DEVICE_HOST_WHITE_LIST configures HCI whitelist

Let .conf file variable DEVICE_HOST_WHITE_LIST to configure device
host's HCI whitelist. The variable contains an array of
HCI host ID's. See specification ETSI TS 102 622 V11.1.10
(2012-10), section 6.1.3.1.

Change-Id: I20de46226713755789c7a64eb9d3b8393cfccf25
rc/adaptation/NfcAdaptation.cpp
rc/include/config.h
855ae32a422fe508c56a9d33f4f65cf6bf77cd9e 20-Nov-2013 Prasad Karuppasamy <prasadk@broadcom.com> Whitelist configuration.

Stack adds fields in tNFA_HCI_CFG structure to allow configuration
of a whitelist of HCI hosts.

Change-Id: I4d113f493a8dd44a210addef03d331a7cbf61e1f
rc/nfa/dm/nfa_dm_cfg.c
rc/nfa/hci/nfa_hci_act.c
rc/nfa/include/nfa_api.h
28724545afbe78a0d371d5e8ae2e95fb34f26d09 12-Feb-2014 Paul Chaisson <chaisson@broadcom.com> Updated version strings.
rc/nfa/ee/nfa_ee_act.c
rc/nfca_version.c
c2ae26946b121d427431808ef4d9b515f739dc78 05-Feb-2014 Sherry Smith <sherrys@broadcom.com> Check maximum size of listen-mode routing table.

Change-Id: Id02e7057c6b5efd86ad9f835e189af616945d348
rc/nfa/ee/nfa_ee_act.c
rc/nfa/int/nfa_ee_int.h
3c8ee3d9f5df8d315dc9d47a4fb05d6411028e8a 03-Feb-2014 Evan Chu <evanchu@broadcom.com> Support custom crystal frequency on 20795A1 chip

Support new .conf variable XTAL_PARAMS_CFG to configure custom
crystal frequency. Variable XTAL_PARAMS_CFG is used if and only if
variable XTAL_FREQ_INDEX=0xFF.

Change-Id: I21112677f6e1109f9b6f23df51c819f5febd3bdd
alimpl/bcm2079x/adaptation/patchram.cpp
rc/include/config.h
f0ab6c7239c3580550eda490042eaa1805b98302 17-Jan-2014 Sherry Smith <sherrys@broadcom.com> Support custom crystal frequency on 20795A1 chip.

Change-Id: Ia5bbac5fb916243bfe66ea0554d583156dfad1d2
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm_cfg.c
rc/hal/int/nfc_hal_int_api.h
40f9717d1d3b664f23724f3457f97164b23d7614 29-Jan-2014 Evan Chu <evanchu@broadcom.com> Determine how many secure elements to discover.

Let .conf variable NFA_MAX_EE_SUPPORTED determine how many secure
element to discover. If the variable is undefined, then stack
automatically discovers all secure element.

Change-Id: I752a952aa023d7dbb86b7511bc435b9f6a8c7b49
alimpl/bcm2079x/adaptation/patchram.cpp
40e67c9ec7191cbda00cde97e4f988d1d5737762 16-Jan-2014 Sherry Smith <sherrys@broadcom.com> When adjusting routing table, wait for completion event.

When JNI calls NFA_EeUpdateNow() to adjust the routing table,
JNI shall wait for NFA_EE_LMP_UPDATED_EVT completion event.

Change-Id: I28f6185fa725c9de8cb94e60725b7b5410a2e37b
rc/nfa/dm/nfa_dm_act.c
rc/nfa/ee/nfa_ee_act.c
rc/nfa/ee/nfa_ee_api.c
rc/nfa/ee/nfa_ee_main.c
rc/nfa/include/nfa_ee_api.h
rc/nfa/int/nfa_ee_int.h
ca0bff46ca93ed18142e20f03db5174399e1de75 23-Jan-2014 Sherry Smith <sherrys@broadcom.com> Calculate free space in the listen-mode routing table.

Change-Id: I3de773da3ac994cb6cfcd71e50ba57d1831b2759
rc/nfa/ee/nfa_ee_act.c
rc/nfa/ee/nfa_ee_api.c
rc/nfa/ee/nfa_ee_main.c
rc/nfa/include/nfa_ee_api.h
rc/nfa/int/nfa_ee_int.h
a96095b67de952a978390f2bfe5987e1c62d456b 18-Dec-2013 Sherry Smith <sherrys@broadcom.com> Allow the total routing entry size of an NFCEE to exceed the capacity of an NCI command.

Change-Id: If2892aec1a2f9c15ac3dd7bb4506ee7840758e73
rc/nfa/ee/nfa_ee_act.c
7b9f7f66cd23c68558a36c80b8fe1b24e6616ee2 13-Dec-2013 Sherry Smith <sherrys@broadcom.com> Enhance nfa-ee to handle bigger routing table.

Change-Id: I7affdce1d091863c377de07eed60b4434c4c83ff
rc/nfa/ee/nfa_ee_act.c
rc/nfc/include/nci_hmsgs.h
rc/nfc/include/nfc_api.h
rc/nfc/nci/nci_hmsgs.c
rc/nfc/nfc/nfc_ee.c
81ad4777853d75c3259ce5f71847866b4e41f358 15-Jan-2014 Sherry Smith <sherrys@broadcom.com> Allow NFA-EE API to be used to set up routing even if nfa_ee_max_ee_cfg is 0.

Change-Id: I327061a568a8910cb17714e194e1c50cb7869390
rc/nfa/dm/nfa_dm_api.c
rc/nfa/ee/nfa_ee_main.c
afb70e803afc203aa3480f2420a04a953e517e09 02-Jan-2014 Paul Chaisson <chaisson@broadcom.com> Handle UICC that takes a while to initialize.

The JNI layer is going to do a Set Mode on any Connected/Inactive
EE and we need to get and NFA_EE_DISCOVER_REQ_EVT event with the
EE info during initialization.

Change-Id: I4c185b1afdfe90b98f42bc9900729a57666b8f19
rc/nfa/ee/nfa_ee_act.c
eecdc2f8c53010e74fb4953acbed6249580fef97 09-Nov-2013 Paul Chaisson <chaisson@broadcom.com> Only reset first-boot after EE has been initialized.

The original implementation reset the flag anytime we initialized
the HAL (e.g. even to just check/download the firmware). We moved
the reset of the flag to HaiGetMaxNfcee, which will only get called
when the stack is to initialize the EE for the first time.

Change-Id: I2cfbbf30be02fced5f942dae90fd9a1b6cd0bdf1
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
43ef645f118877526ae57eebe35229eb52492211 03-Dec-2013 Sherry Smith <sherrys@broadcom.com> Verify the routing table can hold the new routing entry before adding it.

Change-Id: I5731b9426d0db11287a6da35784042be611a363e
rc/nfa/ee/nfa_ee_act.c
rc/nfa/int/nfa_ee_int.h
f23dcad2c02e3e8d08fe9bbef61776d579b5cb49 25-Nov-2013 Paul Chaisson <chaisson@broadcom.com> Increase routing table size and add checks.

Port changes from stack to add check for exceeding the number
of supported routing entries. Increased number of routing
entries to 32.

Change-Id: I6ffc72e186fa6ecd972cda821694ea36af6a912f
rc/include/nfc_target.h
rc/nfa/ee/nfa_ee_act.c
46f4e4f7099609ff6b5e7efce7b91b4252bdbfb1 19-Nov-2013 Evan Chu <evanchu@broadcom.com> Delete non-volatile storage file for NFCEE ID 0xF5.

Delete non-volatile storage file for NFCEE ID 0xF5, which
corresponds to UICC slot 2 on chip 20795.

Change-Id: I1ad2016f93af4fda42c8b6e44672cc39529cb09e
alimpl/bcm2079x/adaptation/NonVolatileStore.cpp
rc/adaptation/libmain.c
a24be4f06674b2707b57904deaa0dff5a95823bd 13-Nov-2013 Evan Chu <evanchu@broadcom.com> Upgrade stack to NFA_PI_1.03.66+

Take code from NFCA_MI_430.10.00.07.
Additional changes include:
* Adjust copyright.
* Clean up stack and HAL diagnostic tracing.
* Fix ce_t4t_data_cback() in src/nfc/tags/ce_t4t.c in order to let HCE payment to work.
* Reduce compilation warnings.

Change-Id: I7b174229029d4a4955ff7750623e78c9a8c856f6
ndroid.mk
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/adaptation/NonVolatileStore.cpp
alimpl/bcm2079x/adaptation/OverrideLog.cpp
alimpl/bcm2079x/adaptation/StartupConfig.cpp
alimpl/bcm2079x/adaptation/android_logmsg.cpp
alimpl/bcm2079x/adaptation/config.cpp
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm_cfg.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci_ci.c
alimpl/bcm2079x/hal/hal/nfc_hal_main.c
alimpl/bcm2079x/hal/hal/nfc_hal_nci.c
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
alimpl/bcm2079x/include/StartupConfig.h
alimpl/bcm2079x/include/android_logmsg.h
alimpl/bcm2079x/include/buildcfg.h
alimpl/bcm2079x/include/buildcfg_hal.h
alimpl/bcm2079x/nfc_nci.c
rc/adaptation/CrcChecksum.cpp
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/OverrideLog.cpp
rc/adaptation/android_logmsg.cpp
rc/adaptation/bte_logmsg.c
rc/adaptation/config.cpp
rc/adaptation/libmain.c
rc/gki/ulinux/gki_ulinux.c
rc/hal/include/nci_defs.h
rc/hal/include/nfc_hal_api.h
rc/hal/include/nfc_hal_target.h
rc/hal/int/nfc_brcm_defs.h
rc/hal/int/nfc_hal_int.h
rc/hal/int/nfc_hal_nv_ci.h
rc/hal/int/nfc_hal_nv_co.h
rc/include/OverrideLog.h
rc/include/bt_target.h
rc/include/bt_trace.h
rc/include/buildcfg.h
rc/include/config.h
rc/include/nfc_target.h
rc/nfa/ce/nfa_ce_act.c
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_api.c
rc/nfa/dm/nfa_dm_cfg.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/ee/nfa_ee_act.c
rc/nfa/hci/nfa_hci_act.c
rc/nfa/hci/nfa_hci_api.c
rc/nfa/hci/nfa_hci_main.c
rc/nfa/hci/nfa_hci_utils.c
rc/nfa/include/nfa_api.h
rc/nfa/include/nfa_ee_api.h
rc/nfa/include/nfa_hci_api.h
rc/nfa/include/nfa_hci_defs.h
rc/nfa/include/nfa_nv_co.h
rc/nfa/include/nfa_rw_api.h
rc/nfa/int/nfa_dm_int.h
rc/nfa/int/nfa_hci_int.h
rc/nfa/int/nfa_rw_int.h
rc/nfa/rw/nfa_rw_act.c
rc/nfa/rw/nfa_rw_api.c
rc/nfa/rw/nfa_rw_main.c
rc/nfc/include/nfc_api.h
rc/nfc/include/rw_api.h
rc/nfc/int/llcp_int.h
rc/nfc/int/nfc_int.h
rc/nfc/int/rw_int.h
rc/nfc/llcp/llcp_api.c
rc/nfc/llcp/llcp_link.c
rc/nfc/nci/nci_hmsgs.c
rc/nfc/nfc/nfc_main.c
rc/nfc/nfc/nfc_ncif.c
rc/nfc/tags/ce_t3t.c
rc/nfc/tags/ce_t4t.c
rc/nfc/tags/rw_i93.c
rc/nfc/tags/rw_t2t.c
rc/nfc/tags/rw_t2t_ndef.c
rc/nfc/tags/rw_t3t.c
rc/nfc/tags/rw_t4t.c
rc/nfca_version.c
rc/static-lib-adapt/ProtoDispBluetoothHci.c
rc/udrv/include/upio.h
e9629bad30a9f478b336ab46b8e6e02f7f87af46 31-Jan-2014 Evan Chu <evanchu@broadcom.com> Adjust copyright year to 2014.

No code change.

Change-Id: Id868ad0356f9b5a43c887de7a3b596bb86be9026
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
alimpl/bcm2079x/hal/hal/nfc_hal_api.c
alimpl/bcm2079x/hal/hal/nfc_hal_brcm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm_cfg.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci_ci.c
alimpl/bcm2079x/hal/hal/nfc_hal_main.c
alimpl/bcm2079x/hal/hal/nfc_hal_nci.c
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
alimpl/bcm2079x/include/HalAdaptation.h
alimpl/bcm2079x/nfc_nci.c
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/config.cpp
rc/adaptation/libmain.c
rc/hal/include/gki_hal_target.h
rc/hal/include/nci_defs.h
rc/hal/include/nfc_hal_api.h
rc/hal/include/nfc_hal_target.h
rc/hal/include/nfc_types.h
rc/hal/int/nfc_brcm_defs.h
rc/hal/int/nfc_hal_int.h
rc/hal/int/nfc_hal_int_api.h
rc/hal/int/nfc_hal_nv_ci.h
rc/hal/int/nfc_hal_nv_co.h
rc/hal/int/nfc_hal_post_reset.h
rc/include/NfcAdaptation.h
rc/include/buildcfg.h
rc/include/config.h
rc/include/nfc_target.h
rc/nfa/ce/nfa_ce_act.c
rc/nfa/ce/nfa_ce_api.c
rc/nfa/ce/nfa_ce_main.c
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_api.c
rc/nfa/dm/nfa_dm_cfg.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/dm/nfa_dm_main.c
rc/nfa/dm/nfa_dm_ndef.c
rc/nfa/ee/nfa_ee_act.c
rc/nfa/ee/nfa_ee_api.c
rc/nfa/ee/nfa_ee_main.c
rc/nfa/hci/nfa_hci_act.c
rc/nfa/hci/nfa_hci_api.c
rc/nfa/hci/nfa_hci_ci.c
rc/nfa/hci/nfa_hci_main.c
rc/nfa/hci/nfa_hci_utils.c
rc/nfa/include/nfa_api.h
rc/nfa/include/nfa_ce_api.h
rc/nfa/include/nfa_cho_api.h
rc/nfa/include/nfa_ee_api.h
rc/nfa/include/nfa_hci_api.h
rc/nfa/include/nfa_hci_defs.h
rc/nfa/include/nfa_mem_co.h
rc/nfa/include/nfa_nv_ci.h
rc/nfa/include/nfa_nv_co.h
rc/nfa/include/nfa_p2p_api.h
rc/nfa/include/nfa_rw_api.h
rc/nfa/include/nfa_snep_api.h
rc/nfa/int/nfa_ce_int.h
rc/nfa/int/nfa_cho_int.h
rc/nfa/int/nfa_dm_int.h
rc/nfa/int/nfa_dta_int.h
rc/nfa/int/nfa_ee_int.h
rc/nfa/int/nfa_hci_int.h
rc/nfa/int/nfa_p2p_int.h
rc/nfa/int/nfa_rw_int.h
rc/nfa/int/nfa_snep_int.h
rc/nfa/int/nfa_sys.h
rc/nfa/int/nfa_sys_int.h
rc/nfa/int/nfa_sys_ptim.h
rc/nfa/p2p/nfa_p2p_act.c
rc/nfa/p2p/nfa_p2p_api.c
rc/nfa/p2p/nfa_p2p_main.c
rc/nfa/rw/nfa_rw_act.c
rc/nfa/rw/nfa_rw_api.c
rc/nfa/rw/nfa_rw_main.c
rc/nfa/sys/nfa_sys_cback.c
rc/nfa/sys/nfa_sys_cfg.c
rc/nfa/sys/nfa_sys_main.c
rc/nfa/sys/nfa_sys_ptim.c
rc/nfc/include/ce_api.h
rc/nfc/include/llcp_api.h
rc/nfc/include/llcp_defs.h
rc/nfc/include/nci_hmsgs.h
rc/nfc/include/ndef_utils.h
rc/nfc/include/nfc_api.h
rc/nfc/include/rw_api.h
rc/nfc/include/tags_defs.h
rc/nfc/int/ce_int.h
rc/nfc/int/llcp_int.h
rc/nfc/int/nfc_int.h
rc/nfc/int/rw_int.h
rc/nfc/int/tags_int.h
rc/nfc/llcp/llcp_api.c
rc/nfc/llcp/llcp_dlc.c
rc/nfc/llcp/llcp_link.c
rc/nfc/llcp/llcp_main.c
rc/nfc/llcp/llcp_sdp.c
rc/nfc/llcp/llcp_util.c
rc/nfc/nci/nci_hmsgs.c
rc/nfc/nci/nci_hrcv.c
rc/nfc/ndef/ndef_cho_utils.c
rc/nfc/ndef/ndef_utils.c
rc/nfc/nfc/nfc_ee.c
rc/nfc/nfc/nfc_main.c
rc/nfc/nfc/nfc_ncif.c
rc/nfc/nfc/nfc_task.c
rc/nfc/nfc/nfc_test.c
rc/nfc/nfc/nfc_utils.c
rc/nfc/nfc/nfc_vs.c
rc/nfc/tags/ce_main.c
rc/nfc/tags/ce_t3t.c
rc/nfc/tags/ce_t4t.c
rc/nfc/tags/rw_i93.c
rc/nfc/tags/rw_main.c
rc/nfc/tags/rw_t1t.c
rc/nfc/tags/rw_t1t_ndef.c
rc/nfc/tags/rw_t2t.c
rc/nfc/tags/rw_t2t_ndef.c
rc/nfc/tags/rw_t3t.c
rc/nfc/tags/rw_t4t.c
rc/nfc/tags/tags_int.c
rc/udrv/include/uamp_api.h
rc/udrv/include/ucodec.h
rc/udrv/include/udac.h
rc/udrv/include/uipc.h
rc/udrv/include/unv.h
rc/udrv/include/upio.h
rc/udrv/include/usb.h
rc/udrv/include/utimer.h
rc/udrv/include/uusb.h
686b51e61ccb676f393bac12f5ff7bac4013f926 08-Apr-2014 Martijn Coenen <maco@google.com> am 46abb3dc: Merge "Fix up pthread_cond_timedwait."

* commit '46abb3dcf960058e48d1444b6a11cc7e84912339':
Fix up pthread_cond_timedwait.
46abb3dcf960058e48d1444b6a11cc7e84912339 08-Apr-2014 Martijn Coenen <maco@google.com> Merge "Fix up pthread_cond_timedwait."
622a5c6848066b473c4992ea484a3ef46da537df 08-Apr-2014 Martijn Coenen <maco@google.com> am 132e8137: Merge "nfc: replace pthread_cond_timedwait_monotonic_np"

* commit '132e8137590b4df54dae0baf0af7d9d00737e3ad':
nfc: replace pthread_cond_timedwait_monotonic_np
51ca88d30ff34662faa36cd3bda2ecf4ef15c7ba 08-Apr-2014 Martijn Coenen <maco@google.com> Fix up pthread_cond_timedwait.

pthread_cond_timedwait_monotonic{_np} is deprecated,
use pthread_condattr_setclock instead.

Change-Id: Icdeaa52c3b1673f3109795ef81dc9e6b9e2bcd4c
alimpl/bcm2079x/gki/ulinux/gki_ulinux.c
rc/gki/ulinux/gki_ulinux.c
132e8137590b4df54dae0baf0af7d9d00737e3ad 08-Apr-2014 Martijn Coenen <maco@google.com> Merge "nfc: replace pthread_cond_timedwait_monotonic_np"
eabd7b11033ffbd799fcd122ab0b3e1769e94927 08-Apr-2014 Colin Cross <ccross@android.com> nfc: replace pthread_cond_timedwait_monotonic_np

pthread_cond_timedwait_monotonic_np is deprecated, use
pthread_condattr_setclock to wait on CLOCK_MONOTONIC
instead.

Change-Id: Idc620959bb8390bef0e2d8a4888e3431153ca641
alimpl/bcm2079x/adaptation/CondVar.cpp
8d3c6b9faddfe63303c72dd050e25b9673a6e7d8 08-Apr-2014 Colin Cross <ccross@android.com> nfc: replace pthread_cond_timedwait_monotonic_np

pthread_cond_timedwait_monotonic_np is deprecated, use
pthread_condattr_setclock to wait on CLOCK_MONOTONIC
instead.

Change-Id: Idc620959bb8390bef0e2d8a4888e3431153ca641
alimpl/bcm2079x/adaptation/CondVar.cpp
4c9706863b026bdfdba460d8a7eb22cd1a746afc 28-Feb-2014 Martijn Coenen <maco@google.com> Merge "Fix 20795 crash." into klp-volantis-dev
ba307d18c06d6ffadc955dbc862c627887453c84 28-Feb-2014 Martijn Coenen <maco@google.com> Merge "Add chip-id adjustment for 20795." into klp-volantis-dev
8fcd301eed3c4577020688b09552278d26731f13 28-Feb-2014 Martijn Coenen <maco@google.com> Merge "libnfc-nci fixes for AArch64 build."
0a85f658ebd49b72be39fe0fb61fcca4ee0fbc82 28-Feb-2014 Martijn Coenen <maco@android.com> libnfc-nci fixes for AArch64 build.

pthread_cond_timedwait_monotonic() is going away in LP64.
Use the POSIX standard for now, and use pthread_condattr_setclock()
when it becomes available to set clock spec to MONOTONIC.

Also fixed some other small build warnings/errors.

Change-Id: Ic192299b157529fa3f74dba521f038b8b99206bf
alimpl/bcm2079x/adaptation/CondVar.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
alimpl/bcm2079x/gki/ulinux/gki_ulinux.c
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/libmain.c
rc/gki/ulinux/gki_ulinux.c
8263ec708307f43758888ef36da854bb589939ae 21-Feb-2014 Martijn Coenen <maco@google.com> Fix 20795 crash.

Increase max num NFCEEs.

Change-Id: Icb41202a30cc34070411ab5ae3d2767c118dfc28
rc/include/nfc_target.h
75c48f079b2f77797c56e9662af1e569b872fb0c 15-Jan-2014 Paul Chaisson <chaisson@broadcom.com> Add chip-id adjustment for 20795.

Change-Id: Ied6ec2f2d0d36bf573305ed9c4ab7a29cc0be237
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
c546ae8a76130b9d6576f959123234b61c62ce8e 28-Jan-2014 Colin Cross <ccross@android.com> Merge "external/libnfc-nci: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
66a05535ce78d6775d327c4a87d070a5bbeaabc5 25-Jan-2014 Colin Cross <ccross@android.com> external/libnfc-nci: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
ndroid.mk
d23865cf04954c28b4fd4805d85b7042f71b3ce6 14-Oct-2013 Nick Kralevich <nnk@google.com> am 2afac84d: Merge "fix GKI_run return type"

* commit '2afac84d489ff3f3f15c7ae84c03268cd1f38592':
fix GKI_run return type
2afac84d489ff3f3f15c7ae84c03268cd1f38592 14-Oct-2013 Nick Kralevich <nnk@google.com> Merge "fix GKI_run return type"
f943de946927e29d42a3190660b0bf0e567fbaf8 13-Oct-2013 synergydev <synergye@codefi.re> fix GKI_run return type

error: void function 'GKI_run' should not return a value [-Wreturn-type]

Change-Id: Ib37a121462c9f321d94cdfcf13a763447d350fcd
rc/gki/ulinux/gki_ulinux.c
1ba9dcccf5b342bd74a2f8213b7ed3be78b9db44 10-Sep-2013 Evan Chu <evanchu@broadcom.com> Fix memory leak.

Found when using reader mode APIs: control is accidentally
granted to the HAL, causing us to leak command buffers.

Also:
- Prevent multiple calls to NFC_Deactivate()
- Proper handling of congestion in P2P

Bug: 10360259
Change-Id: Ia52a948f46f8668cde5b135bd073f175cdd434f5
rc/nfa/dm/nfa_dm_discover.c
rc/nfc/int/nfc_int.h
rc/nfc/llcp/llcp_dlc.c
rc/nfc/nfc/nfc_main.c
rc/nfc/nfc/nfc_ncif.c
67aef6c6c6f6bc7b8364b97949e874b9dc7175bc 29-Aug-2013 Evan Chu <evanchu@broadcom.com> Stack supports enable/disable listen modes and pause/resume P2P.

New API's include:
NFA_EnableListening
NFA_DisableListening
NFA_PauseP2p
NFA_ResumeP2p

Bug: 10360259
Change-Id: I7759c17fe1f83c2af251431e1dc56116a9fc78fd
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_api.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/dm/nfa_dm_main.c
rc/nfa/include/nfa_api.h
rc/nfa/int/nfa_dm_int.h
rc/nfa/p2p/nfa_p2p_main.c
09de1b298ad4237ba50018d28086c0430da8c23e 24-Aug-2013 Martijn Coenen <maco@google.com> Enable/Disable listen mode API.

Bug: 10360259
Change-Id: I57160e7073b9d625c470feff311f305dec16cb5e
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_api.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/dm/nfa_dm_main.c
rc/nfa/include/nfa_api.h
rc/nfa/int/nfa_dm_int.h
71d0548a5cbede7cd93631a530747612db67c61f 14-Aug-2013 Martijn Coenen <maco@google.com> Support B3 with old kernel driver.

Until we upgrade kernel driver on Mako/Manta, just
call the old address change ioctl.

Change-Id: I98cee0126b3f1d8f03eb63773f92ad95e7fe623e
alimpl/bcm2079x/adaptation/userial_linux.c
b4b1c46fa5346651a3554c83eb5005f942f1af0f 05-Aug-2013 Martijn Coenen <maco@google.com> Don't call into HAL for determining max num EE.

Until we figure out how to deal with HAL binary
compatibility.

Also, do init the EE subsystem even if no SEs
are present; we still want to use the EE subsystem
on the host.

Change-Id: I17aad42e75508e2d04f53107527bce5bfe099ffe
alimpl/bcm2079x/nfc_nci.c
rc/adaptation/NfcAdaptation.cpp
rc/nfa/dm/nfa_dm_api.c
b12873e775de94bb4960fba3a67d06eeb93a314c 17-Jul-2013 Evan Chu <evanchu@broadcom.com> nfca_version_string = NFCDROID_MI_422.10.0.15

Change-Id: I513ff28608bfbdc3725af9a6e705669c3e693cc7
rc/nfca_version.c
b20cbf35a541d380f32d1f43a78feb44e9e0dc1b 12-Jul-2013 Paul Chaisson <chaisson@broadcom.com> Support chip-specific max EE setting and configuring 0 EE.

Added 'get_max_ee' to the HAL interface to allow the NFC stack to
inquire the HAL layer of the maximum number of EE on the platform.

Added the necessary HAL interface to allow the stack to get the maximum
number of EE on the system. This allows the system to dynamically set
this value at run-time in order to support chip-specific differences
in the number of EE on the platform.

Change-Id: I3ff00d117d715b1f46636501932ff92accc39483
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/include/HalAdaptation.h
alimpl/bcm2079x/nfc_nci.c
rc/adaptation/NfcAdaptation.cpp
rc/include/NfcAdaptation.h
d23e0531b6835ab75b543dd51cfe5edec8edefe4 11-Jul-2013 Evan Chu <evanchu@broadcom.com> Allow HAL side to configure nfa_ee_max_ee_cfg.

Upgrade stack to allow JNI to control whether
to enable stack's secure element features.

Change-Id: Id4162d0a97a031fb1a0625f64faef90091282b3f
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/hal/hal/nfc_hal_api.c
rc/hal/include/nfc_hal_api.h
rc/hal/int/nfc_hal_int.h
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_api.c
rc/nfa/int/nfa_dm_int.h
e75b11bfe42c06a4ae95e947b04fdf09f1869fbd 03-Jul-2013 Evan Chu <evanchu@broadcom.com> Presence-check times out for Mifare Ultralight 64-byte tag.

Sometimes presence-check times out when reading the tag. Therefore, use
a longer timeout.

Change-Id: I905b36b64fc076adaf94418fc0ce121991c21866
rc/include/nfc_target.h
8fa9bced5cf551d2316763a65fdf45d6a812d65a 27-Jun-2013 Paul Chaisson <chaisson@broadcom.com> Revert the default Max EE constant to 3.

After upgrading to NFA 1.3.62 we took the change to set the max
number of EE to be 4 (to support 20795). But the value must
remain at 3 for the current set of chips. We'll need to add
dynamic support later (or .conf file entry can be used).

Change-Id: If706e345b92a8e7630ad1cc4fdbfe908bceabae8
rc/include/nfc_target.h
d05817f02d578becbf79b46f2599126404c7b413 26-Jun-2013 Evan Chu <evanchu@broadcom.com> Upgrade to new stack.

Improve reliability when creating NCI connection for HCP.
Improve firmware download during error condition.

Change-Id: I5655d4a66d04debd4a2a91c706393e8a45d6dc59
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
rc/hal/int/nfc_hal_int.h
rc/nfa/hci/nfa_hci_main.c
f8de60cb50fffb38ac70e9e29ffdc956f4bac1d8 26-Jun-2013 Evan Chu <evanchu@broadcom.com> Add support for BCM20795 using XTAL of 26khz.

Updated the HAL device init configuration to include and entry
for 20795 to set the proper XTAL frequency/index.
By Paul Chaisson

Change-Id: I00c156822ccc9705a8a2ea670d65c204b05e5290
alimpl/bcm2079x/adaptation/patchram.cpp
c2eeefe7d48a7809b0e2c1aa7b4c6f78605159b9 24-Jun-2013 Evan Chu <evanchu@broadcom.com> Fix deadlock in GKI_getbuf when out of buffer.

By Kevin Park. GKI_getbuf is executed in critical section.
Sometimes, when GKI getbuf fails due to low memory,
code logic in GKI_getbuf just returns NULL without releasing lock.
This introduces deadlock situation.
So fixed the code to call GKI_enable before returning.

Increasing GKI buf pool size for the
specific condition like system very busy on first boot.

Change-Id: I8c7de8d0f472f5dfa41a43c08c30025de4e073c4
alimpl/bcm2079x/gki/common/gki_buffer.c
alimpl/bcm2079x/include/buildcfg_hal.h
rc/gki/common/gki_buffer.c
91ada91fa991b4df5372a19a2cf81f074b298712 21-Jun-2013 Evan Chu <evanchu@broadcom.com> Ability to adjust RF discovery frequency for each technology.

Stack adds ability to adjust RF discovery frequencies.

Change-Id: I3c9a843c83c3a86181e7c8726b95c9f6517d8706
rc/include/config.h
rc/nfa/dm/nfa_dm_cfg.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/include/nfa_api.h
rc/nfa/int/nfa_dm_int.h
rc/nfca_version.c
45e4bfb9d330c6a097b16ea70b4c236687006eaa 20-Jun-2013 Paul Chaisson <chaisson@broadcom.com> Fix device id for 43341 after stack update.

The stack modified the HAL to only compare the chip generation
(e.g."43341") instead of including the chip revision, when trying
to determine if the XTAL frequency needs to be updated.

Change-Id: Iab31706f67d8bab7927ae3180aec8fc36a745b47
alimpl/bcm2079x/adaptation/patchram.cpp
13ccf4ebbb42b8156ec77c0087b02c3915634c87 19-Jun-2013 Paul Chaisson <chaisson@broadcom.com> Cleanup unused conf values.

Remove unused values from config.h:
-ENABLE_BRCM_EXTRAS_API
-LOG_TO_FILE
-LOGCAT_FILTER
-NFA_DM_ENABLE_SLEEP

Change-Id: If850c16a3bdac22b9535b27d9a4f3e103442303f
rc/include/config.h
df5080d7feca9827fd0306471c54f52ecf185c22 14-Jun-2013 Evan Chu <evanchu@broadcom.com> Upgrade stack to NFA_MI_1.03.62.

.conf variable SPD_IGNORE_VERSION is removed. Stack always download
firmware if a difference is detected.

Change-Id: I2a5e21254e6c0df7829506c1c3c2f6ffa44c0048
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci.c
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
alimpl/bcm2079x/include/nfc_target.h
rc/hal/include/nfc_hal_target.h
rc/hal/int/nfc_brcm_defs.h
rc/include/config.h
rc/include/nfc_target.h
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/ee/nfa_ee_main.c
rc/nfa/hci/nfa_hci_act.c
rc/nfa/hci/nfa_hci_main.c
rc/nfa/hci/nfa_hci_utils.c
rc/nfa/include/nfa_snep_api.h
rc/nfa/int/nfa_dm_int.h
rc/nfa/int/nfa_hci_int.h
rc/nfc/llcp/llcp_dlc.c
rc/nfca_version.c
7c69b2723b60a59df4aaa58b13985b3483b291bf 14-May-2013 Evan Chu <evanchu@broadcom.com> Upgrade stack to NFA_MI_1.03.60.

Change-Id: Ifc970a5b68cc962e5fdfa9af11e54e569d25ef1b
rc/include/hcidefs.h
rc/include/nfc_target.h
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_api.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/int/nfa_dm_int.h
rc/nfa/int/nfa_dta_int.h
rc/nfa/int/nfa_rw_int.h
rc/nfa/rw/nfa_rw_act.c
rc/nfa/rw/nfa_rw_api.c
rc/nfa/rw/nfa_rw_main.c
rc/nfc/include/llcp_api.h
rc/nfc/include/nfc_api.h
rc/nfc/int/llcp_int.h
rc/nfc/llcp/llcp_api.c
rc/nfc/llcp/llcp_dlc.c
rc/nfc/llcp/llcp_link.c
rc/nfc/llcp/llcp_sdp.c
rc/nfc/llcp/llcp_util.c
rc/nfc/ndef/ndef_utils.c
rc/nfc/nfc/nfc_ncif.c
rc/nfc/tags/ce_t4t.c
rc/nfc/tags/rw_i93.c
rc/nfc/tags/rw_t3t.c
rc/nfc/tags/rw_t4t.c
rc/nfca_version.c
c9e1e1ef6b1f89ebf0d10c459888a88473264106 15-May-2013 Evan Chu <evanchu@broadcom.com> MPS Coverity 27471 fix.

Change-Id: Ifd54edaa0da38a637c2c010ed59f99974c0fc901
alimpl/bcm2079x/adaptation/userial_linux.c
f3e98a5b72db83ddb30a49d99eabfc9392f0e550 10-May-2013 Evan Chu <evanchu@broadcom.com> Remove UPIO_Set() each time userial writes to transport.

This logic is no longer needed.

Change-Id: I490e20ec599213f73aeddbaa9f99958854c08e8b
alimpl/bcm2079x/adaptation/userial_linux.c
d8f9332bd02e621ee8c38254844f80ea147c46de 10-May-2013 Evan Chu <evanchu@broadcom.com> MPS Coverity reports

Fix potential problems discovered by MPS team's Coverity static analyzer.
CID 14304, 10630, 10626, 23660, 23655, 23654.

Change-Id: Iec34fd793b44710fa971175cd058e87ab17c76cc
alimpl/bcm2079x/adaptation/NonVolatileStore.cpp
alimpl/bcm2079x/adaptation/OverrideLog.cpp
alimpl/bcm2079x/adaptation/patchram.cpp
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/OverrideLog.cpp
fca15e562a5a4651a489f7ebcba5ba03f952bc36 03-May-2013 Evan Chu <evanchu@broadcom.com> Adjust one or both TLV T=0xC2 configurations.

The TLV with T=0xC2 can be sent from one or two locations in the code.
Add ability to dynamically adjust the TLV's value at both locations.
This adjustment is needed to disable one or both secure elements.

Change-Id: I404c4afa350daf571542b83cf0a1b80fa1645073
alimpl/bcm2079x/adaptation/patchram.cpp
5a7e857aee2ebba4e369936aa5acdc7bcecf83e7 01-May-2013 Evan Chu <evanchu@broadcom.com> When preserving non-volatile storage files, detect corruption.

When non-volatile storage files are preserved during cold boot,
JNI must detect corruption in their contents by verifying their
checksums.

Change-Id: I191ac013f12dabda43e590449a80523bc42c0c90
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
rc/adaptation/NfcAdaptation.cpp
0976d37081fae8bcd4fc4dcf7996e1ce194fb4b1 30-Apr-2013 Evan Chu <evanchu@broadcom.com> Output software version strings.

Change-Id: I4be1b5f970300bdf23400be678d802beba65a5d7
ndroid.mk
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
rc/adaptation/NfcAdaptation.cpp
86fd6a04f7f057d7e0b9f456e567a6e2385af153 16-Apr-2013 Evan Chu <evanchu@broadcom.com> Handle RF-interface-error during sleep-wake operation.

Take more changes from main_prasadk_2163714. Fix bug in the operation
that handles a NACK response from type-2 tag.

Change-Id: Iaea8fde94acf82c0f2d63f09378d9ee2818b159c
rc/nfa/rw/nfa_rw_act.c
rc/nfc/tags/rw_t2t.c
2c952b4dc63b88b5cc3d782f50045975a56912fe 21-Mar-2013 Sheng-Hui J. Chu <jeffchu@broadcom.com> Do not need to check the return code from IOCTL.

It's always 0, moved change client address logic to USERIAL.

Change-Id: If5e46c35a8dcb9c2007611043912815ca436137a
alimpl/bcm2079x/adaptation/userial_linux.c
alimpl/bcm2079x/include/bcm2079x.h
c95c79ccb65d82a65b960919077d5c359cf28ced 12-Apr-2013 Evan Chu <evanchu@broadcom.com> Upgrade to new stack NFA_MP_1.03.1

A tag from Korea is Mifare Ultralight C. When the stack performs
presence-check, the tag responds with NACK and enters HALT state.
This patch properly performs presence-check for this tag.

Change-Id: Ia19e6216628bd74e8367f21d90ac806751eacfda
rc/include/hcidefs.h
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/int/nfa_dm_int.h
rc/nfa/int/nfa_rw_int.h
rc/nfa/rw/nfa_rw_act.c
rc/nfc/include/rw_api.h
rc/nfc/int/rw_int.h
rc/nfc/tags/rw_t2t.c
rc/nfc/tags/rw_t2t_ndef.c
rc/nfca_version.c
4a97d9253534ab99e4b245e824661440a200f2c6 12-Apr-2013 Evan Chu <evanchu@broadcom.com> Updated version files for NFCDROID_MI_422.10.0.6

Change-Id: Ia9c970bdf761c776df99392e65c6ff4607746524
rc/nfca_version.c
ef9d04e0f3e01d213d74a09b6e0b2d065361e794 10-Apr-2013 Evan Chu <evanchu@broadcom.com> Handle a corrupted firmware file.

When encountering a corrupted firmware file, power-cycle the controller
and tell stack not to download it during next initialization.
Re-initialize HAL.

Change-Id: I5d330da4f3666a53ac6336b2d6643e5bf6383ffd
alimpl/bcm2079x/adaptation/patchram.cpp
edbfba90df8e223fadd787a10cb131e1dcfa7347 10-Apr-2013 Evan Chu <evanchu@broadcom.com> Store checksum in non-volatile store to detect corruption.

Store 2-byte checksum in the first two bytes of the non-volatile store.
If corruption is detected, delete all content in non-volatile store.

Change-Id: I79ca57796da1950a430064e50752c4a9fae6d05e
ndroid.mk
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/adaptation/NonVolatileStore.cpp
rc/adaptation/CrcChecksum.cpp
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/libmain.c
rc/include/CrcChecksum.h
a6652474ff594ad4a884e905b13e284232e770ef 10-Apr-2013 Evan Chu <evanchu@broadcom.com> NAME_SNOOZE_MODE_CFG shall be chip-specific

The NAME_SNOOZE_MODE_CFG variable shall be defined in the
chip-specific .conf.

Change-Id: I17a86ede4b8bb365f811138d8e37219b52ae8cb7
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
389b8881f8c64480fd0a2542bf8e57ab03e2bc6b 24-Jul-2013 Evan Chu <evanchu@broadcom.com> am 3f0440ad: Fix Apache license on some files.

* commit '3f0440ad1422eba719428822b970c203bfdd392e':
Fix Apache license on some files.
3f0440ad1422eba719428822b970c203bfdd392e 23-Jul-2013 Evan Chu <evanchu@broadcom.com> Fix Apache license on some files.

Change-Id: I0fe5480bd8ef816c01a34147c85acdc1d3fd6612
alimpl/bcm2079x/adaptation/spdhelper.cpp
alimpl/bcm2079x/include/spdhelper.h
rc/nfca_version.c
ddf6125afc5227bbc13b6280bb3f856635e2c3c6 16-Jul-2013 Martijn Coenen <maco@google.com> Don't start a timer to update the routing table.

The NFCC may have transitioned to a power-off
state when the timer is expired, causing a command
timeout. We'll control the routing table strictly
from the higher levels.

Change-Id: Ic5fa100d2a8ba16c5c911118f38ffef0268dff8f
rc/nfa/ee/nfa_ee_act.c
89996d92bb6f4b73c0f5237e2ec1fdf505843607 18-Jun-2013 Martijn Coenen <maco@google.com> Don't check ISO-DEP class byte in case of wildcard AID reg.

Change-Id: I16c6082222e8eda5c5dde54cb9421233284e7115
rc/nfc/tags/ce_t4t.c
a0d589508ae446c8a0d0db9e8efa4f0245b9f0a5 02-May-2013 Martijn Coenen <maco@google.com> Merge "Remove dynamic configuration of active listen modes." into jb-mr2-dev
f5298e6196fb4c4b7692206efd808f0a57e8271a 02-May-2013 Martijn Coenen <maco@google.com> Remove dynamic configuration of active listen modes.

When removing active listen modes, the original listen
mode configuration is stored. If there is no new LLCP
activation within a configured time interval (currently
5s), the listen mode configuration is restored to the
old value.

The configuration that is restored is by then not
necessarily the correct configuration anymore. In
particular, this may disturb eSE access which disables
discovery completely.

Disable this at least temporarily to verify that this
is causing crashes on Manta.

Bug: 8775164
Change-Id: I926535a73466c857f7a0f2cac912b5ab1f8c38e1
rc/nfc/llcp/llcp_link.c
45e68232b8524aca5165dca28b994ec8c11593b1 01-May-2013 Evan Chu <evanchu@broadcom.com> Send config params on HAL_NfcPreDiscover().

Bug: 8776949
Change-Id: Idbfb9c77304ce0df8521b167f25004bfd18b59d8
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/hal/hal/nfc_hal_api.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm_cfg.c
alimpl/bcm2079x/hal/hal/nfc_hal_main.c
rc/adaptation/NfcAdaptation.cpp
rc/hal/int/nfc_hal_int.h
rc/include/config.h
rc/nfa/ee/nfa_ee_act.c
rc/nfa/ee/nfa_ee_main.c
rc/nfa/hci/nfa_hci_main.c
rc/nfa/int/nfa_ee_int.h
d2e38f8f4c231d56d66a7f806587fd2c942a9f12 10-Apr-2013 Martijn Coenen <maco@google.com> Merge "Increase I2C address change delay." into jb-mr2-dev
878a04bd7aedc8177c8200fdeea42a9b0d281417 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: Ib685275875629bc313ba63c53ec0326e329357cd
ndroid.mk
dd071b3b25fa5d845ee05ca3bc9e05ae0f683eaf 10-Apr-2013 Martijn Coenen <maco@google.com> Increase I2C address change delay.

This was decreased recently in order to improve
startup-time, but turned out to be a bit too aggressive.

Bug: 8581772
Change-Id: I67529e91490f6cd4494e73b7b11e383fb4b97638
alimpl/bcm2079x/adaptation/userial_linux.c
201c42e6354bfeac5d42cf27bb15a47e786898af 07-Apr-2013 Martijn Coenen <maco@google.com> Reduce patch auth timeout to 6 seconds for BCM2079xB3.

Increasing this timeout lead to watchdog timeouts for
B3-based products - most notably Manta's with bad
firmware 92. Only increase to 30 seconds for newer
revisions of the chip.

Change-Id: I3c13d690ed29786c3458aefbe8b24732f8dd1b11
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
0eb7353a4877b921c2d4b9226ecad2d1cc672dcb 29-Mar-2013 Paul Chaisson <chaisson@broadcom.com> Allow for adjusting NFCC Enable Timeout

Added NFCC_ENABLE_TIMEOUT which adjusts the time the HAL
layer waits for a RESET NTF after setting REG_PU high
before it allows the stack to start up. The default is
1000ms since newer chips should send the NTF sooner. It
can be adjusted to be lower on older chips to improve
start-up time.

Change-Id: Ic0a5b52ef7c9592ffea7a13eead234b68f3060c0
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
rc/include/config.h
dd682fab2cc1e32cc054b86b77606365b3f8f1ee 28-Mar-2013 Martijn Coenen <maco@google.com> Notify upper layers of first LLCP packet.

Bug: 8508568
Change-Id: I09d8827d96aba39f425ce73452aa22d7b61f6f56
rc/nfa/include/nfa_api.h
rc/nfa/p2p/nfa_p2p_main.c
rc/nfc/include/llcp_api.h
rc/nfc/int/llcp_int.h
rc/nfc/llcp/llcp_link.c
5c65c3a0f42e174e47fecd4e569606003217ff4e 27-Mar-2013 Martijn Coenen <maco@google.com> Latest NFC stack-drop from Broadcom.

Patches provided by Evan Chu <evanchu@broadcom.com> and
Paul Chaisson <pchaisson@broadcom.com>.

Most important changes:
- Support for BCM20793B4 and BCM20793B5 revisions in the HAL.
- Remove connection handover and SNEP implementations, since
we already have them in java-land.
- Fix issue where the NFCC is not woken for HCI writes.
- Remove a lot of duplicated code in the HAL.
- Various small fixes.

Change-Id: I00f7457fe7ec23602071532a15bf2be9d7706b37
ndroid.mk
alimpl/Android.mk
alimpl/bcm2079x/Android.mk
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/adaptation/NonVolatileStore.cpp
alimpl/bcm2079x/adaptation/StartupConfig.cpp
alimpl/bcm2079x/adaptation/config.cpp
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/adaptation/spdhelper.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
alimpl/bcm2079x/gki/common/gki_buffer.c
alimpl/bcm2079x/gki/common/gki_time.c
alimpl/bcm2079x/gki/ulinux/data_types.h
alimpl/bcm2079x/gki/ulinux/gki_ulinux.c
alimpl/bcm2079x/hal/hal/nfc_hal_api.c
alimpl/bcm2079x/hal/hal/nfc_hal_brcm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm_cfg.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci_ci.c
alimpl/bcm2079x/hal/hal/nfc_hal_main.c
alimpl/bcm2079x/hal/hal/nfc_hal_nci.c
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
alimpl/bcm2079x/hal/include/gki_hal_target.h
alimpl/bcm2079x/hal/include/nci_defs.h
alimpl/bcm2079x/hal/include/nfc_hal_api.h
alimpl/bcm2079x/hal/include/nfc_hal_target.h
alimpl/bcm2079x/hal/include/nfc_types.h
alimpl/bcm2079x/hal/int/nfc_brcm_defs.h
alimpl/bcm2079x/hal/int/nfc_hal_int.h
alimpl/bcm2079x/hal/int/nfc_hal_int_api.h
alimpl/bcm2079x/hal/int/nfc_hal_nv_ci.h
alimpl/bcm2079x/hal/int/nfc_hal_nv_co.h
alimpl/bcm2079x/hal/int/nfc_hal_post_reset.h
alimpl/bcm2079x/include/StartupConfig.h
alimpl/bcm2079x/include/bt_trace.h
alimpl/bcm2079x/include/bt_types.h
alimpl/bcm2079x/include/btdisp_lock.h
alimpl/bcm2079x/include/buildcfg.h
alimpl/bcm2079x/include/buildcfg_hal.h
alimpl/bcm2079x/include/config.h
alimpl/bcm2079x/include/dyn_mem.h
alimpl/bcm2079x/include/hcidefs.h
alimpl/bcm2079x/include/nfc_target.h
alimpl/bcm2079x/include/userial.h
alimpl/bcm2079x/libnfc-brcm.conf
alimpl/bcm2079x/nfc_nci.c
alimpl/bcm2079x/udrv/include/upio.h
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/config.cpp
rc/adaptation/libmain.c
rc/gki/common/gki_buffer.c
rc/gki/common/gki_time.c
rc/gki/ulinux/data_types.h
rc/gki/ulinux/gki_ulinux.c
rc/hal/include/gki_hal_target.h
rc/hal/include/nci_defs.h
rc/hal/include/nfc_hal_api.h
rc/hal/include/nfc_hal_target.h
rc/hal/include/nfc_types.h
rc/hal/int/nfc_brcm_defs.h
rc/hal/int/nfc_hal_int.h
rc/hal/int/nfc_hal_int_api.h
rc/hal/int/nfc_hal_nv_ci.h
rc/hal/int/nfc_hal_nv_co.h
rc/hal/int/nfc_hal_post_reset.h
rc/include/NfcAdaptation.h
rc/include/OverrideLog.h
rc/include/bcm2079x.h
rc/include/bt_trace.h
rc/include/bt_types.h
rc/include/btdisp_lock.h
rc/include/buildcfg.h
rc/include/config.h
rc/include/dyn_mem.h
rc/include/hcidefs.h
rc/include/nfc_target.h
rc/include/nfccext.h
rc/libnfc.conf
rc/nfa/ce/nfa_ce_act.c
rc/nfa/ce/nfa_ce_api.c
rc/nfa/ce/nfa_ce_main.c
rc/nfa/cho/nfa_cho_api.c
rc/nfa/cho/nfa_cho_main.c
rc/nfa/cho/nfa_cho_sm.c
rc/nfa/cho/nfa_cho_util.c
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_api.c
rc/nfa/dm/nfa_dm_cfg.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/dm/nfa_dm_main.c
rc/nfa/dm/nfa_dm_ndef.c
rc/nfa/ee/nfa_ee_act.c
rc/nfa/ee/nfa_ee_api.c
rc/nfa/ee/nfa_ee_main.c
rc/nfa/hci/nfa_hci_act.c
rc/nfa/hci/nfa_hci_api.c
rc/nfa/hci/nfa_hci_ci.c
rc/nfa/hci/nfa_hci_main.c
rc/nfa/hci/nfa_hci_utils.c
rc/nfa/include/nfa_api.h
rc/nfa/include/nfa_ce_api.h
rc/nfa/include/nfa_cho_api.h
rc/nfa/include/nfa_ee_api.h
rc/nfa/include/nfa_hci_api.h
rc/nfa/include/nfa_hci_defs.h
rc/nfa/include/nfa_mem_co.h
rc/nfa/include/nfa_nv_ci.h
rc/nfa/include/nfa_nv_co.h
rc/nfa/include/nfa_p2p_api.h
rc/nfa/include/nfa_rw_api.h
rc/nfa/include/nfa_snep_api.h
rc/nfa/int/nfa_ce_int.h
rc/nfa/int/nfa_cho_int.h
rc/nfa/int/nfa_dm_int.h
rc/nfa/int/nfa_dta_int.h
rc/nfa/int/nfa_ee_int.h
rc/nfa/int/nfa_hci_int.h
rc/nfa/int/nfa_p2p_int.h
rc/nfa/int/nfa_rw_int.h
rc/nfa/int/nfa_snep_int.h
rc/nfa/int/nfa_sys.h
rc/nfa/int/nfa_sys_int.h
rc/nfa/int/nfa_sys_ptim.h
rc/nfa/p2p/nfa_p2p_act.c
rc/nfa/p2p/nfa_p2p_api.c
rc/nfa/p2p/nfa_p2p_main.c
rc/nfa/rw/nfa_rw_act.c
rc/nfa/rw/nfa_rw_api.c
rc/nfa/rw/nfa_rw_main.c
rc/nfa/snep/nfa_snep_act.c
rc/nfa/snep/nfa_snep_api.c
rc/nfa/snep/nfa_snep_default.c
rc/nfa/snep/nfa_snep_main.c
rc/nfa/sys/nfa_sys_cback.c
rc/nfa/sys/nfa_sys_cfg.c
rc/nfa/sys/nfa_sys_main.c
rc/nfa/sys/nfa_sys_ptim.c
rc/nfc/include/ce_api.h
rc/nfc/include/llcp_api.h
rc/nfc/include/llcp_defs.h
rc/nfc/include/nci_hmsgs.h
rc/nfc/include/ndef_utils.h
rc/nfc/include/nfc_api.h
rc/nfc/include/rw_api.h
rc/nfc/include/tags_defs.h
rc/nfc/int/ce_int.h
rc/nfc/int/llcp_int.h
rc/nfc/int/nfc_int.h
rc/nfc/int/rw_int.h
rc/nfc/int/tags_int.h
rc/nfc/llcp/llcp_api.c
rc/nfc/llcp/llcp_dlc.c
rc/nfc/llcp/llcp_link.c
rc/nfc/llcp/llcp_main.c
rc/nfc/llcp/llcp_sdp.c
rc/nfc/llcp/llcp_util.c
rc/nfc/nci/nci_hmsgs.c
rc/nfc/nci/nci_hrcv.c
rc/nfc/ndef/ndef_cho_utils.c
rc/nfc/ndef/ndef_utils.c
rc/nfc/nfc/nfc_ee.c
rc/nfc/nfc/nfc_main.c
rc/nfc/nfc/nfc_ncif.c
rc/nfc/nfc/nfc_task.c
rc/nfc/nfc/nfc_test.c
rc/nfc/nfc/nfc_utils.c
rc/nfc/nfc/nfc_vs.c
rc/nfc/tags/ce_main.c
rc/nfc/tags/ce_t3t.c
rc/nfc/tags/ce_t4t.c
rc/nfc/tags/rw_i93.c
rc/nfc/tags/rw_main.c
rc/nfc/tags/rw_t1t.c
rc/nfc/tags/rw_t1t_ndef.c
rc/nfc/tags/rw_t2t.c
rc/nfc/tags/rw_t2t_ndef.c
rc/nfc/tags/rw_t3t.c
rc/nfc/tags/rw_t4t.c
rc/nfc/tags/tags_int.c
rc/nfca_version.c
rc/udrv/include/uipc.h
rc/udrv/include/upio.h
c11a054fc2855196292b062a843321121b591cc0 18-Jan-2013 Evan Chu <evanchu@broadcom.com> Ignore proprietary TLVs before NDEF message.

This change skips proprietary TLVs when
searching for an NDEF message.

Change-Id: I9050b81902c469fe6e9fe7562b6e84c1bcd7c05e
rc/nfc/include/tags_defs.h
rc/nfc/tags/rw_t1t_ndef.c
rc/nfc/tags/rw_t2t_ndef.c
bf6bb391ed16bde3c9512fc69ab28b2d7060954b 04-Feb-2013 Martijn Coenen <maco@google.com> Don't use AFI in 15693 INVENTORY commands.

AFI is optional and not supported by all tags. We
gain nothing by including it in the inventory command,
so remove it for both the presence check and other
calls to inventory.

Change-Id: Ida2feade8510cfd1c06b68310ed86027b4c7e1a0
rc/nfa/rw/nfa_rw_act.c
rc/nfc/include/rw_api.h
rc/nfc/tags/rw_i93.c
85b7e84f6cc61506c94e98844cac9ce50bbbe9dc 18-Jan-2013 Evan Chu <evanchu@broadcom.com> Do not require getSystemInfo() for ISO15693 tags.

ISO15693 tags that do not respond to the
getSystemInfo() command should still be reported
to the upper stack, as getSystemInfo is not mandatory.

This also adds some code to deal with specifc ST
tag configurations, that require the prot ext bit
to be set when executing some commands.

Change-Id: I64dd9234750ea503ba5b14b2a22a46c106f61f76
alimpl/bcm2079x/hal/hal/nfc_hal_hci.c
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/int/nfa_rw_int.h
rc/nfa/rw/nfa_rw_act.c
rc/nfc/include/rw_api.h
rc/nfc/include/tags_defs.h
rc/nfc/int/rw_int.h
rc/nfc/nfc/nfc_main.c
rc/nfc/tags/rw_i93.c
rc/nfc/tags/rw_main.c
rc/stack-info.txt
808ebf88b1d5fae4556abe1f50651ab0a8e75114 14-Dec-2012 The Android Open Source Project <initial-contribution@android.com> Snapshot 80bb394937f5d8334f33d07c57c8f1fe4bf2ae08

Change-Id: Ia7561f34cd619f1807288738ea004c0b0bf060db
rc/nfc/tags/rw_t3t.c
rc/stack-info.txt
e9df6ba5a8fcccf306a80b1670b423be8fe7746a 13-Dec-2012 The Android Open Source Project <initial-contribution@android.com> Snapshot 7ddd630e136a035ba463c427285c5c3e9f199ee0

Change-Id: If08c7b905da667dd9e5110231e4592842b634006
ndroid.mk
leanSpec.mk
alimpl/Android.mk
alimpl/bcm2079x/Android.mk
alimpl/bcm2079x/adaptation/CondVar.cpp
alimpl/bcm2079x/adaptation/CondVar.h
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/adaptation/Mutex.cpp
alimpl/bcm2079x/adaptation/Mutex.h
alimpl/bcm2079x/adaptation/NonVolatileStore.cpp
alimpl/bcm2079x/adaptation/OverrideLog.cpp
alimpl/bcm2079x/adaptation/SyncEvent.h
alimpl/bcm2079x/adaptation/android_logmsg.cpp
alimpl/bcm2079x/adaptation/config.cpp
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/adaptation/spdhelper.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
alimpl/bcm2079x/gki/common/gki.h
alimpl/bcm2079x/gki/common/gki_buffer.c
alimpl/bcm2079x/gki/common/gki_common.h
alimpl/bcm2079x/gki/common/gki_debug.c
alimpl/bcm2079x/gki/common/gki_inet.h
alimpl/bcm2079x/gki/common/gki_time.c
alimpl/bcm2079x/gki/ulinux/data_types.h
alimpl/bcm2079x/gki/ulinux/gki_int.h
alimpl/bcm2079x/gki/ulinux/gki_ulinux.c
alimpl/bcm2079x/hal/hal/nfc_hal_api.c
alimpl/bcm2079x/hal/hal/nfc_hal_brcm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm_cfg.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci_ci.c
alimpl/bcm2079x/hal/hal/nfc_hal_main.c
alimpl/bcm2079x/hal/hal/nfc_hal_nci.c
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
alimpl/bcm2079x/hal/include/gki_hal_target.h
alimpl/bcm2079x/hal/include/nci_defs.h
alimpl/bcm2079x/hal/include/nfc_hal_api.h
alimpl/bcm2079x/hal/include/nfc_hal_target.h
alimpl/bcm2079x/hal/include/nfc_types.h
alimpl/bcm2079x/hal/int/nfc_brcm_defs.h
alimpl/bcm2079x/hal/int/nfc_hal_int.h
alimpl/bcm2079x/hal/int/nfc_hal_int_api.h
alimpl/bcm2079x/hal/int/nfc_hal_nv_ci.h
alimpl/bcm2079x/hal/int/nfc_hal_nv_co.h
alimpl/bcm2079x/hal/int/nfc_hal_post_reset.h
alimpl/bcm2079x/include/HalAdaptation.h
alimpl/bcm2079x/include/OverrideLog.h
alimpl/bcm2079x/include/bcm2079x.h
alimpl/bcm2079x/include/bt_trace.h
alimpl/bcm2079x/include/bt_types.h
alimpl/bcm2079x/include/btdisp_lock.h
alimpl/bcm2079x/include/buildcfg.h
alimpl/bcm2079x/include/buildcfg_hal.h
alimpl/bcm2079x/include/config.h
alimpl/bcm2079x/include/dyn_mem.h
alimpl/bcm2079x/include/gki_target.h
alimpl/bcm2079x/include/hcidefs.h
alimpl/bcm2079x/include/nfc_target.h
alimpl/bcm2079x/include/spdhelper.h
alimpl/bcm2079x/include/userial.h
alimpl/bcm2079x/libnfc-brcm.conf
alimpl/bcm2079x/nfc_nci.c
alimpl/bcm2079x/udrv/include/upio.h
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/OverrideLog.cpp
rc/adaptation/android_logmsg.cpp
rc/adaptation/bte_logmsg.c
rc/adaptation/config.cpp
rc/adaptation/libmain.c
rc/gki/common/gki.h
rc/gki/common/gki_buffer.c
rc/gki/common/gki_common.h
rc/gki/common/gki_debug.c
rc/gki/common/gki_inet.h
rc/gki/common/gki_time.c
rc/gki/ulinux/data_types.h
rc/gki/ulinux/gki_int.h
rc/gki/ulinux/gki_ulinux.c
rc/hal/include/gki_hal_target.h
rc/hal/include/nci_defs.h
rc/hal/include/nfc_hal_api.h
rc/hal/include/nfc_hal_target.h
rc/hal/include/nfc_types.h
rc/hal/int/nfc_brcm_defs.h
rc/hal/int/nfc_hal_int.h
rc/hal/int/nfc_hal_int_api.h
rc/hal/int/nfc_hal_nv_ci.h
rc/hal/int/nfc_hal_nv_co.h
rc/hal/int/nfc_hal_post_reset.h
rc/include/NfcAdaptation.h
rc/include/OverrideLog.h
rc/include/bcm2079x.h
rc/include/bt_target.h
rc/include/bt_trace.h
rc/include/bt_types.h
rc/include/btdisp_lock.h
rc/include/btu_api.h
rc/include/buildcfg.h
rc/include/buildcfg_hal.h
rc/include/config.h
rc/include/dyn_mem.h
rc/include/gki_target.h
rc/include/hcidefs.h
rc/include/nfc_target.h
rc/include/nfccext.h
rc/include/trace_api.h
rc/libnfc.conf
rc/nfa/ce/nfa_ce_act.c
rc/nfa/ce/nfa_ce_api.c
rc/nfa/ce/nfa_ce_main.c
rc/nfa/cho/nfa_cho_api.c
rc/nfa/cho/nfa_cho_main.c
rc/nfa/cho/nfa_cho_sm.c
rc/nfa/cho/nfa_cho_util.c
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_api.c
rc/nfa/dm/nfa_dm_cfg.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfa/dm/nfa_dm_main.c
rc/nfa/dm/nfa_dm_ndef.c
rc/nfa/ee/nfa_ee_act.c
rc/nfa/ee/nfa_ee_api.c
rc/nfa/ee/nfa_ee_main.c
rc/nfa/hci/nfa_hci_act.c
rc/nfa/hci/nfa_hci_api.c
rc/nfa/hci/nfa_hci_ci.c
rc/nfa/hci/nfa_hci_main.c
rc/nfa/hci/nfa_hci_utils.c
rc/nfa/include/nfa_api.h
rc/nfa/include/nfa_ce_api.h
rc/nfa/include/nfa_cho_api.h
rc/nfa/include/nfa_ee_api.h
rc/nfa/include/nfa_hci_api.h
rc/nfa/include/nfa_hci_defs.h
rc/nfa/include/nfa_mem_co.h
rc/nfa/include/nfa_nv_ci.h
rc/nfa/include/nfa_nv_co.h
rc/nfa/include/nfa_p2p_api.h
rc/nfa/include/nfa_rw_api.h
rc/nfa/include/nfa_snep_api.h
rc/nfa/int/nfa_ce_int.h
rc/nfa/int/nfa_cho_int.h
rc/nfa/int/nfa_dm_int.h
rc/nfa/int/nfa_dta_int.h
rc/nfa/int/nfa_ee_int.h
rc/nfa/int/nfa_hci_int.h
rc/nfa/int/nfa_p2p_int.h
rc/nfa/int/nfa_rw_int.h
rc/nfa/int/nfa_snep_int.h
rc/nfa/int/nfa_sys.h
rc/nfa/int/nfa_sys_int.h
rc/nfa/int/nfa_sys_ptim.h
rc/nfa/p2p/nfa_p2p_act.c
rc/nfa/p2p/nfa_p2p_api.c
rc/nfa/p2p/nfa_p2p_main.c
rc/nfa/rw/nfa_rw_act.c
rc/nfa/rw/nfa_rw_api.c
rc/nfa/rw/nfa_rw_main.c
rc/nfa/snep/nfa_snep_act.c
rc/nfa/snep/nfa_snep_api.c
rc/nfa/snep/nfa_snep_default.c
rc/nfa/snep/nfa_snep_main.c
rc/nfa/sys/nfa_sys_cback.c
rc/nfa/sys/nfa_sys_cfg.c
rc/nfa/sys/nfa_sys_main.c
rc/nfa/sys/nfa_sys_ptim.c
rc/nfc/include/ce_api.h
rc/nfc/include/llcp_api.h
rc/nfc/include/llcp_defs.h
rc/nfc/include/nci_hmsgs.h
rc/nfc/include/ndef_utils.h
rc/nfc/include/nfc_api.h
rc/nfc/include/rw_api.h
rc/nfc/include/tags_defs.h
rc/nfc/int/ce_int.h
rc/nfc/int/llcp_int.h
rc/nfc/int/nfc_int.h
rc/nfc/int/rw_int.h
rc/nfc/int/tags_int.h
rc/nfc/llcp/llcp_api.c
rc/nfc/llcp/llcp_dlc.c
rc/nfc/llcp/llcp_link.c
rc/nfc/llcp/llcp_main.c
rc/nfc/llcp/llcp_sdp.c
rc/nfc/llcp/llcp_util.c
rc/nfc/nci/nci_hmsgs.c
rc/nfc/nci/nci_hrcv.c
rc/nfc/ndef/ndef_cho_utils.c
rc/nfc/ndef/ndef_utils.c
rc/nfc/nfc/nfc_ee.c
rc/nfc/nfc/nfc_main.c
rc/nfc/nfc/nfc_ncif.c
rc/nfc/nfc/nfc_task.c
rc/nfc/nfc/nfc_test.c
rc/nfc/nfc/nfc_utils.c
rc/nfc/nfc/nfc_vs.c
rc/nfc/tags/ce_main.c
rc/nfc/tags/ce_t3t.c
rc/nfc/tags/ce_t4t.c
rc/nfc/tags/rw_i93.c
rc/nfc/tags/rw_main.c
rc/nfc/tags/rw_t1t.c
rc/nfc/tags/rw_t1t_ndef.c
rc/nfc/tags/rw_t2t.c
rc/nfc/tags/rw_t2t_ndef.c
rc/nfc/tags/rw_t3t.c
rc/nfc/tags/rw_t4t.c
rc/nfc/tags/tags_int.c
rc/stack-info.txt
rc/udrv/include/uamp_api.h
rc/udrv/include/ucodec.h
rc/udrv/include/udac.h
rc/udrv/include/uipc.h
rc/udrv/include/unv.h
rc/udrv/include/upio.h
rc/udrv/include/usb.h
rc/udrv/include/utimer.h
rc/udrv/include/uusb.h