/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010 Håvard Espeland <gus@ping.uio.no>,
+ * Copyright (C) 2010-2012 Håvard Espeland <gus@ping.uio.no>,
* Copyright (C) 2010 Martin Stensgård <mastensg@ping.uio.no>
* Copyright (C) 2010 Carl Henrik Lunde <chlunde@ping.uio.no>
*
*/
/*
- * ASIX SIGMA Logic Analyzer Driver
+ * ASIX SIGMA/SIGMA2 logic analyzer driver
*/
#include <glib.h>
#include <glib/gstdio.h>
#include <ftdi.h>
#include <string.h>
-#include <zlib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "asix-sigma.h"
#define USB_VENDOR 0xa600
#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),
NULL,
};
-static struct sr_samplerates samplerates = {
+static const struct sr_samplerates samplerates = {
0,
0,
0,
supported_samplerates,
};
-static int hwcaps[] = {
+static const int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
SR_HWCAP_SAMPLERATE,
SR_HWCAP_CAPTURE_RATIO,
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,
- serial_txt, sizeof(serial_txt));
+ serial_txt, sizeof(serial_txt));
sscanf(serial_txt, "%x", &serial);
- if (serial < 0xa6010000 || serial > 0xa602ffff ) {
+ if (serial < 0xa6010000 || serial > 0xa602ffff) {
sr_err("sigma: Only SIGMA and SIGMA2 are supported "
- "in this version of Sigrok.");
+ "in this version of sigrok.");
goto free;
}
sr_err("sigma: %s: sdi was NULL", __func__);
goto free;
}
-
+ sdi->driver = adi;
+ 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)
return SR_OK;
}
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
int ret;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return SR_ERR;
-
ctx = sdi->priv;
/* Make sure it's an ASIX SIGMA. */
return SR_OK;
}
-static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
+static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
{
int i, ret;
struct context *ctx = sdi->priv;
* 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(const 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;
return SR_OK;
}
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
- sr_err("sigma: %s: sdi was NULL", __func__);
- return SR_ERR_BUG;
- }
-
if (!(ctx = sdi->priv)) {
sr_err("sigma: %s: sdi->priv was NULL", __func__);
return SR_ERR_BUG;
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_HWCAPS:
+ *data = hwcaps;
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;
+ default:
+ return SR_ERR_ARG;
}
- 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
return SR_ST_NOT_FOUND;
}
-static 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(const struct sr_dev_inst *sdi, 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)))
- 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
struct context *ctx;
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
+ struct sr_datafeed_meta_logic meta;
struct clockselect_50 clockselect;
int frac, triggerpin, ret;
uint8_t triggerselect;
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;
/* Setup maximum post trigger time. */
sigma_set_register(WRITE_POST_TRIGGER,
- (ctx->capture_ratio * 255) / 100, ctx);
+ (ctx->capture_ratio * 255) / 100, ctx);
/* Start acqusition. */
gettimeofday(&ctx->start_tv, 0);
return SR_ERR_MALLOC;
}
- /* Add capture source. */
- sr_source_add(0, G_IO_IN, 10, receive_data, sdi);
-
/* Send header packet to the session bus. */
packet->type = SR_DF_HEADER;
packet->payload = header;
header->feed_version = 1;
gettimeofday(&header->starttime, NULL);
- header->samplerate = ctx->cur_samplerate;
- header->num_logic_probes = ctx->num_probes;
sr_session_send(ctx->session_dev_id, packet);
+
+ /* Send metadata about the SR_DF_LOGIC packets to come. */
+ packet->type = SR_DF_META_LOGIC;
+ packet->payload = &meta;
+ meta.samplerate = ctx->cur_samplerate;
+ meta.num_probes = ctx->num_probes;
+ sr_session_send(ctx->session_dev_id, packet);
+
+ /* Add capture source. */
+ sr_source_add(0, G_IO_IN, 10, receive_data, sdi);
+
g_free(header);
g_free(packet);
/* 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;
}
SR_PRIV struct sr_dev_driver asix_sigma_driver_info = {
.name = "asix-sigma",
- .longname = "ASIX SIGMA",
+ .longname = "ASIX SIGMA/SIGMA2",
.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,
.dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
+ .instances = NULL,
};
projects / libsigrok.git / blobdiff