Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -1,3 +1,5 @@
// $Id: TTY_IO.cpp 97246 2013-08-07 07:10:20Z johnnyw $
#include "ace/TTY_IO.h"
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_string.h"
@ -242,24 +244,16 @@ 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;
}
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;
}
else if (ACE_OS::strcasecmp (arg->paritymode, ACE_TTY_IO_NONE) == 0)
{
devpar.c_cflag &= ~PARENB;
}
devpar.c_cflag &= ~PARENB;
else
{
return -1;
}
return -1;
}
else
{
@ -299,6 +293,7 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const
devpar.c_cflag |= CLOCAL;
#endif /* CLOCAL */
devpar.c_iflag = IGNPAR | INPCK;
if (arg->databits < 8)
devpar.c_iflag |= ISTRIP;