X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds1xx2%2Fapi.c;h=83323114fe412a467cdb45a6eafeceb1c979ef81;hb=c50277a6ec09fb35de3a6e0f2ae3401bc72a1526;hp=8c03ca86db5a700386087ce893a59e04c7ee68b0;hpb=1987b8d63e748f0813dc6a4630e99686e4fe1728;p=libsigrok.git

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 8c03ca86..83323114 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -27,14 +27,14 @@
 #include "protocol.h"
 
 static const int hwcaps[] = {
-	SR_HWCAP_OSCILLOSCOPE,
-	SR_HWCAP_LIMIT_SAMPLES,
-	SR_HWCAP_TIMEBASE,
-	SR_HWCAP_TRIGGER_SOURCE,
-	SR_HWCAP_TRIGGER_SLOPE,
-	SR_HWCAP_HORIZ_TRIGGERPOS,
-	SR_HWCAP_VDIV,
-	SR_HWCAP_COUPLING,
+	SR_CONF_OSCILLOSCOPE,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_TIMEBASE,
+	SR_CONF_TRIGGER_SOURCE,
+	SR_CONF_TRIGGER_SLOPE,
+	SR_CONF_HORIZ_TRIGGERPOS,
+	SR_CONF_VDIV,
+	SR_CONF_COUPLING,
 	0,
 };
 
@@ -138,6 +138,7 @@ static int clear_instances(void)
 			continue;
 
 		g_free(devc->device);
+		g_slist_free(devc->enabled_probes);
 		close(devc->fd);
 
 		sr_dev_inst_free(sdi);
@@ -323,27 +324,14 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-		       const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
 	(void)sdi;
 
-	switch (info_id) {
+	switch (id) {
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_TIMEBASES:
-		*data = timebases;
-		break;
-	case SR_DI_TRIGGER_SOURCES:
-		*data = trigger_sources;
-		break;
-	case SR_DI_VDIVS:
-		*data = vdivs;
-		break;
-	case SR_DI_COUPLING:
-		*data = coupling;
-		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -351,8 +339,7 @@ static int hw_info_get(int info_id, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-			     const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	uint64_t tmp_u64;
@@ -369,25 +356,25 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	}
 
 	ret = SR_OK;
-	switch (hwcap) {
-	case SR_HWCAP_LIMIT_FRAMES:
+	switch (id) {
+	case SR_CONF_LIMIT_FRAMES:
 		devc->limit_frames = *(const uint64_t *)value;
 		break;
-	case SR_HWCAP_TRIGGER_SLOPE:
+	case SR_CONF_TRIGGER_SLOPE:
 		tmp_u64 = *(const int *)value;
 		rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SLOP %s\n",
 				       tmp_u64 ? "POS" : "NEG");
 		break;
-	case SR_HWCAP_HORIZ_TRIGGERPOS:
+	case SR_CONF_HORIZ_TRIGGERPOS:
 		tmp_float = *(const float *)value;
 		rigol_ds1xx2_send_data(devc->fd, ":TIM:OFFS %.9f\n", tmp_float);
 		break;
-	case SR_HWCAP_TIMEBASE:
+	case SR_CONF_TIMEBASE:
 		tmp_rat = *(const struct sr_rational *)value;
 		rigol_ds1xx2_send_data(devc->fd, ":TIM:SCAL %.9f\n",
 				       (float)tmp_rat.p / tmp_rat.q);
 		break;
-	case SR_HWCAP_TRIGGER_SOURCE:
+	case SR_CONF_TRIGGER_SOURCE:
 		if (!strcmp(value, "CH1"))
 			channel = "CHAN1";
 		else if (!strcmp(value, "CH2"))
@@ -402,7 +389,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		}
 		rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SOUR %s\n", channel);
 		break;
-	case SR_HWCAP_VDIV:
+	case SR_CONF_VDIV:
 		/* TODO: Not supporting vdiv per channel yet. */
 		tmp_rat = *(const struct sr_rational *)value;
 		for (i = 0; vdivs[i].p && vdivs[i].q; i++) {
@@ -418,7 +405,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		if (vdivs[i].p == 0 && vdivs[i].q == 0)
 			ret = SR_ERR_ARG;
 		break;
-	case SR_HWCAP_COUPLING:
+	case SR_CONF_COUPLING:
 		/* TODO: Not supporting coupling per channel yet. */
 		for (i = 0; coupling[i]; i++) {
 			if (!strcmp(value, coupling[i])) {
@@ -432,7 +419,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 			ret = SR_ERR_ARG;
 		break;
 	default:
-		sr_err("Unknown hardware capability: %d.", hwcap);
+		sr_err("Unknown hardware capability: %d.", id);
 		ret = SR_ERR_ARG;
 		break;
 	}
@@ -440,6 +427,31 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	return ret;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_COUPLING:
+		*data = coupling;
+		break;
+	case SR_CONF_VDIV:
+		*data = vdivs;
+		break;
+	case SR_CONF_TIMEBASE:
+		*data = timebases;
+		break;
+	case SR_CONF_TRIGGER_SOURCE:
+		*data = trigger_sources;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data)
 {
@@ -464,6 +476,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	gettimeofday(&header.starttime, NULL);
 	sr_session_send(cb_data, &packet);
 
+	/* Hardcoded to CH1 only. */
+	devc->enabled_probes = g_slist_append(NULL, sdi->probes->data);
 	rigol_ds1xx2_send_data(devc->fd, ":CHAN1:SCAL?\n");
 	len = read(devc->fd, buf, sizeof(buf));
 	buf[len] = 0;
@@ -506,10 +520,11 @@ SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
+	.config_get = config_get,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,