History log of /external/libnfc-nci/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
7ddd630e136a035ba463c427285c5c3e9f199ee0 23-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
a058fe34fadff67c4cd6c276141639f696b5bfdb 23-Oct-2012 Martijn Coenen <maco@google.com> am a041bc7c: Prevent invalid HCI data being stored on fs.

* commit 'a041bc7cb11d52e4d17b5898e234c20a42bc74ce':
Prevent invalid HCI data being stored on fs.
a041bc7cb11d52e4d17b5898e234c20a42bc74ce 23-Oct-2012 Martijn Coenen <maco@google.com> Prevent invalid HCI data being stored on fs.

Make sure we don't store HCI network data
in case "type A card emulation" is not valid.

Bug: 7387638
Change-Id: I56b135ffd5c7372cb8401262994bd1930cc9d4a9
alimpl/bcm2079x/hal/hal/nfc_hal_hci.c
32a56a54058f281fdf662ced258c74f70df93bdc 19-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
095819c98eb55a33975e3ef5bdac188fee22563c 18-Oct-2012 Martijn Coenen <maco@google.com> am a4b403f6: Merge "Fix config responses not being acked up to the JNI." into jb-broadcom-nfc

* commit 'a4b403f68eedfb6c690443bd7dcd3e38186f3b6d':
Fix config responses not being acked up to the JNI.
a4b403f68eedfb6c690443bd7dcd3e38186f3b6d 18-Oct-2012 Martijn Coenen <maco@google.com> Merge "Fix config responses not being acked up to the JNI." into jb-broadcom-nfc
1f0f2ac539631cbd1e0516e19f5d124d0a5f8509 18-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
c0d257b5de50a8b55595a73f5e64573f7d068c88 18-Oct-2012 Evan Chu <evanchu@broadcom.com> am ee00835d: Stack shall clear the content of persistent storage

* commit 'ee00835dfad4b11b2df72ae7caeea1c6ceba2e6c':
Stack shall clear the content of persistent storage
e7dce7c60a33ea3f728c37d35688358743ee0dcd 18-Oct-2012 Martijn Coenen <maco@google.com> Fix config responses not being acked up to the JNI.

If a config command is sent to the core stack and
we're powering down right after it, the bits that
keep track of outstanding config bits do not
get reset properly (even if we still get a response).

Clear the bits whenever we come back to full
power again.

Bug: 7366863
Change-Id: I405caa40c90a9c98276580d830c2c8809afc707b
rc/nfa/dm/nfa_dm_act.c
ee00835dfad4b11b2df72ae7caeea1c6ceba2e6c 17-Oct-2012 Evan Chu <evanchu@broadcom.com> Stack shall clear the content of persistent storage

Reset non-volatile data on clear-all-pipe notification.
This operation clears the content of persistent storage related to
secure element.

Bug: 7350357
Change-Id: I570f03c3fb0266bd217d3883b159990f29e2d3c7
alimpl/bcm2079x/hal/hal/nfc_hal_dm.c
alimpl/bcm2079x/hal/hal/nfc_hal_hci.c
alimpl/bcm2079x/hal/hal/nfc_hal_nci.c
alimpl/bcm2079x/hal/int/nfc_hal_int.h
rc/hal/int/nfc_hal_int.h
rc/nfa/hci/nfa_hci_main.c
rc/stack-info.txt
270572d7e290c276578811451ac059e0e96743d1 17-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
df2580ee369b28007dc717d51cd4302b4b51302b 16-Oct-2012 Evan Chu <evanchu@broadcom.com> am c47b3168: Don\'t print error message regarding NCI_VERSION.

* commit 'c47b3168f900ef2470be7761a74039152132e623':
Don't print error message regarding NCI_VERSION.
c47b3168f900ef2470be7761a74039152132e623 15-Oct-2012 Evan Chu <evanchu@broadcom.com> Don't print error message regarding NCI_VERSION.

Adjust diagnostic message in Userial.

Bug: 7357666
Change-Id: I9e9246b30d3aa787f7ddee1e24216242ecac5314
alimpl/bcm2079x/adaptation/userial_linux.c
rc/nfc/nfc/nfc_ncif.c
2f339b338e2c977ac42676efe842ec84ccd9347d 16-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
0e440012ee4e95e1bb3c4e9c2b8ee6f1fa5c0d7f 16-Oct-2012 Martijn Coenen <maco@google.com> am 673a037e: Don\'t hang when disabling NFC in low-power sleep.

* commit '673a037ee1092cf532d15ef1c129fef3808e7faf':
Don't hang when disabling NFC in low-power sleep.
673a037ee1092cf532d15ef1c129fef3808e7faf 15-Oct-2012 Martijn Coenen <maco@google.com> Don't hang when disabling NFC in low-power sleep.

Bug: 7348651
Change-Id: I8629d24f76490278ee2c6687e751c05c78f2909c
rc/nfa/hci/nfa_hci_main.c
rc/nfc/nfc/nfc_main.c
df24e0bf9b4dce5986802295569ae56bd6b24dbe 15-Oct-2012 Martijn Coenen <maco@google.com> am 2f38594a: Restart NFC when there is a controller timeout.

* commit '2f38594a415a2160e8ea314dd4dcdcd39d878e64':
Restart NFC when there is a controller timeout.
2f38594a415a2160e8ea314dd4dcdcd39d878e64 15-Oct-2012 Martijn Coenen <maco@google.com> Restart NFC when there is a controller timeout.

Bug: 7345591
Change-Id: I5c196756e30b2b409f9d75fc34094f1454dd7fb9
rc/nfc/nfc/nfc_ncif.c
651a78d628bb49f49e7d60845c799f742e4600f9 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
b8ea5e418801e579cd2a974eed73d75c7fc1296c 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
2b7771cc68c21260f86c96ef91c018f755ba3fbf 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
a90c182c310eeb06fdbabd4b2b665e8e7b7edcbf 09-Oct-2012 Martijn Coenen <maco@google.com> am 73ee6bd9: Merge "Force NFC-DEP (p2p) protocol to the DH." into jb-broadcom-nfc

* commit '73ee6bd9a430b2247c714f30f86b56f2af648e96':
Force NFC-DEP (p2p) protocol to the DH.
73ee6bd9a430b2247c714f30f86b56f2af648e96 09-Oct-2012 Martijn Coenen <maco@google.com> Merge "Force NFC-DEP (p2p) protocol to the DH." into jb-broadcom-nfc
1ba71eb91862d97e01655a634b736934deea3db4 08-Oct-2012 Evan Chu <evanchu@broadcom.com> Force NFC-DEP (p2p) protocol to the DH.

We don't support NFC-DEP by the eSE. To
enable reporting of a SAK indicating
p2p support (0x40) on Nfc-A, always
route NFC-DEP to the DH.

Bug: 7301990
Change-Id: I4a4f64753148d80ad23123276f913ba342cad237
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_discover.c
rc/nfc/nfc/nfc_main.c
08ebd298e2a69e63d9f2e17deb16ab1bf63cecd2 08-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
514d795a49267fbc9fcb0c2dd0df230702f149c6 07-Oct-2012 Martijn Coenen <maco@google.com> am abaaafe1: Insert a minimum delay of 5ms between back-to-back writes.

* commit 'abaaafe1ab72ca7c74a904bfb26ec7eaeea02713':
Insert a minimum delay of 5ms between back-to-back writes.
abaaafe1ab72ca7c74a904bfb26ec7eaeea02713 07-Oct-2012 Martijn Coenen <maco@google.com> Insert a minimum delay of 5ms between back-to-back writes.

On Manta the NFC controller is connected to the SPI interface.
NCI forum has defined a custom flow-control mechanism over SPI,
that requires the host to wait for an out-of-band SPI_INT line
to go low before transmitting data. The SPI-controller on our SoC
however can't wait for an out-of-band signal - it immediately
pulls down SPI_CS and starts writing.

For cmd followed by cmd, and data followed by data, this is not
a problem, because we wait for a response / credits respectively.
However, for cmd followed by data, or vice-versa, we have no
flow control mechanism. At this point the simple and safe fix is just
to delay 5ms between any two writes. This should not hurt performance
as we're already waiting 5ms between large packets (where performance
counts most).

Bug: 7283947
Change-Id: I56567d816cc6be06fc3f7fa2f06699a32285f190
alimpl/bcm2079x/adaptation/userial_linux.c
df1d6771bf3f173ff25e3430c30cb1531e7f221b 07-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
abd6efd0b363cbbc551ab7317bb4c623c9713dd3 05-Oct-2012 Evan Chu <evanchu@broadcom.com> am 30423b8f: Fix T3T reading and RF credits on Manta.

* commit '30423b8fe42b7efeaf0e0eae2c0f4f758e98c0ab':
Fix T3T reading and RF credits on Manta.
30423b8fe42b7efeaf0e0eae2c0f4f758e98c0ab 04-Oct-2012 Evan Chu <evanchu@broadcom.com> Fix T3T reading and RF credits on Manta.

Changes include:
* Remove Broadcom-specific destination host, gate values.
* Properly read NDEF message on Type-3 tag.
* Adjust GID of activation notification (credits for Manta).

Author: Paul Chaisson

Bug: 7282057
Change-Id: I4859d61028bedcc19045b5f376e1822f38409e5d
alimpl/bcm2079x/Android.mk
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/hal/hal/nfc_hal_main.c
alimpl/bcm2079x/hal/hal/nfc_hal_nci.c
alimpl/bcm2079x/libnfc-brcm.conf
rc/libnfc.conf
rc/nfa/hci/nfa_hci_act.c
rc/nfa/hci/nfa_hci_api.c
rc/nfa/hci/nfa_hci_main.c
rc/nfa/include/nfa_hci_api.h
rc/nfa/int/nfa_hci_int.h
rc/nfc/tags/rw_t3t.c
rc/stack-info.txt
f463ded8f0f1e32f8cc94805e6d78d59116dad27 04-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
ac814ada706d1f33de2c56e75ba01d1e92688d14 04-Oct-2012 Evan Chu <evanchu@broadcom.com> am 38666aab: Stack fix for NFA_RwT3tWrite crash.

* commit '38666aab1397040df51ab6d28520b3930df1df3f':
Stack fix for NFA_RwT3tWrite crash.
e40b698e2a0e4298c808881934bb02cfa82ccb7b 04-Oct-2012 Evan Chu <evanchu@broadcom.com> am 5bf83a74: Handle deleted connectivity pipe.

* commit '5bf83a74c2a6088dbf15980ad4fed2be4f254486':
Handle deleted connectivity pipe.
9cbd9343e5bf3a1c7a0ad4f999447a1b5a073c54 04-Oct-2012 Evan Chu <evanchu@broadcom.com> am 794a3220: When EEPROM is not detected, re-initialize controller

* commit '794a3220e013b6c679f2127792859e6b751ee280':
When EEPROM is not detected, re-initialize controller
38666aab1397040df51ab6d28520b3930df1df3f 03-Oct-2012 Evan Chu <evanchu@broadcom.com> Stack fix for NFA_RwT3tWrite crash.

Bug: 7282057
Change-Id: I792acf5a5ce40a4bcea455b2e9d776781bd7d59a
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
rc/nfa/rw/nfa_rw_api.c
rc/stack-info.txt
5bf83a74c2a6088dbf15980ad4fed2be4f254486 03-Oct-2012 Evan Chu <evanchu@broadcom.com> Handle deleted connectivity pipe.

We've found that when some UICC/SE's are busy
with reconfiguration, they will no longer accepted
APDUs from the host and time out on those.

To avoid this, queue any APDUs from the host
until the reconfiguration of the SE is done.

Bug: 7257431
Change-Id: I4e50c043a968f91dd3972ed3a58938a047e551cd
rc/nfa/hci/nfa_hci_act.c
rc/nfa/hci/nfa_hci_main.c
rc/nfa/hci/nfa_hci_utils.c
rc/nfa/int/nfa_hci_int.h
rc/stack-info.txt
794a3220e013b6c679f2127792859e6b751ee280 28-Sep-2012 Evan Chu <evanchu@broadcom.com> When EEPROM is not detected, re-initialize controller

HAL will re-initialize the controller, which
should eventually detect EEPROM.

Bug: 7249838
Change-Id: I00c81790d959dd1d6d84cf5d4aacb505ec771050
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
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
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
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
rc/hal/int/nfc_brcm_defs.h
rc/hal/int/nfc_hal_int.h
rc/hal/int/nfc_hal_int_api.h
fc7b623107b7cf3320c3930ce34dd28ef0bbef95 03-Oct-2012 Evan Chu <evanchu@broadcom.com> am 1cee7ea1: Improve robustness of firmware download procedure.

* commit '1cee7ea1898ae8dbcff534f684c5cbcdd6dc6a85':
Improve robustness of firmware download procedure.
1cee7ea1898ae8dbcff534f684c5cbcdd6dc6a85 28-Sep-2012 Evan Chu <evanchu@broadcom.com> Improve robustness of firmware download procedure.

Allow NFCC to come up with current firmware in NVM whenever:
- The patchfiles are not present
- The patchfiles are corrupt
- There is a problem with downloading the patch

Bug: 7090159
Change-Id: I65116e519918ed16e22173510adf9d5e5de44410
alimpl/bcm2079x/adaptation/patchram.cpp
alimpl/bcm2079x/adaptation/spdhelper.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
alimpl/bcm2079x/include/config.h
alimpl/bcm2079x/include/spdhelper.h
alimpl/bcm2079x/include/userial.h
645fec11c86d4636327112faee34b542fddcd434 03-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
3cb48657257c70113a45d420a218ecf5657daeb7 02-Oct-2012 Paul Chaisson <pchaisson@broadcom.com> am c7e1256e: Configuration option to substitute AID in empty select.

* commit 'c7e1256eb29c65ff9bff5fddca6aa250eec91cea':
Configuration option to substitute AID in empty select.
c7e1256eb29c65ff9bff5fddca6aa250eec91cea 01-Oct-2012 Paul Chaisson <pchaisson@broadcom.com> Configuration option to substitute AID in empty select.

Bug: 7198430
Change-Id: I7a3684a838716d6871d2e49ac9eac5e9cd3fca1a
rc/include/config.h
424e4e924c7936712a32079be51e187972adf63b 02-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
f62dacc1c951902316b432c520177d95daa4421c 02-Oct-2012 Paul Chaisson <pchaisson@broadcom.com> am 4c1bc8e7: Add support for setting MAX_RF_DATA_CREDITS from config.

* commit '4c1bc8e7ac6e7bfba5d1d9a5782235f3c94d7294':
Add support for setting MAX_RF_DATA_CREDITS from config.
e0059a71114d64108ec75a5caa2f38fc3991d4a2 02-Oct-2012 Evan Chu <evanchu@broadcom.com> am 34785a5d: Don\'t hang when warm-reset of SE times out.

* commit '34785a5d8cf38d96df9535f4673d03b31fc16d9e':
Don't hang when warm-reset of SE times out.
4c1bc8e7ac6e7bfba5d1d9a5782235f3c94d7294 01-Oct-2012 Paul Chaisson <pchaisson@broadcom.com> Add support for setting MAX_RF_DATA_CREDITS from config.

Bug: 7164846
Change-Id: I9b516113ddee8dabadcf6cb6e8f6bec820f4b141
alimpl/bcm2079x/adaptation/patchram.cpp
34785a5d8cf38d96df9535f4673d03b31fc16d9e 28-Sep-2012 Evan Chu <evanchu@broadcom.com> Don't hang when warm-reset of SE times out.

Bug: 7242068
Change-Id: I9ca43bff25285b219bb596408fbb783b0b1c1fea
rc/nfa/hci/nfa_hci_main.c
rc/nfa/hci/nfa_hci_utils.c
rc/stack-info.txt
834826e7896466d6d1ed77b2322b79dbcd4f6e57 01-Oct-2012 Evan Chu <evanchu@broadcom.com> am ba4c17ee: Upgrade to stack 1.3.45

* commit 'ba4c17ee1d31e1b9f396292711f1414d449dd361':
Upgrade to stack 1.3.45
ba4c17ee1d31e1b9f396292711f1414d449dd361 28-Sep-2012 Evan Chu <evanchu@broadcom.com> Upgrade to stack 1.3.45

- Add halimpl/bcm2079x/libnfc-brcm.conf to keep track of its content.
- Add src/libnfc.conf to keep track of its content.
- Properly shutdown stack [in case NFC controller doesn't come up].
- Do not calculate firmware size [needed for FW > 98].
- HAL cleanup.

Bug: 7202185
Bug: 7214014
Change-Id: I11c646819e28e377c5db9d627d79050a05d9ff69
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/adaptation/config.cpp
alimpl/bcm2079x/adaptation/userial_linux.c
alimpl/bcm2079x/hal/hal/nfc_hal_api.c
alimpl/bcm2079x/hal/hal/nfc_hal_ce.c
alimpl/bcm2079x/hal/hal/nfc_hal_dm.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/nfc_hal_api.h
alimpl/bcm2079x/hal/include/nfc_hal_target.h
alimpl/bcm2079x/hal/int/nfc_brcm_api.h
alimpl/bcm2079x/hal/int/nfc_brcm_defs.h
alimpl/bcm2079x/hal/int/nfc_brcm_int.h
alimpl/bcm2079x/hal/int/nfc_hal_int.h
alimpl/bcm2079x/hal/int/nfc_hal_int_api.h
alimpl/bcm2079x/include/HalAdaptation.h
alimpl/bcm2079x/include/buildcfg_hal.h
alimpl/bcm2079x/include/config.h
alimpl/bcm2079x/libnfc-brcm.conf
alimpl/bcm2079x/nfc_nci.c
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/config.cpp
rc/hal/include/nfc_hal_api.h
rc/hal/int/nfc_brcm_api.h
rc/hal/int/nfc_brcm_defs.h
rc/hal/int/nfc_brcm_int.h
rc/hal/int/nfc_hal_int.h
rc/hal/int/nfc_hal_int_api.h
rc/include/NfcAdaptation.h
rc/include/config.h
rc/include/nfc_target.h
rc/libnfc.conf
rc/nfa/dm/nfa_dm_act.c
rc/nfa/dm/nfa_dm_main.c
rc/nfa/ee/nfa_ee_act.c
rc/nfa/ee/nfa_ee_main.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_hci_api.h
rc/nfa/int/nfa_dm_int.h
rc/nfa/int/nfa_dta_int.h
rc/nfc/include/nfc_api.h
rc/nfc/int/nfc_int.h
rc/nfc/llcp/llcp_api.c
rc/nfc/llcp/llcp_dlc.c
rc/nfc/llcp/llcp_link.c
rc/nfc/nfc/nfc_main.c
rc/nfc/nfc/nfc_ncif.c
rc/nfc/nfc/nfc_task.c
rc/nfc/tags/rw_t2t.c
rc/nfc/tags/rw_t2t_ndef.c
rc/nfc/tags/rw_t3t.c
rc/stack-info.txt
07362a89c2a3c0c5b3f2571e9ad9e38906504bef 01-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
18e31c966d6014e5290fbcdd9463f672faf7361e 01-Oct-2012 Martijn Coenen <maco@google.com> am 17eea69d: Retry NFC controller reset.

* commit '17eea69d283e0e878f6539f598e683b83ad57112':
Retry NFC controller reset.
17eea69d283e0e878f6539f598e683b83ad57112 01-Oct-2012 Martijn Coenen <maco@google.com> Retry NFC controller reset.

We've seen the BCM2079x controller not coming up on Mako
devices in extended tests. In case we can't fix the root
cause in hw, this change will retry the reset for a maximum
of 4 times. We know the reset doesn't work when the change
address ioctl doesn't complete successfully, as that executes
an I2C write that fails if the controller did not come up.

This is not a solution for Manta where we don't need the change
address - we'll come up with a solution later that involves sending
some sort of init command to make sure the controller came up.

Bug: 7258919
Change-Id: I01848c77c283a1d60c89342d44931a5f1c2a10b4
alimpl/bcm2079x/adaptation/userial_linux.c
9d3823d843b745ac0764e3c37f945585fbcd44ca 30-Sep-2012 Martijn Coenen <maco@google.com> am fd02a511: Merge "Increase NCI command/response timeout to 2 seconds." into jb-broadcom-nfc

* commit 'fd02a5118603dd8f6b46842ab997c5b674e3ff15':
Increase NCI command/response timeout to 2 seconds.
fd02a5118603dd8f6b46842ab997c5b674e3ff15 30-Sep-2012 Martijn Coenen <maco@google.com> Merge "Increase NCI command/response timeout to 2 seconds." into jb-broadcom-nfc
49f1aee5a16107e3038a9bb5f52743b684477432 29-Sep-2012 Martijn Coenen <maco@google.com> Increase NCI command/response timeout to 2 seconds.

We've seen that some NCI commands sent during firmware
download can take longer than 1 second. Increase the timeout
to 2 seconds to make sure firmware download can complete.

Bug: 7257302
Change-Id: I41923e0a20512e4c4633c4054a14ae273da187b1
alimpl/bcm2079x/hal/int/nfc_hal_int.h
rc/hal/int/nfc_hal_int.h
6020f0afdb1dbdf09c19a654f66c0b48ace37eb8 27-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
fb7f5684a7773e99968659ea0d40fb8f7cf55d39 26-Sep-2012 Evan Chu <evanchu@broadcom.com> am ea33aa08: During transport error, unblock sync events.

* commit 'ea33aa0892282417adb9359c660795acf6fe7ac1':
During transport error, unblock sync events.
ea33aa0892282417adb9359c660795acf6fe7ac1 25-Sep-2012 Evan Chu <evanchu@broadcom.com> During transport error, unblock sync events.

When error event occurs, unblock all SyncEvent objects.
HAL_NFC_ERROR_EVT occurs when there is transport error.

Bug: 7214014
Change-Id: Ib92c9d03c166b3a33f69ea61bc83047079df770e
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
2271562b0a69f7fa223975aa9a129a700e9def91 22-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
9104868477c8c2cb546d4347fb104025aa28bd3b 22-Sep-2012 Evan Chu <evanchu@broadcom.com> am 6a36486b: Print error message in case of GKI error.

* commit '6a36486bba856b2ea2783c88f47e262c131a68fb':
Print error message in case of GKI error.
6a36486bba856b2ea2783c88f47e262c131a68fb 21-Sep-2012 Evan Chu <evanchu@broadcom.com> Print error message in case of GKI error.

When GKI fails to allocate buffer, print error message.
Remove some line-feed and carriage-return characters in log messages.

Bug: 7113095
Change-Id: Iefbf35f4cc450d731ef24e48c6471c04b920ea70
alimpl/bcm2079x/adaptation/android_logmsg.cpp
alimpl/bcm2079x/gki/common/gki_buffer.c
alimpl/bcm2079x/gki/common/gki_time.c
alimpl/bcm2079x/gki/ulinux/gki_ulinux.c
rc/adaptation/android_logmsg.cpp
rc/adaptation/libmain.c
rc/gki/common/gki_buffer.c
rc/gki/common/gki_time.c
rc/gki/ulinux/gki_ulinux.c
4acbe1b2fe97b1f3d77f9d56feca85f8a5edc22d 21-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
adf746d52123c5ed652e1c4d724ae12180f9f80f 21-Sep-2012 Martijn Coenen <maco@google.com> am 42d73cd9: Tweak logging for enabling error traces.

* commit '42d73cd99ecb8ad8d1108017be383d871b288605':
Tweak logging for enabling error traces.
42d73cd99ecb8ad8d1108017be383d871b288605 21-Sep-2012 Martijn Coenen <maco@google.com> Tweak logging for enabling error traces.

- Always log firmware version in NVM once
- Always log GKI buffer allocation failures
- Change some errors to warnings as they're not critical

Bug: 7113095
Change-Id: I54ad4193c67648e074fec287c1901d0f06fedecd
alimpl/bcm2079x/adaptation/HalAdaptation.cpp
alimpl/bcm2079x/adaptation/NonVolatileStore.cpp
alimpl/bcm2079x/adaptation/android_logmsg.cpp
alimpl/bcm2079x/gki/common/gki_buffer.c
alimpl/bcm2079x/hal/hal/nfc_hal_prm.c
alimpl/bcm2079x/hal/include/gki_hal_target.h
rc/adaptation/libmain.c
rc/gki/common/gki_buffer.c
rc/nfc/llcp/llcp_api.c
rc/nfc/nfc/nfc_ncif.c
3fce624236703d7579ff4591cf23b7687df7e227 20-Sep-2012 Martijn Coenen <maco@google.com> am 19d9a743: Merge "Grant license" into jb-broadcom-nfc

* commit '19d9a743b219b7072f15aa318a2ca15b7eb3e445':
Grant license
e3f7e1bf5aea8d26fd71536f9b2284338e234f02 20-Sep-2012 Martijn Coenen <maco@google.com> am 43ddc232: Increase delay when downloading NFC firmware.

* commit '43ddc2324836d0204f82bb8505b9c5ab143b0c08':
Increase delay when downloading NFC firmware.
19d9a743b219b7072f15aa318a2ca15b7eb3e445 20-Sep-2012 Martijn Coenen <maco@google.com> Merge "Grant license" into jb-broadcom-nfc
e2c4f380c51c72367fad2cf41a03d5bca793cd5b 20-Sep-2012 Evan Chu <evanchu@broadcom.com> am b58ba0e8: copyright by Broadcom, use Apache License

* commit 'b58ba0e89a3767e6174c42d3e90540d1eae10f81':
copyright by Broadcom, use Apache License
8a32b5467bbc8ac9e65c8c7084612591da33c2cf 20-Sep-2012 Evan Chu <evanchu@broadcom.com> Grant license

Bug: 7125646
Change-Id: I93a5e05f6bc10ce7a845ceff4d2ff5a4e396f307
MPORTANT_LICENSE
43ddc2324836d0204f82bb8505b9c5ab143b0c08 20-Sep-2012 Martijn Coenen <maco@google.com> Increase delay when downloading NFC firmware.

Regression from the HAL.

Bug: 7202185
Change-Id: Ia087ce779f297cc964e72949e3d59fd1a04bd8ec
alimpl/bcm2079x/hal/include/nfc_hal_target.h
b58ba0e89a3767e6174c42d3e90540d1eae10f81 20-Sep-2012 Evan Chu <evanchu@broadcom.com> copyright by Broadcom, use Apache License

Bug: 7125646
Change-Id: Iff12339ef9e7de277d5bf024f6549c8c1792c03f
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/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_ce.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_api.h
alimpl/bcm2079x/hal/int/nfc_brcm_defs.h
alimpl/bcm2079x/hal/int/nfc_brcm_int.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/userial.h
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_api.h
rc/hal/int/nfc_brcm_defs.h
rc/hal/int/nfc_brcm_int.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/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/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
1c80046ccf0fee8ffbaabc999da3372ee98cc746 20-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
1eeddcc64e67ba488951132e66a187e06dba19fe 19-Sep-2012 Martijn Coenen <maco@google.com> am 8028cdec: Call GKI_freebug after POST_CORE_RESET.

* commit '8028cdec6af5f22df29a5f5e2bbb88db2cb63cf8':
Call GKI_freebug after POST_CORE_RESET.
8028cdec6af5f22df29a5f5e2bbb88db2cb63cf8 19-Sep-2012 Martijn Coenen <maco@google.com> Call GKI_freebug after POST_CORE_RESET.

Bug: 7195192
Change-Id: Icfe5cdb2e37682272692e8b01384675acaf2933e
alimpl/bcm2079x/hal/hal/nfc_hal_main.c
80a81079e1e45ffc70330d2f8e52bcc4831f02a7 19-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
8ad27769977e5f99266449fd42de0566d861f3fe 19-Sep-2012 Evan Chu <evanchu@broadcom.com> am eb190654: Integrate with NFC Hardware Abstraction Layer

* commit 'eb190654c5fbaea2f396bb5523f57062f291879a':
Integrate with NFC Hardware Abstraction Layer
eb190654c5fbaea2f396bb5523f57062f291879a 13-Sep-2012 Evan Chu <evanchu@broadcom.com> Integrate with NFC Hardware Abstraction Layer

Also upgraded to stack 1.3.43 for HAL features

Bug: 7123942
Change-Id: I24c66c49cc4e54e0ef9d7861d33adf670fb87d0b
ndroid.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/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_ce.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_api.h
alimpl/bcm2079x/hal/int/nfc_brcm_defs.h
alimpl/bcm2079x/hal/int/nfc_brcm_int.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/userial.h
alimpl/bcm2079x/libnfc-brcm.conf
alimpl/bcm2079x/nfc_nci.c
alimpl/bcm2079x/udrv/include/upio.h
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/patchram.cpp
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_api.h
rc/hal/int/nfc_brcm_defs.h
rc/hal/int/nfc_brcm_int.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/bt_trace.h
rc/include/bt_types.h
rc/include/buildcfg_hal.h
rc/include/config.h
rc/include/nfc_target.h
rc/include/userial.h
rc/nfa/brcm/nfa_brcm_api.h
rc/nfa/brcm/nfa_brcm_int.h
rc/nfa/brcm/nfa_dm_brcm.c
rc/nfa/brcm/nfa_dm_brcm_cfg.c
rc/nfa/brcm/nfa_hci_brcm.c
rc/nfa/brcm/nfa_vs_brcm_api.h
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/ee/nfa_ee_act.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_main.c
rc/nfa/hci/nfa_hci_utils.c
rc/nfa/include/nfa_api.h
rc/nfa/include/nfa_dta_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/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_sys.h
rc/nfa/p2p/nfa_p2p_act.c
rc/nfa/rw/nfa_rw_act.c
rc/nfa/sys/nfa_sys_cback.c
rc/nfa/sys/nfa_sys_main.c
rc/nfc/brcm/nci_brcm.c
rc/nfc/brcm/nfc_brcm.c
rc/nfc/brcm/nfc_brcm_api.h
rc/nfc/brcm/nfc_brcm_int.h
rc/nfc/brcm/nfc_prm_brcm.c
rc/nfc/brcm/nfc_vs_brcm_api.h
rc/nfc/include/nci_defs.h
rc/nfc/include/nfc_api.h
rc/nfc/int/nci_int.h
rc/nfc/int/nfc_int.h
rc/nfc/nci/nci_hrcv.c
rc/nfc/nci/ncit_main.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_vs.c
rc/nfc/tags/rw_i93.c
rc/nfc/tags/rw_t1t.c
rc/nfc/tags/rw_t2t_ndef.c
rc/ntal/userial_linux.c
rc/stack-info.txt
rc/udrv/include/userial.h
6078ee9f195c322443fd41f5a72f38727de921b0 09-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
2e8f66ebe73944bd928d1b04794de9e848ec558e 07-Sep-2012 Paul Chaisson <pchaisson@broadcom.com> am 635ce0b0: Added conf file value name for polling duration (NFA_DM_DISC_DURATION_POLL).

* commit '635ce0b008e3c63e6eaa7992af2484118e17fefe':
Added conf file value name for polling duration (NFA_DM_DISC_DURATION_POLL).
635ce0b008e3c63e6eaa7992af2484118e17fefe 07-Sep-2012 Paul Chaisson <pchaisson@broadcom.com> Added conf file value name for polling duration (NFA_DM_DISC_DURATION_POLL).

Change-Id: I66bc580e6f8c69344e8504500cb7e07aa6080845
rc/include/config.h
d4eed921e384d92ca7e96be298cc309215faac87 06-Sep-2012 Evan Chu <evanchu@broadcom.com> am 76ac4570: Use enough delay during firmware patch download

* commit '76ac4570876bd364410d4d0253c0d6647fc3bca4':
Use enough delay during firmware patch download
51c510cdcb09aca17d55f426aa1b46200cbe4e83 06-Sep-2012 Evan Chu <evanchu@broadcom.com> am 01d28b8f: flush tx data queue after timed out

* commit '01d28b8f024088e8b16e16fc5c80a2fef5c24144':
flush tx data queue after timed out
a9c5521977680885d52510c44ce07fbc5ff84291 06-Sep-2012 Evan Chu <evanchu@broadcom.com> am 23944481: Remove "brcm" in names

* commit '23944481f6ec86760286c0e1805750d94d8137aa':
Remove "brcm" in names
afed28bb6f3d0888ad5d268a25df017933ea2a14 05-Sep-2012 Evan Chu <evanchu@broadcom.com> Remove "brcm" in names

BLTH01642677. Remove "brcm" in names

Change-Id: If6f1b13b9d3056248d1e7bfd77b5e81456b8236f
rc/adaptation/patchram.cpp
rc/include/buildcfg.h
76ac4570876bd364410d4d0253c0d6647fc3bca4 05-Sep-2012 Evan Chu <evanchu@broadcom.com> Use enough delay during firmware patch download

Bug: 7088544
Change-Id: Ia995454e723b93c489f103029c56aa36af862ac7
rc/nfc/brcm/nfc_prm_brcm.c
rc/stack-info.txt
01d28b8f024088e8b16e16fc5c80a2fef5c24144 05-Sep-2012 Evan Chu <evanchu@broadcom.com> flush tx data queue after timed out

BLTH01652784: Need to flush tx data queue when LLCP decides LLCP link has timed out.
This stack fix is based on 1.3.36. See main_sherrys_1650236.

Change-Id: Ia421329e047a1fdca390c3183b707fbc88635afd
rc/nfc/include/nfc_api.h
rc/nfc/llcp/llcp_link.c
rc/nfc/nfc/nfc_main.c
rc/nfc/nfc/nfc_ncif.c
rc/stack-info.txt
23944481f6ec86760286c0e1805750d94d8137aa 05-Sep-2012 Evan Chu <evanchu@broadcom.com> Remove "brcm" in names

BLTH01642677. Remove "brcm" in names

Change-Id: If6f1b13b9d3056248d1e7bfd77b5e81456b8236f
rc/adaptation/patchram.cpp
rc/include/buildcfg.h
059ba492c0c11d277cf2a663bb38baca32669133 04-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
ad483f6fa0128f07fd2187bb9c46c2e3f7728cc5 30-Aug-2012 Evan Chu <evanchu@broadcom.com> Upgrade to stack NFA_MI_1.03.36

Upgrade to stack NFA_MI_1.03.36; add stack CR 1647545.

Change-Id: I172170a22263a5c7af19ee616cdd9933592d0a85
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/OverrideLog.cpp
rc/adaptation/libmain.c
rc/adaptation/patchram.cpp
rc/include/bt_trace.h
rc/include/btdisp_lock.h
rc/include/config.h
rc/include/gki_target.h
rc/include/nfc_target.h
rc/nfa/brcm/nfa_brcm_api.h
rc/nfa/brcm/nfa_brcm_int.h
rc/nfa/brcm/nfa_dm_brcm.c
rc/nfa/brcm/nfa_dm_brcm_cfg.c
rc/nfa/ce/nfa_ce_act.c
rc/nfa/ce/nfa_ce_api.c
rc/nfa/cho/nfa_cho_api.c
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/ee/nfa_ee_act.c
rc/nfa/hci/nfa_hci_act.c
rc/nfa/hci/nfa_hci_api.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_dta_api.h
rc/nfa/include/nfa_hci_api.h
rc/nfa/include/nfa_rw_api.h
rc/nfa/int/nfa_dm_int.h
rc/nfa/int/nfa_dta_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/nfc/brcm/nci_brcm.c
rc/nfc/brcm/nfc_brcm.c
rc/nfc/brcm/nfc_brcm_api.h
rc/nfc/brcm/nfc_brcm_int.h
rc/nfc/brcm/nfc_btvscif_brcm.c
rc/nfc/brcm/nfc_prm_brcm.c
rc/nfc/include/ce_api.h
rc/nfc/include/llcp_api.h
rc/nfc/include/llcp_defs.h
rc/nfc/include/nci_defs.h
rc/nfc/include/nci_hmsgs.h
rc/nfc/include/ndef_utils.h
rc/nfc/include/nfc_api.h
rc/nfc/include/tags_defs.h
rc/nfc/int/ce_int.h
rc/nfc/int/nci_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/nci/nci_main.c
rc/nfc/nci/ncit_main.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/ntal/userial_linux.c
rc/stack-info.txt
36f08b37bc7d5d57f31c98e8dbaa71f14ca4fac3 22-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
3d1ef9844e99f6184f5c9c15d470877c5aa00103 21-Aug-2012 Paul Chaisson <pchaisson@broadcom.com> Update patch download procedure to support patch 76 and later.

Change-Id: I046f33e21327269cbec293ef85371eb62f7c5166
rc/nfc/brcm/nfc_prm_brcm.c
77280ebc0522ecfe58180ba24fdb2f1bbbd92ff4 20-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
106eae004dff2ddeb4f715424178a876bab19717 18-Aug-2012 Martijn Coenen <maco@google.com> Change HCI response timeout to 10 seconds.

We've seen the SE requires more than 1 second
to complete certain operations. Change to a safe
upper-bound that matches the NFC service timeout.

Change-Id: Ia5f5c809866292b5865eb4ebc699d1098b532580
rc/nfa/int/nfa_hci_int.h
91f13a0e7994f4fafe586efd06f8cce9e5846acb 14-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
4356939d2a022dc570d21ebe6f7cefff6b85edda 11-Aug-2012 Martijn Coenen <maco@google.com> Change default poll frequency in NCI stack.

From 1000ms to 500ms. Decreases tag discovery latency.

Change-Id: Ie06700592597a0c4d178e5d3db1f2dbea1d3daf4
rc/include/nfc_target.h
e29968cf3e053557a9c2efc5a7a42d0767c51d9d 10-Aug-2012 Evan Chu <evanchu@broadcom.com> New NFC stack drop from partner (8/10).

* The new stack is NFCA_PI_403.10.0.74,
which contains NFA_MI_1.03.33 plus fixes.

* Take stack CR that logs vendor-commands as NCI protocol trace.

* Fix interface-error after rf-discovery-select.

* Stack version information is in src/stack-info.txt.

* Use android property, nfc.app_log_level, to override log setting in .conf.

Change-Id: I1a16b31f2ba6c44d23ba54c886bff050a8323d0e
ndroid.mk
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/OverrideLog.cpp
rc/adaptation/bte_logmsg.c
rc/adaptation/config.cpp
rc/adaptation/libmain.c
rc/adaptation/patchram.cpp
rc/gki/common/gki_buffer.c
rc/gki/common/gki_common.h
rc/gki/common/gki_debug.c
rc/include/OverrideLog.h
rc/include/bt_trace.h
rc/include/bt_types.h
rc/include/config.h
rc/include/hcidefs.h
rc/include/nfc_target.h
rc/include/userial.h
rc/nfa/brcm/nfa_brcm_api.h
rc/nfa/brcm/nfa_brcm_int.h
rc/nfa/brcm/nfa_dm_brcm.c
rc/nfa/brcm/nfa_dm_brcm_cfg.c
rc/nfa/brcm/nfa_hci_brcm.c
rc/nfa/brcm/nfa_vs_brcm_api.h
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_dta_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/brcm/nci_brcm.c
rc/nfc/brcm/nfc_brcm.c
rc/nfc/brcm/nfc_brcm_api.h
rc/nfc/brcm/nfc_brcm_int.h
rc/nfc/brcm/nfc_btvscif_brcm.c
rc/nfc/brcm/nfc_prm_brcm.c
rc/nfc/brcm/nfc_vs_brcm_api.h
rc/nfc/include/ce_api.h
rc/nfc/include/llcp_api.h
rc/nfc/include/llcp_defs.h
rc/nfc/include/nci_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/nci_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/nci/nci_main.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/ntal/userial_linux.c
rc/stack-info.txt
rc/udrv/include/uamp_api.h
rc/udrv/include/ucodec.h
rc/udrv/include/udac.h
rc/udrv/include/unv.h
rc/udrv/include/upio.h
rc/udrv/include/usb.h
rc/udrv/include/userial.h
rc/udrv/include/utimer.h
rc/udrv/include/uusb.h
cae757e7698941d0fb9c4a34f717a98040446fe2 09-Aug-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d30d9deb6eadc55fd61644189417810d96575227 09-Aug-2012 Stephen Hines <srhines@google.com> Add a CleanSpec due to astl dependency removal.

Change-Id: I459a8aeb81ee98c48055d9bce53f728c98448961
leanSpec.mk
e04a20e2f0a6b679bb5e71ab961872faf5443800 07-Aug-2012 Elliott Hughes <enh@google.com> Switch from the dead astl to stlport for libnfc-nci.

Change-Id: I426726b970af8bf052d187136f06e7d217b3666a
ndroid.mk
8693f9f4bb730948c02a83e4a6eed34cdbccda69 07-Aug-2012 Martijn Coenen <maco@google.com> am 993437a4: Follow-up NFC code drop.

* commit '993437a401849447dfaabc2edf53e682e056a5a4':
Follow-up NFC code drop.
e48337d82549b74b597e0b53a75697935083defc 07-Aug-2012 Evan Chu <evanchu@broadcom.com> am f8a4ca32: (-s ours) Initial Broadcom NFC stack commit.

* commit 'f8a4ca325ef137a94869b34d36095ba7d08816a3':
Initial Broadcom NFC stack commit.
a2629b297f3b9f8eee7ce9dd5f890d5eb6cf9321 07-Aug-2012 Chad Jones <chadj@google.com> am 03023496: Test replication with empty commit

* commit '030234960de9492481b0ec3a3b6584f1835c99b6':
Test replication with empty commit
746281982366fdca86c8c033df67ca9b9bec547d 31-Jul-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
993437a401849447dfaabc2edf53e682e056a5a4 30-Jul-2012 Martijn Coenen <maco@google.com> Follow-up NFC code drop.

From partner, uploaded 07/26/2012; only change made
is stripping ^M.

Change-Id: I172ed4480d0e3eaa064ea46c0034b153b334801c
ndroid.mk
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/config.cpp
rc/adaptation/defconfig.c
rc/adaptation/libmain.c
rc/adaptation/patchram.cpp
rc/include/bt_types.h
rc/include/buildcfg.h
rc/include/config.h
rc/include/nfc_target.h
rc/nfa/brcm/nfa_brcm_int.h
rc/nfa/brcm/nfa_dm_brcm_cfg.c
rc/nfa/brcm/nfa_ee_brcm.c
rc/nfa/brcm/nfa_hci_brcm.c
rc/nfa/ce/nfa_ce_act.c
rc/nfa/dm/nfa_dm_act.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_hci_api.h
rc/nfa/include/nfa_p2p_api.h
rc/nfa/int/nfa_dm_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/p2p/nfa_p2p_act.c
rc/nfa/p2p/nfa_p2p_api.c
rc/nfa/p2p/nfa_p2p_main.c
rc/nfc/brcm/nci_brcm.c
rc/nfc/brcm/nfc_brcm.c
rc/nfc/brcm/nfc_brcm_api.h
rc/nfc/brcm/nfc_brcm_int.h
rc/nfc/brcm/nfc_btvscif_brcm.c
rc/nfc/brcm/nfc_prm_brcm.c
rc/nfc/include/nci_defs.h
rc/nfc/include/nfc_api.h
rc/nfc/include/rw_api.h
rc/nfc/include/tags_defs.h
rc/nfc/int/nci_int.h
rc/nfc/int/nfc_int.h
rc/nfc/int/tags_int.h
rc/nfc/llcp/llcp_link.c
rc/nfc/llcp/llcp_util.c
rc/nfc/nci/nci_hrcv.c
rc/nfc/nci/nci_main.c
rc/nfc/ndef/ndef_utils.c
rc/nfc/nfc/nfc_main.c
rc/nfc/nfc/nfc_ncif.c
rc/nfc/nfc/nfc_task.c
rc/nfc/nfc/nfc_utils.c
rc/nfc/nfc/nfc_vs.c
rc/nfc/tags/rw_t2t_ndef.c
rc/nfc/tags/tags_int.c
rc/ntal/userial_linux.c
f8a4ca325ef137a94869b34d36095ba7d08816a3 20-Jul-2012 Evan Chu <evanchu@broadcom.com> Initial Broadcom NFC stack commit.

From partner push dated 07/20; only change made is stripping ^M.

Change-Id: I29840a411f4004c31b063b0ad61e5490f9a8d5d7
ndroid.mk
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/android_logmsg.cpp
rc/adaptation/bte_logmsg.c
rc/adaptation/config.cpp
rc/adaptation/defconfig.c
rc/adaptation/libmain.c
rc/adaptation/patchram.cpp
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/include/NfcAdaptation.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/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/include/userial.h
rc/nfa/brcm/nfa_brcm_api.h
rc/nfa/brcm/nfa_brcm_int.h
rc/nfa/brcm/nfa_dm_brcm.c
rc/nfa/brcm/nfa_dm_brcm_cfg.c
rc/nfa/brcm/nfa_ee_brcm.c
rc/nfa/brcm/nfa_hci_brcm.c
rc/nfa/brcm/nfa_vs_brcm_api.h
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_dta_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/brcm/nci_brcm.c
rc/nfc/brcm/nfc_brcm.c
rc/nfc/brcm/nfc_brcm_api.h
rc/nfc/brcm/nfc_brcm_int.h
rc/nfc/brcm/nfc_btvscif_brcm.c
rc/nfc/brcm/nfc_prm_brcm.c
rc/nfc/brcm/nfc_vs_brcm_api.h
rc/nfc/include/ce_api.h
rc/nfc/include/llcp_api.h
rc/nfc/include/llcp_defs.h
rc/nfc/include/nci_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/nci_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/nci/nci_main.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/ntal/userial_linux.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/userial.h
rc/udrv/include/utimer.h
rc/udrv/include/uusb.h
63f80ce896f0f8c203191b4e44e038fecb6be02a 30-Jul-2012 Martijn Coenen <maco@google.com> Follow-up NFC code drop.

From partner, uploaded 07/26/2012; only change made
is stripping ^M.

Change-Id: I172ed4480d0e3eaa064ea46c0034b153b334801c
ndroid.mk
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/config.cpp
rc/adaptation/defconfig.c
rc/adaptation/libmain.c
rc/adaptation/patchram.cpp
rc/include/bt_types.h
rc/include/buildcfg.h
rc/include/config.h
rc/include/nfc_target.h
rc/nfa/brcm/nfa_brcm_int.h
rc/nfa/brcm/nfa_dm_brcm_cfg.c
rc/nfa/brcm/nfa_ee_brcm.c
rc/nfa/brcm/nfa_hci_brcm.c
rc/nfa/ce/nfa_ce_act.c
rc/nfa/dm/nfa_dm_act.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_hci_api.h
rc/nfa/include/nfa_p2p_api.h
rc/nfa/int/nfa_dm_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/p2p/nfa_p2p_act.c
rc/nfa/p2p/nfa_p2p_api.c
rc/nfa/p2p/nfa_p2p_main.c
rc/nfc/brcm/nci_brcm.c
rc/nfc/brcm/nfc_brcm.c
rc/nfc/brcm/nfc_brcm_api.h
rc/nfc/brcm/nfc_brcm_int.h
rc/nfc/brcm/nfc_btvscif_brcm.c
rc/nfc/brcm/nfc_prm_brcm.c
rc/nfc/include/nci_defs.h
rc/nfc/include/nfc_api.h
rc/nfc/include/rw_api.h
rc/nfc/include/tags_defs.h
rc/nfc/int/nci_int.h
rc/nfc/int/nfc_int.h
rc/nfc/int/tags_int.h
rc/nfc/llcp/llcp_link.c
rc/nfc/llcp/llcp_util.c
rc/nfc/nci/nci_hrcv.c
rc/nfc/nci/nci_main.c
rc/nfc/ndef/ndef_utils.c
rc/nfc/nfc/nfc_main.c
rc/nfc/nfc/nfc_ncif.c
rc/nfc/nfc/nfc_task.c
rc/nfc/nfc/nfc_utils.c
rc/nfc/nfc/nfc_vs.c
rc/nfc/tags/rw_t2t_ndef.c
rc/nfc/tags/tags_int.c
rc/ntal/userial_linux.c
ebacdb5beceee0d0f5bfac665d586c06ef79e961 28-Jul-2012 Evan Chu <evanchu@broadcom.com> am 45faad0f: Initial Broadcom NFC stack commit.

* commit '45faad0ff5deeb0c676356345d99398cc4ab695a':
Initial Broadcom NFC stack commit.
26620e3108f6a0f32f5f0a0725e28e5ae66017d6 20-Jul-2012 Evan Chu <evanchu@broadcom.com> Initial Broadcom NFC stack commit.

From partner push dated 07/20; only change made is stripping ^M.

Change-Id: I1f4d629dd738746c5c372a68d834a2e79e882e39
ndroid.mk
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/android_logmsg.cpp
rc/adaptation/bte_logmsg.c
rc/adaptation/config.cpp
rc/adaptation/defconfig.c
rc/adaptation/libmain.c
rc/adaptation/patchram.cpp
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/include/NfcAdaptation.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/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/include/userial.h
rc/nfa/brcm/nfa_brcm_api.h
rc/nfa/brcm/nfa_brcm_int.h
rc/nfa/brcm/nfa_dm_brcm.c
rc/nfa/brcm/nfa_dm_brcm_cfg.c
rc/nfa/brcm/nfa_ee_brcm.c
rc/nfa/brcm/nfa_hci_brcm.c
rc/nfa/brcm/nfa_vs_brcm_api.h
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_dta_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/brcm/nci_brcm.c
rc/nfc/brcm/nfc_brcm.c
rc/nfc/brcm/nfc_brcm_api.h
rc/nfc/brcm/nfc_brcm_int.h
rc/nfc/brcm/nfc_btvscif_brcm.c
rc/nfc/brcm/nfc_prm_brcm.c
rc/nfc/brcm/nfc_vs_brcm_api.h
rc/nfc/include/ce_api.h
rc/nfc/include/llcp_api.h
rc/nfc/include/llcp_defs.h
rc/nfc/include/nci_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/nci_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/nci/nci_main.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/ntal/userial_linux.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/userial.h
rc/udrv/include/utimer.h
rc/udrv/include/uusb.h
45faad0ff5deeb0c676356345d99398cc4ab695a 20-Jul-2012 Evan Chu <evanchu@broadcom.com> Initial Broadcom NFC stack commit.

From partner push dated 07/20; only change made is stripping ^M.

Change-Id: I29840a411f4004c31b063b0ad61e5490f9a8d5d7
ndroid.mk
rc/adaptation/NfcAdaptation.cpp
rc/adaptation/android_logmsg.cpp
rc/adaptation/bte_logmsg.c
rc/adaptation/config.cpp
rc/adaptation/defconfig.c
rc/adaptation/libmain.c
rc/adaptation/patchram.cpp
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/include/NfcAdaptation.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/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/include/userial.h
rc/nfa/brcm/nfa_brcm_api.h
rc/nfa/brcm/nfa_brcm_int.h
rc/nfa/brcm/nfa_dm_brcm.c
rc/nfa/brcm/nfa_dm_brcm_cfg.c
rc/nfa/brcm/nfa_ee_brcm.c
rc/nfa/brcm/nfa_hci_brcm.c
rc/nfa/brcm/nfa_vs_brcm_api.h
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_dta_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/brcm/nci_brcm.c
rc/nfc/brcm/nfc_brcm.c
rc/nfc/brcm/nfc_brcm_api.h
rc/nfc/brcm/nfc_brcm_int.h
rc/nfc/brcm/nfc_btvscif_brcm.c
rc/nfc/brcm/nfc_prm_brcm.c
rc/nfc/brcm/nfc_vs_brcm_api.h
rc/nfc/include/ce_api.h
rc/nfc/include/llcp_api.h
rc/nfc/include/llcp_defs.h
rc/nfc/include/nci_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/nci_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/nci/nci_main.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/ntal/userial_linux.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/userial.h
rc/udrv/include/utimer.h
rc/udrv/include/uusb.h
030234960de9492481b0ec3a3b6584f1835c99b6 19-Jun-2012 Chad Jones <chadj@google.com> Test replication with empty commit
c2da87779993c82bc42d32183117c5b61cc8255c 19-Jun-2012 Chad Jones <chadj@google.com> Initial empty repository