Consistently use 'cg' for channel group variables.

[libsigrok.git] / hardware / hantek-dso / api.c

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 6ac9ba616cb09ae6c5d13a2aff923e6acf440c4f..a10af6c55c9e480f3deae213fc309095153132b2 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -244,7 +244,7 @@ static void clear_dev_context(void *priv)
 
 }
 
-static int clear_instances(void)
+static int dev_clear(void)
 {
        return std_dev_clear(di, clear_dev_context);
 }
@@ -419,14 +419,17 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-       return clear_instances();
+       return dev_clear();
 }
 
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_channel_group *cg)
 {
        struct sr_usb_dev_inst *usb;
        char str[128];
 
+       (void)cg;
+
        switch (id) {
        case SR_CONF_CONN:
                if (!sdi || !sdi->conn)
@@ -452,7 +455,8 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        double tmp_double;
@@ -462,6 +466,8 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
        const char *tmp_str;
        char **targets;
 
+       (void)cg;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -472,10 +478,11 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
                devc->limit_frames = g_variant_get_uint64(data);
                break;
        case SR_CONF_TRIGGER_SLOPE:
-               tmp_u64 = g_variant_get_uint64(data);
-               if (tmp_u64 != SLOPE_NEGATIVE && tmp_u64 != SLOPE_POSITIVE)
-                       ret = SR_ERR_ARG;
-               devc->triggerslope = tmp_u64;
+               tmp_str = g_variant_get_string(data, NULL);
+               if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r'))
+                       return SR_ERR_ARG;
+               devc->triggerslope = (tmp_str[0] == 'r')
+                       ? SLOPE_POSITIVE : SLOPE_NEGATIVE;
                break;
        case SR_CONF_HORIZ_TRIGGERPOS:
                tmp_double = g_variant_get_double(data);
@@ -579,17 +586,16 @@ static int config_set(int id, 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 *cg)
 {
        struct dev_context *devc;
        GVariant *tuple, *rational[2];
        GVariantBuilder gvb;
        unsigned int i;
 
-       if (!sdi)
-               return SR_ERR_ARG;
+       (void)cg;
 
-       devc = sdi->priv;
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
@@ -600,6 +606,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
                                devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
                break;
        case SR_CONF_BUFFERSIZE:
+               if (!sdi)
+                       return SR_ERR_ARG;
+               devc = sdi->priv;
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
                                devc->profile->buffersizes, 2, sizeof(uint64_t));
                break;
@@ -797,8 +806,7 @@ static int handle_event(int fd, int revents, void *cb_data)
        struct timeval tv;
        struct dev_context *devc;
        struct drv_context *drvc = di->priv;
-       const struct libusb_pollfd **lupfd;
-       int num_probes, i;
+       int num_probes;
        uint32_t trigger_offset;
        uint8_t capturestate;
 
@@ -814,10 +822,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                 * TODO: Doesn't really cancel pending transfers so they might
                 * come in after SR_DF_END is sent.
                 */
-               lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
-               for (i = 0; lupfd[i]; i++)
-                       sr_source_remove(lupfd[i]->fd);
-               free(lupfd);
+               usb_source_remove(drvc->sr_ctx);
 
                packet.type = SR_DF_END;
                sr_session_send(sdi, &packet);
@@ -907,10 +912,8 @@ static int handle_event(int fd, int revents, void *cb_data)
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
-       const struct libusb_pollfd **lupfd;
        struct dev_context *devc;
        struct drv_context *drvc = di->priv;
-       int i;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -930,11 +933,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                return SR_ERR;
 
        devc->dev_state = CAPTURE;
-       lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
-       for (i = 0; lupfd[i]; i++)
-               sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK,
-                               handle_event, (void *)sdi);
-       free(lupfd);
+       usb_source_add(drvc->sr_ctx, TICK, handle_event, (void *)sdi);
 
        /* Send header packet to the session bus. */
        std_session_send_df_header(cb_data, LOG_PREFIX);
@@ -965,7 +964,7 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = clear_instances,
+       .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,