#define PACKET_SIZE 2048 /* ?? */
+//#define ZP_EXPERIMENTAL
+
typedef struct {
unsigned short vid;
unsigned short pid;
};
static const int hwcaps[] = {
- SR_HWCAP_LOGIC_ANALYZER,
- SR_HWCAP_SAMPLERATE,
- SR_HWCAP_CAPTURE_RATIO,
+ SR_CONF_LOGIC_ANALYZER,
+ SR_CONF_SAMPLERATE,
+ SR_CONF_CAPTURE_RATIO,
/* These are really implemented in the driver, not the hardware. */
- SR_HWCAP_LIMIT_SAMPLES,
+ SR_CONF_LIMIT_SAMPLES,
0,
};
* We currently ignore other untested/unsupported devices here.
*/
static const char *probe_names[NUM_PROBES + 1] = {
- "A0",
- "A1",
- "A2",
- "A3",
- "A4",
- "A5",
- "A6",
- "A7",
- "B0",
- "B1",
- "B2",
- "B3",
- "B4",
- "B5",
- "B6",
- "B7",
+ "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
+ "B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7",
NULL,
};
/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
-static struct sr_dev_driver *zdi = &zeroplus_logic_cube_driver_info;
-
-static libusb_context *usb_context = NULL;
+static struct sr_dev_driver *di = &zeroplus_logic_cube_driver_info;
/*
* The hardware supports more samplerates than these, but these are the
/* Private, per-device-instance driver context. */
struct dev_context {
uint64_t cur_samplerate;
+ uint64_t max_samplerate;
uint64_t limit_samples;
int num_channels; /* TODO: This isn't initialized before it's needed :( */
- uint64_t memory_size;
- uint8_t probe_mask;
- uint8_t trigger_mask[NUM_TRIGGER_STAGES];
- uint8_t trigger_value[NUM_TRIGGER_STAGES];
+ int memory_size;
+ unsigned int max_memory_size;
+ //uint8_t probe_mask;
+ //uint8_t trigger_mask[NUM_TRIGGER_STAGES];
+ //uint8_t trigger_value[NUM_TRIGGER_STAGES];
// uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
+ int trigger;
+ unsigned int capture_ratio;
/* TODO: this belongs in the device instance */
struct sr_usb_dev_inst *usb;
};
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
- const void *value);
static int hw_dev_close(struct sr_dev_inst *sdi);
static unsigned int get_memory_size(int type)
return 0;
}
+#if 0
static int configure_probes(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
return SR_OK;
}
+#endif
+
+static int configure_probes(const struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+ const GSList *l;
+ const struct sr_probe *probe;
+ char *tc;
+ int type;
+
+ /* Note: sdi and sdi->priv are non-NULL, the caller checked this. */
+ devc = sdi->priv;
+
+ for (l = sdi->probes; l; l = l->next) {
+ probe = (struct sr_probe *)l->data;
+ if (probe->enabled == FALSE)
+ continue;
+
+ if ((tc = probe->trigger)) {
+ switch (*tc) {
+ case '1':
+ type = TRIGGER_HIGH;
+ break;
+ case '0':
+ type = TRIGGER_LOW;
+ break;
+#if 0
+ case 'r':
+ type = TRIGGER_POSEDGE;
+ break;
+ case 'f':
+ type = TRIGGER_NEGEDGE;
+ break;
+ case 'c':
+ type = TRIGGER_ANYEDGE;
+ break;
+#endif
+ default:
+ return SR_ERR;
+ }
+ analyzer_add_trigger(probe->index, type);
+ devc->trigger = 1;
+ }
+ }
+
+ return SR_OK;
+}
static int clear_instances(void)
{
struct drv_context *drvc;
struct dev_context *devc;
- drvc = zdi->priv;
+ drvc = di->priv;
for (l = drvc->instances; l; l = l->next) {
sdi = l->data;
if (!(devc = sdi->priv)) {
* API callbacks
*/
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
{
struct drv_context *drvc;
sr_err("zeroplus: driver context malloc failed.");
return SR_ERR_MALLOC;
}
- zdi->priv = drvc;
-
- if (libusb_init(&usb_context) != 0) {
- sr_err("zp: Failed to initialize USB.");
- return 0;
- }
+ drvc->sr_ctx = sr_ctx;
+ di->priv = drvc;
return SR_OK;
}
int ret, devcnt, i, j;
(void)options;
- drvc = zdi->priv;
+
+ drvc = di->priv;
devices = NULL;
clear_instances();
/* Find all ZEROPLUS analyzers and add them to device list. */
devcnt = 0;
- libusb_get_device_list(usb_context, &devlist); /* TODO: Errors. */
+ libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); /* TODO: Errors. */
for (i = 0; devlist[i]; i++) {
ret = libusb_get_device_descriptor(devlist[i], &des);
if (ret != 0) {
- sr_err("zp: failed to get device descriptor: %d", ret);
+ sr_err("zp: failed to get device descriptor: %s",
+ libusb_error_name(ret));
continue;
}
sr_err("zp: %s: sr_dev_inst_new failed", __func__);
return NULL;
}
- sdi->driver = zdi;
+ sdi->driver = di;
/* Allocate memory for our private driver context. */
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
}
sdi->priv = devc;
devc->num_channels = prof->channels;
- devc->memory_size = prof->sample_depth * 1024;
+#ifdef ZP_EXPERIMENTAL
+ devc->max_memory_size = 128 * 1024;
+ devc->max_samplerate = 200;
+#else
+ devc->max_memory_size = prof->sample_depth * 1024;
+ devc->max_samplerate = prof->max_sampling_freq;
+#endif
+ devc->max_samplerate *= SR_MHZ(1);
+ devc->memory_size = MEMORY_SIZE_8K;
// memset(devc->trigger_buffer, 0, NUM_TRIGGER_STAGES);
/* Fill in probelist according to this device's profile. */
{
struct drv_context *drvc;
- drvc = zdi->priv;
+ drvc = di->priv;
return drvc->instances;
}
static int hw_dev_open(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct drv_context *drvc = di->priv;
libusb_device **devlist, *dev;
struct libusb_device_descriptor des;
int device_count, ret, i;
return SR_ERR_ARG;
}
- device_count = libusb_get_device_list(usb_context, &devlist);
+ device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx,
+ &devlist);
if (device_count < 0) {
sr_err("zp: Failed to retrieve device list");
return SR_ERR;
dev = NULL;
for (i = 0; i < device_count; i++) {
if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("fx2lafw: Failed to get device descriptor: %d.",
- ret);
+ sr_err("zp: Failed to get device descriptor: %s.",
+ libusb_error_name(ret));
continue;
}
if (libusb_get_bus_number(devlist[i]) == devc->usb->bus
sdi->index, devc->usb->bus,
devc->usb->address, USB_INTERFACE);
} else {
- sr_err("zp: failed to open device: %d", ret);
+ sr_err("zp: failed to open device: %s", libusb_error_name(ret));
return SR_ERR;
}
ret = libusb_set_configuration(devc->usb->devhdl, USB_CONFIGURATION);
if (ret < 0) {
- sr_err("zp: Unable to set USB configuration %d: %d",
- USB_CONFIGURATION, ret);
+ sr_err("zp: Unable to set USB configuration %d: %s",
+ USB_CONFIGURATION, libusb_error_name(ret));
return SR_ERR;
}
ret = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
if (ret != 0) {
- sr_err("zp: Unable to claim interface: %d", ret);
+ sr_err("zp: Unable to claim interface: %s",
+ libusb_error_name(ret));
return SR_ERR;
}
+ /* Set default configuration after power on */
+ if (analyzer_read_status(devc->usb->devhdl) == 0)
+ analyzer_configure(devc->usb->devhdl);
+
analyzer_reset(devc->usb->devhdl);
analyzer_initialize(devc->usb->devhdl);
- analyzer_set_memory_size(MEMORY_SIZE_512K);
+ //analyzer_set_memory_size(MEMORY_SIZE_512K);
// analyzer_set_freq(g_freq, g_freq_scale);
analyzer_set_trigger_count(1);
// analyzer_set_ramsize_trigger_address((((100 - g_pre_trigger)
// * get_memory_size(g_memory_size)) / 100) >> 2);
- analyzer_set_ramsize_trigger_address(
- (100 * get_memory_size(MEMORY_SIZE_512K) / 100) >> 2);
#if 0
if (g_double_mode == 1)
analyzer_set_compression(COMPRESSION_NONE);
if (devc->cur_samplerate == 0) {
- /* Samplerate hasn't been set. Default to the slowest one. */
- if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE,
- &samplerates.list[0]) == SR_ERR)
- return SR_ERR;
+ /* Samplerate hasn't been set. Default to 1MHz. */
+ analyzer_set_freq(1, FREQ_SCALE_MHZ);
+ devc->cur_samplerate = SR_MHZ(1);
}
return SR_OK;
{
struct drv_context *drvc;
- if (!(drvc = zdi->priv))
+ if (!(drvc = di->priv))
return SR_OK;
clear_instances();
- if (usb_context)
- libusb_exit(usb_context);
- usb_context = NULL;
-
return SR_OK;
}
-static int hw_info_get(int info_id, const void **data,
- const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- switch (info_id) {
+ switch (id) {
case SR_DI_HWCAPS:
*data = hwcaps;
break;
- case SR_DI_NUM_PROBES:
- if (sdi) {
- devc = sdi->priv;
- *data = GINT_TO_POINTER(devc->num_channels);
- sr_spew("zp: %s: Returning number of channels: %d.",
- __func__, devc->num_channels);
- } else
- return SR_ERR;
- break;
- case SR_DI_PROBE_NAMES:
- *data = probe_names;
- sr_spew("zp: %s: Returning probenames.", __func__);
- break;
case SR_DI_SAMPLERATES:
*data = &samplerates;
sr_spew("zp: %s: Returning samplerates.", __func__);
return SR_OK;
}
-static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
+static int set_samplerate(struct dev_context *devc, uint64_t samplerate)
{
- struct dev_context *devc;
-
- if (!sdi) {
- sr_err("zp: %s: sdi was NULL", __func__);
- return SR_ERR_ARG;
- }
+ int i;
- if (!(devc = sdi->priv)) {
- sr_err("zp: %s: sdi->priv was NULL", __func__);
+ for (i = 0; supported_samplerates[i]; i++)
+ if (samplerate == supported_samplerates[i])
+ break;
+ if (!supported_samplerates[i] || samplerate > devc->max_samplerate) {
+ sr_err("zp: %s: unsupported samplerate", __func__);
return SR_ERR_ARG;
}
sr_info("zp: Setting samplerate to %" PRIu64 "Hz.", samplerate);
- if (samplerate > SR_MHZ(1))
+ if (samplerate >= SR_MHZ(1))
analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ);
- else if (samplerate > SR_KHZ(1))
+ else if (samplerate >= SR_KHZ(1))
analyzer_set_freq(samplerate / SR_KHZ(1), FREQ_SCALE_KHZ);
else
analyzer_set_freq(samplerate, FREQ_SCALE_HZ);
return SR_OK;
}
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
- const void *value)
+static int set_limit_samples(struct dev_context *devc, uint64_t samples)
+{
+ devc->limit_samples = samples;
+
+ if (samples <= 2 * 1024)
+ devc->memory_size = MEMORY_SIZE_8K;
+ else if (samples <= 16 * 1024)
+ devc->memory_size = MEMORY_SIZE_64K;
+ else if (samples <= 32 * 1024 ||
+ devc->max_memory_size <= 32 * 1024)
+ devc->memory_size = MEMORY_SIZE_128K;
+ else
+ devc->memory_size = MEMORY_SIZE_512K;
+
+ sr_info("zp: Setting memory size to %dK.",
+ get_memory_size(devc->memory_size) / 1024);
+
+ analyzer_set_memory_size(devc->memory_size);
+
+ return SR_OK;
+}
+
+static int set_capture_ratio(struct dev_context *devc, uint64_t ratio)
+{
+ if (ratio > 100) {
+ sr_err("zp: %s: invalid capture ratio", __func__);
+ return SR_ERR_ARG;
+ }
+
+ devc->capture_ratio = ratio;
+
+ sr_info("zp: Setting capture ratio to %d%%.", devc->capture_ratio);
+
+ return SR_OK;
+}
+
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ if (!sdi) {
+ sr_err("zp: %s: sdi was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+
if (!(devc = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
}
- switch (hwcap) {
- case SR_HWCAP_SAMPLERATE:
- return set_samplerate(sdi, *(const uint64_t *)value);
- case SR_HWCAP_LIMIT_SAMPLES:
- devc->limit_samples = *(const uint64_t *)value;
- return SR_OK;
+ switch (id) {
+ case SR_CONF_SAMPLERATE:
+ return set_samplerate(devc, *(const uint64_t *)value);
+ case SR_CONF_LIMIT_SAMPLES:
+ return set_limit_samples(devc, *(const uint64_t *)value);
+ case SR_CONF_CAPTURE_RATIO:
+ return set_capture_ratio(devc, *(const uint64_t *)value);
default:
return SR_ERR;
}
}
+static void set_triggerbar(struct dev_context *devc)
+{
+ unsigned int ramsize;
+ unsigned int n;
+ unsigned int triggerbar;
+
+ ramsize = get_memory_size(devc->memory_size) / 4;
+ if (devc->trigger) {
+ n = ramsize;
+ if (devc->max_memory_size < n)
+ n = devc->max_memory_size;
+ if (devc->limit_samples < n)
+ n = devc->limit_samples;
+ n = n * devc->capture_ratio / 100;
+ if (n > ramsize - 8)
+ triggerbar = ramsize - 8;
+ else
+ triggerbar = n;
+ } else {
+ triggerbar = 0;
+ }
+ analyzer_set_triggerbar_address(triggerbar);
+ analyzer_set_ramsize_trigger_address(ramsize - triggerbar);
+
+ sr_dbg("zp: triggerbar_address = %d(0x%x)", triggerbar, triggerbar);
+ sr_dbg("zp: ramsize_triggerbar_address = %d(0x%x)",
+ ramsize - triggerbar, ramsize - triggerbar);
+}
+
static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
struct sr_datafeed_header header;
- struct sr_datafeed_meta_logic meta;
- uint64_t samples_read;
+ //uint64_t samples_read;
int res;
unsigned int packet_num;
+ unsigned int n;
unsigned char *buf;
struct dev_context *devc;
return SR_ERR;
}
+ set_triggerbar(devc);
+
/* push configured settings to device */
analyzer_configure(devc->usb->devhdl);
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->num_channels;
- sr_session_send(cb_data, &packet);
-
if (!(buf = g_try_malloc(PACKET_SIZE))) {
sr_err("zp: %s: buf malloc failed", __func__);
return SR_ERR_MALLOC;
}
- samples_read = 0;
+ //samples_read = 0;
analyzer_read_start(devc->usb->devhdl);
/* Send the incoming transfer to the session bus. */
- for (packet_num = 0; packet_num < (devc->memory_size * 4 / PACKET_SIZE);
- packet_num++) {
+ n = get_memory_size(devc->memory_size);
+ if (devc->max_memory_size * 4 < n)
+ n = devc->max_memory_size * 4;
+ for (packet_num = 0; packet_num < n / PACKET_SIZE; packet_num++) {
res = analyzer_read_data(devc->usb->devhdl, buf, PACKET_SIZE);
- sr_info("zp: Tried to read %llx bytes, actually read %x bytes",
+ sr_info("zp: Tried to read %d bytes, actually read %d bytes",
PACKET_SIZE, res);
packet.type = SR_DF_LOGIC;
logic.unitsize = 4;
logic.data = buf;
sr_session_send(cb_data, &packet);
- samples_read += res / 4;
+ //samples_read += res / 4;
}
analyzer_read_stop(devc->usb->devhdl);
g_free(buf);
}
/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
struct sr_datafeed_packet packet;
struct dev_context *devc;
.scan = hw_scan,
.dev_list = hw_dev_list,
.dev_clear = hw_cleanup,
+ .config_get = config_get,
+ .config_set = config_set,
.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