hantek-6xxx: store the amount samples received

[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 7886fbbdce00e861e3f6012e15295a4b3d197c22..657e5eb25ae87fa59c148c3ac5bd1dfcf5893a20 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -31,7 +31,7 @@
 struct zp_model {
        uint16_t vid;
        uint16_t pid;
-       char *model_name;
+       const char *model_name;
        unsigned int channels;
        unsigned int sample_depth;      /* In Ksamples/channel */
        unsigned int max_sampling_freq;
@@ -51,7 +51,7 @@ static const struct zp_model zeroplus_models[] = {
        {0x0c12, 0x700e, "LAP-C(16032)",  16, 32,   100},
        {0x0c12, 0x7016, "LAP-C(162000)", 16, 2048, 200},
        {0x0c12, 0x7100, "AKIP-9101", 16, 256, 200},
-       { 0, 0, 0, 0, 0, 0 }
+       ALL_ZERO
 };
 
 static const uint32_t devopts[] = {
@@ -183,12 +183,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); /* TODO: Errors. */
 
        for (i = 0; devlist[i]; i++) {
-               ret = libusb_get_device_descriptor(devlist[i], &des);
-               if (ret != 0) {
-                       sr_err("Failed to get device descriptor: %s.",
-                              libusb_error_name(ret));
-                       continue;
-               }
+               libusb_get_device_descriptor(devlist[i], &des);
 
                if ((ret = libusb_open(devlist[i], &hdl)) < 0)
                        continue;