From: Bert Vermeulen <redacted>
Date: Mon, 12 Nov 2012 01:25:17 +0000 (+0100)
Subject: fluke-dmm: use new serial API
X-Git-Tag: dsupstream~551
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=58d03f034f0d85a2840ed0bc9ea66506b5a1fa1b;p=libsigrok.git

fluke-dmm: use new serial API
---

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index 78b63a86..2d476419 100644
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -101,18 +101,16 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_probe *probe;
+	struct sr_serial_dev_inst *serial;
 	GSList *devices;
-	int fd, retry, len, i, s;
+	int retry, len, i, s;
 	char buf[128], *b, **tokens;
 
-	if ((fd = serial_open(conn, O_RDWR|O_NONBLOCK)) == -1) {
-		sr_err("Unable to open %s: %s.", conn, strerror(errno));
+	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
 		return NULL;
-	}
-	if (serial_set_paramstr(fd, serialcomm) != SR_OK) {
-		sr_err("Unable to set serial parameters.");
+
+	if (serial_open(serial, O_RDWR|O_NONBLOCK) != SR_OK)
 		return NULL;
-	}
 
 	drvc = di->priv;
 	b = buf;
@@ -122,8 +120,8 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 	 * is not in an idle state when we send ID. */
 	while (!devices && retry < 3) {
 		retry++;
-		serial_flush(fd);
-		if (serial_write(fd, "ID\r", 3) == -1) {
+		serial_flush(serial);
+		if (serial_write(serial, "ID\r", 3) == -1) {
 			sr_err("Unable to send ID string: %s.",
 			       strerror(errno));
 			continue;
@@ -132,7 +130,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 		/* Response is first a CMD_ACK byte (ASCII '0' for OK,
 		 * or '1' to signify an error. */
 		len = 128;
-		serial_readline(fd, &b, &len, 150);
+		serial_readline(serial, &b, &len, 150);
 		if (len != 1)
 			continue;
 		if (buf[0] != '0')
@@ -140,7 +138,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 
 		/* If CMD_ACK was OK, ID string follows. */
 		len = 128;
-		serial_readline(fd, &b, &len, 150);
+		serial_readline(serial, &b, &len, 150);
 		if (len < 10)
 			continue;
 		tokens = g_strsplit(buf, ",", 3);
@@ -159,8 +157,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 					return NULL;
 				}
 				devc->profile = &supported_flukedmm[i];
-				devc->serial = sr_serial_dev_inst_new(conn, -1);
-				devc->serialcomm = g_strdup(serialcomm);
+				devc->serial = serial;
 				sdi->priv = devc;
 				sdi->driver = di;
 				if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
@@ -173,7 +170,9 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 		}
 		g_strfreev(tokens);
 	}
-	serial_close(fd);
+	serial_close(serial);
+	if (!devices)
+		sr_serial_dev_inst_free(serial);
 
 	return devices;
 }
@@ -231,15 +230,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR_BUG;
 	}
 
-	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|O_NONBLOCK) != 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;
@@ -255,8 +248,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;
 	}
 
@@ -370,7 +362,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	/* Poll every 100ms, or whenever some data comes in. */
 	sr_source_add(devc->serial->fd, G_IO_IN, 50, fluke_receive_data, (void *)sdi);
 
-	if (serial_write(devc->serial->fd, "QM\r", 3) == -1) {
+	if (serial_write(devc->serial, "QM\r", 3) == -1) {
 		sr_err("Unable to send QM: %s.", strerror(errno));
 		return SR_ERR;
 	}
diff --git a/hardware/fluke-dmm/fluke-dmm.h b/hardware/fluke-dmm/fluke-dmm.h
index 9994af5c..2dc6af57 100644
--- a/hardware/fluke-dmm/fluke-dmm.h
+++ b/hardware/fluke-dmm/fluke-dmm.h
@@ -52,7 +52,6 @@ struct dev_context {
 	uint64_t limit_samples;
 	uint64_t limit_msec;
 	struct sr_serial_dev_inst *serial;
-	char *serialcomm;
 
 	/* Opaque pointer passed in by the frontend. */
 	void *cb_data;
diff --git a/hardware/fluke-dmm/fluke.c b/hardware/fluke-dmm/fluke.c
index 33f7bb65..078ada1d 100644
--- a/hardware/fluke-dmm/fluke.c
+++ b/hardware/fluke-dmm/fluke.c
@@ -314,6 +314,8 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 	int len;
 	int64_t now, elapsed;
 
+	(void)fd;
+
 	if (!(sdi = cb_data))
 		return TRUE;
 
@@ -323,7 +325,7 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 	if (revents == G_IO_IN) {
 		/* Serial data arrived. */
 		while(FLUKEDMM_BUFSIZE - devc->buflen - 1 > 0) {
-			len = serial_read(fd, devc->buf + devc->buflen, 1);
+			len = serial_read(devc->serial, devc->buf + devc->buflen, 1);
 			if (len < 1)
 				break;
 			devc->buflen++;
@@ -349,7 +351,7 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 	if ((devc->expect_response == FALSE && elapsed > devc->profile->poll_period)
 			|| elapsed > 1000) {
 		sr_spew("Sending QM.");
-		if (serial_write(devc->serial->fd, "QM\r", 3) == -1)
+		if (serial_write(devc->serial, "QM\r", 3) == -1)
 			sr_err("Unable to send QM: %s.", strerror(errno));
 		devc->cmd_sent_at = now;
 		devc->expect_response = TRUE;