rigol-ds: Reset num_frames to zero in dev_acquisition_start.

[libsigrok.git] / hardware / ikalogic-scanalogic2 / api.c

diff --git a/hardware/ikalogic-scanalogic2/api.c b/hardware/ikalogic-scanalogic2/api.c
index 1fe869c38d4c7b4ce8db9300e0a0cc9ddf2e8b53..93a9ca87ce692bb384dfe98c8a01d005c9e96875 100644 (file)
--- a/hardware/ikalogic-scanalogic2/api.c
+++ b/hardware/ikalogic-scanalogic2/api.c
@@ -25,6 +25,7 @@ static const int hwcaps[] = {
        SR_CONF_LIMIT_SAMPLES,
        SR_CONF_TRIGGER_TYPE,
        SR_CONF_CAPTURE_RATIO,
+       SR_CONF_MAX_UNCOMPRESSED_SAMPLES,
 };
 
 SR_PRIV const uint64_t sl2_samplerates[NUM_SAMPLERATES] = {
@@ -325,6 +326,9 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
        case SR_CONF_CAPTURE_RATIO:
                *data = g_variant_new_uint64(devc->capture_ratio);
                break;
+       case SR_CONF_MAX_UNCOMPRESSED_SAMPLES:
+               *data = g_variant_new_uint64(MAX_SAMPLES);
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -402,7 +406,6 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
-       const struct libusb_pollfd **pfd;
        struct drv_context *drvc;
        struct dev_context *devc;
        uint16_t trigger_bytes, tmp;
@@ -473,34 +476,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        tmp = GUINT16_TO_LE(devc->after_trigger_delay);
        memcpy(devc->xfer_data_out + 10, &tmp, sizeof(tmp));
 
-       if (!(pfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx))) {
-               sr_err("libusb_get_pollfds failed.");
-               return SR_ERR;
-       }
-
-       /* Count the number of file descriptors. */
-       for (devc->num_usbfd = 0; pfd[devc->num_usbfd]; devc->num_usbfd++);
-
-       if (!(devc->usbfd = g_try_malloc(devc->num_usbfd * sizeof(int)))) {
-               sr_err("File descriptor array malloc failed.");
-               free(pfd);
-               return SR_ERR_MALLOC;
-       }
-
        if ((ret = libusb_submit_transfer(devc->xfer_out)) != 0) {
                sr_err("Submit transfer failed: %s.", libusb_error_name(ret));
-               g_free(devc->usbfd);
                return SR_ERR;
        }
 
-       for (i = 0; i < devc->num_usbfd; i++) {
-               sr_source_add(pfd[i]->fd, pfd[i]->events, 100,
-                       ikalogic_scanalogic2_receive_data, (void *)sdi);
-
-               devc->usbfd[i] = pfd[i]->fd;
-       }
-
-       free(pfd);
+       usb_source_add(drvc->sr_ctx, 100, ikalogic_scanalogic2_receive_data, (void *)sdi);
 
        sr_dbg("Acquisition started successfully.");