zeroplus-logic-cube: move USB VID:PID check in scan before device access

[libsigrok.git] / src / hardware / zeroplus-logic-cube / api.c

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index d8067416286b47d7654cf3bb271a55c532972a09..1fae2c8a8f541e00788e7d19cf03e69ff18e46b4 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -42,6 +42,7 @@ struct zp_model {
  */
 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},
@@ -49,7 +50,9 @@ static const struct zp_model zeroplus_models[] = {
        {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
 };
 
@@ -68,6 +71,9 @@ static const uint32_t devopts[] = {
 static const int32_t trigger_matches[] = {
        SR_TRIGGER_ZERO,
        SR_TRIGGER_ONE,
+       SR_TRIGGER_RISING,
+       SR_TRIGGER_FALLING,
+       SR_TRIGGER_EDGE,
 };
 
 /*
@@ -164,6 +170,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        libusb_device **devlist;
        GSList *devices;
        int ret, i, j;
+       const struct zp_model *check;
        char serial_num[64], connection_id[64];
 
        (void)options;
@@ -178,6 +185,30 @@ static GSList *scan(struct sr_dev_driver *di, GSList *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;
 
@@ -193,18 +224,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
                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));
@@ -391,7 +413,7 @@ static int config_list(uint32_t key, GVariant **data,
 
        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)
@@ -543,8 +565,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                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;
@@ -575,12 +598,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                        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;