X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcolead-slm%2Fapi.c;h=098ba92ffa397a7d5a36534ff84c1e9dd4225e5b;hb=4c0e310ca305ba776aa70d8062f467ac246c910b;hp=a22ccff5e874defaa1eafca0436fbc34d83d0c8c;hpb=538ac9a91e5efb65e3c28d5a9af16c6fcfd63872;p=libsigrok.git

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index a22ccff5..098ba92f 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,
@@ -41,11 +44,6 @@ static const int hwcaps[] = {
 	0,
 };
 
-static const char *probe_names[] = {
-	"P1",
-	NULL,
-};
-
 SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 static struct sr_dev_driver *di = &colead_slm_driver_info;
 
@@ -74,7 +72,7 @@ static int clear_instances(void)
 	return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
 	struct drv_context *drvc;
 
@@ -83,6 +81,7 @@ static int hw_init(void)
 		return SR_ERR;
 	}
 
+	drvc->sr_ctx = sr_ctx;
 	di->priv = drvc;
 
 	return SR_OK;
@@ -93,7 +92,7 @@ static GSList *hw_scan(GSList *options)
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
-	struct sr_hwopt *opt;
+	struct sr_config *src;
 	struct sr_probe *probe;
 	GSList *devices, *l;
 	const char *conn, *serialcomm;
@@ -104,18 +103,20 @@ static GSList *hw_scan(GSList *options)
 
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
-		opt = l->data;
-		switch (opt->hwopt) {
+		src = l->data;
+		switch (src->key) {
 		case SR_HWOPT_CONN:
-			conn = opt->value;
+			conn = src->value;
 			break;
 		case SR_HWOPT_SERIALCOMM:
-			serialcomm = opt->value;
+			serialcomm = src->value;
 			break;
 		}
 	}
 	if (!conn)
 		return NULL;
+	if (!serialcomm)
+		serialcomm = SERIALCOMM;
 
 	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Colead",
 			"SL-5868P", NULL)))
@@ -126,12 +127,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 +159,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);
-		return SR_ERR;
-	}
-	if (serial_set_paramstr(devc->serial->fd, devc->serialcomm) != SR_OK) {
-		sr_err("Unable to set serial parameters.");
+	if (serial_open(devc->serial, SERIAL_RDWR) != SR_OK)
 		return SR_ERR;
-	}
+
 	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
@@ -187,8 +177,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;
 	}
 
@@ -205,7 +194,6 @@ static int hw_cleanup(void)
 static int hw_info_get(int info_id, const void **data,
 		       const struct sr_dev_inst *sdi)
 {
-	
 	(void)sdi;
 
 	switch (info_id) {
@@ -215,12 +203,6 @@ static int hw_info_get(int info_id, const void **data,
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
-		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -271,7 +253,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
-	struct sr_datafeed_meta_analog meta;
 	struct dev_context *devc;
 
 	if (!(devc = sdi->priv)) {
@@ -291,13 +272,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	gettimeofday(&header.starttime, NULL);
 	sr_session_send(devc->cb_data, &packet);
 
-	/* Send metadata about the SR_DF_ANALOG packets to come. */
-	sr_dbg("Sending SR_DF_META_ANALOG.");
-	packet.type = SR_DF_META_ANALOG;
-	packet.payload = &meta;
-	meta.num_probes = 1;
-	sr_session_send(devc->cb_data, &packet);
-
 	/* Poll every 150ms, or whenever some data comes in. */
 	sr_source_add(devc->serial->fd, G_IO_IN, 150, colead_slm_receive_data,
 			(void *)sdi);
@@ -305,8 +279,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-				   void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct sr_datafeed_packet packet;
 	struct dev_context *devc;