lecroy-logicstudio: Initial driver implementation.

This supports both 8 and 16 channel modes with samplerates up to
500 MHz. Voltage thresholds are currently fixed at 1.58V.
This commit is contained in:
Tilman Sauerbeck 2015-10-08 20:13:53 +02:00 committed by Uwe Hermann
parent 17b93fd7c0
commit c7b17bcba3
6 changed files with 1868 additions and 0 deletions

View File

@ -335,6 +335,12 @@ libsigrok_la_SOURCES += \
src/hardware/lascar-el-usb/protocol.c \
src/hardware/lascar-el-usb/api.c
endif
if HW_LECROY_LOGICSTUDIO
libsigrok_la_SOURCES += \
src/hardware/lecroy-logicstudio/protocol.h \
src/hardware/lecroy-logicstudio/protocol.c \
src/hardware/lecroy-logicstudio/api.c
endif
if HW_MANSON_HCS_3XXX
libsigrok_la_SOURCES += \
src/hardware/manson-hcs-3xxx/protocol.h \

View File

@ -241,6 +241,7 @@ SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb])
SR_DRIVER([KERN scale], [kern-scale], [libserialport])
SR_DRIVER([Korad KAxxxxP], [korad-kaxxxxp], [libserialport])
SR_DRIVER([Lascar EL-USB], [lascar-el-usb], [libusb])
SR_DRIVER([LeCroy LogicStudio], [lecroy-logicstudio], [libusb])
SR_DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx], [libserialport])
SR_DRIVER([maynuo-m97], [maynuo-m97])
SR_DRIVER([MIC 985xx], [mic-985xx], [libserialport])

View File

@ -108,6 +108,9 @@ extern SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info;
#ifdef HAVE_HW_LASCAR_EL_USB
extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
#endif
#ifdef HAVE_HW_LECROY_LOGICSTUDIO
extern SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info;
#endif
#ifdef HAVE_HW_LINK_MSO19
extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
#endif
@ -269,6 +272,9 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
#ifdef HAVE_HW_LASCAR_EL_USB
(DRVS) {&lascar_el_usb_driver_info, NULL},
#endif
#ifdef HAVE_HW_LECROY_LOGICSTUDIO
(DRVS) {&lecroy_logicstudio_driver_info, NULL},
#endif
#ifdef HAVE_HW_LINK_MSO19
(DRVS) {&link_mso19_driver_info, NULL},
#endif

View File

@ -0,0 +1,559 @@
/*
* This file is part of the libsigrok project.
*
* Copyright (C) 2015 Tilman Sauerbeck <tilman@code-monkey.de>
* Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
#include "protocol.h"
#define LOGICSTUDIO16_VID 0x05ff
#define LOGICSTUDIO16_PID_LACK_FIRMWARE 0xa001
#define LOGICSTUDIO16_PID_HAVE_FIRMWARE 0xa002
#define USB_INTERFACE 0
#define USB_CONFIGURATION 0
#define FX2_FIRMWARE "lecroy-logicstudio16-fx2lp.fw"
#define UNKNOWN_ADDRESS 0xff
#define MAX_RENUM_DELAY_MS 3000
static const uint32_t devopts[] = {
SR_CONF_LOGIC_ANALYZER,
SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
};
static const int32_t trigger_matches[] = {
SR_TRIGGER_ZERO,
SR_TRIGGER_ONE,
SR_TRIGGER_RISING,
SR_TRIGGER_FALLING,
SR_TRIGGER_EDGE,
};
static const uint64_t samplerates[] = {
SR_HZ(1000),
SR_HZ(2500),
SR_KHZ(5),
SR_KHZ(10),
SR_KHZ(25),
SR_KHZ(50),
SR_KHZ(100),
SR_KHZ(250),
SR_KHZ(500),
SR_KHZ(1000),
SR_KHZ(2500),
SR_MHZ(5),
SR_MHZ(10),
SR_MHZ(25),
SR_MHZ(50),
SR_MHZ(100),
SR_MHZ(250),
SR_MHZ(500),
};
SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info;
static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
}
static struct sr_dev_inst *create_device(struct sr_dev_driver *di,
struct sr_usb_dev_inst *usb, enum sr_dev_inst_status status,
int64_t fw_updated)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
char channel_name[8];
int i;
sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = status;
sdi->vendor = g_strdup("LeCroy");
sdi->model = g_strdup("LogicStudio16");
sdi->driver = di;
sdi->inst_type = SR_INST_USB;
sdi->conn = usb;
for (i = 0; i < 16; i++) {
snprintf(channel_name, sizeof(channel_name), "D%i", i);
sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name);
}
devc = g_malloc0(sizeof(struct dev_context));
sdi->priv = devc;
devc->fw_updated = fw_updated;
devc->capture_ratio = 50;
lls_set_samplerate(sdi, SR_MHZ(500));
return sdi;
}
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct sr_usb_dev_inst *usb;
struct libusb_device_descriptor des;
libusb_device **devlist;
GSList *devices;
char connection_id[64];
size_t i;
int r;
(void)options;
drvc = di->context;
drvc->instances = NULL;
devices = NULL;
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
libusb_get_device_descriptor(devlist[i], &des);
if (des.idVendor != LOGICSTUDIO16_VID)
continue;
usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
usb = NULL;
switch (des.idProduct) {
case LOGICSTUDIO16_PID_HAVE_FIRMWARE:
usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
sdi = create_device(di, usb, SR_ST_INACTIVE, 0);
break;
case LOGICSTUDIO16_PID_LACK_FIRMWARE:
r = ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
USB_CONFIGURATION, FX2_FIRMWARE);
if (r != SR_OK) {
/*
* An error message has already been logged by
* ezusb_upload_firmware().
*/
continue;
}
/*
* Put unknown as the address so that we know we still
* need to get the proper address after the device
* renumerates.
*/
usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
UNKNOWN_ADDRESS, NULL);
sdi = create_device(di, usb, SR_ST_INITIALIZING,
g_get_monotonic_time());
break;
default:
break;
}
/* Cannot handle this device? */
if (!usb)
continue;
sdi->connection_id = g_strdup(connection_id);
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
}
libusb_free_device_list(devlist, 1);
return devices;
}
static GSList *dev_list(const struct sr_dev_driver *di)
{
return ((struct drv_context *)(di->context))->instances;
}
static int dev_clear(const struct sr_dev_driver *di)
{
return std_dev_clear(di, NULL);
}
static int open_device(struct sr_dev_inst *sdi)
{
struct drv_context *drvc;
struct sr_usb_dev_inst *usb;
struct libusb_device_descriptor des;
libusb_device **devlist;
char connection_id[64];
bool is_opened;
size_t i;
int r;
if (sdi->status == SR_ST_ACTIVE)
return SR_ERR;
drvc = sdi->driver->context;
usb = sdi->conn;
is_opened = FALSE;
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
libusb_get_device_descriptor(devlist[i], &des);
if (des.idVendor != LOGICSTUDIO16_VID ||
des.idProduct != LOGICSTUDIO16_PID_HAVE_FIRMWARE)
continue;
usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
/*
* Check if this device is the same one that we associated
* with this sdi in scan() and bail if it isn't.
*/
if (strcmp(sdi->connection_id, connection_id))
continue;
r = libusb_open(devlist[i], &usb->devhdl);
if (r) {
sr_err("Failed to open device: %s.",
libusb_error_name(r));
break;
}
/* Fix up address after firmware upload. */
if (usb->address == UNKNOWN_ADDRESS)
usb->address = libusb_get_device_address(devlist[i]);
is_opened = TRUE;
break;
}
libusb_free_device_list(devlist, 1);
if (!is_opened)
return SR_ERR;
if ((r = libusb_claim_interface(usb->devhdl, USB_INTERFACE))) {
sr_err("Failed to claim interface: %s.",
libusb_error_name(r));
return SR_ERR;
}
sdi->status = SR_ST_ACTIVE;
return SR_OK;
}
static int dev_open(struct sr_dev_inst *sdi)
{
struct drv_context *drvc;
struct dev_context *devc;
int64_t timediff_us, timediff_ms;
int ret;
drvc = sdi->driver->context;
devc = sdi->priv;
if (!drvc) {
sr_err("Driver was not initialized.");
return SR_ERR;
}
/*
* If we didn't need to upload FX2 firmware in scan(), open the device
* right away. Otherwise, wait up to MAX_RENUM_DELAY_MS ms for the
* FX2 to renumerate.
*/
if (!devc->fw_updated) {
ret = open_device(sdi);
} else {
sr_info("Waiting for device to reset.");
/* Takes >= 300ms for the FX2 to be gone from the USB bus. */
g_usleep(300 * 1000);
timediff_ms = 0;
while (timediff_ms < MAX_RENUM_DELAY_MS) {
ret = open_device(sdi);
if (ret == SR_OK)
break;
g_usleep(100 * 1000);
timediff_us = g_get_monotonic_time() - devc->fw_updated;
timediff_ms = timediff_us / 1000;
sr_spew("Waited %" PRIi64 "ms.", timediff_ms);
}
if (ret != SR_OK) {
sr_err("Device failed to renumerate.");
return SR_ERR;
}
sr_info("Device came back after %" PRIi64 "ms.", timediff_ms);
}
if (ret != SR_OK) {
sr_err("Unable to open device.");
return ret;
}
/*
* Only allocate the sample buffer now since it's rather large.
* Don't want to allocate it before we know we are going to use it.
*/
devc->fetched_samples = g_malloc(SAMPLE_BUF_SIZE);
devc->conv8to16 = g_malloc(CONV_8TO16_BUF_SIZE);
devc->intr_xfer = libusb_alloc_transfer(0);
devc->bulk_xfer = libusb_alloc_transfer(0);
return SR_OK;
}
static int dev_close(struct sr_dev_inst *sdi)
{
struct sr_usb_dev_inst *usb;
struct dev_context *devc;
usb = sdi->conn;
devc = sdi->priv;
g_free(devc->fetched_samples);
devc->fetched_samples = NULL;
g_free(devc->conv8to16);
devc->conv8to16 = NULL;
if (devc->intr_xfer) {
devc->intr_xfer->buffer = NULL; /* Points into devc. */
libusb_free_transfer(devc->intr_xfer);
devc->intr_xfer = NULL;
}
if (devc->bulk_xfer) {
devc->bulk_xfer->buffer = NULL; /* Points into devc. */
libusb_free_transfer(devc->bulk_xfer);
devc->bulk_xfer = NULL;
}
if (!usb->devhdl)
return SR_ERR;
libusb_release_interface(usb->devhdl, 0);
libusb_close(usb->devhdl);
usb->devhdl = NULL;
sdi->status = SR_ST_INACTIVE;
return SR_OK;
}
static int cleanup(const struct sr_dev_driver *di)
{
struct drv_context *drvc;
int ret;
drvc = di->context;
ret = dev_clear(di);
g_free(drvc);
return ret;
}
static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
(void)cg;
if (!sdi)
return SR_ERR_ARG;
devc = sdi->priv;
switch (key) {
case SR_CONF_SAMPLERATE:
*data = g_variant_new_uint64(lls_get_samplerate(sdi));
break;
case SR_CONF_CAPTURE_RATIO:
*data = g_variant_new_uint64(devc->capture_ratio);
break;
default:
return SR_ERR_NA;
}
return SR_OK;
}
static int config_set(uint32_t key, GVariant *data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
(void)cg;
if (!sdi)
return SR_ERR_ARG;
devc = sdi->priv;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
switch (key) {
case SR_CONF_SAMPLERATE:
return lls_set_samplerate(sdi, g_variant_get_uint64(data));
case SR_CONF_CAPTURE_RATIO:
devc->capture_ratio = g_variant_get_uint64(data);
if (devc->capture_ratio > 100)
return SR_ERR;
break;
default:
return SR_ERR_NA;
}
return SR_OK;
}
static int config_list(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
GVariantBuilder vb;
GVariant *var;
(void)sdi;
(void)cg;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts, ARRAY_SIZE(devopts),
sizeof(uint32_t));
break;
case SR_CONF_SAMPLERATE:
g_variant_builder_init(&vb, G_VARIANT_TYPE("a{sv}"));
var = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
samplerates, ARRAY_SIZE(samplerates),
sizeof(uint64_t));
g_variant_builder_add(&vb, "{sv}", "samplerates", var);
*data = g_variant_builder_end(&vb);
break;
case SR_CONF_TRIGGER_MATCH:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
trigger_matches, ARRAY_SIZE(trigger_matches),
sizeof(int32_t));
break;
default:
return SR_ERR_NA;
}
return SR_OK;
}
static int config_commit(const struct sr_dev_inst *sdi)
{
return lls_setup_acquisition(sdi);
}
static int receive_usb_data(int fd, int revents, void *cb_data)
{
struct drv_context *drvc;
struct timeval tv;
(void)fd;
(void)revents;
drvc = (struct drv_context *) cb_data;
tv.tv_sec = 0;
tv.tv_usec = 0;
libusb_handle_events_timeout_completed(drvc->sr_ctx->libusb_ctx,
&tv, NULL);
return TRUE;
}
static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
struct drv_context *drvc;
int ret;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
drvc = sdi->driver->context;
if ((ret = lls_start_acquisition(sdi)) < 0)
return ret;
std_session_send_df_header(cb_data, LOG_PREFIX);
return usb_source_add(sdi->session, drvc->sr_ctx, 100,
receive_usb_data, drvc);
}
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
(void)cb_data;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
return lls_stop_acquisition(sdi);
}
SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info = {
.name = "lecroy-logicstudio",
.longname = "LeCroy LogicStudio",
.api_version = 1,
.init = init,
.cleanup = cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
.config_commit = config_commit,
.dev_open = dev_open,
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,107 @@
/*
* This file is part of the libsigrok project.
*
* Copyright (C) 2015 Tilman Sauerbeck <tilman@code-monkey.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBSIGROK_HARDWARE_LECROY_LOGICSTUDIO_PROTOCOL_H
#define LIBSIGROK_HARDWARE_LECROY_LOGICSTUDIO_PROTOCOL_H
#include <stdint.h>
#include <glib.h>
#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#define LOG_PREFIX "lecroy-logicstudio"
#define SAMPLE_BUF_SIZE 40960u
#define CONV_8TO16_BUF_SIZE 8192
#define INTR_BUF_SIZE 32
struct samplerate_info;
/** Private, per-device-instance driver context. */
struct dev_context {
struct libusb_transfer *intr_xfer;
struct libusb_transfer *bulk_xfer;
const struct samplerate_info *samplerate_info;
/**
* When the device is opened, this will point at a buffer
* of SAMPLE_BUF_SIZE bytes.
*/
uint8_t *fetched_samples;
/**
* Used to convert 8 bit samples (8 channels) to 16 bit samples
* (16 channels), thus only used in 8 channel mode.
* Holds CONV_8TO16_BUF_SIZE bytes.
*/
uint16_t *conv8to16;
int64_t fw_updated; /* Time of last FX2 firmware upload. */
/** The pre-trigger capture ratio in percent. */
uint64_t capture_ratio;
uint64_t earliest_sample;
uint64_t trigger_sample;
/** The number of eight-channel groups enabled (either 1 or 2). */
uint32_t num_enabled_channel_groups;
/**
* The number of samples to acquire (in thousands).
* This is not customizable, but depending on the number
* of enabled channel groups.
*/
uint32_t num_thousand_samples;
uint32_t total_received_sample_bytes;
/** Mask of enabled channels. */
uint16_t channel_mask;
uint16_t acquisition_id;
gboolean want_trigger;
gboolean abort_acquisition;
/**
* These two magic values are required in order to fix a sample
* buffer corruption. Before the first acquisition is run, they
* need to be set to 0.
*/
uint8_t magic_arm_trigger;
uint8_t magic_fetch_samples;
/**
* Buffer for interrupt transfers (acquisition state notifications).
*/
uint8_t intr_buf[INTR_BUF_SIZE];
};
SR_PRIV void lls_update_channel_mask(const struct sr_dev_inst *sdi);
SR_PRIV int lls_set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate);
SR_PRIV uint64_t lls_get_samplerate(const struct sr_dev_inst *sdi);
SR_PRIV int lls_setup_acquisition(const struct sr_dev_inst *sdi);
SR_PRIV int lls_start_acquisition(const struct sr_dev_inst *sdi);
SR_PRIV int lls_stop_acquisition(const struct sr_dev_inst *sdi);
#endif