diff options
| author | Chris Liechti <cliechti@gmx.net> | 2016-08-29 23:02:13 +0200 |
|---|---|---|
| committer | Chris Liechti <cliechti@gmx.net> | 2016-08-29 23:02:13 +0200 |
| commit | 6dc58e8f292c761038cd8bbb20e9ec187e00a423 (patch) | |
| tree | 079129af424b7c8d460a147fc50b95b6ca3b0877 | |
| parent | c9f8996d2cdaa676e7e99d102d0e2cc67bce9f59 (diff) | |
| download | pyserial-git-6dc58e8f292c761038cd8bbb20e9ec187e00a423.tar.gz | |
posix: clear CMSPAR on supported platforms, fixes #157
- currently only supported under Linux
- bit was not cleared for all the other parity settings
| -rw-r--r-- | CHANGES.rst | 1 | ||||
| -rw-r--r-- | serial/serialposix.py | 19 |
2 files changed, 14 insertions, 6 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 85633f0..367f80d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -663,4 +663,5 @@ Bugfixes (posix): - [#133] _update_dtr_state throws Inappropriate ioctl for virtual serial port created by socat on OS X +- [#157] Broken handling of CMSPAR in serialposix.py diff --git a/serial/serialposix.py b/serial/serialposix.py index 30af312..e7bbc13 100644 --- a/serial/serialposix.py +++ b/serial/serialposix.py @@ -49,6 +49,11 @@ class PlatformSpecificBase(object): def _set_rs485_mode(self, rs485_settings): raise NotImplementedError('RS485 not supported on this platform') + +# some systems support an extra flag to enable the two in POSIX unsupported +# partiy settings for MARK and SPACE +CMSPAR = 0 # default, for unsupported platforms, override below + # try to detect the OS so that a device can be selected... # this code block should supply a device() and set_special_baudrate() function # for the platform @@ -57,6 +62,9 @@ plat = sys.platform.lower() if plat[:5] == 'linux': # Linux (confirmed) # noqa import array + # extra termios flags + CMSPAR = 0o10000000000 # Use "stick" (mark/space) parity + # baudrate ioctls TCGETS2 = 0x802C542A TCSETS2 = 0x402C542B @@ -220,8 +228,6 @@ TIOCM_DTR_str = struct.pack('I', TIOCM_DTR) TIOCSBRK = getattr(termios, 'TIOCSBRK', 0x5427) TIOCCBRK = getattr(termios, 'TIOCCBRK', 0x5428) -CMSPAR = 0o10000000000 # Use "stick" (mark/space) parity - class Serial(SerialBase, PlatformSpecific): """\ @@ -349,15 +355,16 @@ class Serial(SerialBase, PlatformSpecific): # setup parity iflag &= ~(termios.INPCK | termios.ISTRIP) if self._parity == serial.PARITY_NONE: - cflag &= ~(termios.PARENB | termios.PARODD) + cflag &= ~(termios.PARENB | termios.PARODD | CMSPAR) elif self._parity == serial.PARITY_EVEN: - cflag &= ~(termios.PARODD) + cflag &= ~(termios.PARODD | CMSPAR) cflag |= (termios.PARENB) elif self._parity == serial.PARITY_ODD: + cflag &= ~CMSPAR cflag |= (termios.PARENB | termios.PARODD) - elif self._parity == serial.PARITY_MARK and plat[:5] == 'linux': + elif self._parity == serial.PARITY_MARK and CMSPAR: cflag |= (termios.PARENB | CMSPAR | termios.PARODD) - elif self._parity == serial.PARITY_SPACE and plat[:5] == 'linux': + elif self._parity == serial.PARITY_SPACE and CMSPAR: cflag |= (termios.PARENB | CMSPAR) cflag &= ~(termios.PARODD) else: |