Merge pull request #2413 from ops/ace6tao2

TTY_IO enhancements from master branch

Author: mitza-oci

ACE/NEWS

@@ -1,6 +1,8 @@
 USER VISIBLE CHANGES BETWEEN ACE-6.5.22 and ACE-6.5.23
 ======================================================
 
+. Backported TTY_IO enhancements from ACE-7.x
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.21 and ACE-6.5.22
 ======================================================
 

ACE/ace/TTY_IO.cpp

@@ -36,6 +36,7 @@ ACE_TTY_IO::Serial_Params::Serial_Params (void)
   readmincharacters = 0;
   readtimeoutmsec = 10000;
   paritymode = ACE_TTY_IO_NONE;
+  inpckenb = true;
   ctsenb = false;
   rtsenb = 0;
   xinenb = false;
@@ -243,14 +244,20 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const
               devpar.c_cflag |=  PARENB;
               devpar.c_cflag |=  PARODD;
               devpar.c_iflag &= ~IGNPAR;
-              devpar.c_iflag |=  INPCK | PARMRK;
+              if (arg->inpckenb)
+                devpar.c_iflag |= INPCK | PARMRK;
+              else
+                devpar.c_iflag &= ~(INPCK | PARMRK);
             }
           else if (ACE_OS::strcasecmp (arg->paritymode, ACE_TTY_IO_EVEN) == 0)
             {
               devpar.c_cflag |=  PARENB;
               devpar.c_cflag &= ~PARODD;
               devpar.c_iflag &= ~IGNPAR;
-              devpar.c_iflag |=  INPCK | PARMRK;
+              if (arg->inpckenb)
+                devpar.c_iflag |= INPCK | PARMRK;
+              else
+                devpar.c_iflag &= ~(INPCK | PARMRK);
             }
           else if (ACE_OS::strcasecmp (arg->paritymode, ACE_TTY_IO_NONE) == 0)
             {
@@ -301,6 +308,8 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const
 
       if (arg->databits < 8)
         devpar.c_iflag |= ISTRIP;
+      else
+        devpar.c_iflag &= ~ISTRIP;
 
 #if defined (IGNBRK)
       // If device is not a modem set to ignore break points
@@ -346,6 +355,21 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const
       devpar.c_lflag &= ~ISIG;
 #endif /* ISIG */
 
+#if defined (IGNCR)
+      // Do not discard CR characters
+      devpar.c_iflag &= ~IGNCR;
+#endif /* IGNCR */
+
+#if defined (ICRNL)
+      // Disable CR to NL conversion
+      devpar.c_iflag &= ~ICRNL;
+#endif /* ICRNL */
+
+#if defined (INLCR)
+      // Disable NL to CR conversion
+      devpar.c_iflag &= ~INLCR;
+#endif /* INLCR */
+
 #if defined (OPOST)
       // Disable post-processing of output data
       devpar.c_oflag &= ~OPOST;

ACE/ace/TTY_IO.h

@@ -66,6 +66,9 @@ class ACE_Export ACE_TTY_IO : public ACE_DEV_IO
         "odd" parity. Additionally Win32 supports "mark" and "space"
         parity modes. */
     const char *paritymode;
+    /** Enable/disable input parity checking. This option is only applicable
+        on systems which support the POSIX termios API */
+    bool inpckenb;
     /** Enable & set CTS mode. Note that RTS & CTS are enabled/disabled
         together on some systems (RTS/CTS is enabled if either
         <code>ctsenb</code> or <code>rtsenb</code> is set). */