X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Fapi.c;h=a657e27008b398a4a61331962bb8ebffe72b4d33;hb=a68bf88e3a6ba0184f1d6aea4ce26b9a2950a513;hp=a22f04a911a39268936944fa3e7093afa8955ae0;hpb=eea49cf10d4cf5b990dcf24b4ead2977a5f36a6e;p=libsigrok.git

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index a22f04a9..a657e270 100644
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -51,8 +51,6 @@ static const uint64_t samplerates[] = {
 SR_PRIV struct sr_dev_driver link_mso19_driver_info;
 static struct sr_dev_driver *di = &link_mso19_driver_info;
 
-static int dev_close(struct sr_dev_inst *sdi);
-
 /* TODO: Use sr_dev_inst to store connection handle & use std_dev_clear(). */
 static int dev_clear(void)
 {
@@ -79,7 +77,7 @@ static int dev_clear(void)
 			ret = SR_ERR_BUG;
 			continue;
 		}
-		dev_close(sdi);
+		std_serial_dev_close(sdi);
 		sr_serial_dev_inst_free(devc->serial);
 		sr_dev_inst_free(sdi);
 	}
@@ -272,29 +270,18 @@ static int dev_open(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int dev_close(struct sr_dev_inst *sdi)
-{
-	struct dev_context *devc;
-
-	devc = sdi->priv;
-
-	if (devc->serial && devc->serial->fd != -1) {
-		serial_close(devc->serial);
-		sdi->status = SR_ST_INACTIVE;
-	}
-
-	return SR_OK;
-}
-
 static int cleanup(void)
 {
 	return dev_clear();
 }
 
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *channel_group)
 {
 	struct dev_context *devc;
 
+	(void)channel_group;
+
 	switch (id) {
 	case SR_CONF_SAMPLERATE:
 		if (sdi) {
@@ -310,14 +297,17 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *channel_group)
 {
 	int ret;
 	struct dev_context *devc;
-	uint64_t num_samples, slope;
+	uint64_t num_samples;
+	const char *slope;
 	int trigger_pos;
 	double pos;
 
+	(void)channel_group;
 	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -345,12 +335,14 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 		ret = SR_OK;
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
-		slope = g_variant_get_uint64(data);
-		if (slope != SLOPE_NEGATIVE && slope != SLOPE_POSITIVE) {
+		slope = g_variant_get_string(data, NULL);
+
+		if (!slope || !(slope[0] == 'f' || slope[0] == 'r'))
 			sr_err("Invalid trigger slope");
 			ret = SR_ERR_ARG;
 		} else {
-			devc->trigger_slope = slope;
+			devc->trigger_slope = (slope[0] == 'r')
+				? SLOPE_POSITIVE : SLOPE_NEGATIVE;
 			ret = SR_OK;
 		}
 		break;
@@ -376,11 +368,13 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 	return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *channel_group)
 {
 	GVariant *gvar;
 	GVariantBuilder gvb;
 
+	(void)channel_group;
 	(void)sdi;
 
 	switch (key) {
@@ -466,7 +460,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	/* Our first probe is analog, the other 8 are of type 'logic'. */
 	/* TODO. */
 
-	sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
+	serial_source_add(devc->serial, G_IO_IN, -1, mso_receive_data, cb_data);
 
 	return SR_OK;
 }
@@ -494,7 +488,7 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = dev_open,
-	.dev_close = dev_close,
+	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.priv = NULL,