build: Portability fixes.

[libsigrok.git] / hardware / colead-slm / api.c

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index 99773a80b8fc6af8ec26dbe922ddedf2ae6aca4c..d5fc9ac1c28f5e4f63b68fdaa74fba6436bb53bd 100644 (file)
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -56,7 +56,7 @@ static GSList *scan(GSList *options)
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
        struct sr_config *src;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        GSList *devices, *l;
        const char *conn, *serialcomm;
 
@@ -97,9 +97,9 @@ static GSList *scan(GSList *options)
        sdi->inst_type = SR_INST_SERIAL;
        sdi->priv = devc;
        sdi->driver = 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);
        drvc->instances = g_slist_append(drvc->instances, sdi);
        devices = g_slist_append(devices, sdi);
 
@@ -209,8 +209,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        /* Poll every 150ms, or whenever some data comes in. */
        serial = sdi->conn;
-       serial_source_add(serial, G_IO_IN, 150, colead_slm_receive_data,
-                       (void *)sdi);
+       serial_source_add(sdi->session, serial, G_IO_IN, 150,
+                       colead_slm_receive_data, (void *)sdi);
 
        return SR_OK;
 }