Consistently use 'cg' for channel group variables.

[libsigrok.git] / hardware / saleae-logic16 / api.c

diff --git a/hardware/saleae-logic16/api.c b/hardware/saleae-logic16/api.c
index e399729e9b09d9d5a9dae883cc42ca744c0135f6..40f7812c0e686ac62d266dbbce4be6f63bfcc06e 100644 (file)
--- a/hardware/saleae-logic16/api.c
+++ b/hardware/saleae-logic16/api.c
@@ -240,11 +240,6 @@ static GSList *dev_list(void)
        return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int dev_clear(void)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int logic16_dev_open(struct sr_dev_inst *sdi)
 {
        libusb_device **devlist;
@@ -424,7 +419,8 @@ static int cleanup(void)
                /* Can get called on an unused driver, doesn't matter. */
                return SR_OK;
 
-       ret = dev_clear();
+
+       ret = std_dev_clear(di, NULL);
        g_free(drvc);
        di->priv = NULL;
 
@@ -432,7 +428,7 @@ static int cleanup(void)
 }
 
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        struct sr_usb_dev_inst *usb;
@@ -441,7 +437,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
        int ret;
        unsigned int i;
 
-       (void)probe_group;
+       (void)cg;
 
        ret = SR_OK;
        switch (key) {
@@ -486,14 +482,14 @@ static int config_get(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_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        gdouble low, high;
        int ret;
        unsigned int i;
 
-       (void)probe_group;
+       (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -529,7 +525,7 @@ static int config_set(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_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        GVariant *gvar, *range[2];
        GVariantBuilder gvb;
@@ -537,7 +533,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
        unsigned int i;
 
        (void)sdi;
-       (void)probe_group;
+       (void)cg;
 
        ret = SR_OK;
        switch (key) {
@@ -691,7 +687,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        struct drv_context *drvc;
        struct sr_usb_dev_inst *usb;
        struct libusb_transfer *transfer;
-       const struct libusb_pollfd **lupfd;
        unsigned int i, timeout, num_transfers;
        int ret;
        unsigned char *buf;
@@ -721,7 +716,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        size = get_buffer_size(devc);
        convsize = (size / devc->num_channels + 2) * 16;
        devc->submitted_transfers = 0;
-       devc->usbfd = NULL;
 
        devc->convbuffer_size = convsize;
        if (!(devc->convbuffer = g_try_malloc(convsize))) {
@@ -771,21 +765,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                devc->submitted_transfers++;
        }
 
-       lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
-       for (i = 0; lupfd[i]; i++);
-       devc->usbfd = g_try_malloc(sizeof(struct libusb_pollfd) * (i + 1));
-       if (!devc->usbfd) {
-               abort_acquisition(devc);
-               free(lupfd);
-               return SR_ERR;
-       }
-       for (i = 0; lupfd[i]; i++) {
-               sr_source_add(lupfd[i]->fd, lupfd[i]->events,
-                             timeout, receive_data, (void *)sdi);
-               devc->usbfd[i] = lupfd[i]->fd;
-       }
-       devc->usbfd[i] = -1;
-       free(lupfd);
+       devc->ctx = drvc->sr_ctx;
+
+       usb_source_add(devc->ctx, timeout, receive_data, (void *)sdi);
 
        /* Send header packet to the session bus. */
        std_session_send_df_header(cb_data, LOG_PREFIX);
@@ -822,7 +804,7 @@ SR_PRIV struct sr_dev_driver saleae_logic16_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = NULL,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,