X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fchronovu-la8%2Fapi.c;h=09daa6cb9eb9fc80800b06705cf258eb643d4f03;hb=cfe8a84dd7b5a22e6a225d6b078bde6d0ad8fde4;hp=90926c00b3b595fcaa52b3f60ab897bd82ac1cc8;hpb=45c59c8bdd01954f9214fe7b869d92c55415d109;p=libsigrok.git

diff --git a/hardware/chronovu-la8/api.c b/hardware/chronovu-la8/api.c
index 90926c00..09daa6cb 100644
--- a/hardware/chronovu-la8/api.c
+++ b/hardware/chronovu-la8/api.c
@@ -25,19 +25,63 @@
 #include "libsigrok-internal.h"
 #include "driver.h"
 
-static GSList *dev_insts = NULL;
+SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
+static struct sr_dev_driver *cdi = &chronovu_la8_driver_info;
+
+/*
+ * The ChronoVu LA8 can have multiple PIDs. Older versions shipped with
+ * a standard FTDI USB VID/PID of 0403:6001, newer ones have 0403:8867.
+ */ 
+static const uint16_t usb_pids[] = {
+	0x6001,
+	0x8867,
+};
 
 /* Function prototypes. */
 static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
 
-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 = cdi->instances; l; l = l->next) {
+		if (!(sdi = l->data)) {
+			/* Log error, but continue cleaning up the rest. */
+			sr_err("la8: %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(cdi->instances);
+	cdi->instances = NULL;
+
+}
+
+static int hw_init(void)
+{
+
+	/* Nothing to do. */
+
+	return SR_OK;
+}
+
+static GSList *hw_scan(GSList *options)
 {
 	int ret;
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
+	GSList *devices;
 
-	/* Avoid compiler errors. */
-	(void)devinfo;
+	(void)options;
+	devices = NULL;
 
 	/* Allocate memory for our private driver context. */
 	if (!(ctx = g_try_malloc(sizeof(struct context)))) {
@@ -60,6 +104,7 @@ static int hw_init(const char *devinfo)
 	ctx->done = 0;
 	ctx->block_counter = 0;
 	ctx->divcount = 0; /* 10ns sample period == 100MHz samplerate */
+	ctx->usb_pid = 0;
 
 	/* Allocate memory where we'll store the de-mangled data. */
 	if (!(ctx->final_buf = g_try_malloc(SDRAM_SIZE))) {
@@ -74,13 +119,20 @@ static int hw_init(const char *devinfo)
 	}
 
 	/* Check for the device and temporarily open it. */
-	if ((ret = ftdi_usb_open_desc(ctx->ftdic, USB_VENDOR_ID,
-			USB_PRODUCT_ID, USB_DESCRIPTION, NULL)) < 0) {
-		(void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */
-		goto err_free_ftdic;
+	for (i = 0; i < ARRAY_SIZE(usb_pids); i++) {
+		sr_dbg("la8: Probing for VID/PID %04x:%04x.", USB_VENDOR_ID,
+		       usb_pids[i]);
+		ret = ftdi_usb_open_desc(ctx->ftdic, USB_VENDOR_ID,
+					 usb_pids[i], USB_DESCRIPTION, NULL);
+		if (ret == 0) {
+			sr_dbg("la8: Found LA8 device (%04x:%04x).",
+			       USB_VENDOR_ID, usb_pids[i]);
+			ctx->usb_pid = usb_pids[i];
+		}
 	}
-	sr_dbg("la8: Found LA8 device (%04x:%04x).", USB_VENDOR_ID,
-	       USB_PRODUCT_ID);
+
+	if (ctx->usb_pid == 0)
+		goto err_free_ftdic;
 
 	/* Register the device with libsigrok. */
 	sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING,
@@ -89,17 +141,18 @@ static int hw_init(const char *devinfo)
 		sr_err("la8: %s: sr_dev_inst_new failed", __func__);
 		goto err_close_ftdic;
 	}
-
+	sdi->driver = cdi;
 	sdi->priv = ctx;
 
-	dev_insts = g_slist_append(dev_insts, sdi);
+	devices = g_slist_append(devices, sdi);
+	cdi->instances = g_slist_append(cdi->instances, sdi);
 
 	sr_spew("la8: Device init successful.");
 
 	/* Close device. We'll reopen it again when we need it. */
 	(void) la8_close(ctx); /* Log, but ignore errors. */
 
-	return 1;
+	return devices;
 
 err_close_ftdic:
 	(void) la8_close(ctx); /* Log, but ignore errors. */
@@ -111,7 +164,7 @@ err_free_ctx:
 	g_free(ctx);
 err_free_nothing:
 
-	return 0;
+	return NULL;
 }
 
 static int hw_dev_open(int dev_index)
@@ -120,7 +173,7 @@ static int hw_dev_open(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(cdi->instances, dev_index))) {
 		sr_err("la8: %s: sdi was NULL", __func__);
 		return SR_ERR_BUG;
 	}
@@ -131,11 +184,11 @@ static int hw_dev_open(int dev_index)
 	}
 
 	sr_dbg("la8: Opening LA8 device (%04x:%04x).", USB_VENDOR_ID,
-	       USB_PRODUCT_ID);
+	       ctx->usb_pid);
 
 	/* Open the device. */
 	if ((ret = ftdi_usb_open_desc(ctx->ftdic, USB_VENDOR_ID,
-			USB_PRODUCT_ID, USB_DESCRIPTION, NULL)) < 0) {
+			ctx->usb_pid, USB_DESCRIPTION, NULL)) < 0) {
 		sr_err("la8: %s: ftdi_usb_open_desc: (%d) %s",
 		       __func__, ret, ftdi_get_error_string(ctx->ftdic));
 		(void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */
@@ -178,7 +231,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(cdi->instances, dev_index))) {
 		sr_err("la8: %s: sdi was NULL", __func__);
 		return SR_ERR_BUG;
 	}
@@ -208,89 +261,62 @@ 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("la8: %s: sdi was NULL, continuing", __func__);
-			ret = SR_ERR_BUG;
-			continue;
-		}
-		sr_dev_inst_free(sdi); /* Returns void. */
-	}
-	g_slist_free(dev_insts); /* Returns void. */
-	dev_insts = NULL;
+	clear_instances();
 
-	return ret;
+	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;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-		sr_err("la8: %s: sdi was NULL", __func__);
-		return NULL;
-	}
-
-	if (!(ctx = sdi->priv)) {
-		sr_err("la8: %s: sdi->priv was NULL", __func__);
-		return NULL;
-	}
-
-	sr_spew("la8: %s: dev_index %d, dev_info_id %d.", __func__,
-		dev_index, dev_info_id);
-
-	switch (dev_info_id) {
+	switch (info_id) {
 	case SR_DI_INST:
-		info = sdi;
+		*data = sdi;
 		sr_spew("la8: %s: Returning sdi.", __func__);
 		break;
 	case SR_DI_NUM_PROBES:
-		info = GINT_TO_POINTER(NUM_PROBES);
+		*data = GINT_TO_POINTER(NUM_PROBES);
 		sr_spew("la8: %s: Returning number of probes: %d.", __func__,
 			NUM_PROBES);
 		break;
 	case SR_DI_PROBE_NAMES:
-		info = probe_names;
+		*data = probe_names;
 		sr_spew("la8: %s: Returning probenames.", __func__);
 		break;
 	case SR_DI_SAMPLERATES:
 		fill_supported_samplerates_if_needed();
-		info = &samplerates;
+		*data = &samplerates;
 		sr_spew("la8: %s: Returning samplerates.", __func__);
 		break;
 	case SR_DI_TRIGGER_TYPES:
-		info = (char *)TRIGGER_TYPES;
+		*data = (char *)TRIGGER_TYPES;
 		sr_spew("la8: %s: Returning trigger types: %s.", __func__,
 			TRIGGER_TYPES);
 		break;
 	case SR_DI_CUR_SAMPLERATE:
-		info = &ctx->cur_samplerate;
-		sr_spew("la8: %s: Returning samplerate: %" PRIu64 "Hz.",
-			__func__, ctx->cur_samplerate);
+		if (sdi) {
+			ctx = sdi->priv;
+			*data = &ctx->cur_samplerate;
+			sr_spew("la8: %s: Returning samplerate: %" PRIu64 "Hz.",
+				__func__, ctx->cur_samplerate);
+		} else
+			return SR_ERR;
 		break;
 	default:
-		/* Unknown device info ID, return NULL. */
-		sr_err("la8: %s: Unknown device info ID", __func__);
-		info = NULL;
-		break;
+		return SR_ERR_ARG;
 	}
 
-	return info;
+	return SR_OK;
 }
 
 static int hw_dev_status_get(int dev_index)
 {
 	struct sr_dev_inst *sdi;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+	if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) {
 		sr_err("la8: %s: sdi was NULL, device not found", __func__);
 		return SR_ST_NOT_FOUND;
 	}
@@ -312,7 +338,7 @@ static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+	if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) {
 		sr_err("la8: %s: sdi was NULL", __func__);
 		return SR_ERR_BUG;
 	}
@@ -424,7 +450,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	uint8_t buf[4];
 	int bytes_written;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+	if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) {
 		sr_err("la8: %s: sdi was NULL", __func__);
 		return SR_ERR_BUG;
 	}
@@ -503,7 +529,7 @@ static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 
 	sr_dbg("la8: Stopping acquisition.");
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+	if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) {
 		sr_err("la8: %s: sdi was NULL", __func__);
 		return SR_ERR_BUG;
 	}
@@ -527,12 +553,14 @@ SR_PRIV struct sr_dev_driver chronovu_la8_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,
 };