summaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-06-27 09:01:51 -0700
committerNick Pelly <npelly@google.com>2011-06-27 09:30:36 -0700
commit34ff48f6cd6595a899e05fbd56f4c84891840d3f (patch)
tree2157358fa3ddd5309f102185c8cf278fbb078d2c /inc
parentd4cb91ee6f74f187cc0e7ba9dc073b0a77c27dfa (diff)
downloadexternal_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.zip
external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.tar.gz
external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.tar.bz2
libnfc spring cleaning
o Fix most libnfc warnings, from 360 to 18 o Make DAL_DEBUG much less verbose and more useful o Clean up Android.mk Done with minimal textual diff to minimize merge conflicts. Change-Id: I918645500723ff7bb092ad9959628fcabac45bec
Diffstat (limited to 'inc')
-rw-r--r--inc/phNfcConfig.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/phNfcConfig.h b/inc/phNfcConfig.h
index 563b7ae..c234724 100644
--- a/inc/phNfcConfig.h
+++ b/inc/phNfcConfig.h
@@ -254,7 +254,7 @@
#ifndef NXP_NFC_HCI_TIMER
-#define NXP_NFC_HCI_TIMER 0
+#define NXP_NFC_HCI_TIMER 1
#define NXP_NFC_HCI_TIMEOUT 6000
#endif