Merge branch 'windows' into devel

1 files changed, 3 insertions, 1 deletions

diff --git a/source/stmdsp/stmdsp.cpp b/source/stmdsp/stmdsp.cpp
index d7e977b..294e98f 100644
--- a/source/stmdsp/stmdsp.cpp
+++ b/source/stmdsp/stmdsp.cpp
@@ -45,7 +45,9 @@ namespace stmdsp
     device::device(const std::string& file)
     {
         // This could throw!
-        m_serial.reset(new serial::Serial(file, 8'000'000, serial::Timeout::simpleTimeout(50)));
+	// Note: Windows needs a not-simple, positive timeout like this to
+	// ensure that reads block.
+        m_serial.reset(new serial::Serial(file, 921'600 /*8'000'000*/, serial::Timeout(1000, 1000, 1, 1000, 1)));
 
         // Test the ID command.
         m_serial->flush();