build: Portability fixes.

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

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 41c78290ef79b38a77341276de1292ca3cb93a3b..c948e4216a8260ea591f207a5ebaf9d62feeb375 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -60,7 +60,7 @@ static const int32_t devopts[] = {
        SR_CONF_NUM_VDIV,
 };
 
-static const char *probe_names[] = {
+static const char *channel_names[] = {
        "CH1", "CH2",
        NULL,
 };
@@ -160,7 +160,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof)
 {
        struct sr_dev_inst *sdi;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        struct drv_context *drvc;
        struct dev_context *devc;
        int i;
@@ -172,14 +172,14 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
        sdi->driver = di;
 
        /*
-        * Add only the real probes -- EXT isn't a source of data, only
+        * Add only the real channels -- EXT isn't a source of data, only
         * a trigger source internal to the device.
         */
-       for (i = 0; probe_names[i]; i++) {
-               if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
-                               probe_names[i])))
+       for (i = 0; channel_names[i]; i++) {
+               if (!(ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE,
+                               channel_names[i])))
                        return NULL;
-               sdi->probes = g_slist_append(sdi->probes, probe);
+               sdi->channels = g_slist_append(sdi->channels, ch);
        }
 
        if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -210,25 +210,25 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
        return sdi;
 }
 
-static int configure_probes(const struct sr_dev_inst *sdi)
+static int configure_channels(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        const GSList *l;
        int p;
 
        devc = sdi->priv;
 
-       g_slist_free(devc->enabled_probes);
+       g_slist_free(devc->enabled_channels);
        devc->ch1_enabled = devc->ch2_enabled = FALSE;
-       for (l = sdi->probes, p = 0; l; l = l->next, p++) {
-               probe = l->data;
+       for (l = sdi->channels, p = 0; l; l = l->next, p++) {
+               ch = l->data;
                if (p == 0)
-                       devc->ch1_enabled = probe->enabled;
+                       devc->ch1_enabled = ch->enabled;
                else
-                       devc->ch2_enabled = probe->enabled;
-               if (probe->enabled)
-                       devc->enabled_probes = g_slist_append(devc->enabled_probes, probe);
+                       devc->ch2_enabled = ch->enabled;
+               if (ch->enabled)
+                       devc->enabled_channels = g_slist_append(devc->enabled_channels, ch);
        }
 
        return SR_OK;
@@ -240,7 +240,7 @@ static void clear_dev_context(void *priv)
 
        devc = priv;
        g_free(devc->triggersource);
-       g_slist_free(devc->enabled_probes);
+       g_slist_free(devc->enabled_channels);
 
 }
 
@@ -423,12 +423,12 @@ static int cleanup(void)
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct sr_usb_dev_inst *usb;
        char str[128];
 
-       (void)probe_group;
+       (void)cg;
 
        switch (id) {
        case SR_CONF_CONN:
@@ -456,7 +456,7 @@ static int config_get(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_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        double tmp_double;
@@ -466,7 +466,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
        const char *tmp_str;
        char **targets;
 
-       (void)probe_group;
+       (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -587,14 +587,14 @@ static int config_set(int id, 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)
 {
        struct dev_context *devc;
        GVariant *tuple, *rational[2];
        GVariantBuilder gvb;
        unsigned int i;
 
-       (void)probe_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
@@ -657,19 +657,19 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
        struct sr_datafeed_analog analog;
        struct dev_context *devc;
        float ch1, ch2, range;
-       int num_probes, data_offset, i;
+       int num_channels, data_offset, i;
 
        devc = sdi->priv;
-       num_probes = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
+       num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
        packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
        /* TODO: support for 5xxx series 9-bit samples */
-       analog.probes = devc->enabled_probes;
+       analog.channels = devc->enabled_channels;
        analog.num_samples = num_samples;
        analog.mq = SR_MQ_VOLTAGE;
        analog.unit = SR_UNIT_VOLT;
        /* TODO: Check malloc return value. */
-       analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_probes);
+       analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels);
        data_offset = 0;
        for (i = 0; i < analog.num_samples; i++) {
                /*
@@ -806,7 +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;
-       int num_probes;
+       int num_channels;
        uint32_t trigger_offset;
        uint8_t capturestate;
 
@@ -822,7 +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.
                 */
-               usb_source_remove(drvc->sr_ctx);
+               usb_source_remove(sdi->session, drvc->sr_ctx);
 
                packet.type = SR_DF_END;
                sr_session_send(sdi, &packet);
@@ -876,9 +876,9 @@ static int handle_event(int fd, int revents, void *cb_data)
                /* Remember where in the captured frame the trigger is. */
                devc->trigger_offset = trigger_offset;
 
-               num_probes = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
+               num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
                /* TODO: Check malloc return value. */
-               devc->framebuf = g_try_malloc(devc->framesize * num_probes * 2);
+               devc->framebuf = g_try_malloc(devc->framesize * num_channels * 2);
                devc->samp_buffered = devc->samp_received = 0;
 
                /* Tell the scope to send us the first frame. */
@@ -921,8 +921,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        devc = sdi->priv;
        devc->cb_data = cb_data;
 
-       if (configure_probes(sdi) != SR_OK) {
-               sr_err("Failed to configure probes.");
+       if (configure_channels(sdi) != SR_OK) {
+               sr_err("Failed to configure channels.");
                return SR_ERR;
        }
 
@@ -933,7 +933,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                return SR_ERR;
 
        devc->dev_state = CAPTURE;
-       usb_source_add(drvc->sr_ctx, TICK, handle_event, (void *)sdi);
+       usb_source_add(sdi->session, drvc->sr_ctx, TICK, handle_event, (void *)sdi);
 
        /* Send header packet to the session bus. */
        std_session_send_df_header(cb_data, LOG_PREFIX);