*/
static const struct zp_model zeroplus_models[] = {
{0x0c12, 0x7002, "LAP-16128U", 16, 128, 200},
+ {0x0c12, 0x7007, "LAP-16032U", 16, 32, 200},
{0x0c12, 0x7009, "LAP-C(16064)", 16, 64, 100},
{0x0c12, 0x700a, "LAP-C(16128)", 16, 128, 200},
{0x0c12, 0x700b, "LAP-C(32128)", 32, 128, 200},
{0x0c12, 0x700d, "LAP-C(322000)", 32, 2048, 200},
{0x0c12, 0x700e, "LAP-C(16032)", 16, 32, 100},
{0x0c12, 0x7016, "LAP-C(162000)", 16, 2048, 200},
- {0x0c12, 0x7100, "AKIP-9101", 16, 256, 200},
+ {0x0c12, 0x7025, "LAP-C(16128+)", 16, 128, 200},
+ {0x0c12, 0x7064, "Logian-16L", 16, 128, 200},
+ {0x0c12, 0x7100, "AKIP-9101", 16, 256, 200},
ALL_ZERO
};
static const int32_t trigger_matches[] = {
SR_TRIGGER_ZERO,
SR_TRIGGER_ONE,
+ SR_TRIGGER_RISING,
+ SR_TRIGGER_FALLING,
+ SR_TRIGGER_EDGE,
};
/*
libusb_device **devlist;
GSList *devices;
int ret, i, j;
+ const struct zp_model *check;
char serial_num[64], connection_id[64];
(void)options;
for (i = 0; devlist[i]; i++) {
libusb_get_device_descriptor(devlist[i], &des);
+ /*
+ * Check for expected VID:PID first as soon as we got
+ * the descriptor's content. This avoids access to flaky
+ * unrelated devices which trouble the application even
+ * if they are unrelated to measurement purposes.
+ *
+ * See https://sigrok.org/bugzilla/show_bug.cgi?id=1115
+ * and https://github.com/sigrokproject/libsigrok/pull/165
+ * for a discussion.
+ */
+ prof = NULL;
+ for (j = 0; zeroplus_models[j].vid; j++) {
+ check = &zeroplus_models[j];
+ if (des.idVendor != check->vid)
+ continue;
+ if (des.idProduct != check->pid)
+ continue;
+ prof = check;
+ break;
+ }
+ if (!prof)
+ continue;
+
+ /* Get the device's serial number from USB strings. */
if ((ret = libusb_open(devlist[i], &hdl)) < 0)
continue;
libusb_close(hdl);
- usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
-
- prof = NULL;
- for (j = 0; j < zeroplus_models[j].vid; j++) {
- if (des.idVendor == zeroplus_models[j].vid &&
- des.idProduct == zeroplus_models[j].pid) {
- prof = &zeroplus_models[j];
- }
- }
-
- if (!prof)
+ if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
continue;
+
sr_info("Found ZEROPLUS %s.", prof->model_name);
sdi = g_malloc0(sizeof(struct sr_dev_inst));
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
- GVariant *range[2];
(void)cg;
*data = g_variant_new_uint64(devc->capture_ratio);
break;
case SR_CONF_VOLTAGE_THRESHOLD:
- range[0] = g_variant_new_double(devc->cur_threshold);
- range[1] = g_variant_new_double(devc->cur_threshold);
- *data = g_variant_new_tuple(range, 2);
+ *data = std_gvar_tuple_double(devc->cur_threshold, devc->cur_threshold);
break;
default:
return SR_ERR_NA;
case SR_CONF_LIMIT_SAMPLES:
return set_limit_samples(devc, g_variant_get_uint64(data));
case SR_CONF_CAPTURE_RATIO:
- return set_capture_ratio(devc, g_variant_get_uint64(data));
+ devc->capture_ratio = g_variant_get_uint64(data);
+ break;
case SR_CONF_VOLTAGE_THRESHOLD:
g_variant_get(data, "(dd)", &low, &high);
return set_voltage_threshold(devc, (low + high) / 2.0);
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
+ return STD_CONFIG_LIST(key, data, sdi, cg, NO_OPTS, drvopts, devopts);
case SR_CONF_SAMPLERATE:
devc = sdi->priv;
if (devc->prof->max_sampling_freq == 100)
unsigned int buf_offset;
res = analyzer_read_data(usb->devhdl, buf, PACKET_SIZE);
- sr_info("Tried to read %d bytes, actually read %d bytes.",
- PACKET_SIZE, res);
+ if (res != PACKET_SIZE)
+ sr_warn("Tried to read %d bytes, actually read %d.",
+ PACKET_SIZE, res);
if (discard >= PACKET_SIZE / 4) {
discard -= PACKET_SIZE / 4;
buf_offset += logic.length;
}
- if (samples_read == trigger_offset) {
- /* Send out trigger */
- packet.type = SR_DF_TRIGGER;
- packet.payload = NULL;
- sr_session_send(sdi, &packet);
- }
+ if (samples_read == trigger_offset)
+ std_session_send_df_trigger(sdi);
/* Send out data (or data after trigger) */
packet.type = SR_DF_LOGIC;