1 files changed, 70 insertions, 114 deletions
diff --git a/3rdParty/Boost/src/boost/asio/detail/reactive_serial_port_service.hpp b/3rdParty/Boost/src/boost/asio/detail/reactive_serial_port_service.hpp
index faa2149..0955f1d 100644
--- a/3rdParty/Boost/src/boost/asio/detail/reactive_serial_port_service.hpp
+++ b/3rdParty/Boost/src/boost/asio/detail/reactive_serial_port_service.hpp
@@ -1,6 +1,6 @@
 //
-// reactive_serial_port_service.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// detail/reactive_serial_port_service.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2003-2010 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
@@ -16,23 +16,20 @@
 # pragma once
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
-#include <boost/asio/detail/push_options.hpp>
-
-#include <boost/asio/detail/push_options.hpp>
-#include <cstring>
-#include <string>
-#include <boost/asio/detail/pop_options.hpp>
+#include <boost/asio/detail/config.hpp>
 
-#include <boost/asio/serial_port_base.hpp>
-
-#if defined(BOOST_ASIO_HAS_SERIAL_PORT) \
-  && !defined(BOOST_WINDOWS) && !defined(__CYGWIN__)
+#if defined(BOOST_ASIO_HAS_SERIAL_PORT)
+#if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__)
 
+#include <string>
 #include <boost/asio/error.hpp>
 #include <boost/asio/io_service.hpp>
+#include <boost/asio/serial_port_base.hpp>
 #include <boost/asio/detail/descriptor_ops.hpp>
 #include <boost/asio/detail/reactive_descriptor_service.hpp>
 
+#include <boost/asio/detail/push_options.hpp>
+
 namespace boost {
 namespace asio {
 namespace detail {
@@ -47,119 +44,55 @@ public:
   // The implementation type of the serial port.
   typedef reactive_descriptor_service::implementation_type implementation_type;
 
-  reactive_serial_port_service(boost::asio::io_service& io_service)
-    : descriptor_service_(io_service)
-  {
-  }
+  BOOST_ASIO_DECL reactive_serial_port_service(
+      boost::asio::io_service& io_service);
 
   // Destroy all user-defined handler objects owned by the service.
-  void shutdown_service()
-  {
-    descriptor_service_.shutdown_service();
-  }
+  BOOST_ASIO_DECL void shutdown_service();
 
-  // Construct a new handle implementation.
+  // Construct a new serial port implementation.
   void construct(implementation_type& impl)
   {
     descriptor_service_.construct(impl);
   }
 
-  // Destroy a handle implementation.
+  // Destroy a serial port implementation.
   void destroy(implementation_type& impl)
   {
     descriptor_service_.destroy(impl);
   }
 
   // Open the serial port using the specified device name.
-  boost::system::error_code open(implementation_type& impl,
-      const std::string& device, boost::system::error_code& ec)
-  {
-    if (is_open(impl))
-    {
-      ec = boost::asio::error::already_open;
-      return ec;
-    }
-
-    int fd = descriptor_ops::open(device.c_str(),
-        O_RDWR | O_NONBLOCK | O_NOCTTY, ec);
-    if (fd < 0)
-      return ec;
-
-    int s = descriptor_ops::fcntl(fd, F_GETFL, ec);
-    if (s >= 0)
-      s = descriptor_ops::fcntl(fd, F_SETFL, s | O_NONBLOCK, ec);
-    if (s < 0)
-    {
-      boost::system::error_code ignored_ec;
-      descriptor_ops::close(fd, ignored_ec);
-      return ec;
-    }
-  
-    // Set up default serial port options.
-    termios ios;
-    descriptor_ops::clear_error(ec);
-    s = descriptor_ops::error_wrapper(::tcgetattr(fd, &ios), ec);
-    if (s >= 0)
-    {
-#if defined(_BSD_SOURCE)
-      ::cfmakeraw(&ios);
-#else
-      ios.c_iflag &= ~(IGNBRK | BRKINT | PARMRK
-          | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
-      ios.c_oflag &= ~OPOST;
-      ios.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
-      ios.c_cflag &= ~(CSIZE | PARENB);
-      ios.c_cflag |= CS8;
-#endif
-      ios.c_iflag |= IGNPAR;
-      ios.c_cflag |= CREAD | CLOCAL;
-      descriptor_ops::clear_error(ec);
-      s = descriptor_ops::error_wrapper(::tcsetattr(fd, TCSANOW, &ios), ec);
-    }
-    if (s < 0)
-    {
-      boost::system::error_code ignored_ec;
-      descriptor_ops::close(fd, ignored_ec);
-      return ec;
-    }
-  
-    // We're done. Take ownership of the serial port descriptor.
-    if (descriptor_service_.assign(impl, fd, ec))
-    {
-      boost::system::error_code ignored_ec;
-      descriptor_ops::close(fd, ignored_ec);
-    }
-
-    return ec;
-  }
+  BOOST_ASIO_DECL boost::system::error_code open(implementation_type& impl,
+      const std::string& device, boost::system::error_code& ec);
 
-  // Assign a native handle to a handle implementation.
+  // Assign a native descriptor to a serial port implementation.
   boost::system::error_code assign(implementation_type& impl,
       const native_type& native_descriptor, boost::system::error_code& ec)
   {
     return descriptor_service_.assign(impl, native_descriptor, ec);
   }
 
-  // Determine whether the handle is open.
+  // Determine whether the serial port is open.
   bool is_open(const implementation_type& impl) const
   {
     return descriptor_service_.is_open(impl);
   }
 
-  // Destroy a handle implementation.
+  // Destroy a serial port implementation.
   boost::system::error_code close(implementation_type& impl,
       boost::system::error_code& ec)
   {
     return descriptor_service_.close(impl, ec);
   }
 
-  // Get the native handle representation.
+  // Get the native serial port representation.
   native_type native(implementation_type& impl)
   {
     return descriptor_service_.native(impl);
   }
 
-  // Cancel all operations associated with the handle.
+  // Cancel all operations associated with the serial port.
   boost::system::error_code cancel(implementation_type& impl,
       boost::system::error_code& ec)
   {
@@ -171,20 +104,9 @@ public:
   boost::system::error_code set_option(implementation_type& impl,
       const SettableSerialPortOption& option, boost::system::error_code& ec)
   {
-    termios ios;
-    descriptor_ops::clear_error(ec);
-    descriptor_ops::error_wrapper(::tcgetattr(
-          descriptor_service_.native(impl), &ios), ec);
-    if (ec)
-      return ec;
-
-    if (option.store(ios, ec))
-      return ec;
-
-    descriptor_ops::clear_error(ec);
-    descriptor_ops::error_wrapper(::tcsetattr(
-          descriptor_service_.native(impl), TCSANOW, &ios), ec);
-    return ec;
+    return do_set_option(impl,
+        &reactive_serial_port_service::store_option<SettableSerialPortOption>,
+        &option, ec);
   }
 
   // Get an option from the serial port.
@@ -192,21 +114,16 @@ public:
   boost::system::error_code get_option(const implementation_type& impl,
       GettableSerialPortOption& option, boost::system::error_code& ec) const
   {
-    termios ios;
-    descriptor_ops::clear_error(ec);
-    descriptor_ops::error_wrapper(::tcgetattr(
-          descriptor_service_.native(impl), &ios), ec);
-    if (ec)
-      return ec;
-
-    return option.load(ios, ec);
+    return do_get_option(impl,
+        &reactive_serial_port_service::load_option<GettableSerialPortOption>,
+        &option, ec);
   }
 
   // Send a break sequence to the serial port.
   boost::system::error_code send_break(implementation_type& impl,
       boost::system::error_code& ec)
   {
-    descriptor_ops::clear_error(ec);
+    errno = 0;
     descriptor_ops::error_wrapper(::tcsendbreak(
           descriptor_service_.native(impl), 0), ec);
     return ec;
@@ -247,6 +164,41 @@ public:
   }
 
 private:
+  // Function pointer type for storing a serial port option.
+  typedef boost::system::error_code (*store_function_type)(
+      const void*, termios&, boost::system::error_code&);
+
+  // Helper function template to store a serial port option.
+  template <typename SettableSerialPortOption>
+  static boost::system::error_code store_option(const void* option,
+      termios& storage, boost::system::error_code& ec)
+  {
+    return static_cast<const SettableSerialPortOption*>(option)->store(
+        storage, ec);
+  }
+
+  // Helper function to set a serial port option.
+  BOOST_ASIO_DECL boost::system::error_code do_set_option(
+      implementation_type& impl, store_function_type store,
+      const void* option, boost::system::error_code& ec);
+
+  // Function pointer type for loading a serial port option.
+  typedef boost::system::error_code (*load_function_type)(
+      void*, const termios&, boost::system::error_code&);
+
+  // Helper function template to load a serial port option.
+  template <typename GettableSerialPortOption>
+  static boost::system::error_code load_option(void* option,
+      const termios& storage, boost::system::error_code& ec)
+  {
+    return static_cast<GettableSerialPortOption*>(option)->load(storage, ec);
+  }
+
+  // Helper function to get a serial port option.
+  BOOST_ASIO_DECL boost::system::error_code do_get_option(
+      const implementation_type& impl, load_function_type load,
+      void* option, boost::system::error_code& ec) const;
+
   // The implementation used for initiating asynchronous operations.
   reactive_descriptor_service descriptor_service_;
 };
@@ -255,9 +207,13 @@ private:
 } // namespace asio
 } // namespace boost
 
-#endif // defined(BOOST_ASIO_HAS_SERIAL_PORT)
-       //   && !defined(BOOST_WINDOWS) && !defined(__CYGWIN__)
-
 #include <boost/asio/detail/pop_options.hpp>
 
+#if defined(BOOST_ASIO_HEADER_ONLY)
+# include <boost/asio/detail/impl/reactive_serial_port_service.ipp>
+#endif // defined(BOOST_ASIO_HEADER_ONLY)
+
+#endif // !defined(BOOST_WINDOWS) && !defined(__CYGWIN__)
+#endif // defined(BOOST_ASIO_HAS_SERIAL_PORT)
+
 #endif // BOOST_ASIO_DETAIL_REACTIVE_SERIAL_PORT_SERVICE_HPP