Support mark/space parity settings.

[libserialport.git] / serialport.c

diff --git a/serialport.c b/serialport.c
index 9d2a50440046fd67642cd91431f3e55398aa4f29..05fb85cd06d28ebf494fe957eb8229ee94863761 100644 (file)
--- a/serialport.c
+++ b/serialport.c
@@ -660,17 +660,18 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
                RETURN_CODEVAL(ret);
        }
 
-       /* Turn off all serial port cooking. */
-       data.term.c_iflag &= ~(ISTRIP | INLCR | ICRNL);
-       data.term.c_oflag &= ~(ONLCR | OCRNL | ONOCR);
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+       /* Turn off all fancy termios tricks, give us a raw channel. */
+       data.term.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IUCLC|IMAXBEL);
+       data.term.c_oflag &= ~(OPOST|OLCUC|ONLCR|OCRNL|ONOCR|ONLRET|NLDLY|CRDLY|TABDLY|BSDLY|VTDLY|FFDLY);
+#ifdef OFILL
        data.term.c_oflag &= ~OFILL;
 #endif
-       /* Disable canonical mode, and don't echo input characters. */
-       data.term.c_lflag &= ~(ICANON | ECHO);
+       data.term.c_lflag &= ~(ISIG|ICANON|ECHO|IEXTEN);
+       data.term.c_cc[VMIN] = 0;
+       data.term.c_cc[VTIME] = 0;
 
-       /* Ignore modem status lines; enable receiver */
-       data.term.c_cflag |= (CLOCAL | CREAD);
+       /* Ignore modem status lines; enable receiver; leave control lines alone on close. */
+       data.term.c_cflag |= (CLOCAL | CREAD | HUPCL);
 
        ret = set_config(port, &data, &config);
 
@@ -1023,11 +1024,17 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
                case NOPARITY:
                        config->parity = SP_PARITY_NONE;
                        break;
+               case ODDPARITY:
+                       config->parity = SP_PARITY_ODD;
+                       break;
                case EVENPARITY:
                        config->parity = SP_PARITY_EVEN;
                        break;
-               case ODDPARITY:
-                       config->parity = SP_PARITY_ODD;
+               case MARKPARITY:
+                       config->parity = SP_PARITY_MARK;
+                       break;
+               case SPACEPARITY:
+                       config->parity = SP_PARITY_SPACE;
                        break;
                default:
                        config->parity = -1;
@@ -1149,6 +1156,8 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
                config->parity = SP_PARITY_NONE;
        else if (!(data->term.c_cflag & PARENB) || (data->term.c_iflag & IGNPAR))
                config->parity = -1;
+       else if (data->term.c_cflag & CMSPAR)
+               config->parity = (data->term.c_cflag & PARODD) ? SP_PARITY_MARK : SP_PARITY_SPACE;
        else
                config->parity = (data->term.c_cflag & PARODD) ? SP_PARITY_ODD : SP_PARITY_EVEN;
 
@@ -1230,11 +1239,17 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
                case SP_PARITY_NONE:
                        data->dcb.Parity = NOPARITY;
                        break;
+               case SP_PARITY_ODD:
+                       data->dcb.Parity = ODDPARITY;
+                       break;
                case SP_PARITY_EVEN:
                        data->dcb.Parity = EVENPARITY;
                        break;
-               case SP_PARITY_ODD:
-                       data->dcb.Parity = ODDPARITY;
+               case SP_PARITY_MARK:
+                       data->dcb.Parity = MARKPARITY;
+                       break;
+               case SP_PARITY_SPACE:
+                       data->dcb.Parity = SPACEPARITY;
                        break;
                default:
                        RETURN_ERROR(SP_ERR_ARG, "Invalid parity setting");
@@ -1392,7 +1407,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 
        if (config->parity >= 0) {
                data->term.c_iflag &= ~IGNPAR;
-               data->term.c_cflag &= ~(PARENB | PARODD);
+               data->term.c_cflag &= ~(PARENB | PARODD | CMSPAR);
                switch (config->parity) {
                case SP_PARITY_NONE:
                        data->term.c_iflag |= IGNPAR;
@@ -1403,6 +1418,12 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
                case SP_PARITY_ODD:
                        data->term.c_cflag |= PARENB | PARODD;
                        break;
+               case SP_PARITY_MARK:
+                       data->term.c_cflag |= PARENB | PARODD | CMSPAR;
+                       break;
+               case SP_PARITY_SPACE:
+                       data->term.c_cflag |= PARENB | CMSPAR;
+                       break;
                default:
                        RETURN_ERROR(SP_ERR_ARG, "Invalid parity setting");
                }