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

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index e5bd5505..5eeb6c1c 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -27,8 +27,8 @@
 #include <glib/gstdio.h>
 #include <ftdi.h>
 #include <string.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "asix-sigma.h"
 
 #define USB_VENDOR			0xa600
@@ -40,9 +40,10 @@
 #define TRIGGER_TYPES			"rf10"
 #define NUM_PROBES			16
 
-static GSList *dev_insts = NULL;
+SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
+static struct sr_dev_driver *adi = &asix_sigma_driver_info;
 
-static uint64_t supported_samplerates[] = {
+static const uint64_t supported_samplerates[] = {
 	SR_KHZ(200),
 	SR_KHZ(250),
 	SR_KHZ(500),
@@ -81,7 +82,7 @@ static const char *probe_names[NUM_PROBES + 1] = {
 	NULL,
 };
 
-static struct sr_samplerates samplerates = {
+static const struct sr_samplerates samplerates = {
 	0,
 	0,
 	0,
@@ -405,29 +406,68 @@ static int bin2bitbang(const char *filename,
 	return SR_OK;
 }
 
-static int hw_init(const char *devinfo)
+static void clear_instances(void)
+{
+	GSList *l;
+	struct sr_dev_inst *sdi;
+	struct context *ctx;
+
+	/* Properly close all devices. */
+	for (l = adi->instances; l; l = l->next) {
+		if (!(sdi = l->data)) {
+			/* Log error, but continue cleaning up the rest. */
+			sr_err("sigma: %s: sdi was NULL, continuing", __func__);
+			continue;
+		}
+		if (sdi->priv) {
+			ctx = sdi->priv;
+			ftdi_free(&ctx->ftdic);
+			g_free(ctx);
+		}
+		sr_dev_inst_free(sdi);
+	}
+	g_slist_free(adi->instances);
+	adi->instances = NULL;
+
+}
+
+static int hw_init(void)
+{
+
+	/* Nothing to do. */
+
+	return SR_OK;
+}
+
+static GSList *hw_scan(GSList *options)
 {
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
+	GSList *devices;
 	struct ftdi_device_list *devlist;
 	char serial_txt[10];
 	uint32_t serial;
+	int ret;
 
-	/* Avoid compiler warnings. */
-	(void)devinfo;
+	(void)options;
+	devices = NULL;
+	clear_instances();
 
 	if (!(ctx = g_try_malloc(sizeof(struct context)))) {
 		sr_err("sigma: %s: ctx malloc failed", __func__);
-		return SR_ERR_MALLOC;
+		return NULL;
 	}
 
 	ftdi_init(&ctx->ftdic);
 
 	/* 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,
@@ -457,19 +497,19 @@ static int hw_init(const char *devinfo)
 		sr_err("sigma: %s: sdi was NULL", __func__);
 		goto free;
 	}
-
+	devices = g_slist_append(devices, sdi);
+	adi->instances = g_slist_append(adi->instances, sdi);
 	sdi->priv = ctx;
 
-	dev_insts = g_slist_append(dev_insts, sdi);
-
 	/* We will open the device again when we need it. */
 	ftdi_list_free(&devlist);
 
-	return 1;
+	return devices;
 
 free:
+	ftdi_deinit(&ctx->ftdic);
 	g_free(ctx);
-	return 0;
+	return NULL;
 }
 
 static int upload_firmware(int firmware_idx, struct context *ctx)
@@ -572,7 +612,7 @@ static int hw_dev_open(int dev_index)
 	struct context *ctx;
 	int ret;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+	if (!(sdi = sr_dev_inst_get(adi->instances, dev_index)))
 		return SR_ERR;
 
 	ctx = sdi->priv;
@@ -633,11 +673,11 @@ static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
  * The Sigma supports complex triggers using boolean expressions, but this
  * has not been implemented yet.
  */
-static int configure_probes(struct sr_dev_inst *sdi, GSList *probes)
+static int configure_probes(struct sr_dev_inst *sdi, const GSList *probes)
 {
 	struct context *ctx = sdi->priv;
-	struct sr_probe *probe;
-	GSList *l;
+	const struct sr_probe *probe;
+	const GSList *l;
 	int trigger_set = 0;
 	int probebit;
 
@@ -712,7 +752,7 @@ static int hw_dev_close(int dev_index)
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+	if (!(sdi = sr_dev_inst_get(adi->instances, dev_index))) {
 		sr_err("sigma: %s: sdi was NULL", __func__);
 		return SR_ERR_BUG;
 	}
@@ -733,68 +773,50 @@ static int hw_dev_close(int dev_index)
 
 static int hw_cleanup(void)
 {
-	GSList *l;
-	struct sr_dev_inst *sdi;
-	int ret = SR_OK;
 
-	/* Properly close all devices. */
-	for (l = dev_insts; l; l = l->next) {
-		if (!(sdi = l->data)) {
-			/* Log error, but continue cleaning up the rest. */
-			sr_err("sigma: %s: sdi was NULL, continuing", __func__);
-			ret = SR_ERR_BUG;
-			continue;
-		}
-		sr_dev_inst_free(sdi);
-	}
-	g_slist_free(dev_insts);
-	dev_insts = NULL;
+	clear_instances();
 
-	return ret;
+	return SR_OK;
 }
 
-static 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;
-	void *info = NULL;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, 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)
 {
 	struct sr_dev_inst *sdi;
 
-	sdi = sr_dev_inst_get(dev_insts, dev_index);
+	sdi = sr_dev_inst_get(adi->instances, dev_index);
 	if (sdi)
 		return sdi->status;
 	else
@@ -806,29 +828,29 @@ static const int *hw_hwcap_get_all(void)
 	return hwcaps;
 }
 
-static int hw_dev_config_set(int dev_index, int hwcap, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
 {
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
 	int ret;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+	if (!(sdi = sr_dev_inst_get(adi->instances, dev_index)))
 		return SR_ERR;
 
 	ctx = sdi->priv;
 
 	if (hwcap == SR_HWCAP_SAMPLERATE) {
-		ret = set_samplerate(sdi, *(uint64_t *)value);
+		ret = set_samplerate(sdi, *(const uint64_t *)value);
 	} else if (hwcap == SR_HWCAP_PROBECONFIG) {
 		ret = configure_probes(sdi, value);
 	} else if (hwcap == SR_HWCAP_LIMIT_MSEC) {
-		ctx->limit_msec = *(uint64_t *)value;
+		ctx->limit_msec = *(const uint64_t *)value;
 		if (ctx->limit_msec > 0)
 			ret = SR_OK;
 		else
 			ret = SR_ERR;
 	} else if (hwcap == SR_HWCAP_CAPTURE_RATIO) {
-		ctx->capture_ratio = *(uint64_t *)value;
+		ctx->capture_ratio = *(const uint64_t *)value;
 		if (ctx->capture_ratio < 0 || ctx->capture_ratio > 100)
 			ret = SR_ERR;
 		else
@@ -1272,7 +1294,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	struct triggerinout triggerinout_conf;
 	struct triggerlut lut;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+	if (!(sdi = sr_dev_inst_get(adi->instances, dev_index)))
 		return SR_ERR;
 
 	ctx = sdi->priv;
@@ -1401,7 +1423,7 @@ static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 	/* Avoid compiler warnings. */
 	(void)cb_data;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+	if (!(sdi = sr_dev_inst_get(adi->instances, dev_index))) {
 		sr_err("sigma: %s: sdi was NULL", __func__);
 		return SR_ERR_BUG;
 	}
@@ -1440,12 +1462,14 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = {
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
+	.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,
+//	.hwcap_get_all = hw_hwcap_get_all,
 	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.instances = NULL,
 };