X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fsaleae-logic16%2Fapi.c;h=bee0ea4ad95f30a755fcc00463b7d587f34c0b60;hb=9cfc695ffe5f04622f61acb98ea4ac91c3f4ffc3;hp=6b282f7d58c79898d6169fe78d59ba765a897eb0;hpb=a0e0bb4149081eda06714f1158639f2dadcfa9d8;p=libsigrok.git
diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c
index 6b282f7d..bee0ea4a 100644
--- a/src/hardware/saleae-logic16/api.c
+++ b/src/hardware/saleae-logic16/api.c
@@ -19,12 +19,13 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "protocol.h"
@@ -33,13 +34,12 @@
#define USB_INTERFACE 0
#define USB_CONFIGURATION 1
-#define FX2_FIRMWARE FIRMWARE_DIR "/saleae-logic16-fx2.fw"
+#define FX2_FIRMWARE "saleae-logic16-fx2.fw"
#define MAX_RENUM_DELAY_MS 3000
#define NUM_SIMUL_TRANSFERS 32
SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
-static struct sr_dev_driver *di = &saleae_logic16_driver_info;
static const uint32_t scanopts[] = {
SR_CONF_CONN,
@@ -47,13 +47,13 @@ static const uint32_t scanopts[] = {
static const uint32_t devopts[] = {
SR_CONF_LOGIC_ANALYZER,
- SR_CONF_SAMPLERATE,
- SR_CONF_VOLTAGE_THRESHOLD,
- SR_CONF_TRIGGER_MATCH,
-
- /* These are really implemented in the driver, not the hardware. */
- SR_CONF_LIMIT_SAMPLES,
SR_CONF_CONTINUOUS,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
+ SR_CONF_CONN | SR_CONF_GET,
+ SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_VOLTAGE_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+ SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
};
static const int32_t soft_trigger_matches[] = {
@@ -67,7 +67,6 @@ static const int32_t soft_trigger_matches[] = {
static const char *channel_names[] = {
"0", "1", "2", "3", "4", "5", "6", "7", "8",
"9", "10", "11", "12", "13", "14", "15",
- NULL,
};
static const struct {
@@ -96,7 +95,7 @@ static const uint64_t samplerates[] = {
SR_MHZ(100),
};
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
}
@@ -112,8 +111,7 @@ static gboolean check_conf_profile(libusb_device *dev)
ret = FALSE;
while (!ret) {
/* Assume the FW has not been loaded, unless proven wrong. */
- if (libusb_get_device_descriptor(dev, &des) != 0)
- break;
+ libusb_get_device_descriptor(dev, &des);
if (libusb_open(dev, &hdl) != 0)
break;
@@ -139,21 +137,21 @@ static gboolean check_conf_profile(libusb_device *dev)
return ret;
}
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
struct dev_context *devc;
struct sr_dev_inst *sdi;
struct sr_usb_dev_inst *usb;
- struct sr_channel *ch;
struct sr_config *src;
GSList *l, *devices, *conn_devices;
struct libusb_device_descriptor des;
libusb_device **devlist;
- int devcnt, ret, i, j;
+ unsigned int i, j;
const char *conn;
+ char connection_id[64];
- drvc = di->priv;
+ drvc = di->context;
conn = NULL;
for (l = options; l; l = l->next) {
@@ -187,31 +185,25 @@ static GSList *scan(GSList *options)
continue;
}
- if ((ret = libusb_get_device_descriptor(devlist[i], &des)) != 0) {
- sr_warn("Failed to get device descriptor: %s.",
- libusb_error_name(ret));
- continue;
- }
+ libusb_get_device_descriptor(devlist[i], &des);
+
+ usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
if (des.idVendor != LOGIC16_VID || des.idProduct != LOGIC16_PID)
continue;
- devcnt = g_slist_length(drvc->instances);
- sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
- "Saleae", "Logic16", NULL);
- if (!sdi)
- return NULL;
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_INITIALIZING;
+ sdi->vendor = g_strdup("Saleae");
+ sdi->model = g_strdup("Logic16");
sdi->driver = di;
+ sdi->connection_id = g_strdup(connection_id);
- for (j = 0; channel_names[j]; j++) {
- if (!(ch = sr_channel_new(j, SR_CHANNEL_LOGIC, TRUE,
- channel_names[j])))
- return NULL;
- sdi->channels = g_slist_append(sdi->channels, ch);
- }
+ for (j = 0; j < ARRAY_SIZE(channel_names); j++)
+ sr_channel_new(sdi, j, SR_CHANNEL_LOGIC, TRUE,
+ channel_names[j]);
- if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
- return NULL;
+ devc = g_malloc0(sizeof(struct dev_context));
devc->selected_voltage_range = VOLTAGE_RANGE_18_33_V;
sdi->priv = devc;
drvc->instances = g_slist_append(drvc->instances, sdi);
@@ -226,13 +218,12 @@ static GSList *scan(GSList *options)
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
} else {
- if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
- FX2_FIRMWARE) == SR_OK)
+ if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
+ USB_CONFIGURATION, FX2_FIRMWARE) == SR_OK)
/* Store when this device's FW was updated. */
devc->fw_updated = g_get_monotonic_time();
else
- sr_err("Firmware upload failed for "
- "device %d.", devcnt);
+ sr_err("Firmware upload failed.");
sdi->inst_type = SR_INST_USB;
sdi->conn = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]), 0xff, NULL);
@@ -244,27 +235,29 @@ static GSList *scan(GSList *options)
return devices;
}
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
static int logic16_dev_open(struct sr_dev_inst *sdi)
{
+ struct sr_dev_driver *di;
libusb_device **devlist;
struct sr_usb_dev_inst *usb;
struct libusb_device_descriptor des;
struct drv_context *drvc;
- int ret, skip, i, device_count;
+ int ret, i, device_count;
+ char connection_id[64];
- drvc = di->priv;
+ di = sdi->driver;
+ drvc = di->context;
usb = sdi->conn;
if (sdi->status == SR_ST_ACTIVE)
/* Device is already in use. */
return SR_ERR;
- skip = 0;
device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
if (device_count < 0) {
sr_err("Failed to get device list: %s.",
@@ -273,28 +266,18 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
}
for (i = 0; i < device_count; i++) {
- if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("Failed to get device descriptor: %s.",
- libusb_error_name(ret));
- continue;
- }
+ libusb_get_device_descriptor(devlist[i], &des);
if (des.idVendor != LOGIC16_VID || des.idProduct != LOGIC16_PID)
continue;
- if (sdi->status == SR_ST_INITIALIZING) {
- if (skip != sdi->index) {
- /* Skip devices of this type that aren't the one we want. */
- skip += 1;
- continue;
- }
- } else if (sdi->status == SR_ST_INACTIVE) {
+ if ((sdi->status == SR_ST_INITIALIZING) ||
+ (sdi->status == SR_ST_INACTIVE)) {
/*
- * This device is fully enumerated, so we need to find
- * this device by vendor, product, bus and address.
+ * Check device by its physical USB bus/port address.
*/
- if (libusb_get_bus_number(devlist[i]) != usb->bus
- || libusb_get_device_address(devlist[i]) != usb->address)
+ usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+ if (strcmp(sdi->connection_id, connection_id))
/* This is not the one. */
continue;
}
@@ -332,8 +315,8 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
}
sdi->status = SR_ST_ACTIVE;
- sr_info("Opened device %d on %d.%d, interface %d.",
- sdi->index, usb->bus, usb->address, USB_INTERFACE);
+ sr_info("Opened device on %d.%d (logical) / %s (physical), interface %d.",
+ usb->bus, usb->address, sdi->connection_id, USB_INTERFACE);
break;
}
@@ -406,11 +389,11 @@ static int dev_close(struct sr_dev_inst *sdi)
struct sr_usb_dev_inst *usb;
usb = sdi->conn;
- if (usb->devhdl == NULL)
+ if (!usb->devhdl)
return SR_ERR;
- sr_info("Closing device %d on %d.%d interface %d.",
- sdi->index, usb->bus, usb->address, USB_INTERFACE);
+ sr_info("Closing device on %d.%d (logical) / %s (physical) interface %d.",
+ usb->bus, usb->address, sdi->connection_id, USB_INTERFACE);
libusb_release_interface(usb->devhdl, USB_INTERFACE);
libusb_close(usb->devhdl);
usb->devhdl = NULL;
@@ -419,19 +402,17 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
{
int ret;
struct drv_context *drvc;
- if (!(drvc = di->priv))
+ if (!(drvc = di->context))
/* Can get called on an unused driver, doesn't matter. */
return SR_OK;
-
ret = std_dev_clear(di, NULL);
g_free(drvc);
- di->priv = NULL;
return ret;
}
@@ -467,6 +448,12 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
devc = sdi->priv;
*data = g_variant_new_uint64(devc->cur_samplerate);
break;
+ case SR_CONF_CAPTURE_RATIO:
+ if (!sdi)
+ return SR_ERR;
+ devc = sdi->priv;
+ *data = g_variant_new_uint64(devc->capture_ratio);
+ break;
case SR_CONF_VOLTAGE_THRESHOLD:
if (!sdi)
return SR_ERR;
@@ -513,6 +500,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = g_variant_get_uint64(data);
break;
+ case SR_CONF_CAPTURE_RATIO:
+ devc->capture_ratio = g_variant_get_uint64(data);
+ ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK;
+ break;
case SR_CONF_VOLTAGE_THRESHOLD:
g_variant_get(data, "(dd)", &low, &high);
ret = SR_ERR_ARG;
@@ -676,12 +667,14 @@ static int receive_data(int fd, int revents, void *cb_data)
struct dev_context *devc;
struct drv_context *drvc;
const struct sr_dev_inst *sdi;
+ struct sr_dev_driver *di;
(void)fd;
(void)revents;
sdi = cb_data;
- drvc = di->priv;
+ di = sdi->driver;
+ drvc = di->context;
devc = sdi->priv;
tv.tv_sec = tv.tv_usec = 0;
@@ -697,6 +690,7 @@ static int receive_data(int fd, int revents, void *cb_data)
static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
+ struct sr_dev_driver *di = sdi->driver;
struct dev_context *devc;
struct drv_context *drvc;
struct sr_usb_dev_inst *usb;
@@ -710,7 +704,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- drvc = di->priv;
+ drvc = di->context;
devc = sdi->priv;
usb = sdi->conn;
@@ -727,7 +721,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
memset(devc->channel_data, 0, sizeof(devc->channel_data));
if ((trigger = sr_session_trigger_get(sdi->session))) {
- devc->stl = soft_trigger_logic_new(sdi, trigger);
+ int pre_trigger_samples = 0;
+ if (devc->limit_samples > 0)
+ pre_trigger_samples = devc->capture_ratio * devc->limit_samples/100;
+ devc->stl = soft_trigger_logic_new(sdi, trigger, pre_trigger_samples);
+ if (!devc->stl)
+ return SR_ERR_MALLOC;
devc->trigger_fired = FALSE;
} else
devc->trigger_fired = TRUE;
@@ -833,5 +832,5 @@ SR_PRIV struct sr_dev_driver saleae_logic16_driver_info = {
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};