From: Bert Vermeulen <redacted>
Date: Mon, 12 Nov 2012 01:48:04 +0000 (+0100)
Subject: colead-slm: use new serial API
X-Git-Tag: dsupstream~549
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=f306ca61f65cb703b38e447bbd3dbea3ff9c57c0;p=libsigrok.git

colead-slm: use new serial API
---

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index eb3fa187..def7cf04 100644
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -27,6 +27,9 @@
 #include <errno.h>
 #include <string.h>
 
+/* The Colead SL-5868P uses this. */
+#define SERIALCOMM "2400/8n1"
+
 static const int hwopts[] = {
 	SR_HWOPT_CONN,
 	SR_HWOPT_SERIALCOMM,
@@ -116,6 +119,8 @@ static GSList *hw_scan(GSList *options)
 	}
 	if (!conn)
 		return NULL;
+	if (!serialcomm)
+		serialcomm = SERIALCOMM;
 
 	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Colead",
 			"SL-5868P", NULL)))
@@ -126,12 +131,9 @@ static GSList *hw_scan(GSList *options)
 		return NULL;
 	}
 
-	if (!serialcomm)
-		/* The Colead SL-5868P uses this. */
-		serialcomm = "2400/8n1";
+	if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm)))
+		return NULL;
 
-	devc->serial = sr_serial_dev_inst_new(conn, -1);
-	devc->serialcomm = g_strdup(serialcomm);
 	sdi->priv = devc;
 	sdi->driver = di;
 	if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
@@ -161,17 +163,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR_BUG;
 	}
 
-	sr_dbg("opening %s with %s", devc->serial->port, devc->serialcomm);
-	devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK);
-	if (devc->serial->fd == -1) {
-		sr_err("Couldn't open serial port '%s'.",
-		       devc->serial->port);
+	if (serial_open(devc->serial, O_RDWR) != SR_OK)
 		return SR_ERR;
-	}
-	if (serial_set_paramstr(devc->serial->fd, devc->serialcomm) != SR_OK) {
-		sr_err("Unable to set serial parameters.");
-		return SR_ERR;
-	}
+
 	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
@@ -187,8 +181,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
 	}
 
 	if (devc->serial && devc->serial->fd != -1) {
-		serial_close(devc->serial->fd);
-		devc->serial->fd = -1;
+		serial_close(devc->serial);
 		sdi->status = SR_ST_INACTIVE;
 	}
 
diff --git a/hardware/colead-slm/protocol.c b/hardware/colead-slm/protocol.c
index 85ecc108..d8cd2159 100644
--- a/hardware/colead-slm/protocol.c
+++ b/hardware/colead-slm/protocol.c
@@ -183,6 +183,8 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
 	int len;
 	char buf[128];
 
+	(void)fd;
+
 	if (!(sdi = cb_data))
 		return TRUE;
 
@@ -194,20 +196,21 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
 		return TRUE;
 
 	if (devc->state == IDLE) {
-		if (serial_read(fd, buf, 128) != 1 || buf[0] != 0x10)
+		if (serial_read(devc->serial, buf, 128) != 1 || buf[0] != 0x10)
 			/* Nothing there, or caught the tail end of a previous packet,
 			 * or some garbage. Unless it's a single "data ready" byte,
 			 * we don't want it. */
 			return TRUE;
 		/* Got 0x10, "measurement ready". */
-		if (serial_write(fd, "\x20", 1) == -1)
+		if (serial_write(devc->serial, "\x20", 1) == -1)
 			sr_err("unable to send command: %s", strerror(errno));
 		else {
 			devc->state = COMMAND_SENT;
 			devc->buflen = 0;
 		}
 	} else {
-		len = serial_read(fd, devc->buf + devc->buflen, 10 - devc->buflen);
+		len = serial_read(devc->serial, devc->buf + devc->buflen,
+				10 - devc->buflen);
 		if (len < 1)
 			return TRUE;
 		devc->buflen += len;
diff --git a/hardware/colead-slm/protocol.h b/hardware/colead-slm/protocol.h
index 7963babb..0e37cd95 100644
--- a/hardware/colead-slm/protocol.h
+++ b/hardware/colead-slm/protocol.h
@@ -52,7 +52,6 @@ struct dev_context {
 	/** The current number of already received samples. */
 	uint64_t num_samples;
 	struct sr_serial_dev_inst *serial;
-	char *serialcomm;
 	int state;
 	char buf[10];
 	int buflen;