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

agilent-dmm: use new serial API
---

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 0e2bc7d8..c7783bca 100644
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -115,8 +115,9 @@ static GSList *hw_scan(GSList *options)
 	struct dev_context *devc;
 	struct sr_hwopt *opt;
 	struct sr_probe *probe;
+	struct sr_serial_dev_inst *serial;
 	GSList *l, *devices;
-	int len, fd, i;
+	int len, i;
 	const char *conn, *serialcomm;
 	char *buf, **tokens;
 
@@ -138,22 +139,17 @@ static GSList *hw_scan(GSList *options)
 	}
 	if (!conn)
 		return NULL;
+	if (!serialcomm)
+		serialcomm = SERIALCOMM;
 
-	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 (!serialcomm)
-		serialcomm = SERIALCOMM;
-	if (serial_set_paramstr(fd, serialcomm) != SR_OK) {
-		sr_err("Unable to set serial parameters: %s.",
-		       strerror(errno));
+	if (serial_open(serial, O_RDWR|O_NONBLOCK) != SR_OK)
 		return NULL;
-	}
 
-	serial_flush(fd);
-	if (serial_write(fd, "*IDN?\r\n", 7) == -1) {
+	serial_flush(serial);
+	if (serial_write(serial, "*IDN?\r\n", 7) == -1) {
 		sr_err("Unable to send identification string: %s.",
 		       strerror(errno));
 		return NULL;
@@ -164,7 +160,7 @@ static GSList *hw_scan(GSList *options)
 		sr_err("Serial buffer malloc failed.");
 		return NULL;
 	}
-	serial_readline(fd, &buf, &len, 150);
+	serial_readline(serial, &buf, &len, 150);
 	if (!len)
 		return NULL;
 
@@ -182,7 +178,7 @@ static GSList *hw_scan(GSList *options)
 				return NULL;
 			}
 			devc->profile = &supported_agdmm[i];
-			devc->serial = sr_serial_dev_inst_new(conn, -1);
+			devc->serial = serial;
 			devc->cur_mq = -1;
 			sdi->priv = devc;
 			sdi->driver = di;
@@ -197,7 +193,9 @@ static GSList *hw_scan(GSList *options)
 	g_strfreev(tokens);
 	g_free(buf);
 
-	serial_close(fd);
+	serial_close(serial);
+	if (!devices)
+		sr_serial_dev_inst_free(serial);
 
 	return devices;
 }
@@ -220,13 +218,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;
-	}
-	serial_set_paramstr(devc->serial->fd, SERIALCOMM);
+
 	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
@@ -242,8 +236,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/agilent-dmm/sched.c b/hardware/agilent-dmm/sched.c
index 56e768db..339dbac6 100644
--- a/hardware/agilent-dmm/sched.c
+++ b/hardware/agilent-dmm/sched.c
@@ -93,6 +93,8 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
 	struct dev_context *devc;
 	int len;
 
+	(void)fd;
+
 	if (!(sdi = cb_data))
 		return TRUE;
 
@@ -102,7 +104,7 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
 	if (revents == G_IO_IN) {
 		/* Serial data arrived. */
 		while(AGDMM_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 += len;
@@ -135,7 +137,7 @@ static int agdmm_send(const struct sr_dev_inst *sdi, const char *cmd)
 		strncat(buf, "\r\n", 32);
 	else
 		strncat(buf, "\n\r\n", 32);
-	if (serial_write(devc->serial->fd, buf, strlen(buf)) == -1) {
+	if (serial_write(devc->serial, buf, strlen(buf)) == -1) {
 		sr_err("Failed to send: %s.", strerror(errno));
 		return SR_ERR;
 	}