X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fchronovu-la%2Fapi.c;h=d35a4f5377d2b8d8bc943cfbf893b2a043340444;hb=d32120c4c30650c30720d04eaf88dcf7b76a1e9f;hp=0a1a22327a2f82e266237cfbea0286e1015c1981;hpb=a162eeb2e8f23da99d1a7ca7d62dc6ad0981afc6;p=libsigrok.git

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 0a1a2232..d35a4f53 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,
@@ -244,7 +243,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 		goto err_ftdi_free;
 	}
 
-	if ((ret = ftdi_usb_purge_buffers(devc->ftdic)) < 0) {
+	if ((ret = PURGE_FTDI_BOTH(devc->ftdic)) < 0) {
 		sr_err("Failed to purge FTDI buffers (%d): %s.",
 		       ret, ftdi_get_error_string(devc->ftdic));
 		goto err_ftdi_free;
@@ -288,7 +287,6 @@ static int config_get(uint32_t key, GVariant **data,
 {
 	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,
 	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)
@@ -327,13 +324,9 @@ static int config_set(uint32_t key, GVariant *data,
 			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:
@@ -359,12 +352,12 @@ static int config_list(uint32_t key, GVariant **data,
 		*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;
 		*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 = std_gvar_array_i32(trigger_matches, devc->prof->num_trigger_matches);
 		break;