X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fserial.c;h=f887194b8a7179d269d74ef0b7af39ac55e80356;hb=af51a7718eb22e9630107af814db6ae9f179a969;hp=336e78ce288b52f2cb07b5b9a7f5bb5da72297b4;hpb=49aaa0bc68c1bf77cd81989c40e471fe7bd161ec;p=libsigrok.git

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index 336e78ce..f887194b 100644
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2010-2012 Uwe Hermann <uwe@hermann-uwe.de>
@@ -278,8 +278,6 @@ SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf,
 #else
 	/* Returns the number of bytes read, or -1 upon failure. */
 	ret = read(serial->fd, buf, count);
-	if (ret >= 0)
-		sr_spew("Read %d/%d bytes (fd %d).", ret, count, serial->fd);
 #endif
 
 	return ret;
@@ -424,7 +422,7 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
 
 	if (dtr != -1) {
 		sr_spew("Setting DTR %s.", dtr ? "high" : "low");
-		if (rts)
+		if (dtr)
 			dcb.fDtrControl = DTR_CONTROL_ENABLE;
 		else
 			dcb.fDtrControl = DTR_CONTROL_DISABLE;
@@ -501,7 +499,7 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
 	case 230400:
 		baud = B230400;
 		break;
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__OpenBSD__)
 	case 460800:
 		baud = B460800;
 		break;
@@ -591,8 +589,12 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
 		return SR_ERR;
 	}
 
-	/* Do not translate carriage return to newline on input. */
-	term.c_iflag &= ~(ICRNL);
+	/* Turn off all serial port cooking. */
+	term.c_iflag &= ~(ISTRIP | INLCR | ICRNL);
+	term.c_oflag &= ~(ONLCR | OCRNL | ONOCR);
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+	term.c_oflag &= ~OFILL;
+#endif
 
 	/* Disable canonical mode, and don't echo input characters. */
 	term.c_lflag &= ~(ICANON | ECHO);
@@ -633,8 +635,8 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
  *
  * @param serial Previously initialized serial port structure.
  * @param paramstr A serial communication parameters string, in the form
- * of <speed>/<data bits><parity><stopbits>, for example "9600/8n1" or
- * "600/7o2".
+ * of <speed>/<data bits><parity><stopbits><flow>, for example "9600/8n1" or
+ * "600/7o2" or "460800/8n1/flow=2" where flow is 0 for none, 1 for rts/cts and 2 for xon/xoff.
  *
  * @return SR_OK upon success, SR_ERR upon failure.
  */
@@ -644,10 +646,10 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
 {
 	GRegex *reg;
 	GMatchInfo *match;
-	int speed, databits, parity, stopbits, rts, dtr, i;
+	int speed, databits, parity, stopbits, flow, rts, dtr, i;
 	char *mstr, **opts, **kv;
 
-	speed = databits = parity = stopbits = 0;
+	speed = databits = parity = stopbits = flow = 0;
 	rts = dtr = -1;
 	sr_spew("Parsing parameters from \"%s\".", paramstr);
 	reg = g_regex_new(SERIAL_COMM_SPEC, 0, 0, NULL);
@@ -702,6 +704,17 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
 							sr_dbg("invalid value for dtr: %c", kv[1][0]);
 							speed = 0;
 						}
+					} else if (!strncmp(kv[0], "flow", 4)) {
+						if (kv[1][0] == '0')
+							flow = 0;
+						else if (kv[1][0] == '1')
+							flow = 1;
+						else if (kv[1][0] == '2')
+							flow = 2;
+						else {
+							sr_dbg("invalid value for flow: %c", kv[1][0]);
+							speed = 0;
+						}
 					}
 					g_strfreev(kv);
 				}
@@ -715,7 +728,7 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
 
 	if (speed) {
 		return serial_set_params(serial, speed, databits, parity,
-					 stopbits, 0, rts, dtr);
+					 stopbits, flow, rts, dtr);
 	} else {
 		sr_dbg("Could not infer speed from parameter string.");
 		return SR_ERR_ARG;