X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fchronovu-la%2Fapi.c;h=694bd54ac84fb91f0f864cefa67d9d31eb2a641c;hb=deb7615262ac4f9cc0750a08351afa7cbf9c34d5;hp=95aee39e1ffc56393179c645443ba093f62104e7;hpb=463160cbca37367ef94dfead0c64531d82b83ab8;p=libsigrok.git

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 95aee39e..694bd54a 100644
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -192,18 +192,17 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			continue;
 		}
 
-		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
-
 		libusb_close(hdl);
 
-		if (!strcmp(product, "ChronoVu LA8")) {
+		if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+			continue;
+
+		if (!strcmp(product, "ChronoVu LA8"))
 			model = 0;
-		} else if (!strcmp(product, "ChronoVu LA16")) {
+		else if (!strcmp(product, "ChronoVu LA16"))
 			model = 1;
-		} else {
-			sr_spew("Unknown iProduct string '%s'.", product);
-			continue;
-		}
+		else
+			continue; /* Unknown iProduct string, ignore. */
 
 		sr_dbg("Found %s (%04x:%04x, %d.%d, %s).",
 		       product, des.idVendor, des.idProduct,
@@ -283,12 +282,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return (ret == 0) ? SR_OK : SR_ERR;
 }
 
-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;
 	struct sr_usb_dev_inst *usb;
-	char str[128];
 
 	(void)cg;
 
@@ -296,8 +294,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	case SR_CONF_CONN:
 		if (!sdi || !(usb = sdi->conn))
 			return SR_ERR_ARG;
-		snprintf(str, 128, "%d.%d", usb->bus, usb->address);
-		*data = g_variant_new_string(str);
+		*data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
 		break;
 	case SR_CONF_SAMPLERATE:
 		if (!sdi)
@@ -312,8 +309,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	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)
 {
 	struct dev_context *devc;
 
@@ -327,13 +324,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 			return SR_ERR;
 		break;
 	case SR_CONF_LIMIT_MSEC:
-		if (g_variant_get_uint64(data) == 0)
-			return SR_ERR_ARG;
 		devc->limit_msec = g_variant_get_uint64(data);
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
-		if (g_variant_get_uint64(data) == 0)
-			return SR_ERR_ARG;
 		devc->limit_samples = g_variant_get_uint64(data);
 		break;
 	default:
@@ -343,10 +336,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	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];
 	struct dev_context *devc;
 
 	devc = (sdi) ? sdi->priv : NULL;
@@ -357,24 +349,17 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	case SR_CONF_SAMPLERATE:
 		cv_fill_samplerates_if_needed(sdi);
-		*data = std_gvar_samplerates(devc->samplerates, ARRAY_SIZE(devc->samplerates));
+		*data = std_gvar_samplerates(ARRAY_AND_SIZE(devc->samplerates));
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
-		if (!devc->prof)
+		if (!devc || !devc->prof)
 			return SR_ERR_BUG;
-		grange[0] = g_variant_new_uint64(0);
-		if (devc->prof->model == CHRONOVU_LA8)
-			grange[1] = g_variant_new_uint64(MAX_NUM_SAMPLES);
-		else
-			grange[1] = g_variant_new_uint64(MAX_NUM_SAMPLES / 2);
-		*data = g_variant_new_tuple(grange, 2);
+		*data = std_gvar_tuple_u64(0, (devc->prof->model == CHRONOVU_LA8) ? MAX_NUM_SAMPLES : MAX_NUM_SAMPLES / 2);
 		break;
 	case SR_CONF_TRIGGER_MATCH:
-		if (!devc->prof)
+		if (!devc || !devc->prof)
 			return SR_ERR_BUG;
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-				trigger_matches, devc->prof->num_trigger_matches,
-				sizeof(int32_t));
+		*data = std_gvar_array_i32(trigger_matches, devc->prof->num_trigger_matches);
 		break;
 	default:
 		return SR_ERR_NA;