]> sigrok.org Git - libserialport.git/blobdiff - serialport.c
Make sp_flush take an option for what to flush.
[libserialport.git] / serialport.c
index a2cff495707146adb42e215d90899948c5e1cb1a..92156b476471cdf73f3a3efefe05bba69aff6795 100644 (file)
@@ -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
 };
 
@@ -416,9 +422,10 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
        sprintf(escaped_port_name, "\\\\.\\%s", port->name);
 
        /* Map 'flags' to the OS-specific settings. */
-       desired_access |= GENERIC_READ;
        flags_and_attributes = FILE_ATTRIBUTE_NORMAL;
-       if (flags & SP_MODE_RDWR)
+       if (flags & SP_MODE_READ)
+               desired_access |= GENERIC_READ;
+       if (flags & SP_MODE_WRITE)
                desired_access |= GENERIC_WRITE;
        if (flags & SP_MODE_NONBLOCK)
                flags_and_attributes |= FILE_FLAG_OVERLAPPED;
@@ -437,10 +444,12 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
        int ret;
 
        /* Map 'flags' to the OS-specific settings. */
-       if (flags & SP_MODE_RDWR)
+       if (flags & (SP_MODE_READ | SP_MODE_WRITE))
                flags_local |= O_RDWR;
-       if (flags & SP_MODE_RDONLY)
+       else if (flags & SP_MODE_READ)
                flags_local |= O_RDONLY;
+       else if (flags & SP_MODE_WRITE)
+               flags_local |= O_WRONLY;
        if (flags & SP_MODE_NONBLOCK)
                flags_local |= O_NONBLOCK;
 
@@ -496,17 +505,31 @@ enum sp_return sp_close(struct sp_port *port)
        return SP_OK;
 }
 
-enum sp_return sp_flush(struct sp_port *port)
+enum sp_return sp_flush(struct sp_port *port, enum sp_buffer buffers)
 {
        CHECK_PORT();
 
 #ifdef _WIN32
+       DWORD flags = 0;
+       if (buffers & SP_BUF_INPUT)
+               flags |= PURGE_RXCLEAR;
+       if (buffers & SP_BUF_OUTPUT)
+               flags |= PURGE_TXCLEAR;
+
        /* Returns non-zero upon success, 0 upon failure. */
-       if (PurgeComm(port->hdl, PURGE_RXCLEAR | PURGE_TXCLEAR) == 0)
+       if (PurgeComm(port->hdl, flags) == 0)
                return SP_ERR_FAIL;
 #else
+       int flags = 0;
+       if (buffers & SP_BUF_BOTH)
+               flags = TCIOFLUSH;
+       else if (buffers & SP_BUF_INPUT)
+               flags = TCIFLUSH;
+       if (buffers & SP_BUF_OUTPUT)
+               flags = TCOFLUSH;
+
        /* Returns 0 upon success, -1 upon failure. */
-       if (tcflush(port->fd, TCIOFLUSH) < 0)
+       if (tcflush(port->fd, flags) < 0)
                return SP_ERR_FAIL;
 #endif
        return SP_OK;
@@ -594,7 +617,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 +755,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 +807,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 +1076,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 +1128,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 +1161,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 +1198,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 */