Support non-standard flow control modes on Linux.

diff --git a/configure.ac b/configure.ac
index a9be4576b4c2cbf3b78ef9ff012c30866e361428..551ef709496612bc29504a98002a3cbef620ce9f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,7 @@ AC_C_INLINE
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_CHECK_TYPE([struct termios2],[AC_DEFINE(HAVE_TERMIOS2, 1)],[],[[#include <linux/termios.h>]])
+AC_CHECK_TYPE([struct termiox],[AC_DEFINE(HAVE_TERMIOX, 1)],[],[[#include <linux/termios.h>]])
 
 # Checks for library functions.
 AC_CHECK_FUNCS([strerror])

diff --git a/linux_termios.c b/linux_termios.c
index 68c98e002f16ec7dd0c6b5ffbac1d87e4a4d5ff5..874889aba4641c7ed268923f1eeb32d4908b5d47 100644 (file)
--- a/linux_termios.c
+++ b/linux_termios.c
@@ -71,3 +71,43 @@ void set_termios_speed(void *data, int speed)
        term->c_cflag |= BOTHER;
        term->c_ispeed = term->c_ospeed = speed;
 }
+
+#ifdef HAVE_TERMIOX
+int get_termiox_size(void)
+{
+       return sizeof(struct termiox);
+}
+
+int get_termiox_flow(void *data)
+{
+       struct termiox *termx = (struct termiox *) data;
+
+       int flags = 0;
+       if (termx->x_cflag & RTSXOFF)
+               flags |= RTS_FLOW;
+       if (termx->x_cflag & CTSXON)
+               flags |= CTS_FLOW;
+       if (termx->x_cflag & DTRXOFF)
+               flags |= DTR_FLOW;
+       if (termx->x_cflag & DSRXON)
+               flags |= DSR_FLOW;
+
+       return flags;
+}
+
+void set_termiox_flow(void *data, int flags)
+{
+       struct termiox *termx = (struct termiox *) data;
+
+       termx->x_cflag &= ~(RTSXOFF | CTSXON | DTRXOFF | DSRXON);
+
+       if (flags & RTS_FLOW)
+               termx->x_cflag |= RTSXOFF;
+       if (flags & CTS_FLOW)
+               termx->x_cflag |= CTSXON;
+       if (flags & DTR_FLOW)
+               termx->x_cflag |= DTRXOFF;
+       if (flags & DSR_FLOW)
+               termx->x_cflag |= DSRXON;
+}
+#endif

diff --git a/linux_termios.h b/linux_termios.h
index 8e6d202ff771cbb1ba0107c73ad4be174a34ae14..1e1c7d7b53d15ca09be8f23b6ecc15e4bd68d716 100644 (file)
--- a/linux_termios.h
+++ b/linux_termios.h
@@ -17,8 +17,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define RTS_FLOW 1
+#define CTS_FLOW 2
+#define DTR_FLOW 4
+#define DSR_FLOW 8
+
 int get_termios_get_ioctl(void);
 int get_termios_set_ioctl(void);
 int get_termios_size(void);
 int get_termios_speed(void *data);
 void set_termios_speed(void *data, int speed);
+int get_termiox_size(void);
+int get_termiox_flow(void *data);
+void set_termiox_flow(void *data, int flags);

diff --git a/serialport.c b/serialport.c
index a2cff495707146adb42e215d90899948c5e1cb1a..7127cb36e532f369539af7f57c5d8199dc68af45 100644 (file)
--- a/serialport.c
+++ b/serialport.c
@@ -45,6 +45,9 @@
 #include "libudev.h"
 #include "linux/serial.h"
 #include "linux_termios.h"
+#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_TERMIOX)
+#define USE_TERMIOX
+#endif
 #endif
 
 #include "libserialport.h"
@@ -55,6 +58,9 @@ struct port_data {
 #else
        struct termios term;
        int controlbits;
+#ifdef USE_TERMIOX
+       int flow;
+#endif
 #endif
 };
 
@@ -594,7 +600,42 @@ static enum sp_return set_baudrate(int fd, int baudrate)
 
        return SP_OK;
 }
-#endif
+
+#ifdef USE_TERMIOX
+static enum sp_return get_flow(int fd, int *flow)
+{
+       void *data;
+
+       if (!(data = malloc(get_termiox_size())))
+               return SP_ERR_MEM;
+
+       if (ioctl(fd, TCGETX, data) < 0)
+               return SP_ERR_FAIL;
+
+       *flow = get_termiox_flow(data);
+
+       return SP_OK;
+}
+
+static enum sp_return set_flow(int fd, int flow)
+{
+       void *data;
+
+       if (!(data = malloc(get_termiox_size())))
+               return SP_ERR_MEM;
+
+       if (ioctl(fd, TCGETX, data) < 0)
+               return SP_ERR_FAIL;
+
+       set_termiox_flow(data, flow);
+
+       if (ioctl(fd, TCSETX, data) < 0)
+               return SP_ERR_FAIL;
+
+       return SP_OK;
+}
+#endif /* USE_TERMIOX */
+#endif /* __linux__ */
 
 static enum sp_return get_config(struct sp_port *port, struct port_data *data,
        struct sp_port_config *config)
@@ -697,6 +738,11 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 
        if (ioctl(port->fd, TIOCMGET, &data->controlbits) < 0)
                return SP_ERR_FAIL;
+
+#ifdef USE_TERMIOX
+       TRY(get_flow(port->fd, &data->flow));
+#endif
+
        for (i = 0; i < NUM_STD_BAUDRATES; i++) {
                if (cfgetispeed(&data->term) == std_baudrates[i].index) {
                        config->baudrate = std_baudrates[i].value;
@@ -744,12 +790,30 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
                config->rts = SP_RTS_FLOW_CONTROL;
                config->cts = SP_CTS_FLOW_CONTROL;
        } else {
+#ifdef USE_TERMIOX
+               if (data->flow & RTS_FLOW)
+                       config->rts = SP_RTS_FLOW_CONTROL;
+               else
+                       config->rts = (data->controlbits & TIOCM_RTS) ? SP_RTS_ON : SP_RTS_OFF;
+
+               config->cts = (data->flow & CTS_FLOW) ? SP_CTS_FLOW_CONTROL : SP_CTS_IGNORE;
+#else
                config->rts = (data->controlbits & TIOCM_RTS) ? SP_RTS_ON : SP_RTS_OFF;
                config->cts = SP_CTS_IGNORE;
+#endif
        }
 
+#ifdef USE_TERMIOX
+       if (data->flow & DTR_FLOW)
+               config->dtr = SP_DTR_FLOW_CONTROL;
+       else
+               config->dtr = (data->controlbits & TIOCM_DTR) ? SP_DTR_ON : SP_DTR_OFF;
+
+       config->dsr = (data->flow & DSR_FLOW) ? SP_DSR_FLOW_CONTROL : SP_DSR_IGNORE;
+#else
        config->dtr = (data->controlbits & TIOCM_DTR) ? SP_DTR_ON : SP_DTR_OFF;
        config->dsr = SP_DSR_IGNORE;
+#endif
 
        if (data->term.c_iflag & IXOFF) {
                if (data->term.c_iflag & IXON)
@@ -995,8 +1059,31 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
        }
 
        if (config->rts >= 0 || config->cts >= 0) {
-               /* Asymmetric use of RTS/CTS not supported yet. */
+#ifdef USE_TERMIOX
+               data->flow &= ~(RTS_FLOW | CTS_FLOW);
+               switch (config->rts) {
+                       case SP_RTS_OFF:
+                       case SP_RTS_ON:
+                               controlbits = TIOCM_RTS;
+                               if (ioctl(port->fd, config->rts == SP_RTS_ON ? TIOCMBIS : TIOCMBIC,
+                                               &controlbits) < 0)
+                                       return SP_ERR_FAIL;
+                               break;
+                       case SP_RTS_FLOW_CONTROL:
+                               data->flow |= RTS_FLOW;
+                               break;
+                       default:
+                               break;
+               }
+               if (config->cts == SP_CTS_FLOW_CONTROL)
+                       data->flow |= CTS_FLOW;
 
+               if (data->flow & (RTS_FLOW | CTS_FLOW))
+                       data->term.c_iflag |= CRTSCTS;
+               else
+                       data->term.c_iflag &= ~CRTSCTS;
+#else
+               /* Asymmetric use of RTS/CTS not supported. */
                if (data->term.c_iflag & CRTSCTS) {
                        /* Flow control can only be disabled for both RTS & CTS together. */
                        if (config->rts >= 0 && config->rts != SP_RTS_FLOW_CONTROL) {
@@ -1024,10 +1111,30 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
                                        return SP_ERR_FAIL;
                        }
                }
+#endif
        }
 
        if (config->dtr >= 0 || config->dsr >= 0) {
-               /* DTR/DSR flow control not supported yet. */
+#ifdef USE_TERMIOX
+               data->flow &= ~(DTR_FLOW | DSR_FLOW);
+               switch (config->dtr) {
+                       case SP_DTR_OFF:
+                       case SP_DTR_ON:
+                               controlbits = TIOCM_DTR;
+                               if (ioctl(port->fd, config->dtr == SP_DTR_ON ? TIOCMBIS : TIOCMBIC,
+                                               &controlbits) < 0)
+                                       return SP_ERR_FAIL;
+                               break;
+                       case SP_DTR_FLOW_CONTROL:
+                               data->flow |= DTR_FLOW;
+                               break;
+                       default:
+                               break;
+               }
+               if (config->dsr == SP_DSR_FLOW_CONTROL)
+                       data->flow |= DSR_FLOW;
+#else
+               /* DTR/DSR flow control not supported. */
                if (config->dtr == SP_DTR_FLOW_CONTROL || config->dsr == SP_DSR_FLOW_CONTROL)
                        return SP_ERR_ARG;
 
@@ -1037,6 +1144,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
                                        &controlbits) < 0)
                                return SP_ERR_FAIL;
                }
+#endif
        }
 
        if (config->xon_xoff >= 0) {
@@ -1073,6 +1181,9 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 #elif defined(__linux__)
        if (baud_nonstd)
                TRY(set_baudrate(port->fd, config->baudrate));
+#ifdef USE_TERMIOX
+       TRY(set_flow(port->fd, data->flow));
+#endif
 #endif
 
 #endif /* !_WIN32 */