commit 9fef86a05822e0adf5d436667487b0f4fd198a67
author The Android Automerger <android-build@android.com> Wed Oct 26 07:05:23 2011 -0700
committer The Android Automerger <android-build@android.com> Wed Oct 26 07:05:23 2011 -0700
tree 09523ff87feb3ef06c5f13264597576d4eff3070
parent 366238178f7a6d26ce051150f4fb65e533c2fae4
parent a32af9d78ca175921d0d30ff8871d80bd5c9b1b2

merge in ics-mr1-release history after reset to ics-mr1

Linux_x86/phDal4Nfc_uart.c

diff --git a/Linux_x86/phDal4Nfc_uart.c b/Linux_x86/phDal4Nfc_uart.c
index 7ff9c4c..a2f6db3 100644
--- a/Linux_x86/phDal4Nfc_uart.c
+++ b/Linux_x86/phDal4Nfc_uart.c
@@ -342,7 +342,7 @@
     read_property();
 
     // Read timeout:
-    // FW mode: no timeout
+    // FW mode: 10s timeout
     // 1 byte read: steady-state LLC length read, allowed to block forever
     // >1 byte read: LLC payload, 100ms timeout (before pn544 re-transmit)
     if (nNbBytesToRead > 1 && !libnfc_firmware_mode) {
@@ -353,6 +353,10 @@
             timeout.tv_nsec -= 1000000000;
         }
         ptv = &tv;
+    } else if (libnfc_firmware_mode) {
+        clock_gettime(CLOCK_MONOTONIC, &timeout);
+        timeout.tv_sec += 10;
+        ptv = &tv;
     } else {
         ptv = NULL;
     }

inc/phNfcConfig.h

diff --git a/inc/phNfcConfig.h b/inc/phNfcConfig.h
index bcefaec..cced2ca 100644
--- a/inc/phNfcConfig.h
+++ b/inc/phNfcConfig.h
@@ -235,7 +235,7 @@
 
 
 #ifndef NXP_DNLD_COMPLETE_TIMEOUT
-#define NXP_DNLD_COMPLETE_TIMEOUT         120000U
+#define NXP_DNLD_COMPLETE_TIMEOUT         60000U
 #endif