X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fcommon%2Fserial.c;h=0be403af9b87e3a456bd94647382d3a36c1d6dc0;hb=5c51e09868ea24c0eb77908aa3a9d585a46a3158;hp=cd7002b8345d8be7e76d6624e7cac8a39fafa14f;hpb=0abee5076fd7751bd77d0fee940d617a1a40ea34;p=libsigrok.git

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index cd7002b8..0be403af 100644
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -30,8 +30,8 @@
 #endif
 #include <stdlib.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 // FIXME: Must be moved, or rather passed as function argument.
 #ifdef _WIN32
@@ -234,6 +234,9 @@ SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
 	struct termios term;
 	speed_t baud;
 
+	if (tcgetattr(fd, &term) < 0)
+		return SR_ERR;
+
 	switch (baudrate) {
 	case 9600:
 		baud = B9600;
@@ -255,8 +258,7 @@ SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
 	default:
 		return SR_ERR;
 	}
-
-	if (tcgetattr(fd, &term) < 0)
+	if (cfsetospeed(&term, baud) < 0)
 		return SR_ERR;
 	if (cfsetispeed(&term, baud) < 0)
 		return SR_ERR;
@@ -283,13 +285,17 @@ SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
 		return SR_ERR;
 	}
 
-	term.c_cflag &= ~(IXON | IXOFF | CRTSCTS);
+	term.c_iflag &= ~(IXON | IXOFF);
+	term.c_cflag &= ~CRTSCTS;
 	switch (flowcontrol) {
-	case 2:
-		term.c_cflag |= IXON | IXOFF;
+	case 0:
+		/* No flow control. */
 		break;
 	case 1:
 		term.c_cflag |= CRTSCTS;
+	case 2:
+		term.c_iflag |= IXON | IXOFF;
+		break;
 	default:
 		return SR_ERR;
 	}
@@ -297,22 +303,70 @@ SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
 	term.c_iflag &= ~IGNPAR;
 	term.c_cflag &= ~(PARODD | PARENB);
 	switch (parity) {
-	case 0:
+	case SERIAL_PARITY_NONE:
 		term.c_iflag |= IGNPAR;
 		break;
-	case 1:
+	case SERIAL_PARITY_EVEN:
 		term.c_cflag |= PARENB;
 		break;
-	case 2:
+	case SERIAL_PARITY_ODD:
 		term.c_cflag |= PARENB | PARODD;
 		break;
 	default:
 		return SR_ERR;
 	}
 
+	/* Some default parameters */
+	term.c_lflag &= ~(ICANON | ECHO);
+
 	if (tcsetattr(fd, TCSADRAIN, &term) < 0)
 		return SR_ERR;
 #endif
 
 	return SR_OK;
 }
+
+#define SERIAL_COMM_SPEC "^(\\d+)/([78])([neo])([12])$"
+SR_PRIV int serial_set_paramstr(int fd, const char *paramstr)
+{
+	GRegex *reg;
+	GMatchInfo *match;
+	int speed, databits, parity, stopbits;
+	char *mstr;
+
+	speed = databits = parity = stopbits = 0;
+	reg = g_regex_new(SERIAL_COMM_SPEC, 0, 0, NULL);
+	if (g_regex_match(reg, paramstr, 0, &match)) {
+		if ((mstr = g_match_info_fetch(match, 1)))
+			speed = strtoul(mstr, NULL, 10);
+		g_free(mstr);
+		if ((mstr = g_match_info_fetch(match, 2)))
+			databits = strtoul(mstr, NULL, 10);
+		g_free(mstr);
+		if ((mstr = g_match_info_fetch(match, 3))) {
+			switch (mstr[0]) {
+			case 'n':
+				parity = SERIAL_PARITY_NONE;
+				break;
+			case 'e':
+				parity = SERIAL_PARITY_EVEN;
+				break;
+			case 'o':
+				parity = SERIAL_PARITY_ODD;
+				break;
+			}
+		}
+		g_free(mstr);
+		if ((mstr = g_match_info_fetch(match, 4)))
+			stopbits = strtoul(mstr, NULL, 10);
+		g_free(mstr);
+	}
+	g_match_info_unref(match);
+	g_regex_unref(reg);
+
+	if (speed)
+		return serial_set_params(fd, speed, databits, parity, stopbits, 0);
+	else
+		return SR_ERR_ARG;
+}
+