From d35afa87c9e6d40d34154a784b62deeaffc3ad80 Mon Sep 17 00:00:00 2001
From: Bert Vermeulen <bert@biot.com>
Date: Mon, 12 Nov 2012 12:50:42 +0100
Subject: [PATCH] tekpower-dmm: use new serial API

---
 hardware/tekpower-dmm/api.c      | 41 ++++++++++++--------------------
 hardware/tekpower-dmm/protocol.c |  8 ++++---
 hardware/tekpower-dmm/protocol.h |  1 -
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/hardware/tekpower-dmm/api.c b/hardware/tekpower-dmm/api.c
index f6a649c1..40d48a91 100644
--- a/hardware/tekpower-dmm/api.c
+++ b/hardware/tekpower-dmm/api.c
@@ -28,6 +28,8 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
+#define SERIALCOMM "2400/8n1"
+
 static const int hwopts[] = {
 	SR_HWOPT_CONN,
 	SR_HWOPT_SERIALCOMM,
@@ -95,18 +97,16 @@ static GSList *lcd14_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 i, len, fd, retry, good_packets = 0, dropped, ret;
+	int i, len, retry, good_packets = 0, dropped;
 	uint8_t buf[128], *b;
 
-	if ((fd = serial_open(conn, O_RDONLY | 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 ((ret = serial_set_paramstr(fd, serialcomm)) != SR_OK) {
-		sr_err("Unable to set serial parameters: %d", ret);
+
+	if (serial_open(serial, O_RDONLY|O_NONBLOCK) != SR_OK)
 		return NULL;
-	}
 
 	sr_info("Probing port %s readonly.", conn);
 
@@ -114,7 +114,7 @@ static GSList *lcd14_scan(const char *conn, const char *serialcomm)
 	b = buf;
 	retry = 0;
 	devices = NULL;
-	serial_flush(fd);
+	serial_flush(serial);
 
 	/*
 	 * There's no way to get an ID from the multimeter. It just sends data
@@ -126,7 +126,7 @@ static GSList *lcd14_scan(const char *conn, const char *serialcomm)
 
 		/* Let's get a bit of data and see if we can find a packet. */
 		len = sizeof(buf);
-		serial_readline(fd, (char **)&b, &len, 500);
+		serial_readline(serial, (char **)&b, &len, 500);
 		if ((len == 0) || (len < FS9721_PACKET_SIZE)) {
 			/* Not enough data received, is the DMM connected? */
 			continue;
@@ -165,8 +165,7 @@ static GSList *lcd14_scan(const char *conn, const char *serialcomm)
 			return NULL;
 		}
 
-		devc->serial = sr_serial_dev_inst_new(conn, -1);
-		devc->serialcomm = g_strdup(serialcomm);
+		devc->serial = serial;
 
 		sdi->priv = devc;
 		sdi->driver = di;
@@ -178,7 +177,7 @@ static GSList *lcd14_scan(const char *conn, const char *serialcomm)
 		break;
 	}
 
-	serial_close(fd);
+	serial_close(serial);
 	return devices;
 }
 
@@ -207,8 +206,8 @@ static GSList *hw_scan(GSList *options)
 		/* Use the provided comm specs. */
 		devices = lcd14_scan(conn, serialcomm);
 	} else {
-		/* Try the default 2400/8n1. */
-		devices = lcd14_scan(conn, "2400/8n1");
+		/* Try the default. */
+		devices = lcd14_scan(conn, SERIALCOMM);
 	}
 
 	return devices;
@@ -225,7 +224,6 @@ static GSList *hw_dev_list(void)
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-	int ret;
 	struct dev_context *devc;
 
 	if (!(devc = sdi->priv)) {
@@ -233,17 +231,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR_BUG;
 	}
 
-	devc->serial->fd = serial_open(devc->serial->port, O_RDONLY);
-	if (devc->serial->fd == -1) {
-		sr_err("Couldn't open serial port '%s'.", devc->serial->port);
+	if (serial_open(devc->serial, O_RDONLY) != SR_OK)
 		return SR_ERR;
-	}
 
-	ret = serial_set_paramstr(devc->serial->fd, devc->serialcomm);
-	if (ret != SR_OK) {
-		sr_err("Unable to set serial parameters: %d.", ret);
-		return SR_ERR;
-	}
 	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
@@ -259,8 +249,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/tekpower-dmm/protocol.c b/hardware/tekpower-dmm/protocol.c
index 2d495f1a..f7a40879 100644
--- a/hardware/tekpower-dmm/protocol.c
+++ b/hardware/tekpower-dmm/protocol.c
@@ -73,13 +73,13 @@ static void fs9721_serial_handle_packet(const uint8_t *buf,
 	g_free(analog);
 }
 
-static void handle_new_data(struct dev_context *devc, int fd)
+static void handle_new_data(struct dev_context *devc)
 {
 	int len, i, offset = 0;
 
 	/* Try to get as much data as the buffer can hold. */
 	len = DMM_BUFSIZE - devc->buflen;
-	len = serial_read(fd, devc->buf + devc->buflen, len);
+	len = serial_read(devc->serial, devc->buf + devc->buflen, len);
 	if (len < 1) {
 		sr_err("Serial port read error: %d.", len);
 		return;
@@ -107,6 +107,8 @@ SR_PRIV int tekpower_dmm_receive_data(int fd, int revents, void *cb_data)
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 
+	(void)fd;
+
 	if (!(sdi = cb_data))
 		return TRUE;
 
@@ -115,7 +117,7 @@ SR_PRIV int tekpower_dmm_receive_data(int fd, int revents, void *cb_data)
 
 	if (revents == G_IO_IN) {
 		/* Serial data arrived. */
-		handle_new_data(devc, fd);
+		handle_new_data(devc);
 	}
 
 	if (devc->num_samples >= devc->limit_samples) {
diff --git a/hardware/tekpower-dmm/protocol.h b/hardware/tekpower-dmm/protocol.h
index e797515b..d2f59420 100644
--- a/hardware/tekpower-dmm/protocol.h
+++ b/hardware/tekpower-dmm/protocol.h
@@ -43,7 +43,6 @@ struct dev_context {
 	uint64_t num_samples;
 
 	struct sr_serial_dev_inst *serial;
-	char *serialcomm;
 
 	uint8_t buf[DMM_BUFSIZE];
 	int bufoffset;