increase WAIT_FOR_WRITE_FLAG as 600ms is not enough for swap in some cases.

diff --git a/NEWS b/NEWS
index 9c163ebedbb2f118ccdb737e8454d3844e0bf35b..d4cb5b5b3dbdd30b0cdabcd838cb802f7a55dc07 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ info. To use this with the api see yk_write_scan_map().
 
 ** In the api add ykp_ndef_as_text() to export the text from a YK_NDEF structure.
 
+** Higher timeout for configuration writes as in particular swap can take
+longer than 600 ms.
+
 * Version 1.9.0 (released 2012-11-08)
 
 ** ykinfo: New tool to print information about YubiKey.

diff --git a/ykcore/ykcore.c b/ykcore/ykcore.c
index e65296b4d003c41e1071b798239929df6dc14b7b..bd70a663e512852301e8594da13b90326ee6efd6 100644 (file)
--- a/ykcore/ykcore.c
+++ b/ykcore/ykcore.c
@@ -44,8 +44,12 @@
 /*
  * Yubikey low-level interface section 2.4 (Report arbitration polling) specifies
  * a 600 ms timeout for a Yubikey to process something written to it.
+ * Where can that document be found?
+ * It has been discovered that for swap 600 is not enough, swapping can worst
+ * case take 920 ms, which we then add 25% to for safety margin, arriving at
+ * 1150 ms.
  */
-#define WAIT_FOR_WRITE_FLAG    600
+#define WAIT_FOR_WRITE_FLAG    1150
 
 int yk_init(void)
 {