X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=9aed547362c59bd5933c45e56cff2e24a7fb43f8;hp=6a5b327566e3a332c4673f370b68df7f4f26f1ec;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hpb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7 diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c index 6a5b3275..9aed5473 100644 --- a/hardware/cem-dt-885x/api.c +++ b/hardware/cem-dt-885x/api.c @@ -126,7 +126,7 @@ static GSList *scan(GSList *options) sdi->inst_type = SR_INST_SERIAL; sdi->priv = devc; sdi->driver = di; - if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "SPL"))) + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL"))) return NULL; sdi->channels = g_slist_append(sdi->channels, ch); drvc->instances = g_slist_append(drvc->instances, sdi); @@ -397,16 +397,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) /* Poll every 100ms, or whenever some data comes in. */ serial = sdi->conn; - serial_source_add(serial, G_IO_IN, 150, cem_dt_885x_receive_data, - (void *)sdi); + serial_source_add(sdi->session, serial, G_IO_IN, 150, + cem_dt_885x_receive_data, (void *)sdi); return SR_OK; } static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - (void)cb_data; - if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED;