build: Portability fixes.

[libsigrok.git] / hardware / uni-t-dmm / api.c

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index a91af6cc02da640a232f7f037bf8bed59d6e399b..f98c4f5e39e32654fc2fd3e87a1b99577e2dab7e 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -181,7 +181,7 @@ static GSList *scan(GSList *options, int dmm)
        struct drv_context *drvc;
        struct sr_usb_dev_inst *usb;
        struct sr_config *src;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        const char *conn;
 
        drvc = udmms[dmm].di->priv;
@@ -221,9 +221,9 @@ static GSList *scan(GSList *options, int dmm)
                }
                sdi->priv = devc;
                sdi->driver = udmms[dmm].di;
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+               if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
                        return NULL;
-               sdi->probes = g_slist_append(sdi->probes, probe);
+               sdi->channels = g_slist_append(sdi->channels, ch);
 
                sdi->inst_type = SR_INST_USB;
                sdi->conn = usb;
@@ -257,8 +257,6 @@ static int dev_open(struct sr_dev_inst *sdi, int dmm)
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-       (void)sdi;
-
        /* TODO */
 
        sdi->status = SR_ST_INACTIVE;
@@ -272,11 +270,11 @@ static int cleanup(int dmm)
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *channel_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
-       (void)channel_group;
+       (void)cg;
 
        devc = sdi->priv;
 
@@ -307,10 +305,10 @@ 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_channel_group *channel_group)
+               const struct sr_channel_group *cg)
 {
        (void)sdi;
-       (void)channel_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
@@ -340,9 +338,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        devc->starttime = g_get_monotonic_time();
 
        /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
-       sr_source_add(0, 0, 10 /* poll_timeout */,
+       sr_session_source_add(sdi->session, 0, 0, 10 /* poll_timeout */,
                      udmms[dmm].receive_data, (void *)sdi);
 
        return SR_OK;
@@ -352,17 +350,16 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        struct sr_datafeed_packet packet;
 
-       (void)sdi;
+       (void)cb_data;
 
        sr_dbg("Stopping acquisition.");
 
        /* Send end packet to the session bus. */
        sr_dbg("Sending SR_DF_END.");
        packet.type = SR_DF_END;
-       sr_session_send(cb_data, &packet);
+       sr_session_send(sdi, &packet);
 
-       /* TODO? */
-       sr_source_remove(0);
+       sr_session_source_remove(sdi->session, 0);
 
        return SR_OK;
 }