X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fapi.c;h=b911f03d182b224cd9a48c5db8edb50a99e349ff;hb=d8fbfcd9d6d66bffcb8607e9de7706ce322d42c7;hp=3b832866e4de40030ac73b2022a0f742e5ea4cfc;hpb=463160cbca37367ef94dfead0c64531d82b83ab8;p=libsigrok.git

diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c
index 3b832866..b911f03d 100644
--- a/src/hardware/ikalogic-scanalogic2/api.c
+++ b/src/hardware/ikalogic-scanalogic2/api.c
@@ -104,8 +104,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 		sdi = g_malloc0(sizeof(struct sr_dev_inst));
 		sdi->status = SR_ST_INACTIVE;
-		sdi->vendor = g_strdup(VENDOR_NAME);
-		sdi->model = g_strdup(MODEL_NAME);
+		sdi->vendor = g_strdup("IKALOGIC");
+		sdi->model = g_strdup("Scanalogic-2");
 		sdi->version = g_strdup_printf("%u.%u", dev_info.fw_ver_major, dev_info.fw_ver_minor);
 		sdi->serial_num = g_strdup_printf("%d", dev_info.serial);
 		sdi->priv = devc;
@@ -244,15 +244,13 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	int ret;
 
 	(void)cg;
 
-	ret = SR_OK;
 	devc = sdi->priv;
 
 	switch (key) {
@@ -266,57 +264,50 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	uint64_t samplerate, limit_samples, capture_ratio;
-	int ret;
+	struct dev_context *devc;
+	uint64_t samplerate, limit_samples;
 
 	(void)cg;
 
+	devc = sdi->priv;
+
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
 		limit_samples = g_variant_get_uint64(data);
-		ret = sl2_set_limit_samples(sdi, limit_samples);
-		break;
+		return sl2_set_limit_samples(sdi, limit_samples);
 	case SR_CONF_SAMPLERATE:
 		samplerate = g_variant_get_uint64(data);
-		ret = sl2_set_samplerate(sdi, samplerate);
-		break;
+		return sl2_set_samplerate(sdi, samplerate);
 	case SR_CONF_CAPTURE_RATIO:
-		capture_ratio = g_variant_get_uint64(data);
-		ret = sl2_set_capture_ratio(sdi, capture_ratio);
+		devc->capture_ratio = g_variant_get_uint64(data);
 		break;
 	default:
 		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	GVariant *grange[2];
-
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
-		return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
+		return STD_CONFIG_LIST(key, data, sdi, cg, NO_OPTS, drvopts, devopts);
 	case SR_CONF_SAMPLERATE:
-		*data = std_gvar_samplerates(sl2_samplerates, ARRAY_SIZE(sl2_samplerates));
+		*data = std_gvar_samplerates(ARRAY_AND_SIZE(sl2_samplerates));
 		break;
 	case SR_CONF_TRIGGER_MATCH:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-				trigger_matches, ARRAY_SIZE(trigger_matches),
-				sizeof(int32_t));
+		*data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
-		grange[0] = g_variant_new_uint64(0);
-		grange[1] = g_variant_new_uint64(MAX_SAMPLES);
-		*data = g_variant_new_tuple(grange, 2);
+		*data = std_gvar_tuple_u64(0, MAX_SAMPLES);
 		break;
 	default:
 		return SR_ERR_NA;