X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=5eeb6c1cf1aae5cbe56f425db1412cb6e3af8c15;hb=4147960558ae0d8964e8344faa3515a8ec4d9efb;hp=3bf6e847d96a8c915ddf3ef985c57c755b8e8567;hpb=0448d11097b057606f7f643b0f0537706d95afa7;p=libsigrok.git

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 3bf6e847..5eeb6c1c 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -447,6 +447,7 @@ static GSList *hw_scan(GSList *options)
 	struct ftdi_device_list *devlist;
 	char serial_txt[10];
 	uint32_t serial;
+	int ret;
 
 	(void)options;
 	devices = NULL;
@@ -461,9 +462,12 @@ static GSList *hw_scan(GSList *options)
 
 	/* Look for SIGMAs. */
 
-	if (ftdi_usb_find_all(&ctx->ftdic, &devlist,
-	    USB_VENDOR, USB_PRODUCT) <= 0)
+	if ((ret = ftdi_usb_find_all(&ctx->ftdic, &devlist,
+	    USB_VENDOR, USB_PRODUCT)) <= 0) {
+		if (ret < 0)
+			sr_err("ftdi_usb_find_all(): %d", ret);
 		goto free;
+	}
 
 	/* Make sure it's a version 1 or 2 SIGMA. */
 	ftdi_usb_get_strings(&ctx->ftdic, devlist->dev, NULL, 0, NULL, 0,
@@ -503,7 +507,7 @@ static GSList *hw_scan(GSList *options)
 	return devices;
 
 free:
-	ftdi_free(&ctx->ftdic);
+	ftdi_deinit(&ctx->ftdic);
 	g_free(ctx);
 	return NULL;
 }
@@ -775,41 +779,37 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static const void *hw_dev_info_get(int dev_index, int dev_info_id)
+static int hw_info_get(int info_id, const void **data,
+       const struct sr_dev_inst *sdi)
 {
-	struct sr_dev_inst *sdi;
 	struct context *ctx;
-	const void *info = NULL;
-
-	if (!(sdi = sr_dev_inst_get(adi->instances, dev_index))) {
-		sr_err("sigma: %s: sdi was NULL", __func__);
-		return NULL;
-	}
-
-	ctx = sdi->priv;
 
-	switch (dev_info_id) {
+	switch (info_id) {
 	case SR_DI_INST:
-		info = sdi;
+		*data = sdi;
 		break;
 	case SR_DI_NUM_PROBES:
-		info = GINT_TO_POINTER(NUM_PROBES);
+		*data = GINT_TO_POINTER(NUM_PROBES);
 		break;
 	case SR_DI_PROBE_NAMES:
-		info = probe_names;
+		*data = probe_names;
 		break;
 	case SR_DI_SAMPLERATES:
-		info = &samplerates;
+		*data = &samplerates;
 		break;
 	case SR_DI_TRIGGER_TYPES:
-		info = (char *)TRIGGER_TYPES;
+		*data = (char *)TRIGGER_TYPES;
 		break;
 	case SR_DI_CUR_SAMPLERATE:
-		info = &ctx->cur_samplerate;
+		if (sdi) {
+			ctx = sdi->priv;
+			*data = &ctx->cur_samplerate;
+		} else
+			return SR_ERR;
 		break;
 	}
 
-	return info;
+	return SR_OK;
 }
 
 static int hw_dev_status_get(int dev_index)
@@ -1465,7 +1465,7 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = {
 	.scan = hw_scan,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.dev_info_get = hw_dev_info_get,
+	.info_get = hw_info_get,
 	.dev_status_get = hw_dev_status_get,
 //	.hwcap_get_all = hw_hwcap_get_all,
 	.dev_config_set = hw_dev_config_set,