Add struct sr_session parameter to all session source backends.

[libsigrok.git] / hardware / brymen-dmm / api.c

diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c
index 9af92f1da15e2f4eb334d1c7995d5813e11b713e..1ccd18af0fa36f3eb92685d818c2fe94308b6edc 100644 (file)
--- a/hardware/brymen-dmm/api.c
+++ b/hardware/brymen-dmm/api.c
@@ -44,7 +44,7 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
        struct drv_context *drvc;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        struct sr_serial_dev_inst *serial;
        GSList *devices;
        int ret;
@@ -75,7 +75,7 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
 
        sr_info("Found device on port %s.", conn);
 
-       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Brymen", "BM85x", "")))
+       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Brymen", "BM85x", NULL)))
                goto scan_cleanup;
 
        if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -89,10 +89,10 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
        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")))
                goto scan_cleanup;
 
-       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);
 
@@ -230,8 +230,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        /* Poll every 50ms, or whenever some data comes in. */
        serial = sdi->conn;
-       serial_source_add(serial, G_IO_IN, 50,
-                     brymen_dmm_receive_data, (void *)sdi);
+       serial_source_add(sdi->session, serial, G_IO_IN, 50,
+                       brymen_dmm_receive_data, (void *)sdi);
 
        return SR_OK;
 }