X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fserial.c;h=554dbb9be27b4ae0d64e3929a00f2598ec0e9fc0;hb=b6eb8252e545f358d359d4aa7a01073f10f1cd00;hp=7dde05e00af35c70cd5513cda5a359a11aaf5656;hpb=449cc16bb279e5d3322846ce6bd390e867e71ccb;p=libsigrok.git

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index 7dde05e0..554dbb9b 100644
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -51,6 +51,7 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
 {
 	int ret;
 	char *error;
+	int sp_flags = 0;
 
 	if (!serial) {
 		sr_dbg("Invalid serial port.");
@@ -61,7 +62,14 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
 
 	sp_get_port_by_name(serial->port, &serial->data);
 
-	ret = sp_open(serial->data, flags);
+	if (flags & SERIAL_RDWR)
+		sp_flags = (SP_MODE_READ | SP_MODE_WRITE);
+	else if (flags & SERIAL_RDONLY)
+		sp_flags = SP_MODE_READ;
+
+	serial->nonblocking = (flags & SERIAL_NONBLOCK) ? 1 : 0;
+
+	ret = sp_open(serial->data, sp_flags);
 
 	switch (ret) {
 	case SP_ERR_ARG:
@@ -74,10 +82,6 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
 		return SR_ERR;
 	}
 
-#ifndef _WIN32
-	serial->fd = serial->data->fd;
-#endif
-
 	if (serial->serialcomm)
 		return serial_set_paramstr(serial, serial->serialcomm);
 	else
@@ -101,13 +105,12 @@ SR_PRIV int serial_close(struct sr_serial_dev_inst *serial)
 		return SR_ERR;
 	}
 
-	if (serial->fd == -1) {
-		sr_dbg("Cannot close unopened serial port %s (fd %d).",
-				serial->port, serial->fd);
+	if (!serial->data) {
+		sr_dbg("Cannot close unopened serial port %s.", serial->port);
 		return SR_ERR;
 	}
 
-	sr_spew("Closing serial port %s (fd %d).", serial->port, serial->fd);
+	sr_spew("Closing serial port %s.", serial->port);
 
 	ret = sp_close(serial->data);
 
@@ -122,7 +125,8 @@ SR_PRIV int serial_close(struct sr_serial_dev_inst *serial)
 		return SR_ERR;
 	}
 
-	serial->fd = -1;
+	sp_free_port(serial->data);
+	serial->data = NULL;
 
 	return SR_OK;
 }
@@ -144,15 +148,14 @@ SR_PRIV int serial_flush(struct sr_serial_dev_inst *serial)
 		return SR_ERR;
 	}
 
-	if (serial->fd == -1) {
-		sr_dbg("Cannot flush unopened serial port %s (fd %d).",
-				serial->port, serial->fd);
+	if (!serial->data) {
+		sr_dbg("Cannot flush unopened serial port %s.", serial->port);
 		return SR_ERR;
 	}
 
-	sr_spew("Flushing serial port %s (fd %d).", serial->port, serial->fd);
+	sr_spew("Flushing serial port %s.", serial->port);
 
-	ret = sp_flush(serial->data);
+	ret = sp_flush(serial->data, SP_BUF_BOTH);
 
 	switch (ret) {
 	case SP_ERR_ARG:
@@ -188,13 +191,15 @@ SR_PRIV int serial_write(struct sr_serial_dev_inst *serial,
 		return SR_ERR;
 	}
 
-	if (serial->fd == -1) {
-		sr_dbg("Cannot use unopened serial port %s (fd %d).",
-				serial->port, serial->fd);
+	if (!serial->data) {
+		sr_dbg("Cannot use unopened serial port %s.", serial->port);
 		return SR_ERR;
 	}
 
-	ret = sp_write(serial->data, buf, count);
+	if (serial->nonblocking)
+		ret = sp_nonblocking_write(serial->data, buf, count);
+	else
+		ret = sp_blocking_write(serial->data, buf, count, 0);
 
 	switch (ret) {
 	case SP_ERR_ARG:
@@ -207,7 +212,7 @@ SR_PRIV int serial_write(struct sr_serial_dev_inst *serial,
 		return SR_ERR;
 	}
 
-	sr_spew("Wrote %d/%d bytes (fd %d).", ret, count, serial->fd);
+	sr_spew("Wrote %d/%d bytes.", ret, count);
 
 	return ret;
 }
@@ -232,27 +237,29 @@ SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf,
 		return SR_ERR;
 	}
 
-	if (serial->fd == -1) {
-		sr_dbg("Cannot use unopened serial port %s (fd %d).",
-				serial->port, serial->fd);
+	if (!serial->data) {
+		sr_dbg("Cannot use unopened serial port %s.", serial->port);
 		return SR_ERR;
 	}
 
-	ret = sp_read(serial->data, buf, count);
+	if (serial->nonblocking)
+		ret = sp_nonblocking_read(serial->data, buf, count);
+	else
+		ret = sp_blocking_read(serial->data, buf, count, 0);
 
 	switch (ret) {
 	case SP_ERR_ARG:
 		sr_err("Attempted serial port read with invalid arguments.");
 		return SR_ERR_ARG;
-	// Temporarily disabled, will come back later.
-	// case SP_ERR_FAIL:
-	// 	error = sp_last_error_message();
-	// 	sr_err("Read error: %s.", error);
-	// 	sp_free_error_message(error);
-	// 	return SR_ERR;
+	case SP_ERR_FAIL:
+		error = sp_last_error_message();
+		sr_err("Read error: %s.", error);
+		sp_free_error_message(error);
+		return SR_ERR;
 	}
 
-	sr_spew("Read %d/%d bytes (fd %d).", ret, count, serial->fd);
+	if (ret > 0)
+		sr_spew("Read %d/%d bytes.", ret, count);
 
 	return ret;
 }
@@ -276,23 +283,45 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
 {
 	int ret;
 	char *error;
+	struct sp_port_config *config;
 
 	if (!serial) {
 		sr_dbg("Invalid serial port.");
 		return SR_ERR;
 	}
 
-	if (serial->fd == -1) {
-		sr_dbg("Cannot configure unopened serial port %s (fd %d).",
-		       serial->port, serial->fd);
+	if (!serial->data) {
+		sr_dbg("Cannot configure unopened serial port %s.", serial->port);
 		return SR_ERR;
 	}
 
-	sr_spew("Setting serial parameters on port %s (fd %d).", serial->port,
-		serial->fd);
+	sr_spew("Setting serial parameters on port %s.", serial->port);
+
+	sp_new_config(&config);
+	sp_set_config_baudrate(config, baudrate);
+	sp_set_config_bits(config, bits);
+	switch (parity) {
+	case 0:
+		sp_set_config_parity(config, SP_PARITY_NONE);
+		break;
+	case 1:
+		sp_set_config_parity(config, SP_PARITY_EVEN);
+		break;
+	case 2:
+		sp_set_config_parity(config, SP_PARITY_ODD);
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+	sp_set_config_stopbits(config, stopbits);
+	sp_set_config_rts(config, flowcontrol == 1 ? SP_RTS_FLOW_CONTROL : rts);
+	sp_set_config_cts(config, flowcontrol == 1 ? SP_CTS_FLOW_CONTROL : SP_CTS_IGNORE);
+	sp_set_config_dtr(config, dtr);
+	sp_set_config_dsr(config, SP_DSR_IGNORE);
+	sp_set_config_xon_xoff(config, flowcontrol == 2 ? SP_XONXOFF_INOUT : SP_XONXOFF_DISABLED);
 
-	ret = sp_set_params(serial->data, baudrate, bits, parity, stopbits,
-			flowcontrol, rts, dtr);
+	ret = sp_set_config(serial->data, config);
+	sp_free_config(config);
 
 	switch (ret) {
 	case SP_ERR_ARG:
@@ -318,7 +347,7 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
  *
  * @return SR_OK upon success, SR_ERR upon failure.
  */
-#define SERIAL_COMM_SPEC "^(\\d+)/([78])([neo])([12])(.*)$"
+#define SERIAL_COMM_SPEC "^(\\d+)/([5678])([neo])([12])(.*)$"
 SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
 		const char *paramstr)
 {
@@ -431,14 +460,13 @@ SR_PRIV int serial_readline(struct sr_serial_dev_inst *serial, char **buf,
 	gint64 start;
 	int maxlen, len;
 
-	if (!serial || serial->fd == -1) {
+	if (!serial) {
 		sr_dbg("Invalid serial port.");
 		return SR_ERR;
 	}
 
-	if (serial->fd == -1) {
-		sr_dbg("Cannot use unopened serial port %s (fd %d).",
-				serial->port, serial->fd);
+	if (!serial->data) {
+		sr_dbg("Cannot use unopened serial port %s.", serial->port);
 		return -1;
 	}
 
@@ -502,8 +530,8 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
 
 	maxlen = *buflen;
 
-	sr_dbg("Detecting packets on FD %d (timeout = %" PRIu64
-	       "ms, baudrate = %d).", serial->fd, timeout_ms, baudrate);
+	sr_dbg("Detecting packets on %s (timeout = %" PRIu64
+	       "ms, baudrate = %d).", serial->port, timeout_ms, baudrate);
 
 	if (maxlen < (packet_size / 2) ) {
 		sr_err("Buffer size must be at least twice the packet size.");
@@ -557,3 +585,68 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
 
 	return SR_ERR;
 }
+
+/**
+ * Extract the serial device and options from the options linked list.
+ *
+ * @param options List of options passed from the command line.
+ * @param serial_device Pointer where to store the exctracted serial device.
+ * @param serial_options Pointer where to store the optional extracted serial
+ * options.
+ *
+ * @return SR_OK if a serial_device is found, SR_ERR if no device is found. The
+ * returned string should not be freed by the caller.
+ */
+SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_device,
+				      const char **serial_options)
+{
+	GSList *l;
+	struct sr_config *src;
+
+	*serial_device = NULL;
+
+	for (l = options; l; l = l->next) {
+		src = l->data;
+		switch (src->key) {
+		case SR_CONF_CONN:
+			*serial_device = g_variant_get_string(src->data, NULL);
+			sr_dbg("Parsed serial device: %s", *serial_device);
+			break;
+
+		case SR_CONF_SERIALCOMM:
+			*serial_options = g_variant_get_string(src->data, NULL);
+			sr_dbg("Parsed serial options: %s", *serial_options);
+			break;
+		}
+	}
+
+	if (!*serial_device) {
+		sr_dbg("No serial device specified");
+		return SR_ERR;
+	}
+
+	return SR_OK;
+}
+
+SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events,
+		int timeout, sr_receive_data_callback_t cb, void *cb_data)
+{
+#ifdef _WIN32
+	return SR_ERR;
+#else
+	int fd;
+	sp_get_port_handle(serial->data, &fd);
+	return sr_source_add(fd, events, timeout, cb, cb_data);
+#endif
+}
+
+SR_PRIV int serial_source_remove(struct sr_serial_dev_inst *serial)
+{
+#ifdef _WIN32
+	return SR_ERR;
+#else
+	int fd;
+	sp_get_port_handle(serial->data, &fd);
+	return sr_source_remove(fd);
+#endif
+}