X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fapi.c;h=177c18416bfc3f77826deed17e659732ed4ecfd4;hb=a68bf88e3a6ba0184f1d6aea4ce26b9a2950a513;hp=25b4f78f80aa278a5a30cc996a2d88d203db85da;hpb=7142d6b9d5d65749e0cedfcff9025dffe38c76c2;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/api.c b/hardware/zeroplus-logic-cube/api.c
index 25b4f78f..177c1841 100644
--- a/hardware/zeroplus-logic-cube/api.c
+++ b/hardware/zeroplus-logic-cube/api.c
@@ -239,11 +239,6 @@ SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate)
 	return SR_OK;
 }
 
-static int dev_clear(void)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int init(struct sr_context *sr_ctx)
 {
 	return std_init(sr_ctx, di, LOG_PREFIX);
@@ -468,15 +463,15 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-	return dev_clear();
+	return std_dev_clear(di, NULL);
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_probe_group *probe_group)
+		const struct sr_channel_group *channel_group)
 {
 	struct dev_context *devc;
 
-	(void)probe_group;
+	(void)channel_group;
 
 	switch (id) {
 	case SR_CONF_SAMPLERATE:
@@ -486,14 +481,14 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 			sr_spew("Returning samplerate: %" PRIu64 "Hz.",
 				devc->cur_samplerate);
 		} else
-			return SR_ERR;
+			return SR_ERR_ARG;
 		break;
 	case SR_CONF_CAPTURE_RATIO:
 		if (sdi) {
 			devc = sdi->priv;
 			*data = g_variant_new_uint64(devc->capture_ratio);
 		} else
-			return SR_ERR;
+			return SR_ERR_ARG;
 		break;
 	case SR_CONF_VOLTAGE_THRESHOLD:
 		if (sdi) {
@@ -503,7 +498,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 			range[1] = g_variant_new_double(devc->cur_threshold);
 			*data = g_variant_new_tuple(range, 2);
 		} else
-			return SR_ERR;
+			return SR_ERR_ARG;
 		break;
 	default:
 		return SR_ERR_NA;
@@ -513,12 +508,12 @@ static int config_get(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_probe_group *probe_group)
+		const struct sr_channel_group *channel_group)
 {
 	struct dev_context *devc;
 	gdouble low, high;
 
-	(void)probe_group;
+	(void)channel_group;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
@@ -546,15 +541,15 @@ static int config_set(int id, 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_probe_group *probe_group)
+		const struct sr_channel_group *channel_group)
 {
 	struct dev_context *devc;
-	GVariant *gvar;
+	GVariant *gvar, *grange[2];
 	GVariantBuilder gvb;
 	double v;
 	GVariant *range[2];
 
-	(void)probe_group;
+	(void)channel_group;
 
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
@@ -593,6 +588,14 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		}
 		*data = g_variant_builder_end(&gvb);
 		break;
+	case SR_CONF_LIMIT_SAMPLES:
+		if (!sdi)
+			return SR_ERR_ARG;
+		devc = sdi->priv;
+		grange[0] = g_variant_new_uint64(0);
+		grange[1] = g_variant_new_uint64(devc->max_sample_depth);
+		*data = g_variant_new_tuple(grange, 2);
+		break;
 	default:
 		return SR_ERR_NA;
 	}
@@ -819,7 +822,7 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
 	.cleanup = cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = dev_clear,
+	.dev_clear = NULL,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,