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

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index a22f04a9..45453efd 100644
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -25,6 +25,7 @@ static const int32_t hwcaps[] = {
 	SR_CONF_OSCILLOSCOPE,
 	SR_CONF_LOGIC_ANALYZER,
 	SR_CONF_SAMPLERATE,
+	SR_CONF_TRIGGER_TYPE,
 	SR_CONF_TRIGGER_SLOPE,
 	SR_CONF_HORIZ_TRIGGERPOS,
 //      SR_CONF_CAPTURE_RATIO,
@@ -33,11 +34,11 @@ static const int32_t hwcaps[] = {
 };
 
 /*
- * Probes are numbered 0 to 7.
+ * Channels are numbered 0 to 7.
  *
  * See also: http://www.linkinstruments.com/images/mso19_1113.gif
  */
-SR_PRIV const char *mso19_probe_names[NUM_PROBES + 1] = {
+SR_PRIV const char *mso19_channel_names[NUM_CHANNELS + 1] = {
 	/* Note: DSO needs to be first. */
 	"DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL,
 };
@@ -51,8 +52,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 +78,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);
 	}
@@ -103,7 +102,7 @@ static GSList *scan(GSList *options)
 	GSList *l;
 	struct sr_config *src;
 	struct udev *udev;
-	int ptype;
+	int chtype;
 
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -218,13 +217,13 @@ static GSList *scan(GSList *options)
 		sdi->driver = di;
 		sdi->priv = devc;
 
-		for (i = 0; i < NUM_PROBES; i++) {
-			struct sr_probe *probe;
-			ptype = (i == 0) ? SR_PROBE_ANALOG : SR_PROBE_LOGIC;
-			if (!(probe = sr_probe_new(i, ptype, TRUE,
-						   mso19_probe_names[i])))
+		for (i = 0; i < NUM_CHANNELS; i++) {
+			struct sr_channel *ch;
+			chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC;
+			if (!(ch = sr_channel_new(i, chtype, TRUE,
+						   mso19_channel_names[i])))
 				return 0;
-			sdi->probes = g_slist_append(sdi->probes, probe);
+			sdi->channels = g_slist_append(sdi->channels, ch);
 		}
 
 		//Add the driver
@@ -272,29 +271,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 *cg)
 {
 	struct dev_context *devc;
 
+	(void)cg;
+
 	switch (id) {
 	case SR_CONF_SAMPLERATE:
 		if (sdi) {
@@ -310,14 +298,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 *cg)
 {
 	int ret;
 	struct dev_context *devc;
-	uint64_t num_samples, slope;
+	uint64_t num_samples;
+	const char *slope;
 	int trigger_pos;
 	double pos;
 
+	(void)cg;
 	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -345,12 +336,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 +369,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 *cg)
 {
 	GVariant *gvar;
 	GVariantBuilder gvb;
 
+	(void)cg;
 	(void)sdi;
 
 	switch (key) {
@@ -415,8 +410,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 	devc = sdi->priv;
 
-	if (mso_configure_probes(sdi) != SR_OK) {
-		sr_err("Failed to configure probes.");
+	if (mso_configure_channels(sdi) != SR_OK) {
+		sr_err("Failed to configure channels.");
 		return SR_ERR;
 	}
 
@@ -463,10 +458,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
-	/* Our first probe is analog, the other 8 are of type 'logic'. */
+	/* Our first channel 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 +489,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,