korad-kaxxxxp: use ID text prefix with optional version for RND models

[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 73af06ea0dc7a58d062cc775a4b7a26e448c93d4..9d15fe6c97c13ec7e915e3036861ba348e228f30 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,
 };
 
 /*
@@ -193,7 +199,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
                libusb_close(hdl);
 
-               usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+               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++) {
@@ -372,7 +379,8 @@ static int config_set(uint32_t key, GVariant *data,
        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);
@@ -390,7 +398,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)
@@ -542,8 +550,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;
@@ -574,12 +583,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;