/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
*
* same 128K sample depth.
*/
static const struct zp_model zeroplus_models[] = {
+ {0x0c12, 0x7002, "LAP-16128U", 16, 128, 200},
{0x0c12, 0x7009, "LAP-C(16064)", 16, 64, 100},
{0x0c12, 0x700a, "LAP-C(16128)", 16, 128, 200},
/* TODO: We don't know anything about these.
{ 0, 0, 0, 0, 0, 0 }
};
-static const int hwcaps[] = {
+static const int32_t hwcaps[] = {
SR_CONF_LOGIC_ANALYZER,
SR_CONF_SAMPLERATE,
SR_CONF_CAPTURE_RATIO,
SR_CONF_LIMIT_SAMPLES,
- 0,
};
/*
* options hardcoded into the vendor's Windows GUI.
*/
-/*
- * TODO: We shouldn't support 150MHz and 200MHz on devices that don't go up
- * that high.
- */
-const uint64_t zp_supported_samplerates[] = {
+static const uint64_t samplerates_100[] = {
SR_HZ(100),
SR_HZ(500),
SR_KHZ(1),
SR_MHZ(50),
SR_MHZ(80),
SR_MHZ(100),
- SR_MHZ(150),
- SR_MHZ(200),
- 0,
};
-static const struct sr_samplerates samplerates = {
- .low = 0,
- .high = 0,
- .step = 0,
- .list = zp_supported_samplerates,
+const uint64_t samplerates_200[] = {
+ SR_HZ(100),
+ SR_HZ(500),
+ SR_KHZ(1),
+ SR_KHZ(5),
+ SR_KHZ(25),
+ SR_KHZ(50),
+ SR_KHZ(100),
+ SR_KHZ(200),
+ SR_KHZ(400),
+ SR_KHZ(800),
+ SR_MHZ(1),
+ SR_MHZ(10),
+ SR_MHZ(25),
+ SR_MHZ(50),
+ SR_MHZ(80),
+ SR_MHZ(100),
+ SR_MHZ(150),
+ SR_MHZ(200),
};
static int hw_dev_close(struct sr_dev_inst *sdi);
return SR_OK;
}
-static int clear_instances(void)
+SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate)
{
- GSList *l;
- struct sr_dev_inst *sdi;
- struct drv_context *drvc;
- struct dev_context *devc;
+ int i;
- drvc = di->priv;
- for (l = drvc->instances; l; l = l->next) {
- sdi = l->data;
- if (!(devc = sdi->priv)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("%s: sdi->priv was NULL, continuing", __func__);
- continue;
- }
- sr_usb_dev_inst_free(devc->usb);
- /* Properly close all devices... */
- hw_dev_close(sdi);
- /* ...and free all their memory. */
- sr_dev_inst_free(sdi);
+ for (i = 0; ARRAY_SIZE(samplerates_200); i++)
+ if (samplerate == samplerates_200[i])
+ break;
+
+ if (i == ARRAY_SIZE(samplerates_200) || samplerate > devc->max_samplerate) {
+ sr_err("Unsupported samplerate: %" PRIu64 "Hz.", samplerate);
+ return SR_ERR_ARG;
}
- g_slist_free(drvc->instances);
- drvc->instances = NULL;
+
+ sr_info("Setting samplerate to %" PRIu64 "Hz.", samplerate);
+
+ if (samplerate >= SR_MHZ(1))
+ analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ);
+ else if (samplerate >= SR_KHZ(1))
+ analyzer_set_freq(samplerate / SR_KHZ(1), FREQ_SCALE_KHZ);
+ else
+ analyzer_set_freq(samplerate, FREQ_SCALE_HZ);
+
+ devc->cur_samplerate = samplerate;
return SR_OK;
}
+static int clear_instances(void)
+{
+ return std_dev_clear(di, NULL);
+}
+
static int hw_init(struct sr_context *sr_ctx)
{
return std_hw_init(sr_ctx, di, "zeroplus: ");
devices = NULL;
- clear_instances();
-
/* Find all ZEROPLUS analyzers and add them to device list. */
devcnt = 0;
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); /* TODO: Errors. */
}
sdi->priv = devc;
+ devc->prof = prof;
devc->num_channels = prof->channels;
#ifdef ZP_EXPERIMENTAL
devc->max_memory_size = 128 * 1024;
devices = g_slist_append(devices, sdi);
drvc->instances = g_slist_append(drvc->instances, sdi);
- devc->usb = sr_usb_dev_inst_new(
+ sdi->conn = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
devcnt++;
{
struct dev_context *devc;
struct drv_context *drvc;
+ struct sr_usb_dev_inst *usb;
libusb_device **devlist, *dev;
struct libusb_device_descriptor des;
int device_count, ret, i;
drvc = di->priv;
+ usb = sdi->conn;
if (!(devc = sdi->priv)) {
sr_err("%s: sdi->priv was NULL", __func__);
libusb_error_name(ret));
continue;
}
- if (libusb_get_bus_number(devlist[i]) == devc->usb->bus
- && libusb_get_device_address(devlist[i]) == devc->usb->address) {
+ if (libusb_get_bus_number(devlist[i]) == usb->bus
+ && libusb_get_device_address(devlist[i]) == usb->address) {
dev = devlist[i];
break;
}
}
if (!dev) {
sr_err("Device on bus %d address %d disappeared!",
- devc->usb->bus, devc->usb->address);
+ usb->bus, usb->address);
return SR_ERR;
}
- if (!(ret = libusb_open(dev, &(devc->usb->devhdl)))) {
+ if (!(ret = libusb_open(dev, &(usb->devhdl)))) {
sdi->status = SR_ST_ACTIVE;
sr_info("Opened device %d on %d.%d interface %d.",
- sdi->index, devc->usb->bus,
- devc->usb->address, USB_INTERFACE);
+ sdi->index, usb->bus, usb->address, USB_INTERFACE);
} else {
sr_err("Failed to open device: %s.", libusb_error_name(ret));
return SR_ERR;
}
- ret = libusb_set_configuration(devc->usb->devhdl, USB_CONFIGURATION);
+ ret = libusb_set_configuration(usb->devhdl, USB_CONFIGURATION);
if (ret < 0) {
sr_err("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);
+ ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
if (ret != 0) {
sr_err("Unable to claim interface: %s.",
libusb_error_name(ret));
}
/* Set default configuration after power on. */
- if (analyzer_read_status(devc->usb->devhdl) == 0)
- analyzer_configure(devc->usb->devhdl);
+ if (analyzer_read_status(usb->devhdl) == 0)
+ analyzer_configure(usb->devhdl);
- analyzer_reset(devc->usb->devhdl);
- analyzer_initialize(devc->usb->devhdl);
+ analyzer_reset(usb->devhdl);
+ analyzer_initialize(usb->devhdl);
//analyzer_set_memory_size(MEMORY_SIZE_512K);
// analyzer_set_freq(g_freq, g_freq_scale);
static int hw_dev_close(struct sr_dev_inst *sdi)
{
- struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
- devc = sdi->priv;
+ usb = sdi->conn;
- if (!devc->usb->devhdl)
+ if (!usb->devhdl)
return SR_ERR;
sr_info("Closing device %d on %d.%d interface %d.", sdi->index,
- devc->usb->bus, devc->usb->address, USB_INTERFACE);
- libusb_release_interface(devc->usb->devhdl, USB_INTERFACE);
- libusb_reset_device(devc->usb->devhdl);
- libusb_close(devc->usb->devhdl);
- devc->usb->devhdl = NULL;
+ usb->bus, usb->address, USB_INTERFACE);
+ libusb_release_interface(usb->devhdl, USB_INTERFACE);
+ libusb_reset_device(usb->devhdl);
+ libusb_close(usb->devhdl);
+ usb->devhdl = NULL;
sdi->status = SR_ST_INACTIVE;
return SR_OK;
static int hw_cleanup(void)
{
- struct drv_context *drvc;
-
- if (!(drvc = di->priv))
- return SR_OK;
-
- clear_instances();
-
- return SR_OK;
+ return clear_instances();
}
-static int config_get(int 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;
case SR_CONF_SAMPLERATE:
if (sdi) {
devc = sdi->priv;
- *data = &devc->cur_samplerate;
+ *data = g_variant_new_uint64(devc->cur_samplerate);
sr_spew("Returning samplerate: %" PRIu64 "Hz.",
devc->cur_samplerate);
} else
return SR_ERR;
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
}
-static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- if (!sdi) {
- sr_err("%s: sdi was NULL", __func__);
- return SR_ERR_ARG;
- }
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("%s: sdi->priv was NULL", __func__);
switch (id) {
case SR_CONF_SAMPLERATE:
- return zp_set_samplerate(devc, *(const uint64_t *)value);
+ return zp_set_samplerate(devc, g_variant_get_uint64(data));
case SR_CONF_LIMIT_SAMPLES:
- return set_limit_samples(devc, *(const uint64_t *)value);
+ return set_limit_samples(devc, g_variant_get_uint64(data));
case SR_CONF_CAPTURE_RATIO:
- return set_capture_ratio(devc, *(const uint64_t *)value);
+ return set_capture_ratio(devc, g_variant_get_uint64(data));
default:
- return SR_ERR;
+ return SR_ERR_NA;
}
return SR_OK;
}
-static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
- (void)sdi;
+ struct dev_context *devc;
+ GVariant *gvar;
+ GVariantBuilder gvb;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- *data = hwcaps;
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
break;
case SR_CONF_SAMPLERATE:
- *data = &samplerates;
+ devc = sdi->priv;
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
+ if (devc->prof->max_sampling_freq == 100) {
+ gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
+ samplerates_100, ARRAY_SIZE(samplerates_100),
+ sizeof(uint64_t));
+ } else if (devc->prof->max_sampling_freq == 200) {
+ gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
+ samplerates_200, ARRAY_SIZE(samplerates_200),
+ sizeof(uint64_t));
+ } else {
+ sr_err("Internal error: Unknown max. samplerate: %d.",
+ devc->prof->max_sampling_freq);
+ return SR_ERR_ARG;
+ }
+ g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
+ *data = g_variant_builder_end(&gvb);
break;
case SR_CONF_TRIGGER_TYPE:
- *data = TRIGGER_TYPE;
+ *data = g_variant_new_string(TRIGGER_TYPE);
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
+ struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
//uint64_t samples_read;
int res;
unsigned int packet_num, n;
unsigned char *buf;
- struct dev_context *devc;
+
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("%s: sdi->priv was NULL", __func__);
return SR_ERR;
}
+ usb = sdi->conn;
+
set_triggerbar(devc);
/* Push configured settings to device. */
- analyzer_configure(devc->usb->devhdl);
+ analyzer_configure(usb->devhdl);
- analyzer_start(devc->usb->devhdl);
+ analyzer_start(usb->devhdl);
sr_info("Waiting for data.");
- analyzer_wait_data(devc->usb->devhdl);
+ analyzer_wait_data(usb->devhdl);
sr_info("Stop address = 0x%x.",
- analyzer_get_stop_address(devc->usb->devhdl));
+ analyzer_get_stop_address(usb->devhdl));
sr_info("Now address = 0x%x.",
- analyzer_get_now_address(devc->usb->devhdl));
+ analyzer_get_now_address(usb->devhdl));
sr_info("Trigger address = 0x%x.",
- analyzer_get_trigger_address(devc->usb->devhdl));
+ analyzer_get_trigger_address(usb->devhdl));
/* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+ std_session_send_df_header(cb_data, LOG_PREFIX);
if (!(buf = g_try_malloc(PACKET_SIZE))) {
sr_err("Packet buffer malloc failed.");
}
//samples_read = 0;
- analyzer_read_start(devc->usb->devhdl);
+ analyzer_read_start(usb->devhdl);
/* Send the incoming transfer to the session bus. */
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);
+ res = analyzer_read_data(usb->devhdl, buf, PACKET_SIZE);
sr_info("Tried to read %d bytes, actually read %d bytes.",
PACKET_SIZE, res);
sr_session_send(cb_data, &packet);
//samples_read += res / 4;
}
- analyzer_read_stop(devc->usb->devhdl);
+ analyzer_read_stop(usb->devhdl);
g_free(buf);
packet.type = SR_DF_END;
/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
- struct sr_datafeed_packet packet;
struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
+ struct sr_datafeed_packet packet;
packet.type = SR_DF_END;
sr_session_send(cb_data, &packet);
return SR_ERR_BUG;
}
- analyzer_reset(devc->usb->devhdl);
+ usb = sdi->conn;
+ analyzer_reset(usb->devhdl);
/* TODO: Need to cancel and free any queued up transfers. */
return SR_OK;
projects / libsigrok.git / blobdiff