Replace 'probe group' with 'channel group' everywhere.

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

diff --git a/hardware/ikalogic-scanalogic2/api.c b/hardware/ikalogic-scanalogic2/api.c
index 4f1d09fbe50e0a47d38dc48122b2fa5bb13d6eab..052369a720bd4b712aa343b890ebed28534b8eb1 100644 (file)
--- a/hardware/ikalogic-scanalogic2/api.c
+++ b/hardware/ikalogic-scanalogic2/api.c
@@ -307,11 +307,14 @@ static int cleanup(void)
        return dev_clear();
 }
 
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_channel_group *channel_group)
 {
        struct dev_context *devc;
        int ret;
 
+       (void)channel_group;
+
        ret = SR_OK;
        devc = sdi->priv;
 
@@ -329,11 +332,14 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
        return ret;
 }
 
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_channel_group *channel_group)
 {
        uint64_t samplerate, limit_samples, capture_ratio;
        int ret;
 
+       (void)channel_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -359,13 +365,15 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
        return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_channel_group *channel_group)
 {
-       GVariant *gvar;
+       GVariant *gvar, *grange[2];
        GVariantBuilder gvb;
        int ret;
 
        (void)sdi;
+       (void)channel_group;
 
        ret = SR_OK;
 
@@ -385,6 +393,11 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
        case SR_CONF_TRIGGER_TYPE:
                *data = g_variant_new_string(TRIGGER_TYPES);
                break;
+       case SR_CONF_LIMIT_SAMPLES:
+               grange[0] = g_variant_new_uint64(0);
+               grange[1] = g_variant_new_uint64(MAX_SAMPLES);
+               *data = g_variant_new_tuple(grange, 2);
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -394,7 +407,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;
@@ -465,34 +477,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.");