/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
* This program is free software: you can redistribute it and/or modify
{ 0, 0, 0, 0, 0, 0, 0 }
};
-static const int hwcaps[] = {
- SR_HWCAP_LOGIC_ANALYZER,
- SR_HWCAP_SAMPLERATE,
+static const int32_t hwcaps[] = {
+ SR_CONF_LOGIC_ANALYZER,
+ SR_CONF_TRIGGER_TYPE,
+ SR_CONF_SAMPLERATE,
/* These are really implemented in the driver, not the hardware. */
- SR_HWCAP_LIMIT_SAMPLES,
- SR_HWCAP_CONTINUOUS,
- 0,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_CONTINUOUS,
};
static const char *probe_names[] = {
NULL,
};
-static const uint64_t supported_samplerates[] = {
+static const uint64_t samplerates[] = {
SR_KHZ(20),
SR_KHZ(25),
SR_KHZ(50),
SR_MHZ(12),
SR_MHZ(16),
SR_MHZ(24),
- 0,
-};
-
-static const struct sr_samplerates samplerates = {
- 0,
- 0,
- 0,
- supported_samplerates,
};
SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
static struct sr_dev_driver *di = &fx2lafw_driver_info;
static int hw_dev_close(struct sr_dev_inst *sdi);
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
- const void *value);
static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
/**
static int hw_init(struct sr_context *sr_ctx)
{
- struct drv_context *drvc;
-
- if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
- sr_err("Driver context malloc failed.");
- return SR_ERR_MALLOC;
- }
-
- drvc->sr_ctx = sr_ctx;
- di->priv = drvc;
-
- return SR_OK;
+ return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
}
static GSList *hw_scan(GSList *options)
{
- GSList *devices;
- struct libusb_device_descriptor des;
- struct sr_dev_inst *sdi;
- const struct fx2lafw_profile *prof;
struct drv_context *drvc;
struct dev_context *devc;
+ struct sr_dev_inst *sdi;
+ struct sr_usb_dev_inst *usb;
struct sr_probe *probe;
+ struct sr_config *src;
+ const struct fx2lafw_profile *prof;
+ GSList *l, *devices, *conn_devices;
+ struct libusb_device_descriptor des;
libusb_device **devlist;
int devcnt, num_logic_probes, ret, i, j;
+ const char *conn;
(void)options;
/* This scan always invalidates any previous scans. */
clear_instances();
+ conn = NULL;
+ for (l = options; l; l = l->next) {
+ src = l->data;
+ switch (src->key) {
+ case SR_CONF_CONN:
+ conn = g_variant_get_string(src->data, NULL);
+ break;
+ }
+ }
+ if (conn)
+ conn_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn);
+ else
+ conn_devices = NULL;
+
/* Find all fx2lafw compatible devices and upload firmware to them. */
devices = NULL;
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
+ if (conn) {
+ usb = NULL;
+ for (l = conn_devices; l; l = l->next) {
+ usb = l->data;
+ if (usb->bus == libusb_get_bus_number(devlist[i])
+ && usb->address == libusb_get_device_address(devlist[i]))
+ break;
+ }
+ if (!l)
+ /* This device matched none of the ones that
+ * matched the conn specification. */
+ continue;
+ }
- if ((ret = libusb_get_device_descriptor(
- devlist[i], &des)) != 0) {
+ if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) {
sr_warn("Failed to get device descriptor: %s.",
libusb_error_name(ret));
continue;
static GSList *hw_dev_list(void)
{
- struct drv_context *drvc;
-
- drvc = di->priv;
-
- return drvc->instances;
+ return ((struct drv_context *)(di->priv))->instances;
}
static int hw_dev_open(struct sr_dev_inst *sdi)
if (devc->cur_samplerate == 0) {
/* Samplerate hasn't been set; default to the slowest one. */
- if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE,
- &supported_samplerates[0]) == SR_ERR)
- return SR_ERR;
+ devc->cur_samplerate = samplerates[0];
}
return SR_OK;
struct dev_context *devc;
devc = sdi->priv;
+
if (devc->usb->devhdl == NULL)
return SR_ERR;
return ret;
}
-static int hw_info_get(int info_id, const void **data,
- const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- switch (info_id) {
- case SR_DI_HWCAPS:
- *data = hwcaps;
- break;
- case SR_DI_SAMPLERATES:
- *data = &samplerates;
- break;
- case SR_DI_TRIGGER_TYPES:
- *data = TRIGGER_TYPES;
- break;
- case SR_DI_CUR_SAMPLERATE:
+ switch (id) {
+ case SR_CONF_SAMPLERATE:
if (sdi) {
devc = sdi->priv;
- *data = &devc->cur_samplerate;
+ *data = g_variant_new_uint64(devc->cur_samplerate);
} else
return SR_ERR;
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
}
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
- const void *value)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
int ret;
devc = sdi->priv;
- if (hwcap == SR_HWCAP_SAMPLERATE) {
- devc->cur_samplerate = *(const uint64_t *)value;
+ if (id == SR_CONF_SAMPLERATE) {
+ devc->cur_samplerate = g_variant_get_uint64(data);
ret = SR_OK;
- } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
- devc->limit_samples = *(const uint64_t *)value;
+ } else if (id == SR_CONF_LIMIT_SAMPLES) {
+ devc->limit_samples = g_variant_get_uint64(data);
ret = SR_OK;
} else {
- ret = SR_ERR;
+ ret = SR_ERR_NA;
}
return ret;
}
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+{
+ GVariant *gvar;
+ GVariantBuilder gvb;
+
+ (void)sdi;
+
+ switch (key) {
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+ break;
+ case SR_CONF_SAMPLERATE:
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
+ gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,
+ ARRAY_SIZE(samplerates), sizeof(uint64_t));
+ g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
+ *data = g_variant_builder_end(&gvb);
+ break;
+ case SR_CONF_TRIGGER_TYPE:
+ *data = g_variant_new_string(TRIGGER_TYPE);
+ break;
+ default:
+ return SR_ERR_NA;
+ }
+
+ return SR_OK;
+}
+
static int receive_data(int fd, int revents, void *cb_data)
{
struct timeval tv;
/* Terminate session. */
packet.type = SR_DF_END;
- sr_session_send(devc->session_dev_id, &packet);
+ sr_session_send(devc->cb_data, &packet);
/* Remove fds from polling. */
lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
*/
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
- sr_session_send(devc->session_dev_id, &packet);
+ sr_session_send(devc->cb_data, &packet);
/*
* Send the samples that triggered it,
logic.unitsize = sizeof(*devc->trigger_buffer);
logic.length = devc->trigger_stage * logic.unitsize;
logic.data = devc->trigger_buffer;
- sr_session_send(devc->session_dev_id, &packet);
+ sr_session_send(devc->cb_data, &packet);
devc->trigger_stage = TRIGGER_FIRED;
break;
logic.length = transfer->actual_length - trigger_offset_bytes;
logic.unitsize = sample_width;
logic.data = cur_buf + trigger_offset_bytes;
- sr_session_send(devc->session_dev_id, &packet);
+ sr_session_send(devc->cb_data, &packet);
devc->num_samples += cur_sample_count;
if (devc->limit_samples &&
static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
- struct sr_datafeed_packet packet;
- struct sr_datafeed_header header;
- struct sr_datafeed_meta_logic meta;
struct dev_context *devc;
struct drv_context *drvc;
struct libusb_transfer *transfer;
return SR_ERR;
}
- devc->session_dev_id = cb_data;
+ devc->cb_data = cb_data;
devc->num_samples = 0;
devc->empty_transfer_count = 0;
timeout, receive_data, NULL);
free(lupfd); /* NOT g_free()! */
- packet.type = SR_DF_HEADER;
- packet.payload = &header;
- header.feed_version = 1;
- gettimeofday(&header.starttime, NULL);
- sr_session_send(cb_data, &packet);
-
- /* Send metadata about the SR_DF_LOGIC packets to come. */
- packet.type = SR_DF_META_LOGIC;
- packet.payload = &meta;
- meta.samplerate = devc->cur_samplerate;
- meta.num_probes = devc->sample_wide ? 16 : 8;
- sr_session_send(cb_data, &packet);
+ /* Send header packet to the session bus. */
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
if ((ret = command_start_acquisition(devc->usb->devhdl,
devc->cur_samplerate, devc->sample_wide)) != SR_OK) {
.scan = hw_scan,
.dev_list = hw_dev_list,
.dev_clear = clear_instances,
+ .config_get = config_get,
+ .config_set = config_set,
+ .config_list = config_list,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
.priv = NULL,
projects / libsigrok.git / blobdiff