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;
if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
continue;
- 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)
- continue;
sr_info("Found ZEROPLUS %s.", prof->model_name);
sdi = g_malloc0(sizeof(struct sr_dev_inst));
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;